18 files changed, 111 insertions, 65 deletions

diff --git a/app/helpers/access_links_helper.rb b/app/helpers/access_links_helper.rb
new file mode 100644
index 000000000..8df452f65
--- /dev/null
+++ b/app/helpers/access_links_helper.rb
@@ -0,0 +1,7 @@
+module AccessLinksHelper
+  def access_link_type_label_pairs
+    Chouette::AccessLink
+    .access_link_types
+    .zip_map { |type| t("connection_link_types.label.#{type}") }
+  end
+end
diff --git a/app/helpers/access_points_helper.rb b/app/helpers/access_points_helper.rb
index c5e9f672e..c954e6cad 100644
--- a/app/helpers/access_points_helper.rb
+++ b/app/helpers/access_points_helper.rb
@@ -1,28 +1,14 @@
 module AccessPointsHelper
-  def access_links_pairs(access_links)
-    hpairs = Hash.new
-    pairs = Array.new
-    access_links.each do |link|
-      key = pair_key(link)
-      pair = nil
-      if (hpairs.has_key? key)
-        pair = hpairs[key]
-      else
-        pair = AccessLinkPair.new
-        pairs << pair
-        hpairs[key] = pair
-      end
-      if (link.link_orientation_type == "access_point_to_stop_area")
-        pair.from_access_point = link
-      else
-        pair.to_access_point = link
-      end
-    end
-    pairs
+
+
+  def access_point_type_label_pairs
+    Chouette::AccessPoint
+    .access_point_types
+    .zip_map { |access_point_type| t("access_types.label.#{access_point_type}") }
   end
-  
+
   def pair_key(access_link)
     "#{access_link.access_point.id}-#{access_link.stop_area.id}"
   end
-  
+
 end
diff --git a/app/helpers/common_helpers.rb b/app/helpers/common_helpers.rb
new file mode 100644
index 000000000..29cabddac
--- /dev/null
+++ b/app/helpers/common_helpers.rb
@@ -0,0 +1,26 @@
+
+module CommonHelpers
+  # TODO: Needs refactoring, but does not seem to be under test
+  # so let us refactor this **after** test coverage.
+  def access_links_pairs(access_links)
+    hpairs = Hash.new
+    pairs = Array.new
+    access_links.each do |link|
+      key = pair_key(link)
+      pair = nil
+      if (hpairs.has_key? key)
+        pair = hpairs[key]
+      else
+        pair = AccessLinkPair.new
+        pairs << pair
+        hpairs[key] = pair
+      end
+      if (link.link_orientation_type == "access_point_to_stop_area")
+        pair.from_access_point = link
+      else
+        pair.to_access_point = link
+      end
+    end
+    pairs
+  end
+end
diff --git a/app/helpers/connection_links_helper.rb b/app/helpers/connection_links_helper.rb
new file mode 100644
index 000000000..d9c201028
--- /dev/null
+++ b/app/helpers/connection_links_helper.rb
@@ -0,0 +1,8 @@
+module ConnectionLinksHelper
+
+  def connection_link_type_label_pairs
+    Chouette::ConnectionLink
+      .connection_link_types
+      .zip_map { |type| t("connection_link_types.label.#{type}") }
+  end
+end
diff --git a/app/helpers/core_helper.rb b/app/helpers/core_helper.rb
new file mode 100644
index 000000000..af2f6664c
--- /dev/null
+++ b/app/helpers/core_helper.rb
@@ -0,0 +1,7 @@
+module CoreHelper
+  module ::Enumerable
+    def zip_map
+      map { |ele| [ele, yield(ele)] }
+    end
+  end
+end
diff --git a/app/helpers/networks_helper.rb b/app/helpers/networks_helper.rb
new file mode 100644
index 000000000..b881ce078
--- /dev/null
+++ b/app/helpers/networks_helper.rb
@@ -0,0 +1,7 @@
+module NetworksHelper
+
+  def source_type_name_label_pairs
+    Chouette::Network.source_type_names
+      .zip_map { |source_type_name| t("source_types.label.#{source_type_name}") }
+  end
+end
diff --git a/app/helpers/rule_parameter_sets_helper.rb b/app/helpers/rule_parameter_sets_helper.rb
index 538a5cddd..bb210d9cd 100644
--- a/app/helpers/rule_parameter_sets_helper.rb
+++ b/app/helpers/rule_parameter_sets_helper.rb
@@ -18,6 +18,11 @@ module RuleParameterSetsHelper
     t "false"
   end
   
+  def transport_mode_label_pairs
+    Chouette::TransportMode
+      .all
+      .zip_map { |mode| t("transport_modes.label.#{mode}") }
+  end
 end
 
 
diff --git a/app/helpers/stop_area_copies_helper.rb b/app/helpers/stop_area_copies_helper.rb
new file mode 100644
index 000000000..023a9d750
--- /dev/null
+++ b/app/helpers/stop_area_copies_helper.rb
@@ -0,0 +1,8 @@
+module StopAreaCopiesHelper
+  
+  def label_stop_area_types(*stop_area_types)
+    stop_area_types
+      .flatten
+      .zip_map { |stop_area_type| t("area_types.label.#{stop_area_type}") }
+  end
+end
diff --git a/app/helpers/stop_areas_helper.rb b/app/helpers/stop_areas_helper.rb
index 2188a272d..3e04fac7d 100644
--- a/app/helpers/stop_areas_helper.rb
+++ b/app/helpers/stop_areas_helper.rb
@@ -33,27 +33,6 @@ module StopAreasHelper
     @stop_area.stop_area_type == 'stop_place' || @stop_area.stop_area_type == 'commercial_stop_point'
   end
 
-  def access_links_pairs(access_links)
-    hpairs = Hash.new
-    pairs = Array.new
-    access_links.each do |link|
-      key = pair_key(link)
-      pair = nil
-      if (hpairs.has_key? key)
-        pair = hpairs[key]
-      else
-        pair = AccessLinkPair.new
-        pairs << pair
-        hpairs[key] = pair
-      end
-      if (link.link_orientation_type == "access_point_to_stop_area")
-        pair.from_access_point = link
-      else
-        pair.to_access_point = link
-      end
-    end
-    pairs
-  end
 
   def pair_key(access_link)
     "#{access_link.access_point.id}-#{access_link.stop_area.id}"
diff --git a/app/helpers/vehicle_journeys_helper.rb b/app/helpers/vehicle_journeys_helper.rb
index e70f2954b..6877abd11 100644
--- a/app/helpers/vehicle_journeys_helper.rb
+++ b/app/helpers/vehicle_journeys_helper.rb
@@ -41,6 +41,12 @@ module VehicleJourneysHelper
     end
   end
   
+  def route_journey_pattern_label_pairs route
+    route
+      .journey_patterns
+      .zip_map { |jp| journey_name(jp) }
+  end
+
   def edit_vehicle_title( vehicle)
     return t('vehicle_journeys.edit.title_stopless', :name => vehicle_name( vehicle)) if vehicle.vehicle_journey_at_stops.empty?
     first_vjas = vehicle.vehicle_journey_at_stops.first
diff --git a/app/views/access_links/_form.html.slim b/app/views/access_links/_form.html.slim
index db5ed2d9b..429656115 100644
--- a/app/views/access_links/_form.html.slim
+++ b/app/views/access_links/_form.html.slim
@@ -5,7 +5,7 @@
     = form.input :stop_area_id , as: :hidden
     = form.input :link_orientation_type , as: :hidden
     = form.input :name
-    = form.input :access_link_type, as: :select, collection: Chouette::AccessLink.access_link_types, include_blank: true, member_label: Proc.new { |type| t("connection_link_types.label.#{type}") }
+    = form.input :access_link_type, as: :select, collection: access_link_type_label_pairs, include_blank: true
     = form.input :comment
     = form.input :link_distance
     = form.input :mobility_restricted_suitability, as: :select, collection: [[t("true"), true], [t("false"), false]], include_blank: true
diff --git a/app/views/access_points/_form.html.slim b/app/views/access_points/_form.html.slim
index 1874644d5..5ba7a6863 100644
--- a/app/views/access_points/_form.html.slim
+++ b/app/views/access_points/_form.html.slim
@@ -7,9 +7,8 @@
       = form.input :name
       = form.input :access_point_type, as: :select,
                      :input_html => {:disabled => !@access_point.new_record? },
-                     :collection => Chouette::AccessPoint.access_point_types,
-                     include_blank: false,
-                     :member_label => Proc.new { |access_point_type| t("access_types.label.#{access_point_type}") }
+                     :collection => access_point_type_label_pairs,
+                     include_blank: false
       = form.input :street_name
       = form.input :country_code
       = form.input :zip_code
@@ -41,4 +40,4 @@
 
     = form.actions do
       = form.action :submit, as: :button
-      = form.action :cancel, as: :link
\ No newline at end of file
+      = form.action :cancel, as: :link
diff --git a/app/views/connection_links/_form.html.slim b/app/views/connection_links/_form.html.slim
index e5b4d0f0c..a3774ec88 100644
--- a/app/views/connection_links/_form.html.slim
+++ b/app/views/connection_links/_form.html.slim
@@ -1,9 +1,9 @@
 = semantic_form_for [@referential, @connection_link] do |form|
   = form.inputs do
     = form.input :name
-    = form.input :connection_link_type, as: :select, :collection => Chouette::ConnectionLink.connection_link_types, :include_blank => true, :member_label => Proc.new { |type| t("connection_link_types.label.#{type}") }
+    = form.input :connection_link_type, as: :select, collection: connection_link_type_label_pairs, include_blank: true
     = form.input :comment
-    = form.input :link_distance, input_html: { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.connection_link.link_distance") }
+    = form.input :link_distance, input_html: { title: t("formtastic.titles#{format_restriction_for_locales(@referential)}.connection_link.link_distance") }
     = form.input :mobility_restricted_suitability, as: :select, :collection => [[t("true"), true], [t("false"), false]], include_blank: true
     = form.input :stairs_availability, as: :select, :collection => [[t("true"), true], [t("false"), false]], include_blank: true
     = form.input :lift_availability, as: :select, :collection => [[t("true"), true], [t("false"), false]], include_blank: true
diff --git a/app/views/networks/_form.html.slim b/app/views/networks/_form.html.slim
index f7b97c27d..7b048edc9 100644
--- a/app/views/networks/_form.html.slim
+++ b/app/views/networks/_form.html.slim
@@ -6,10 +6,10 @@
     = form.input :version_date, as: :date_picker
     = form.input :description
     = form.input :source_name
-    = form.input :source_type_name, as: :select, :collection => Chouette::Network.source_type_names, :include_blank => true, :member_label => Proc.new { |mode| t("source_types.label.#{mode}") }
+    = form.input :source_type_name, as: :select, :collection => source_type_name_label_pairs, :include_blank => true
     = form.input :source_identifier
     = form.input :objectid, :required => !@network.new_record?, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.network.objectid")}
 
   = form.actions do
     = form.action :submit, as: :button
-    = form.action :cancel, as: :link
\ No newline at end of file
+    = form.action :cancel, as: :link
diff --git a/app/views/referential_networks/_form.html.slim b/app/views/referential_networks/_form.html.slim
index e7020ef68..a92fc7121 100644
--- a/app/views/referential_networks/_form.html.slim
+++ b/app/views/referential_networks/_form.html.slim
@@ -1,15 +1,15 @@
 = semantic_form_for [@referential, @network] do |form|
   = form.inputs do
-    = form.input :name, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.network.name")}
-    = form.input :registration_number, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.network.registration_number")}
+    = form.input :name, input_html: { title: t("formtastic.titles#{format_restriction_for_locales(@referential)}.network.name")}
+    = form.input :registration_number, input_html: { title: t("formtastic.titles#{format_restriction_for_locales(@referential)}.network.registration_number")}
     = form.input :comment
     = form.input :version_date, as: :date_picker
     = form.input :description
     = form.input :source_name
-    = form.input :source_type_name, as: :select, :collection => Chouette::Network.source_type_names, :include_blank => true, :member_label => Proc.new { |mode| t("source_types.label.#{mode}") }
+    = form.input :source_type_name, as: :select, collection: source_type_name_label_pairs, include_blank: true
     = form.input :source_identifier
-    = form.input :objectid, :required => !@network.new_record?, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.network.objectid")}
+    = form.input :objectid, required: !@network.new_record?, input_html: { title: t("formtastic.titles#{format_restriction_for_locales(@referential)}.network.objectid")}
 
   = form.actions do
     = form.action :submit, as: :button
-    = form.action :cancel, as: :link
\ No newline at end of file
+    = form.action :cancel, as: :link
diff --git a/app/views/rule_parameter_sets/_transport_mode_parameter_set_fields.html.slim b/app/views/rule_parameter_sets/_transport_mode_parameter_set_fields.html.slim
index a60c966e2..ede7e2b75 100644
--- a/app/views/rule_parameter_sets/_transport_mode_parameter_set_fields.html.slim
+++ b/app/views/rule_parameter_sets/_transport_mode_parameter_set_fields.html.slim
@@ -1,9 +1,9 @@
 = f.inputs class: 'transport_mode_parameter_sets nested-fields' do
-  = f.input :transport_mode, as: :select, :collection => Chouette::TransportMode.all, include_blank: false, member_label: Proc.new { |mode| t("transport_modes.label.#{mode}") }, label: "transport_mode", wrapper_html: { class: 'fl1' }
+  = f.input :transport_mode, as: :select, collection: transport_mode_label_pairs, include_blank: false, label: "transport_mode", wrapper_html: { class: 'fl1' }
   = f.input :inter_stop_area_distance_min, as: :number, label: "inter_stop_area_distance_min", wrapper_html: { class: 'fl1' }
   = f.input :inter_stop_area_distance_max, as: :number, label: "inter_stop_area_distance_max", wrapper_html: { class: 'fl2' }
   = f.input :speed_min, as: :number, label: "speed_min", wrapper_html: { class: 'fl2' }
   = f.input :speed_max, as: :number, label: "speed_max", wrapper_html: { class: 'fl2' }
   = f.input :inter_stop_duration_variation_max, as: :number, label: "inter_stop_duration_variation_max", wrapper_html: { class: 'fl2' }
   
-  = link_to_remove_association t('actions.destroy'), f
\ No newline at end of file
+  = link_to_remove_association t('actions.destroy'), f
diff --git a/app/views/stop_area_copies/new.html.slim b/app/views/stop_area_copies/new.html.slim
index a4c0c8bde..1a8764cbc 100644
--- a/app/views/stop_area_copies/new.html.slim
+++ b/app/views/stop_area_copies/new.html.slim
@@ -8,13 +8,21 @@
     
     - if @stop_area_copy.hierarchy == "child"
       - if @stop_area.area_type.underscore == "stop_place"
-        = form.input :area_type, as: :select, :collection => ["stop_place","commercial_stop_point"], :include_blank => false, :member_label => Proc.new { |stop_area_type| t("area_types.label.#{stop_area_type}") }
+        = form.input :area_type,
+          as: :select,
+          collection: label_stop_area_types( "stop_place","commercial_stop_point" ),
+          include_blank: false
       - else
-        = form.input :area_type, as: :select, :collection => ["boarding_position","quay"], :include_blank => false, :member_label => Proc.new { |stop_area_type| t("area_types.label.#{stop_area_type}") }
-
+        = form.input :area_type,
+          as: :select,
+          collection: label_stop_area_types( "boarding_position","quay" ),
+          include_blank: false
     - else
-      = form.input :area_type, as: :select, :collection => [@stop_area_copy.area_type], :include_blank => false, :member_label => Proc.new { |stop_area_type| t("area_types.label.#{stop_area_type}") }
+      = form.input :area_type,
+        as: :select,
+        collection: label_stop_area_types(@stop_area_copy.area_type),
+        include_blank: false
 
   = form.actions do
     = form.action :submit, as: :button , label: t('formtastic.duplicate')
-    = form.action :cancel, as: :link
\ No newline at end of file
+    = form.action :cancel, as: :link
diff --git a/app/views/vehicle_journeys/_form.html.slim b/app/views/vehicle_journeys/_form.html.slim
index c738b8b00..ca200a5f7 100644
--- a/app/views/vehicle_journeys/_form.html.slim
+++ b/app/views/vehicle_journeys/_form.html.slim
@@ -2,7 +2,7 @@
   == render 'shared/form_messages', { errors: vehicle_journey.errors }
 
   = form.inputs do
-    = form.input :journey_pattern, as: :select, :collection => @route.journey_patterns, :member_label => Proc.new { |jp| journey_name(jp) }
+    = form.input :journey_pattern, as: :select, collection: route_journey_pattern_label_pairs(@route)
     = form.input :number
     = form.input :published_journey_name
     = form.input :published_journey_identifier