Merge pull request #5 from AF83/master

Merge master into Staging

22 files changed, 105 insertions, 105 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index adf7c7999..cda2bdf70 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,7 +7,7 @@ GIT
 
 GIT
   remote: git@github.com:AF83/stif-codifline-api.git
-  revision: aee8bb5320bf03369fe15fd2f000b55e12c8b915
+  revision: 72d53d7666736523b5cbef41a2de7e466d58ea1a
   specs:
     codifligne (0.0.2)
       nokogiri (~> 1.6)
diff --git a/app/controllers/companies_controller.rb b/app/controllers/companies_controller.rb
index 78b9f43a0..842398552 100644
--- a/app/controllers/companies_controller.rb
+++ b/app/controllers/companies_controller.rb
@@ -35,6 +35,7 @@ class CompaniesController < BreadcrumbController
   def collection
     @q = line_referential.companies.search(params[:q])
     @companies ||= @q.result(:distinct => true).order(:name).paginate(:page => params[:page])
+    @decoratedcompanies = CompanyDecorator.decorate_collection(@companies)
   end
 
 
diff --git a/app/helpers/refobjects_helper.rb b/app/helpers/refobjects_helper.rb
index 8dbc2bc07..f7ebb65ea 100644
--- a/app/helpers/refobjects_helper.rb
+++ b/app/helpers/refobjects_helper.rb
@@ -6,7 +6,7 @@ module RefobjectsHelper
     head = content_tag :thead do
       content_tag :tr do
         columns.each do |col|
-          concat content_tag(:th, collection.first.respond_to?(col) ? col.to_s.titleize : "Doesn't exist")
+          concat content_tag :th, col.to_s.titleize
         end
         concat content_tag :th, "Actions" if actions.any?
       end
@@ -32,7 +32,7 @@ module RefobjectsHelper
 
     actions.each do |action|
       if action == "show"
-        showlink = link_to({controller: params[:controller], action: action, id: item.id}, class: 'btn btn-default') do
+        showlink = link_to({controller: params[:controller], action: action, id: item}, class: 'btn btn-default') do
           content_tag :span, "", class: 'fa fa-eye'
         end
         link << showlink
diff --git a/app/models/chouette/line.rb b/app/models/chouette/line.rb
index 9f5d4ea85..c3a867caa 100644
--- a/app/models/chouette/line.rb
+++ b/app/models/chouette/line.rb
@@ -22,7 +22,7 @@ class Chouette::Line < Chouette::ActiveRecord
   attr_accessor :transport_mode
 
   # validates_presence_of :network
-  validates_presence_of :company
+  # validates_presence_of :company
 
   validates_format_of :registration_number, :with => %r{\A[\d\w_\-]+\Z}, :allow_nil => true, :allow_blank => true
   validates_format_of :stable_id, :with => %r{\A[\d\w_\-]+\Z}, :allow_nil => true, :allow_blank => true
diff --git a/app/views/companies/_companies.html.slim b/app/views/companies/_companies.html.slim
index 187ff4d0d..028a21af4 100644
--- a/app/views/companies/_companies.html.slim
+++ b/app/views/companies/_companies.html.slim
@@ -1,9 +1,9 @@
-.page_info
-  span.search = t('will_paginate.page_entries_info.search')
-  = page_entries_info @companies
+/ .page_info
+/   span.search = t('will_paginate.page_entries_info.search')
+/   = page_entries_info @companies
 
 .companies.paginated_content style="margin-top:20px;"
-  = table_builder CompanyDecorator.decorate_collection(@companies),
+  = table_builder @decoratedcompanies,
                   [:name, :edited_at, :published_at, :validity_period, :linecount, :transporter, :status],
                   ["show"],
                   'table table-bordered'
diff --git a/app/views/companies/index.html.slim b/app/views/companies/index.html.slim
index 1b616a6c8..15cd6398f 100644
--- a/app/views/companies/index.html.slim
+++ b/app/views/companies/index.html.slim
@@ -1,22 +1,16 @@
 = title_tag t('companies.index.title')
 
-= search_form_for @q, :url => line_referential_companies_path(@line_referential), remote: true, :html => {:method => :get, class: 'form-inline', id: 'search', role: "form"} do |f|
-
-  .panel.panel-default
-    .panel-heading
-      .input-group.col-md-12
-        = f.text_field :name_cont, placeholder: t('.name'), class: 'form-control'
-        .input-group-btn
-          button.btn.btn-default type="submit"
-            i.fa.fa-search
-
-      / <!-- /input-group -->
-      / <!-- <a data-toggle="collapse" data-parent="#search" href="#advanced_search"> -->
-      / <!--   <i class="fa fa-plus"></i> <%= "#{t('.advanced_search')}" %> -->
-      / <!-- </a> -->
+= search_form_for @q, url: line_referential_companies_path(@line_referential), remote: true, html: { method: :get, class: 'form', id: 'search', role: "form"} do |f|
+  .well.well-sm
+    .input-group
+      = f.text_field :name_or_objectid_cont, placeholder: t('.name_or_objectid'), class: 'form-control'
+      
+      .input-group-btn
+        button.btn.btn-primary type="submit"
+          span.fa.fa-search
 
 #companies
-  = render partial: 'companies', object: @companies
+  = render partial: 'companies'
 
 - content_for :sidebar do
   ul.actions
diff --git a/app/views/line_referentials/show.html.slim b/app/views/line_referentials/show.html.slim
index 408a07c2d..406da8fee 100644
--- a/app/views/line_referentials/show.html.slim
+++ b/app/views/line_referentials/show.html.slim
@@ -39,5 +39,4 @@
 
 - content_for :sidebar do
   ul.actions
-    li = link_to t('line_referentials.actions.edit'), edit_line_referential_path(@line_referential), class: 'edit'
     li = link_to t('line_referentials.actions.sync'), sync_line_referential_path(@line_referential), class: 'sync', method: :post
diff --git a/app/views/lines/index.html.slim b/app/views/lines/index.html.slim
index a28d3d765..bf83486eb 100644
--- a/app/views/lines/index.html.slim
+++ b/app/views/lines/index.html.slim
@@ -1,35 +1,41 @@
 = title_tag t('lines.index.title')
 
-= search_form_for @q, :url => line_referential_lines_path(@line_referential), remote: true, :html => {:method => :get, class: "form-inline", :id => "search", role: "form"} do |f|
-  .panel.panel-default
-    .panel-heading
-      .input-group.col-md-9
-        = f.text_field :name_or_number_cont, placeholder: "#{t('.name_or_number')}", class: 'form-control'
-        .input-group-btn
-          button.btn.btn-default type="submit"
-            i.fa.fa-search
-
-      a data-toggle="collapse" data-parent="#search" href="#advanced_search"
-        i.fa.fa-plus
-        = "#{t('.advanced_search')}"
-
-    #advanced_search.panel-collapse.collapse
-      .panel-body
-        = f.select(:network_id_eq, @line_referential.networks.collect {|n| [ n.name, n.id ] }.unshift([t('.no_networks'), -1]), {include_blank: t('.all_networks')}, { :class => 'form-control' })
-        = f.select(:company_id_eq, @line_referential.companies.collect {|c| [ c.name, c.id ] }.unshift([t('.no_companies'), -1]), { include_blank: t('.all_companies')}, { :class => 'form-control' })
-        = f.select(:group_of_lines_id_eq, @line_referential.group_of_lines.collect {|c| [ c.name, c.id ] }.unshift([t('.no_group_of_lines'), -1]), {include_blank: t('.all_group_of_lines')}, { :class => 'form-control' })
+= search_form_for @q, url: line_referential_lines_path(@line_referential), remote: true, html: {method: :get, class: "form", id: "search", role: "form"} do |f|
+  .well.well-sm
+    .input-group
+      = f.text_field :name_or_number_or_objectid_cont, placeholder: t('.name_or_number_or_objectid'), class: 'form-control'
+      
+      .input-group-btn
+        button.btn.btn-primary type="submit"
+          span.fa.fa-search
+
+= search_form_for @q, url: line_referential_lines_path(@line_referential), remote: true, html: {method: :get, class: "form", id: "search", role: "form"} do |f|
+  .well.well-sm
+    .row
+      .col-md-10.col-sm-9
+        .row
+          .col-md-4.col-sm-4
+            = f.select(:network_id_eq, @line_referential.networks.collect {|n| [ n.name, n.id ] }.unshift([t('.no_networks'), -1]), {include_blank: t('.all_networks')}, {class: 'form-control'})
+          .col-md-4.col-sm-4
+            = f.select(:company_id_eq, @line_referential.companies.collect {|c| [ c.name, c.id ] }.unshift([t('.no_companies'), -1]), {include_blank: t('.all_companies')}, {class: 'form-control'})
+          .col-md-4.col-sm-4
+            = f.select(:group_of_lines_id_eq, @line_referential.group_of_lines.collect {|c| [ c.name, c.id ] }.unshift([t('.no_group_of_lines'), -1]), {include_blank: t('.all_group_of_lines')}, {class: 'form-control'})
+        
+      .col-md-2.col-sm-3
+        button.btn.btn-primary.btn-block type="submit" Filtrer
 
 #lines
   = render 'lines'
 
 - content_for :sidebar do
   ul.actions
-    li
-      = link_to t('lines.actions.new'), new_line_referential_line_path(@line_referential), class: 'add'
+    - if policy(Chouette::Line).create?
+      li
+        = link_to t('lines.actions.new'), new_line_referential_line_path(@line_referential), class: 'add'
 
   #multiple_selection_menu
     h4 = t('.multi_selection')
-    
+
     .disabled
       a.enable href="#"
         = t('.multi_selection_enable')
@@ -45,4 +51,4 @@
         = t('.select_all')
       = " | "
       a.deselect_all href="#"
-        = t('.deselect_all')
\ No newline at end of file
+        = t('.deselect_all')
diff --git a/app/views/networks/index.html.slim b/app/views/networks/index.html.slim
index 587552729..3e3aeb032 100644
--- a/app/views/networks/index.html.slim
+++ b/app/views/networks/index.html.slim
@@ -1,17 +1,13 @@
 = title_tag t('networks.index.title')
 
-= search_form_for @q, :url => line_referential_networks_path(@line_referential), remote: true, :html => {:method => :get, class: "form-inline", :id => "search", role: "form"} do |f|
-  .panel.panel-default
-    .panel-heading
-      .input-group.col-md-12
-        = f.text_field :name_cont, placeholder: "#{t('.name')}", class: 'form-control'
-        .input-group-btn
-          button.btn.btn-default type="submit"
-            i.fa.fa-search
-
-      / <!-- <a data-toggle="collapse" data-parent="#search" href="#advanced_search"> -->
-      / <!--   <i class="fa fa-plus"></i> <%= "#{t('.advanced_search')}" %> -->
-      / <!-- </a> -->
+= search_form_for @q, url: line_referential_networks_path(@line_referential), remote: true, html: {method: :get, class: "form", id: "search", role: "form"} do |f|
+  .well.well-sm
+    .input-group
+      = f.text_field :name_or_objectid_cont, placeholder: t('.name_or_objectid'), class: 'form-control'
+      
+      .input-group-btn
+        button.btn.btn-primary type="submit"
+          span.fa.fa-search
 
 #networks
   = render 'networks'
diff --git a/app/views/stop_areas/index.html.slim b/app/views/stop_areas/index.html.slim
index b6328c6f9..7f7e1fa74 100644
--- a/app/views/stop_areas/index.html.slim
+++ b/app/views/stop_areas/index.html.slim
@@ -3,27 +3,30 @@
 #country_codes
   = @country_codes.to_json
 
-= search_form_for @q, url: stop_area_referential_stop_areas_path(@stop_area_referential), remote: true, html: { method: :get, class: "form-inline", id: "search", role: "form"} do |f|
-  .panel.panel-default
-    .panel-heading
-      .input-group.col-md-9
-        = f.text_field :name_cont, placeholder: "#{t('.name')}", class: 'form-control'
-
-        .input-group-btn
-          button.btn.btn-default type="submit"
-            i.fa.fa-search
-
-      a data-toggle="collapse" data-parent="#search" href="#advanced_search"
-        i.fa.fa-plus
-        = "#{t('.advanced_search')}"
-
-    #advanced_search.panel-collapse.collapse
-      .panel-body
-        = f.text_field :zip_code_cont, placeholder: "#{t('.zip_code')}", class: 'form-control typeahead'
-        = f.select(:area_type_cont, options_from_collection_for_select(Chouette::StopArea.stop_area_types, 'name', Proc.new { |stop_area_type| t("area_types.label.#{stop_area_type}") } ), { :include_blank => "#{t('.area_type')}" }, { :class => 'form-control' })
+= search_form_for @q, url: stop_area_referential_stop_areas_path(@stop_area_referential), remote: true, html: { method: :get, class: "form", id: "search", role: "form"} do |f|
+  .well.well-sm
+    .input-group
+      = f.text_field :name_or_objectid_cont, placeholder: t('.name_or_objectid'), class: 'form-control'
+
+      .input-group-btn
+        button.btn.btn-primary type="submit"
+          span.fa.fa-search
+
+= search_form_for @q, url: stop_area_referential_stop_areas_path(@stop_area_referential), remote: true, html: { method: :get, class: "form", id: "search", role: "form"} do |f|
+  .well.well-sm
+    .row
+      .col-md-10.col-sm-9
+        .row
+          .col-md-3.col-sm-3
+            = f.text_field :zip_code_cont, placeholder: "#{t('.zip_code')}", class: 'form-control typeahead'
+          .col-md-5.col-sm-5
+            = f.select(:area_type_cont, options_from_collection_for_select(Chouette::StopArea.stop_area_types, 'name', Proc.new { |stop_area_type| t("area_types.label.#{stop_area_type}") } ), { include_blank: t('.area_type') }, { class: 'form-control' })
+            
+      .col-md-2.col-sm-3
+        button.btn.btn-primary.btn-block type="submit" Filtrer        
 
 #stop_areas
-  == render 'stop_areas'
+  = render 'stop_areas'
 
 - content_for :sidebar do
   ul.actions
diff --git a/bin/spring b/bin/spring
index 7f24d96fb..7b45d374f 100755
--- a/bin/spring
+++ b/bin/spring
@@ -1,17 +1,14 @@
 #!/usr/bin/env ruby
 
-# This file loads spring without using Bundler, in order to be fast
-# It gets overwritten when you run the `spring binstub` command
+# This file loads spring without using Bundler, in order to be fast.
+# It gets overwritten when you run the `spring binstub` command.
 
 unless defined?(Spring)
   require "rubygems"
   require "bundler"
 
   if match = Bundler.default_lockfile.read.match(/^GEM$.*?^    (?:  )*spring \((.*?)\)$.*?^$/m)
-    ENV["GEM_PATH"] = ([Bundler.bundle_path.to_s] + Gem.path).join(File::PATH_SEPARATOR)
-    ENV["GEM_HOME"] = ""
-    Gem.paths = ENV
-
+    Gem.paths = { "GEM_PATH" => [Bundler.bundle_path.to_s, *Gem.path].uniq }
     gem "spring", match[1]
     require "spring/binstub"
   end
diff --git a/config/locales/companies.en.yml b/config/locales/companies.en.yml
index 7393a2af7..706b8e62f 100644
--- a/config/locales/companies.en.yml
+++ b/config/locales/companies.en.yml
@@ -13,7 +13,8 @@ en:
       title: "Company  %{company}"
     index:
       title: "Companies"
-      name: "Search by name"
+      name: "Search by name..."
+      name_or_objectid: "Search by name or by objectid..."
       advanced_search: "Advanced search"
   activerecord:
     models:
@@ -65,4 +66,4 @@ en:
           registration_number: "Positif integer, unique key, of no more than 8 digits."
           objectid: "[prefix]:Company:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character. Maximum length of the unique key = 3."
   referential_companies:
-    <<: *en_companies
\ No newline at end of file
+    <<: *en_companies
diff --git a/config/locales/companies.fr.yml b/config/locales/companies.fr.yml
index 909ee1045..61967fc2b 100644
--- a/config/locales/companies.fr.yml
+++ b/config/locales/companies.fr.yml
@@ -13,7 +13,8 @@ fr:
       title: "Transporteur %{company}"
     index:
       title: "Transporteurs"
-      name: "Recherche par nom"
+      name: "Recherche par nom..."
+      name_or_objectid: "Recherche par nom ou objectid..."
       advanced_search: "Recherche avancée"
   activerecord:
     models:
@@ -65,4 +66,4 @@ fr:
           registration_number: "Entier positif, clé unique, d'un maximum de 8 chiffres."
           objectid: "[prefixe]:Company:[clé_unique]  caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'. Longueur maximale de la clé unique = 3."
   referential_companies:
-    <<: *fr_companies
\ No newline at end of file
+    <<: *fr_companies
diff --git a/config/locales/lines.en.yml b/config/locales/lines.en.yml
index 596c93dac..4bc485180 100644
--- a/config/locales/lines.en.yml
+++ b/config/locales/lines.en.yml
@@ -22,7 +22,8 @@ en:
     index:
       deactivated: "Disabled line"
       title: "Lines"
-      name_or_number: "Search by name or number"
+      name_or_number: "Search by name or number..."
+      name_or_number_or_objectid: "Search by name, number or objectid..."
       no_networks: "No networks"
       no_companies: "No companies"
       no_group_of_lines: "No group of lines"
@@ -117,4 +118,4 @@ en:
           objectid: "[prefix]:Line:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character. Maximum length of the unique key = 14."
           number: "Only alphanumerical or underscore characters. Maximum length = 6."
   referential_lines:
-    <<: *en_lines
\ No newline at end of file
+    <<: *en_lines
diff --git a/config/locales/lines.fr.yml b/config/locales/lines.fr.yml
index 2b325e220..9e749f038 100644
--- a/config/locales/lines.fr.yml
+++ b/config/locales/lines.fr.yml
@@ -22,7 +22,8 @@ fr:
     index:
       deactivated: "Ligne désactivée"
       title: "Lignes"
-      name_or_number: "Recherche par nom ou indice"
+      name_or_number: "Recherche par nom ou indice..."
+      name_or_number_or_objectid: "Recherche par nom, indice ou objectid..."
       no_networks: "Aucun réseaux"
       no_companies: "Aucun transporteurs"
       no_group_of_lines: "Aucun groupes de ligne"
@@ -117,4 +118,4 @@ fr:
           objectid: "[prefixe]:Line:[clé_unique] caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'. Longueur maximale de la clé unique = 14."
           number: "Caractères autorisés : alphanumériques et 'souligné'. Longueur maximale = 6."
   referential_lines:
-    <<: *fr_lines
\ No newline at end of file
+    <<: *fr_lines
diff --git a/config/locales/networks.en.yml b/config/locales/networks.en.yml
index 69b45050e..f2b256a08 100644
--- a/config/locales/networks.en.yml
+++ b/config/locales/networks.en.yml
@@ -13,7 +13,8 @@ en:
       title: "Network"
     index:
       title: "Networks"
-      name: "Search by name"
+      name: "Search by name..."
+      name_or_objectid: "Search by name or by objectid..."
       advanced_search: "Advanced search"
   activerecord:
     models:
@@ -62,4 +63,4 @@ en:
           registration_number: "Positif integer, unique key, of no more than 8 digits."
           objectid: "[prefix]:PTNetwork:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character. Maximum length of the unique key = 3."
   referential_networks:
-    <<: *en_networks
\ No newline at end of file
+    <<: *en_networks
diff --git a/config/locales/networks.fr.yml b/config/locales/networks.fr.yml
index c31982b43..8d259a9a0 100644
--- a/config/locales/networks.fr.yml
+++ b/config/locales/networks.fr.yml
@@ -13,7 +13,8 @@ fr:
       title: "Réseau %{network}"
     index:
       title: "Réseaux"
-      name: "Recherche par nom"
+      name: "Recherche par nom..."
+      name_or_objectid: "Recherche par nom ou objectid..."
       advanced_search: "Recherche avancée"
   activerecord:
     models:
@@ -62,4 +63,4 @@ fr:
           registration_number: "Entier positif, clé unique, d'un maximum de 8 chiffres."
           objectid: "[prefixe]:PTNetwork:[clé_unique]  caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'. Longueur maximale de la clé unique = 3."
   referential_networks:
-    <<: *fr_networks
\ No newline at end of file
+    <<: *fr_networks
diff --git a/config/locales/stop_areas.en.yml b/config/locales/stop_areas.en.yml
index 4197daaa2..d06da3e76 100644
--- a/config/locales/stop_areas.en.yml
+++ b/config/locales/stop_areas.en.yml
@@ -50,7 +50,8 @@ en:
       genealogical_routing: "Routing constraint's links"
     index:
       title: "Stop areas"
-      name: "Search by name"
+      name: "Search by name..."
+      name_or_objectid: "Search by name or by objectid..."
       zip_code: "Zip Code"
       selection: "Filter on"
       selection_all: "All"
diff --git a/config/locales/stop_areas.fr.yml b/config/locales/stop_areas.fr.yml
index b552a3483..0015b571d 100644
--- a/config/locales/stop_areas.fr.yml
+++ b/config/locales/stop_areas.fr.yml
@@ -55,7 +55,8 @@ fr:
       access_link_legend_1: "Les flêches grises représentent des liens non définis"
       access_link_legend_2: "cliquer sur les flêches pour créer/éditer un lien"
     index:
-      name: "Recherche par nom"
+      name: "Recherche par nom..."
+      name_or_objectid: "Recherche par nom ou par objectid..."
       zip_code: "Code Postal"
       title: "Arrêts"
       selection: "Filtrer sur"
diff --git a/lib/stif/codif_line_synchronization.rb b/lib/stif/codif_line_synchronization.rb
index 1be5474c2..d580ae3b8 100644
--- a/lib/stif/codif_line_synchronization.rb
+++ b/lib/stif/codif_line_synchronization.rb
@@ -71,13 +71,9 @@ module Stif
           import_xml: api_line.xml
         }
 
-        # Find Company
-        # TODO Check behavior when operator_codes count is 0 or > 1
-        if api_line.operator_codes.any?
-          company_id = "STIF:CODIFLIGNE:Operator:" + api_line.operator_codes.first
-          params[:company] = Chouette::Company.find_by(objectid: company_id)
+        unless api_line.operator_ref.nil?
+          params[:company] = Chouette::Company.find_by(objectid: api_line.operator_ref)
         end
-
         save_or_update(params, Chouette::Line)
       end
 
diff --git a/spec/models/chouette/line_spec.rb b/spec/models/chouette/line_spec.rb
index 9a87a3435..fee4bee5a 100644
--- a/spec/models/chouette/line_spec.rb
+++ b/spec/models/chouette/line_spec.rb
@@ -5,7 +5,7 @@ describe Chouette::Line, :type => :model do
   subject { create(:line) }
 
   # it { is_expected.to validate_presence_of :network }
-  it { is_expected.to validate_presence_of :company }
+  # it { is_expected.to validate_presence_of :company }
 
   it { is_expected.to validate_presence_of :name }
 
diff --git a/spec/views/companies/index.html.erb_spec.rb b/spec/views/companies/index.html.erb_spec.rb
index 5bb528744..6f244064d 100644
--- a/spec/views/companies/index.html.erb_spec.rb
+++ b/spec/views/companies/index.html.erb_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "/companies/index", :type => :view do
 
   let!(:line_referential) { assign :line_referential, create(:line_referential) }
-  let!(:companies) { assign :companies, Array.new(2) { create(:company, line_referential: line_referential) }.paginate  }
+  let!(:companies) { assign :companies, CompanyDecorator.decorate_collection(Array.new(2) { create(:company, line_referential: line_referential) }.paginate) }
   let!(:search) { assign :q, Ransack::Search.new(Chouette::Company) }
 
   # Fixme #1795