- | #{company.objectid.local_id} |
+ #{company.get_objectid.local_id} |
#{company.name} |
|
|
diff --git a/spec/policies/access_link_policy_spec.rb b/spec/policies/access_link_policy_spec.rb
index 392ad7f92..6194ae55c 100644
--- a/spec/policies/access_link_policy_spec.rb
+++ b/spec/policies/access_link_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe Chouette::AccessLinkPolicy, type: :policy do
+RSpec.describe AccessLinkPolicy, type: :policy do
let( :record ){ build_stubbed :access_link }
diff --git a/spec/policies/access_point_policy_spec.rb b/spec/policies/access_point_policy_spec.rb
index 8154b3d24..b6bc46eb4 100644
--- a/spec/policies/access_point_policy_spec.rb
+++ b/spec/policies/access_point_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe Chouette::AccessPointPolicy, type: :policy do
+RSpec.describe AccessPointPolicy, type: :policy do
let( :record ){ build_stubbed :access_point }
diff --git a/spec/policies/company_policy_spec.rb b/spec/policies/company_policy_spec.rb
index f374e31d2..2d249a2be 100644
--- a/spec/policies/company_policy_spec.rb
+++ b/spec/policies/company_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe Chouette::CompanyPolicy, type: :policy do
+RSpec.describe CompanyPolicy, type: :policy do
let( :record ){ build_stubbed :company }
before { stub_policy_scope(record) }
diff --git a/spec/policies/connection_link_policy_spec.rb b/spec/policies/connection_link_policy_spec.rb
index 17cfdeb04..23e40abe3 100644
--- a/spec/policies/connection_link_policy_spec.rb
+++ b/spec/policies/connection_link_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe Chouette::ConnectionLinkPolicy, type: :policy do
+RSpec.describe ConnectionLinkPolicy, type: :policy do
let( :record ){ build_stubbed :connection_link }
diff --git a/spec/policies/group_of_line_policy_spec.rb b/spec/policies/group_of_line_policy_spec.rb
index 7a58a7f0e..29fbb1bfb 100644
--- a/spec/policies/group_of_line_policy_spec.rb
+++ b/spec/policies/group_of_line_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe Chouette::GroupOfLinePolicy, type: :policy do
+RSpec.describe GroupOfLinePolicy, type: :policy do
let( :record ){ build_stubbed :group_of_line }
before { stub_policy_scope(record) }
diff --git a/spec/policies/journey_pattern_policy_spec.rb b/spec/policies/journey_pattern_policy_spec.rb
index a7de379a2..39f849277 100644
--- a/spec/policies/journey_pattern_policy_spec.rb
+++ b/spec/policies/journey_pattern_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe Chouette::JourneyPatternPolicy, type: :policy do
+RSpec.describe JourneyPatternPolicy, type: :policy do
let( :record ){ build_stubbed :journey_pattern }
diff --git a/spec/policies/line_policy_spec.rb b/spec/policies/line_policy_spec.rb
index d2248e750..334073506 100644
--- a/spec/policies/line_policy_spec.rb
+++ b/spec/policies/line_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe Chouette::LinePolicy, type: :policy do
+RSpec.describe LinePolicy, type: :policy do
let( :record ){ build_stubbed :line }
before { stub_policy_scope(record) }
diff --git a/spec/policies/network_policy_spec.rb b/spec/policies/network_policy_spec.rb
index c09546c22..ae4ffa03a 100644
--- a/spec/policies/network_policy_spec.rb
+++ b/spec/policies/network_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe Chouette::NetworkPolicy, type: :policy do
+RSpec.describe NetworkPolicy, type: :policy do
let( :record ){ build_stubbed :network }
before { stub_policy_scope(record) }
diff --git a/spec/policies/route_policy_spec.rb b/spec/policies/route_policy_spec.rb
index df2e41a89..d7edceaef 100644
--- a/spec/policies/route_policy_spec.rb
+++ b/spec/policies/route_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe Chouette::RoutePolicy, type: :policy do
+RSpec.describe RoutePolicy, type: :policy do
let( :record ){ build_stubbed :route }
diff --git a/spec/policies/routing_constraint_zone_policy_spec.rb b/spec/policies/routing_constraint_zone_policy_spec.rb
index 903e3671a..2ef15fa95 100644
--- a/spec/policies/routing_constraint_zone_policy_spec.rb
+++ b/spec/policies/routing_constraint_zone_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe Chouette::RoutingConstraintZonePolicy, type: :policy do
+RSpec.describe RoutingConstraintZonePolicy, type: :policy do
let( :record ){ build_stubbed :routing_constraint_zone }
diff --git a/spec/policies/stop_area_policy_spec.rb b/spec/policies/stop_area_policy_spec.rb
index 1295ecd68..8fe59c8e3 100644
--- a/spec/policies/stop_area_policy_spec.rb
+++ b/spec/policies/stop_area_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe Chouette::StopAreaPolicy, type: :policy do
+RSpec.describe StopAreaPolicy, type: :policy do
let( :record ){ build_stubbed :stop_area }
before { stub_policy_scope(record) }
diff --git a/spec/policies/time_table_policy_spec.rb b/spec/policies/time_table_policy_spec.rb
index 6f1e13844..dad3c13bc 100644
--- a/spec/policies/time_table_policy_spec.rb
+++ b/spec/policies/time_table_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe Chouette::TimeTablePolicy, type: :policy do
+RSpec.describe TimeTablePolicy, type: :policy do
let( :record ){ build_stubbed :time_table }
diff --git a/spec/views/routes/show.html.erb_spec.rb b/spec/views/routes/show.html.erb_spec.rb
index ee917127f..dae8c9ed3 100644
--- a/spec/views/routes/show.html.erb_spec.rb
+++ b/spec/views/routes/show.html.erb_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe "/routes/show", type: :view do
let!(:route_sp) do
assign :route_sp, ModelDecorator.decorate(
route.stop_points,
- with: Chouette::StopPointDecorator
+ with: StopPointDecorator
)
end
--
cgit v1.2.3
From be2bd2e4f902ef12a21425ebe7dcf5699768762a Mon Sep 17 00:00:00 2001
From: cedricnjanga
Date: Wed, 22 Nov 2017 00:15:30 +0100
Subject: Fix the delation of the hacking of Chouette::ActiveRecord#model_name
to remove the Chouette namespace off of the construction of link in the app
and in other places.
Added a small change in the reflex sync to set the stop_area_referential in the initialization of the object to be in sync with the work on the objectids (need a objectid_formatter)
---
.gitignore | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitignore b/.gitignore
index cfcbf47a5..03a39be90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,8 @@ coverage
/public/packs
/public/packs-test
+/bin
+
# Every machine shall create its binstubs
/bin/rake
/bin/rails
--
cgit v1.2.3
From 921e5022928941b047089bfe8548c7b5c85e47a0 Mon Sep 17 00:00:00 2001
From: cedricnjanga
Date: Wed, 22 Nov 2017 00:54:13 +0100
Subject: Fix merged file
---
app/models/chouette/route.rb | 4 ----
1 file changed, 4 deletions(-)
diff --git a/app/models/chouette/route.rb b/app/models/chouette/route.rb
index be86b5b04..d8e6533c4 100644
--- a/app/models/chouette/route.rb
+++ b/app/models/chouette/route.rb
@@ -191,13 +191,9 @@ module Chouette
protected
-<<<<<<< HEAD
def self.vehicle_journeys_timeless(stop_point_id)
all( :conditions => ['vehicle_journeys.id NOT IN (?)', Chouette::VehicleJourneyAtStop.where(stop_point_id: stop_point_id).pluck(:vehicle_journey_id)] )
end
-=======
- protected
->>>>>>> master
end
end
\ No newline at end of file
--
cgit v1.2.3
From 148d8ba1f38c78709695d0f4534a38696e3ccbbd Mon Sep 17 00:00:00 2001
From: cedricnjanga
Date: Wed, 22 Nov 2017 01:00:12 +0100
Subject: Fix merge
---
app/models/chouette/journey_pattern.rb | 5 -----
1 file changed, 5 deletions(-)
diff --git a/app/models/chouette/journey_pattern.rb b/app/models/chouette/journey_pattern.rb
index 5058c95dc..0c1905286 100644
--- a/app/models/chouette/journey_pattern.rb
+++ b/app/models/chouette/journey_pattern.rb
@@ -148,7 +148,6 @@ module Chouette
vjas.destroy
end
end
-<<<<<<< HEAD
def control_route_sections
stop_area_ids = self.stop_points.map(&:stop_area_id)
@@ -185,7 +184,3 @@ module Chouette
end
end
end
-=======
- end
-end
->>>>>>> master
--
cgit v1.2.3
From 577204834de4dfcd1851fc9b5f85558eaa141a89 Mon Sep 17 00:00:00 2001
From: cedricnjanga
Date: Wed, 22 Nov 2017 10:06:34 +0100
Subject: Add webpack binstubs
---
bin/bundle | 3 +++
bin/setup | 29 +++++++++++++++++++++++++++++
bin/webpack | 17 +++++++++++++++++
bin/webpack-dev-server | 17 +++++++++++++++++
4 files changed, 66 insertions(+)
create mode 100755 bin/bundle
create mode 100755 bin/setup
create mode 100755 bin/webpack
create mode 100755 bin/webpack-dev-server
diff --git a/bin/bundle b/bin/bundle
new file mode 100755
index 000000000..66e9889e8
--- /dev/null
+++ b/bin/bundle
@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')
diff --git a/bin/setup b/bin/setup
new file mode 100755
index 000000000..acdb2c138
--- /dev/null
+++ b/bin/setup
@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+
+Dir.chdir APP_ROOT do
+ # This script is a starting point to setup your application.
+ # Add necessary setup steps to this file:
+
+ puts "== Installing dependencies =="
+ system "gem install bundler --conservative"
+ system "bundle check || bundle install"
+
+ # puts "\n== Copying sample files =="
+ # unless File.exist?("config/database.yml")
+ # system "cp config/database.yml.sample config/database.yml"
+ # end
+
+ puts "\n== Preparing database =="
+ system "bin/rake db:setup"
+
+ puts "\n== Removing old logs and tempfiles =="
+ system "rm -f log/*"
+ system "rm -rf tmp/cache"
+
+ puts "\n== Restarting application server =="
+ system "touch tmp/restart.txt"
+end
diff --git a/bin/webpack b/bin/webpack
new file mode 100755
index 000000000..9d3800c74
--- /dev/null
+++ b/bin/webpack
@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'webpack' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+ Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("webpacker", "webpack")
diff --git a/bin/webpack-dev-server b/bin/webpack-dev-server
new file mode 100755
index 000000000..cf701102a
--- /dev/null
+++ b/bin/webpack-dev-server
@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'webpack-dev-server' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+ Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("webpacker", "webpack-dev-server")
--
cgit v1.2.3
From 62282a0384394fadf395f48a7d2ca112d2aa3d27 Mon Sep 17 00:00:00 2001
From: Guillaume
Date: Thu, 9 Nov 2017 15:20:54 +0100
Subject: add object_id_format to migrations, create module for call
Referential, Line Referential, StopAreaReferential in models, add Enumerize
in models Refs #4941
---
app/models/chouette/journey_pattern.rb | 2 --
app/models/chouette/line.rb | 10 ++++++++++
app/models/concerns/object_id_format.rb | 5 +++++
db/schema.rb | 4 ++--
4 files changed, 17 insertions(+), 4 deletions(-)
create mode 100644 app/models/concerns/object_id_format.rb
diff --git a/app/models/chouette/journey_pattern.rb b/app/models/chouette/journey_pattern.rb
index 0c1905286..dce674791 100644
--- a/app/models/chouette/journey_pattern.rb
+++ b/app/models/chouette/journey_pattern.rb
@@ -21,8 +21,6 @@ module Chouette
enum section_status: { todo: 0, completed: 1, control: 2 }
attr_accessor :control_checked
- after_update :control_route_sections, :unless => "control_checked"
-
def local_id
"IBOO-#{self.referential.id}-#{self.route.line.get_objectid.local_id}-#{self.id}"
diff --git a/app/models/chouette/line.rb b/app/models/chouette/line.rb
index 780f6473f..d50395182 100644
--- a/app/models/chouette/line.rb
+++ b/app/models/chouette/line.rb
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
module Chouette
class Line < Chouette::ActiveRecord
include LineRestrictions
@@ -5,6 +6,15 @@ module Chouette
include ObjectidSupport
extend StifTransportModeEnumerations
extend StifTransportSubmodeEnumerations
+=======
+class Chouette::Line < Chouette::ActiveRecord
+ include StifCodifligneAttributesSupport
+ include LineRestrictions
+ include LineReferentialSupport
+ include ObjectIdFormat
+ extend StifTransportModeEnumerations
+ extend StifTransportSubmodeEnumerations
+>>>>>>> add object_id_format to migrations, create module for call Referential, Line Referential, StopAreaReferential in models, add Enumerize in models Refs #4941
extend ActiveModel::Naming
diff --git a/app/models/concerns/object_id_format.rb b/app/models/concerns/object_id_format.rb
new file mode 100644
index 000000000..55b93ec81
--- /dev/null
+++ b/app/models/concerns/object_id_format.rb
@@ -0,0 +1,5 @@
+module ObjectIdFormat
+ def object_id_format
+ self.referential.object_id_format
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 21aa73cd8..830e3ca25 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20171114102438) do
+ActiveRecord::Schema.define(version: 20171109101605) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -408,9 +408,9 @@ ActiveRecord::Schema.define(version: 20171114102438) do
t.string "type"
t.integer "parent_id", limit: 8
t.string "parent_type"
+ t.datetime "notified_parent_at"
t.integer "current_step", default: 0
t.integer "total_steps", default: 0
- t.datetime "notified_parent_at"
t.string "creator"
end
--
cgit v1.2.3
From 7c032665a81d9b81f6267d9bb133e8f0ec3b9e21 Mon Sep 17 00:00:00 2001
From: Guillaume
Date: Thu, 16 Nov 2017 15:38:39 +0100
Subject: Refs #4941 remove object_id_format_to_line_referential module,
include just a object_id_format_to_referential module
---
app/models/chouette/line.rb | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/app/models/chouette/line.rb b/app/models/chouette/line.rb
index d50395182..8d5ff5f60 100644
--- a/app/models/chouette/line.rb
+++ b/app/models/chouette/line.rb
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
module Chouette
class Line < Chouette::ActiveRecord
include LineRestrictions
@@ -6,16 +5,6 @@ module Chouette
include ObjectidSupport
extend StifTransportModeEnumerations
extend StifTransportSubmodeEnumerations
-=======
-class Chouette::Line < Chouette::ActiveRecord
- include StifCodifligneAttributesSupport
- include LineRestrictions
- include LineReferentialSupport
- include ObjectIdFormat
- extend StifTransportModeEnumerations
- extend StifTransportSubmodeEnumerations
->>>>>>> add object_id_format to migrations, create module for call Referential, Line Referential, StopAreaReferential in models, add Enumerize in models Refs #4941
-
extend ActiveModel::Naming
# FIXME http://jira.codehaus.org/browse/JRUBY-6358
--
cgit v1.2.3
From 31db1bba72800bddfa5dc9db4419ba95178dc4ff Mon Sep 17 00:00:00 2001
From: cedricnjanga
Date: Thu, 16 Nov 2017 16:44:37 +0100
Subject: Add Cédric new objectid concerns
objectid_support handles reading and writing object_ids
objectid_formater_support gets the right formater class
include these concerns in chouette models
Remove StifNetexAttributSupport modules because these are handled by the new objectid concerns
Add a objectid and formater classes for each format type
Add objectid formats to the factories
Modify somes specs for object_ids but there are still a number of failling tests
---
app/models/chouette/journey_pattern.rb | 34 ----------------------
app/models/chouette/objectid/netex.rb | 2 +-
app/models/chouette/objectid/stif_codifligne.rb | 2 +-
app/models/chouette/objectid/stif_netex.rb | 2 +-
app/models/chouette/objectid/stif_reflex.rb | 2 +-
app/models/chouette/objectid_formater/netex.rb | 18 ++++++++++++
.../chouette/objectid_formater/stif_codifligne.rb | 18 ++++++++++++
.../chouette/objectid_formater/stif_netex.rb | 20 +++++++++++++
.../chouette/objectid_formater/stif_reflex.rb | 18 ++++++++++++
app/models/chouette/stop_area.rb | 1 -
app/models/concerns/objectid_formater_support.rb | 15 ++++++++++
spec/models/chouette/journey_pattern_spec.rb | 2 +-
12 files changed, 94 insertions(+), 40 deletions(-)
create mode 100644 app/models/chouette/objectid_formater/netex.rb
create mode 100644 app/models/chouette/objectid_formater/stif_codifligne.rb
create mode 100644 app/models/chouette/objectid_formater/stif_netex.rb
create mode 100644 app/models/chouette/objectid_formater/stif_reflex.rb
create mode 100644 app/models/concerns/objectid_formater_support.rb
diff --git a/app/models/chouette/journey_pattern.rb b/app/models/chouette/journey_pattern.rb
index dce674791..797b6adb1 100644
--- a/app/models/chouette/journey_pattern.rb
+++ b/app/models/chouette/journey_pattern.rb
@@ -146,39 +146,5 @@ module Chouette
vjas.destroy
end
end
-
- def control_route_sections
- stop_area_ids = self.stop_points.map(&:stop_area_id)
- control_route_sections_by_stop_areas(stop_area_ids)
- end
-
- def control_route_sections_by_stop_areas(stop_area_ids)
- journey_pattern_section_all
- i = 0
- to_control = false
- stop_area_ids.each_cons(2) do |a|
- jps = @route_sections_orders[i]
- i += 1
- unless jps
- to_control = true
- next
- end
- unless [jps.route_section.departure.id, jps.route_section.arrival.id] == a
- jps.destroy
- to_control = true
- end
- end
- self.control_checked = true
- to_control ? self.control! : self.completed!
- end
-
- protected
-
- def journey_pattern_section_all
- @route_sections_orders = {}
- self.journey_pattern_sections.all.map do |journey_pattern_section|
- @route_sections_orders[journey_pattern_section.rank] = journey_pattern_section
- end
- end
end
end
diff --git a/app/models/chouette/objectid/netex.rb b/app/models/chouette/objectid/netex.rb
index 7953c6b12..0013de7c8 100644
--- a/app/models/chouette/objectid/netex.rb
+++ b/app/models/chouette/objectid/netex.rb
@@ -30,4 +30,4 @@ module Chouette
end
end
end
-end
\ No newline at end of file
+end
diff --git a/app/models/chouette/objectid/stif_codifligne.rb b/app/models/chouette/objectid/stif_codifligne.rb
index a1e40f0a1..c3c19e418 100644
--- a/app/models/chouette/objectid/stif_codifligne.rb
+++ b/app/models/chouette/objectid/stif_codifligne.rb
@@ -21,4 +21,4 @@ module Chouette
end
end
end
-end
\ No newline at end of file
+end
diff --git a/app/models/chouette/objectid/stif_netex.rb b/app/models/chouette/objectid/stif_netex.rb
index 80208af56..4894daac7 100644
--- a/app/models/chouette/objectid/stif_netex.rb
+++ b/app/models/chouette/objectid/stif_netex.rb
@@ -12,4 +12,4 @@ module Chouette
end
end
end
-end
\ No newline at end of file
+end
diff --git a/app/models/chouette/objectid/stif_reflex.rb b/app/models/chouette/objectid/stif_reflex.rb
index 69a3f52fa..711308541 100644
--- a/app/models/chouette/objectid/stif_reflex.rb
+++ b/app/models/chouette/objectid/stif_reflex.rb
@@ -20,4 +20,4 @@ module Chouette
end
end
end
-end
\ No newline at end of file
+end
diff --git a/app/models/chouette/objectid_formater/netex.rb b/app/models/chouette/objectid_formater/netex.rb
new file mode 100644
index 000000000..0736b6ff9
--- /dev/null
+++ b/app/models/chouette/objectid_formater/netex.rb
@@ -0,0 +1,18 @@
+module Chouette
+ module ObjectidFormater
+ class Netex
+ def before_validation(model)
+ model.objectid ||= Chouette::Objectid::Netex.new(local_id: SecureRandom.uuid, object_type: model.class.name.gsub(/Chouette::/,'')).to_s
+ end
+
+ def after_commit(model)
+ # unused method in this context
+ end
+
+ def parse_objectid(definition)
+ parts = definition.split(":")
+ Chouette::Objectid::Netex.new(provider_id: parts[0], object_type: parts[1], local_id: parts[2], creation_id: parts[3]).to_s rescue nil
+ end
+ end
+ end
+end
\ No newline at end of file
diff --git a/app/models/chouette/objectid_formater/stif_codifligne.rb b/app/models/chouette/objectid_formater/stif_codifligne.rb
new file mode 100644
index 000000000..53fd28c82
--- /dev/null
+++ b/app/models/chouette/objectid_formater/stif_codifligne.rb
@@ -0,0 +1,18 @@
+module Chouette
+ module ObjectidFormater
+ class StifCodifligne
+ def before_validation(model)
+ # unused method in this context
+ end
+
+ def after_commit(model)
+ # unused method in this context
+ end
+
+ def parse_objectid(definition)
+ parts = definition.split(":")
+ Chouette::Objectid::StifCodifligne.new(provider_id: parts[0], sync_id: parts[1], object_type: parts[2], local_id: parts[3]).to_s rescue nil
+ end
+ end
+ end
+end
\ No newline at end of file
diff --git a/app/models/chouette/objectid_formater/stif_netex.rb b/app/models/chouette/objectid_formater/stif_netex.rb
new file mode 100644
index 000000000..88995dd05
--- /dev/null
+++ b/app/models/chouette/objectid_formater/stif_netex.rb
@@ -0,0 +1,20 @@
+module Chouette
+ module ObjectidFormater
+ class StifNetex
+ def before_validation(model)
+ model.objectid ||= "__pending_id__#{rand(50)+ rand(50)}"
+ end
+
+ def after_commit(model)
+ if model.objectid.include? ':__pending_id__'
+ model.objectid = Chouette::Objectid::StifNetex.new(provider_id: "stif", object_type: model.class.name.gsub(/Chouette::/,''), local_id: model.local_id).to_s
+ end
+ end
+
+ def parse_objectid(definition)
+ parts = definition.split(":")
+ Chouette::Objectid::StifNetex.new(provider_id: parts[0], object_type: parts[1], local_id: parts[2], creation_id: parts[3]).to_s rescue nil
+ end
+ end
+ end
+end
\ No newline at end of file
diff --git a/app/models/chouette/objectid_formater/stif_reflex.rb b/app/models/chouette/objectid_formater/stif_reflex.rb
new file mode 100644
index 000000000..e6c6a6a70
--- /dev/null
+++ b/app/models/chouette/objectid_formater/stif_reflex.rb
@@ -0,0 +1,18 @@
+module Chouette
+ module ObjectidFormater
+ class StifReflex
+ def before_validation(model)
+ # unused method in this context
+ end
+
+ def after_commit(model)
+ # unused method in this context
+ end
+
+ def parse_objectid(definition)
+ parts = definition.split(":")
+ Chouette::Objectid::StifReflex.new(country_code: parts[0], zip_code: parts[1], object_type: parts[2], local_id: parts[3], provider_id: parts[4]).to_s rescue nil
+ end
+ end
+ end
+end
\ No newline at end of file
diff --git a/app/models/chouette/stop_area.rb b/app/models/chouette/stop_area.rb
index f907f6777..d96381ee8 100644
--- a/app/models/chouette/stop_area.rb
+++ b/app/models/chouette/stop_area.rb
@@ -26,7 +26,6 @@ module Chouette
has_and_belongs_to_many :routing_stops, :class_name => 'Chouette::StopArea', :foreign_key => "parent_id", :association_foreign_key => "child_id", :join_table => "stop_areas_stop_areas", :order => "stop_areas.name"
belongs_to :stop_area_referential
- validates_presence_of :stop_area_referential_id
acts_as_tree :foreign_key => 'parent_id', :order => "name"
diff --git a/app/models/concerns/objectid_formater_support.rb b/app/models/concerns/objectid_formater_support.rb
new file mode 100644
index 000000000..1064b156f
--- /dev/null
+++ b/app/models/concerns/objectid_formater_support.rb
@@ -0,0 +1,15 @@
+module ObjectidFormaterSupport
+ extend ActiveSupport::Concern
+
+ included do
+ validates_presence_of :objectid_formater_class
+
+ def objectid_formater
+ objectid_formater_class.new
+ end
+
+ def objectid_formater_class
+ "Chouette::ObjectidFormater::#{read_attribute(:objectid_format).camelcase}".constantize if read_attribute(:objectid_format)
+ end
+ end
+end
\ No newline at end of file
diff --git a/spec/models/chouette/journey_pattern_spec.rb b/spec/models/chouette/journey_pattern_spec.rb
index d631511a3..a3017ee7a 100644
--- a/spec/models/chouette/journey_pattern_spec.rb
+++ b/spec/models/chouette/journey_pattern_spec.rb
@@ -70,7 +70,7 @@ describe Chouette::JourneyPattern, :type => :model do
end
it 'should create journey_pattern' do
- new_state = journey_pattern_to_state(build(:journey_pattern, objectid: nil, route: route))
+ new_state = journey_pattern_to_state(create(:journey_pattern, route: route))
Chouette::JourneyPattern.state_create_instance route, new_state
expect(new_state['object_id']).to be_truthy
expect(new_state['new_record']).to be_truthy
--
cgit v1.2.3
From 6a4e6e9363913415b9dc35725b7ac85ec9166368 Mon Sep 17 00:00:00 2001
From: cedricnjanga
Date: Thu, 16 Nov 2017 16:10:48 +0100
Subject: Create objectid format and integrate it in models. Work in progress.
Refs #4941
---
app/models/line_referential.rb | 8 ++++++++
app/models/referential.rb | 8 ++++++++
app/models/stop_area_referential.rb | 8 ++++++++
3 files changed, 24 insertions(+)
diff --git a/app/models/line_referential.rb b/app/models/line_referential.rb
index d8cf74bda..0d7125a57 100644
--- a/app/models/line_referential.rb
+++ b/app/models/line_referential.rb
@@ -1,5 +1,9 @@
class LineReferential < ActiveRecord::Base
+<<<<<<< HEAD
include ObjectidFormatterSupport
+=======
+ include ObjectidFormaterSupport
+>>>>>>> Create objectid format and integrate it in models. Work in progress. Refs #4941
extend StifTransportModeEnumerations
extend Enumerize
@@ -11,7 +15,11 @@ class LineReferential < ActiveRecord::Base
has_many :networks, class_name: 'Chouette::Network'
has_many :line_referential_syncs, -> { order created_at: :desc }
has_many :workbenches
+<<<<<<< HEAD
enumerize :objectid_format, in: %w(netex stif_netex stif_reflex stif_codifligne), default: 'netex'
+=======
+ enumerize :objectid_format, in: %w(netex stif_netex stif_reflex stif_codifligne)
+>>>>>>> Create objectid format and integrate it in models. Work in progress. Refs #4941
def add_member(organisation, options = {})
attributes = options.merge organisation: organisation
diff --git a/app/models/referential.rb b/app/models/referential.rb
index fa6bcbcf1..372f303f1 100644
--- a/app/models/referential.rb
+++ b/app/models/referential.rb
@@ -1,6 +1,10 @@
class Referential < ActiveRecord::Base
include DataFormatEnumerations
+<<<<<<< HEAD
include ObjectidFormatterSupport
+=======
+ include ObjectidFormaterSupport
+>>>>>>> Create objectid format and integrate it in models. Work in progress. Refs #4941
extend Enumerize
validates_presence_of :name
@@ -56,7 +60,11 @@ class Referential < ActiveRecord::Base
belongs_to :referential_suite
+<<<<<<< HEAD
enumerize :objectid_format, in: %w(netex stif_netex stif_reflex stif_codifligne), default: 'netex'
+=======
+ enumerize :objectid_format, in: %w(netex stif_netex stif_reflex stif_codifligne)
+>>>>>>> Create objectid format and integrate it in models. Work in progress. Refs #4941
scope :ready, -> { where(ready: true) }
scope :in_periode, ->(periode) { where(id: referential_ids_in_periode(periode)) }
diff --git a/app/models/stop_area_referential.rb b/app/models/stop_area_referential.rb
index 159ee07b3..5709a43a9 100644
--- a/app/models/stop_area_referential.rb
+++ b/app/models/stop_area_referential.rb
@@ -1,13 +1,21 @@
class StopAreaReferential < ActiveRecord::Base
extend Enumerize
+<<<<<<< HEAD
include ObjectidFormatterSupport
+=======
+ include ObjectidFormaterSupport
+>>>>>>> Create objectid format and integrate it in models. Work in progress. Refs #4941
has_many :stop_area_referential_memberships
has_many :organisations, through: :stop_area_referential_memberships
has_many :stop_areas, class_name: 'Chouette::StopArea'
has_many :stop_area_referential_syncs, -> {order created_at: :desc}
has_many :workbenches
+<<<<<<< HEAD
enumerize :objectid_format, in: %w(netex stif_netex stif_reflex stif_codifligne), default: 'netex'
+=======
+ enumerize :objectid_format, in: %w(netex stif_netex stif_reflex stif_codifligne)
+>>>>>>> Create objectid format and integrate it in models. Work in progress. Refs #4941
validates_presence_of :objectid_format
def add_member(organisation, options = {})
--
cgit v1.2.3
From 8295760c9a6e391733cd840bf802651d27bfc197 Mon Sep 17 00:00:00 2001
From: cedricnjanga
Date: Fri, 17 Nov 2017 18:07:29 +0100
Subject: Add some changes to the objectid construction
---
app/models/chouette/objectid_formater/netex.rb | 18 ------------------
.../chouette/objectid_formater/stif_codifligne.rb | 18 ------------------
app/models/chouette/objectid_formater/stif_netex.rb | 20 --------------------
app/models/chouette/objectid_formater/stif_reflex.rb | 18 ------------------
app/models/chouette/objectid_formatter/netex.rb | 2 +-
.../chouette/objectid_formatter/stif_codifligne.rb | 2 +-
.../chouette/objectid_formatter/stif_reflex.rb | 2 +-
app/models/concerns/objectid_formater_support.rb | 15 ---------------
app/models/concerns/objectid_support.rb | 8 ++++++--
app/models/line_referential.rb | 8 --------
app/models/referential.rb | 8 --------
app/models/stop_area_referential.rb | 8 --------
spec/models/chouette/journey_pattern_spec.rb | 2 +-
13 files changed, 10 insertions(+), 119 deletions(-)
delete mode 100644 app/models/chouette/objectid_formater/netex.rb
delete mode 100644 app/models/chouette/objectid_formater/stif_codifligne.rb
delete mode 100644 app/models/chouette/objectid_formater/stif_netex.rb
delete mode 100644 app/models/chouette/objectid_formater/stif_reflex.rb
delete mode 100644 app/models/concerns/objectid_formater_support.rb
diff --git a/app/models/chouette/objectid_formater/netex.rb b/app/models/chouette/objectid_formater/netex.rb
deleted file mode 100644
index 0736b6ff9..000000000
--- a/app/models/chouette/objectid_formater/netex.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-module Chouette
- module ObjectidFormater
- class Netex
- def before_validation(model)
- model.objectid ||= Chouette::Objectid::Netex.new(local_id: SecureRandom.uuid, object_type: model.class.name.gsub(/Chouette::/,'')).to_s
- end
-
- def after_commit(model)
- # unused method in this context
- end
-
- def parse_objectid(definition)
- parts = definition.split(":")
- Chouette::Objectid::Netex.new(provider_id: parts[0], object_type: parts[1], local_id: parts[2], creation_id: parts[3]).to_s rescue nil
- end
- end
- end
-end
\ No newline at end of file
diff --git a/app/models/chouette/objectid_formater/stif_codifligne.rb b/app/models/chouette/objectid_formater/stif_codifligne.rb
deleted file mode 100644
index 53fd28c82..000000000
--- a/app/models/chouette/objectid_formater/stif_codifligne.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-module Chouette
- module ObjectidFormater
- class StifCodifligne
- def before_validation(model)
- # unused method in this context
- end
-
- def after_commit(model)
- # unused method in this context
- end
-
- def parse_objectid(definition)
- parts = definition.split(":")
- Chouette::Objectid::StifCodifligne.new(provider_id: parts[0], sync_id: parts[1], object_type: parts[2], local_id: parts[3]).to_s rescue nil
- end
- end
- end
-end
\ No newline at end of file
diff --git a/app/models/chouette/objectid_formater/stif_netex.rb b/app/models/chouette/objectid_formater/stif_netex.rb
deleted file mode 100644
index 88995dd05..000000000
--- a/app/models/chouette/objectid_formater/stif_netex.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-module Chouette
- module ObjectidFormater
- class StifNetex
- def before_validation(model)
- model.objectid ||= "__pending_id__#{rand(50)+ rand(50)}"
- end
-
- def after_commit(model)
- if model.objectid.include? ':__pending_id__'
- model.objectid = Chouette::Objectid::StifNetex.new(provider_id: "stif", object_type: model.class.name.gsub(/Chouette::/,''), local_id: model.local_id).to_s
- end
- end
-
- def parse_objectid(definition)
- parts = definition.split(":")
- Chouette::Objectid::StifNetex.new(provider_id: parts[0], object_type: parts[1], local_id: parts[2], creation_id: parts[3]).to_s rescue nil
- end
- end
- end
-end
\ No newline at end of file
diff --git a/app/models/chouette/objectid_formater/stif_reflex.rb b/app/models/chouette/objectid_formater/stif_reflex.rb
deleted file mode 100644
index e6c6a6a70..000000000
--- a/app/models/chouette/objectid_formater/stif_reflex.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-module Chouette
- module ObjectidFormater
- class StifReflex
- def before_validation(model)
- # unused method in this context
- end
-
- def after_commit(model)
- # unused method in this context
- end
-
- def parse_objectid(definition)
- parts = definition.split(":")
- Chouette::Objectid::StifReflex.new(country_code: parts[0], zip_code: parts[1], object_type: parts[2], local_id: parts[3], provider_id: parts[4]).to_s rescue nil
- end
- end
- end
-end
\ No newline at end of file
diff --git a/app/models/chouette/objectid_formatter/netex.rb b/app/models/chouette/objectid_formatter/netex.rb
index 7279fdaa5..b17cb2c4d 100644
--- a/app/models/chouette/objectid_formatter/netex.rb
+++ b/app/models/chouette/objectid_formatter/netex.rb
@@ -5,7 +5,7 @@ module Chouette
model.update_attributes(objectid: Chouette::Objectid::Netex.new(local_id: SecureRandom.uuid, object_type: model.class.name.gsub(/Chouette::/,'')).to_s) unless model.read_attribute(:objectid)
end
- def after_commit(model)
+ def after_create(model)
# unused method in this context
end
diff --git a/app/models/chouette/objectid_formatter/stif_codifligne.rb b/app/models/chouette/objectid_formatter/stif_codifligne.rb
index 0624fc8a8..3bc29d89e 100644
--- a/app/models/chouette/objectid_formatter/stif_codifligne.rb
+++ b/app/models/chouette/objectid_formatter/stif_codifligne.rb
@@ -5,7 +5,7 @@ module Chouette
# unused method in this context
end
- def after_commit(model)
+ def after_create(model)
# unused method in this context
end
diff --git a/app/models/chouette/objectid_formatter/stif_reflex.rb b/app/models/chouette/objectid_formatter/stif_reflex.rb
index 5637f2806..287c7b756 100644
--- a/app/models/chouette/objectid_formatter/stif_reflex.rb
+++ b/app/models/chouette/objectid_formatter/stif_reflex.rb
@@ -5,7 +5,7 @@ module Chouette
# unused method in this context
end
- def after_commit(model)
+ def after_create(model)
# unused method in this context
end
diff --git a/app/models/concerns/objectid_formater_support.rb b/app/models/concerns/objectid_formater_support.rb
deleted file mode 100644
index 1064b156f..000000000
--- a/app/models/concerns/objectid_formater_support.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-module ObjectidFormaterSupport
- extend ActiveSupport::Concern
-
- included do
- validates_presence_of :objectid_formater_class
-
- def objectid_formater
- objectid_formater_class.new
- end
-
- def objectid_formater_class
- "Chouette::ObjectidFormater::#{read_attribute(:objectid_format).camelcase}".constantize if read_attribute(:objectid_format)
- end
- end
-end
\ No newline at end of file
diff --git a/app/models/concerns/objectid_support.rb b/app/models/concerns/objectid_support.rb
index 6822912f1..bd41beb01 100644
--- a/app/models/concerns/objectid_support.rb
+++ b/app/models/concerns/objectid_support.rb
@@ -11,8 +11,12 @@ module ObjectidSupport
self.referential.objectid_formater.before_validation self
end
- def after_commit_objectid
- self.referential.objectid_formater.after_commit self
+ def after_create_objectid
+ self.referential.objectid_formater.after_create self
+ end
+
+ def get_objectid
+ self.referential.objectid_formater.get_objectid read_attribute(:objectid) if objectid_format && read_attribute(:objectid)
end
def get_objectid
diff --git a/app/models/line_referential.rb b/app/models/line_referential.rb
index 0d7125a57..d8cf74bda 100644
--- a/app/models/line_referential.rb
+++ b/app/models/line_referential.rb
@@ -1,9 +1,5 @@
class LineReferential < ActiveRecord::Base
-<<<<<<< HEAD
include ObjectidFormatterSupport
-=======
- include ObjectidFormaterSupport
->>>>>>> Create objectid format and integrate it in models. Work in progress. Refs #4941
extend StifTransportModeEnumerations
extend Enumerize
@@ -15,11 +11,7 @@ class LineReferential < ActiveRecord::Base
has_many :networks, class_name: 'Chouette::Network'
has_many :line_referential_syncs, -> { order created_at: :desc }
has_many :workbenches
-<<<<<<< HEAD
enumerize :objectid_format, in: %w(netex stif_netex stif_reflex stif_codifligne), default: 'netex'
-=======
- enumerize :objectid_format, in: %w(netex stif_netex stif_reflex stif_codifligne)
->>>>>>> Create objectid format and integrate it in models. Work in progress. Refs #4941
def add_member(organisation, options = {})
attributes = options.merge organisation: organisation
diff --git a/app/models/referential.rb b/app/models/referential.rb
index 372f303f1..fa6bcbcf1 100644
--- a/app/models/referential.rb
+++ b/app/models/referential.rb
@@ -1,10 +1,6 @@
class Referential < ActiveRecord::Base
include DataFormatEnumerations
-<<<<<<< HEAD
include ObjectidFormatterSupport
-=======
- include ObjectidFormaterSupport
->>>>>>> Create objectid format and integrate it in models. Work in progress. Refs #4941
extend Enumerize
validates_presence_of :name
@@ -60,11 +56,7 @@ class Referential < ActiveRecord::Base
belongs_to :referential_suite
-<<<<<<< HEAD
enumerize :objectid_format, in: %w(netex stif_netex stif_reflex stif_codifligne), default: 'netex'
-=======
- enumerize :objectid_format, in: %w(netex stif_netex stif_reflex stif_codifligne)
->>>>>>> Create objectid format and integrate it in models. Work in progress. Refs #4941
scope :ready, -> { where(ready: true) }
scope :in_periode, ->(periode) { where(id: referential_ids_in_periode(periode)) }
diff --git a/app/models/stop_area_referential.rb b/app/models/stop_area_referential.rb
index 5709a43a9..159ee07b3 100644
--- a/app/models/stop_area_referential.rb
+++ b/app/models/stop_area_referential.rb
@@ -1,21 +1,13 @@
class StopAreaReferential < ActiveRecord::Base
extend Enumerize
-<<<<<<< HEAD
include ObjectidFormatterSupport
-=======
- include ObjectidFormaterSupport
->>>>>>> Create objectid format and integrate it in models. Work in progress. Refs #4941
has_many :stop_area_referential_memberships
has_many :organisations, through: :stop_area_referential_memberships
has_many :stop_areas, class_name: 'Chouette::StopArea'
has_many :stop_area_referential_syncs, -> {order created_at: :desc}
has_many :workbenches
-<<<<<<< HEAD
enumerize :objectid_format, in: %w(netex stif_netex stif_reflex stif_codifligne), default: 'netex'
-=======
- enumerize :objectid_format, in: %w(netex stif_netex stif_reflex stif_codifligne)
->>>>>>> Create objectid format and integrate it in models. Work in progress. Refs #4941
validates_presence_of :objectid_format
def add_member(organisation, options = {})
diff --git a/spec/models/chouette/journey_pattern_spec.rb b/spec/models/chouette/journey_pattern_spec.rb
index a3017ee7a..d631511a3 100644
--- a/spec/models/chouette/journey_pattern_spec.rb
+++ b/spec/models/chouette/journey_pattern_spec.rb
@@ -70,7 +70,7 @@ describe Chouette::JourneyPattern, :type => :model do
end
it 'should create journey_pattern' do
- new_state = journey_pattern_to_state(create(:journey_pattern, route: route))
+ new_state = journey_pattern_to_state(build(:journey_pattern, objectid: nil, route: route))
Chouette::JourneyPattern.state_create_instance route, new_state
expect(new_state['object_id']).to be_truthy
expect(new_state['new_record']).to be_truthy
--
cgit v1.2.3
From 40a5b7409d5214dd8361937c0c9d4726acb53222 Mon Sep 17 00:00:00 2001
From: cedricnjanga
Date: Mon, 20 Nov 2017 15:43:25 +0100
Subject: Change the use of namespace and remove modules
---
app/models/chouette/access_link.rb | 89 ++--
app/models/chouette/journey_frequency.rb | 4 +-
app/models/chouette/journey_pattern.rb | 187 ++++----
app/models/chouette/objectid/netex.rb | 48 +--
app/models/chouette/objectid/stif_codifligne.rb | 14 +-
app/models/chouette/objectid/stif_netex.rb | 20 +-
app/models/chouette/objectid/stif_reflex.rb | 15 +-
app/models/chouette/objectid_formatter/netex.rb | 14 +-
.../chouette/objectid_formatter/stif_codifligne.rb | 14 +-
.../chouette/objectid_formatter/stif_netex.rb | 8 +-
.../chouette/objectid_formatter/stif_reflex.rb | 14 +-
app/models/chouette/stop_point.rb | 69 +--
app/models/chouette/timeband.rb | 3 +
app/models/chouette/vehicle_journey.rb | 468 ++++++++++-----------
app/models/chouette/vehicle_journey_at_stop.rb | 107 +++--
...stops_are_in_increasing_time_order_validator.rb | 75 ++--
.../vehicle_journey_at_stops_day_offset.rb | 58 ++-
app/models/chouette/vehicle_journey_frequency.rb | 101 +++--
app/models/concerns/objectid_support.rb | 4 +-
spec/controllers/routes_controller_spec.rb | 4 +-
20 files changed, 650 insertions(+), 666 deletions(-)
diff --git a/app/models/chouette/access_link.rb b/app/models/chouette/access_link.rb
index 46fbcb631..5e44704fd 100644
--- a/app/models/chouette/access_link.rb
+++ b/app/models/chouette/access_link.rb
@@ -4,63 +4,62 @@ module Chouette
# FIXME http://jira.codehaus.org/browse/JRUBY-6358
self.primary_key = "id"
- attr_accessor :access_link_type, :link_orientation_type, :link_key
+ attr_accessor :access_link_type, :link_orientation_type, :link_key
- belongs_to :access_point, :class_name => 'Chouette::AccessPoint'
- belongs_to :stop_area, :class_name => 'Chouette::StopArea'
+ belongs_to :access_point, :class_name => 'Chouette::AccessPoint'
+ belongs_to :stop_area, :class_name => 'Chouette::StopArea'
- validates_presence_of :name
- validates_presence_of :link_orientation
+ validates_presence_of :name
+ validates_presence_of :link_orientation
- def self.nullable_attributes
- [:link_distance, :default_duration, :frequent_traveller_duration, :occasional_traveller_duration,
- :mobility_restricted_traveller_duration, :link_type]
- end
+ def self.nullable_attributes
+ [:link_distance, :default_duration, :frequent_traveller_duration, :occasional_traveller_duration,
+ :mobility_restricted_traveller_duration, :link_type]
+ end
- def access_link_type
- link_type && Chouette::ConnectionLinkType.new(link_type.underscore)
- end
+ def access_link_type
+ link_type && Chouette::ConnectionLinkType.new(link_type.underscore)
+ end
- def access_link_type=(access_link_type)
- self.link_type = (access_link_type ? access_link_type.camelcase : nil)
- end
+ def access_link_type=(access_link_type)
+ self.link_type = (access_link_type ? access_link_type.camelcase : nil)
+ end
- @@access_link_types = nil
- def self.access_link_types
- @@access_link_types ||= Chouette::ConnectionLinkType.all
- end
+ @@access_link_types = nil
+ def self.access_link_types
+ @@access_link_types ||= Chouette::ConnectionLinkType.all
+ end
- def link_orientation_type
- link_orientation && Chouette::LinkOrientationType.new(link_orientation.underscore)
- end
+ def link_orientation_type
+ link_orientation && Chouette::LinkOrientationType.new(link_orientation.underscore)
+ end
- def link_orientation_type=(link_orientation_type)
- self.link_orientation = (link_orientation_type ? link_orientation_type.camelcase : nil)
- end
+ def link_orientation_type=(link_orientation_type)
+ self.link_orientation = (link_orientation_type ? link_orientation_type.camelcase : nil)
+ end
- @@link_orientation_types = nil
- def self.link_orientation_types
- @@link_orientation_types ||= Chouette::LinkOrientationType.all
- end
+ @@link_orientation_types = nil
+ def self.link_orientation_types
+ @@link_orientation_types ||= Chouette::LinkOrientationType.all
+ end
- def geometry
- GeoRuby::SimpleFeatures::LineString.from_points( [ access_point.geometry, stop_area.geometry], 4326) if access_point.geometry and stop_area.geometry
- end
+ def geometry
+ GeoRuby::SimpleFeatures::LineString.from_points( [ access_point.geometry, stop_area.geometry], 4326) if access_point.geometry and stop_area.geometry
+ end
- def link_key
- Chouette::AccessLink.build_link_key(access_point,stop_area,link_orientation_type)
- end
-
- def self.build_link_key(access_point,stop_area,link_orientation_type)
- if link_orientation_type == "access_point_to_stop_area"
- "A_#{access_point.id}-S_#{stop_area.id}"
- else
- "S_#{stop_area.id}-A_#{access_point.id}"
- end
+ def link_key
+ Chouette::AccessLink.build_link_key(access_point,stop_area,link_orientation_type)
+ end
+
+ def self.build_link_key(access_point,stop_area,link_orientation_type)
+ if link_orientation_type == "access_point_to_stop_area"
+ "A_#{access_point.id}-S_#{stop_area.id}"
+ else
+ "S_#{stop_area.id}-A_#{access_point.id}"
end
+ end
- def geometry_presenter
- Chouette::Geometry::AccessLinkPresenter.new self
- end
+ def geometry_presenter
+ Chouette::Geometry::AccessLinkPresenter.new self
end
end
\ No newline at end of file
diff --git a/app/models/chouette/journey_frequency.rb b/app/models/chouette/journey_frequency.rb
index 1b4efe96e..8e7dd1819 100644
--- a/app/models/chouette/journey_frequency.rb
+++ b/app/models/chouette/journey_frequency.rb
@@ -18,8 +18,8 @@ module Chouette
if record.first_departure_time == record.last_departure_time
record.errors[:last_departure_time] << I18n.t('activerecord.errors.models.journey_frequency.end_must_be_different_from_first')
end
- if record.scheduled_headway_interval.blank? || (record.scheduled_headway_interval.strftime( "%H%M%S%N" ) == Time.current.midnight.strftime( "%H%M%S%N" ))
- record.errors[:scheduled_headway_interval] << I18n.t('activerecord.errors.models.journey_frequency.scheduled_headway_interval_greater_than_zero')
+ unless last_departure_time.between? timeband_start_time, timeband_end_time
+ record.errors[:last_departure_time] << I18n.t('activerecord.errors.models.journey_frequency.end_must_be_before_timeband')
end
end
end
diff --git a/app/models/chouette/journey_pattern.rb b/app/models/chouette/journey_pattern.rb
index 797b6adb1..31b7c56be 100644
--- a/app/models/chouette/journey_pattern.rb
+++ b/app/models/chouette/journey_pattern.rb
@@ -26,125 +26,124 @@ module Chouette
"IBOO-#{self.referential.id}-#{self.route.line.get_objectid.local_id}-#{self.id}"
end
- def checksum_attributes
- values = self.slice(*['name', 'published_name', 'registration_number']).values
- values << self.stop_points.map(&:stop_area).map(&:user_objectid)
- values.flatten
- end
+ def checksum_attributes
+ values = self.slice(*['name', 'published_name', 'registration_number']).values
+ values << self.stop_points.map(&:stop_area).map(&:user_objectid)
+ values.flatten
+ end
- def self.state_update route, state
- transaction do
- state.each do |item|
- item.delete('errors')
- jp = find_by(objectid: item['object_id']) || state_create_instance(route, item)
- next if item['deletable'] && jp.persisted? && jp.destroy
- # Update attributes and stop_points associations
- jp.update_attributes(state_permited_attributes(item)) unless item['new_record']
- jp.state_stop_points_update(item) if !jp.errors.any? && jp.persisted?
- item['errors'] = jp.errors if jp.errors.any?
- end
-
- if state.any? {|item| item['errors']}
- state.map {|item| item.delete('object_id') if item['new_record']}
- raise ::ActiveRecord::Rollback
- end
+ def self.state_update route, state
+ transaction do
+ state.each do |item|
+ item.delete('errors')
+ jp = find_by(objectid: item['object_id']) || state_create_instance(route, item)
+ next if item['deletable'] && jp.persisted? && jp.destroy
+ # Update attributes and stop_points associations
+ jp.update_attributes(state_permited_attributes(item)) unless item['new_record']
+ jp.state_stop_points_update(item) if !jp.errors.any? && jp.persisted?
+ item['errors'] = jp.errors if jp.errors.any?
end
- state.map {|item| item.delete('new_record')}
- state.delete_if {|item| item['deletable']}
+ if state.any? {|item| item['errors']}
+ state.map {|item| item.delete('object_id') if item['new_record']}
+ raise ActiveRecord::Rollback
+ end
end
- def self.state_permited_attributes item
- {
- name: item['name'],
- published_name: item['published_name'],
- registration_number: item['registration_number']
- }
- end
+ state.map {|item| item.delete('new_record')}
+ state.delete_if {|item| item['deletable']}
+ end
- def self.state_create_instance route, item
- # Flag new record, so we can unset object_id if transaction rollback
- jp = route.journey_patterns.create(state_permited_attributes(item))
+ def self.state_permited_attributes item
+ {
+ name: item['name'],
+ published_name: item['published_name'],
+ registration_number: item['registration_number']
+ }
+ end
- # FIXME
- # DefaultAttributesSupport will trigger some weird validation on after save
- # wich will call to valid?, wich will populate errors
- # In this case, we mark jp to be valid if persisted? return true
- jp.errors.clear if jp.persisted?
+ def self.state_create_instance route, item
+ # Flag new record, so we can unset object_id if transaction rollback
+ jp = route.journey_patterns.create(state_permited_attributes(item))
- item['object_id'] = jp.objectid
- item['new_record'] = true
- jp
- end
+ # FIXME
+ # DefaultAttributesSupport will trigger some weird validation on after save
+ # wich will call to valid?, wich will populate errors
+ # In this case, we mark jp to be valid if persisted? return true
+ jp.errors.clear if jp.persisted?
- def state_stop_points_update item
- item['stop_points'].each do |sp|
- exist = stop_area_ids.include?(sp['id'])
- next if exist && sp['checked']
-
- stop_point = route.stop_points.find_by(stop_area_id: sp['id'])
- if !exist && sp['checked']
- stop_points << stop_point
- end
- if exist && !sp['checked']
- stop_points.delete(stop_point)
- end
+ item['object_id'] = jp.objectid
+ item['new_record'] = true
+ jp
+ end
+
+ def state_stop_points_update item
+ item['stop_points'].each do |sp|
+ exist = stop_area_ids.include?(sp['id'])
+ next if exist && sp['checked']
+
+ stop_point = route.stop_points.find_by(stop_area_id: sp['id'])
+ if !exist && sp['checked']
+ stop_points << stop_point
+ end
+ if exist && !sp['checked']
+ stop_points.delete(stop_point)
end
end
+ end
- # TODO: this a workarround
- # otherwise, we loose the first stop_point
- # when creating a new journey_pattern
- def special_update
- bck_sp = self.stop_points.map {|s| s}
- self.update_attributes :stop_points => []
- self.update_attributes :stop_points => bck_sp
- end
+ # TODO: this a workarround
+ # otherwise, we loose the first stop_point
+ # when creating a new journey_pattern
+ def special_update
+ bck_sp = self.stop_points.map {|s| s}
+ self.update_attributes :stop_points => []
+ self.update_attributes :stop_points => bck_sp
+ end
- def departure_stop_point
- return unless departure_stop_point_id
- Chouette::StopPoint.find( departure_stop_point_id)
- end
+ def departure_stop_point
+ return unless departure_stop_point_id
+ Chouette::StopPoint.find( departure_stop_point_id)
+ end
- def arrival_stop_point
- return unless arrival_stop_point_id
- Chouette::StopPoint.find( arrival_stop_point_id)
- end
+ def arrival_stop_point
+ return unless arrival_stop_point_id
+ Chouette::StopPoint.find( arrival_stop_point_id)
+ end
- def shortcuts_update_for_add( stop_point)
- stop_points << stop_point unless stop_points.include?( stop_point)
+ def shortcuts_update_for_add( stop_point)
+ stop_points << stop_point unless stop_points.include?( stop_point)
- ordered_stop_points = stop_points
- ordered_stop_points = ordered_stop_points.sort { |a,b| a.position <=> b.position} unless ordered_stop_points.empty?
+ ordered_stop_points = stop_points
+ ordered_stop_points = ordered_stop_points.sort { |a,b| a.position <=> b.position} unless ordered_stop_points.empty?
- self.update_attributes( :departure_stop_point_id => (ordered_stop_points.first && ordered_stop_points.first.id),
- :arrival_stop_point_id => (ordered_stop_points.last && ordered_stop_points.last.id))
- end
+ self.update_attributes( :departure_stop_point_id => (ordered_stop_points.first && ordered_stop_points.first.id),
+ :arrival_stop_point_id => (ordered_stop_points.last && ordered_stop_points.last.id))
+ end
- def shortcuts_update_for_remove( stop_point)
- stop_points.delete( stop_point) if stop_points.include?( stop_point)
+ def shortcuts_update_for_remove( stop_point)
+ stop_points.delete( stop_point) if stop_points.include?( stop_point)
- ordered_stop_points = stop_points
- ordered_stop_points = ordered_stop_points.sort { |a,b| a.position <=> b.position} unless ordered_stop_points.empty?
+ ordered_stop_points = stop_points
+ ordered_stop_points = ordered_stop_points.sort { |a,b| a.position <=> b.position} unless ordered_stop_points.empty?
- self.update_attributes( :departure_stop_point_id => (ordered_stop_points.first && ordered_stop_points.first.id),
- :arrival_stop_point_id => (ordered_stop_points.last && ordered_stop_points.last.id))
- end
+ self.update_attributes( :departure_stop_point_id => (ordered_stop_points.first && ordered_stop_points.first.id),
+ :arrival_stop_point_id => (ordered_stop_points.last && ordered_stop_points.last.id))
+ end
- def vjas_add( stop_point)
- return if new_record?
+ def vjas_add( stop_point)
+ return if new_record?
- vehicle_journeys.each do |vj|
- vjas = vj.vehicle_journey_at_stops.create :stop_point_id => stop_point.id
- end
+ vehicle_journeys.each do |vj|
+ vjas = vj.vehicle_journey_at_stops.create :stop_point_id => stop_point.id
end
+ end
- def vjas_remove( stop_point)
- return if new_record?
+ def vjas_remove( stop_point)
+ return if new_record?
- vehicle_journey_at_stops.where( :stop_point_id => stop_point.id).each do |vjas|
- vjas.destroy
- end
+ vehicle_journey_at_stops.where( :stop_point_id => stop_point.id).each do |vjas|
+ vjas.destroy
end
end
end
diff --git a/app/models/chouette/objectid/netex.rb b/app/models/chouette/objectid/netex.rb
index 0013de7c8..b83ef7b8d 100644
--- a/app/models/chouette/objectid/netex.rb
+++ b/app/models/chouette/objectid/netex.rb
@@ -1,33 +1,29 @@
-module Chouette
- module Objectid
- class Netex
- include ActiveModel::Model
+class Chouette::Objectid::Netex
+ include ActiveModel::Model
- attr_accessor :provider_id, :object_type, :local_id, :creation_id
- validates_presence_of :provider_id, :object_type, :local_id, :creation_id
- validate :must_respect_format
+ attr_accessor :provider_id, :object_type, :local_id, :creation_id
+ validates_presence_of :provider_id, :object_type, :local_id, :creation_id
+ validate :must_respect_format
- def initialize(**attributes)
- @provider_id ||= (attributes[:provider_id] ||= 'chouette')
- @object_type = attributes[:object_type]
- @local_id = attributes[:local_id]
- @creation_id = (attributes[:creation_id] ||= 'LOC')
- end
+ def initialize(**attributes)
+ @provider_id ||= (attributes[:provider_id] ||= 'chouette')
+ @object_type = attributes[:object_type]
+ @local_id = attributes[:local_id]
+ @creation_id = (attributes[:creation_id] ||= 'LOC')
+ end
- @@format = /^([A-Za-z_-]+):([A-Za-z]+):([0-9A-Za-z_-]+):([A-Za-z]+)$/
- cattr_reader :format
+ @@format = /^([A-Za-z_-]+):([A-Za-z]+):([0-9A-Za-z_-]+):([A-Za-z]+)$/
+ cattr_reader :format
- def to_s
- "#{self.provider_id}:#{self.object_type}:#{self.local_id}:#{self.creation_id}"
- end
+ def to_s
+ "#{self.provider_id}:#{self.object_type}:#{self.local_id}:#{self.creation_id}"
+ end
- def must_respect_format
- self.to_s.match(format)
- end
+ def must_respect_format
+ self.to_s.match(format)
+ end
- def short_id
- local_id
- end
- end
+ def short_id
+ local_id
end
-end
+end
\ No newline at end of file
diff --git a/app/models/chouette/objectid/stif_codifligne.rb b/app/models/chouette/objectid/stif_codifligne.rb
index c3c19e418..d1a1e7862 100644
--- a/app/models/chouette/objectid/stif_codifligne.rb
+++ b/app/models/chouette/objectid/stif_codifligne.rb
@@ -1,12 +1,10 @@
-module Chouette
- module Objectid
- class StifCodifligne < Chouette::Objectid::Netex
+class Chouette::Objectid::StifCodifligne < Chouette::Objectid::Netex
- attr_accessor :sync_id
- validates_presence_of :sync_id
- validates :creation_id, presence: false
+ attr_accessor :sync_id
+ validates_presence_of :sync_id
+ validates :creation_id, presence: false
- @@format = /^([A-Za-z_]+):([A-Za-z]+):([A-Za-z]+):([0-9A-Za-z_-]+)$/
+ @@format = /^([A-Za-z_]+):([A-Za-z]+):([A-Za-z]+):([0-9A-Za-z_-]+)$/
def initialize(**attributes)
@provider_id = attributes[:provider_id]
@@ -21,4 +19,4 @@ module Chouette
end
end
end
-end
+end
\ No newline at end of file
diff --git a/app/models/chouette/objectid/stif_netex.rb b/app/models/chouette/objectid/stif_netex.rb
index 4894daac7..26700bf4b 100644
--- a/app/models/chouette/objectid/stif_netex.rb
+++ b/app/models/chouette/objectid/stif_netex.rb
@@ -1,15 +1,11 @@
-module Chouette
- module Objectid
- class StifNetex < Chouette::Objectid::Netex
+class Chouette::Objectid::StifNetex < Chouette::Objectid::Netex
- def initialize(**attributes)
- @provider_id = (attributes[:provider_id] ||= 'stif')
- super
- end
+ def initialize(**attributes)
+ @provider_id = (attributes[:provider_id] ||= 'stif')
+ super
+ end
- def short_id
- local_id.try(:split, "-").try(:[], -1)
- end
- end
+ def short_id
+ local_id.try(:split, "-").try(:[], -1)
end
-end
+end
\ No newline at end of file
diff --git a/app/models/chouette/objectid/stif_reflex.rb b/app/models/chouette/objectid/stif_reflex.rb
index 711308541..6ffaf7c0e 100644
--- a/app/models/chouette/objectid/stif_reflex.rb
+++ b/app/models/chouette/objectid/stif_reflex.rb
@@ -1,12 +1,10 @@
-module Chouette
- module Objectid
- class StifReflex < Chouette::Objectid::Netex
+class Chouette::Objectid::StifReflex < Chouette::Objectid::Netex
- attr_accessor :country_code, :zip_code
- validates_presence_of :country_code, :zip_code
- validates :creation_id, presence: false
+ attr_accessor :country_code, :zip_code
+ validates_presence_of :country_code, :zip_code
+ validates :creation_id, presence: false
- @@format = /^([A-Za-z_]+):([0-9A-Za-z_-]+):([A-Za-z]+):([0-9A-Za-z_-]+):([A-Za-z]+)$/
+ @@format = /^([A-Za-z_]+):([0-9A-Za-z_-]+):([A-Za-z]+):([0-9A-Za-z_-]+):([A-Za-z]+)$/
def initialize(**attributes)
@provider_id = attributes[:provider_id]
@@ -20,4 +18,5 @@ module Chouette
end
end
end
-end
+
+end
\ No newline at end of file
diff --git a/app/models/chouette/objectid_formatter/netex.rb b/app/models/chouette/objectid_formatter/netex.rb
index b17cb2c4d..6b64b8f82 100644
--- a/app/models/chouette/objectid_formatter/netex.rb
+++ b/app/models/chouette/objectid_formatter/netex.rb
@@ -5,14 +5,12 @@ module Chouette
model.update_attributes(objectid: Chouette::Objectid::Netex.new(local_id: SecureRandom.uuid, object_type: model.class.name.gsub(/Chouette::/,'')).to_s) unless model.read_attribute(:objectid)
end
- def after_create(model)
- # unused method in this context
- end
+ def after_commit(model)
+ # unused method in this context
+ end
- def get_objectid(definition)
- parts = definition.try(:split, ":")
- Chouette::Objectid::Netex.new(provider_id: parts[0], object_type: parts[1], local_id: parts[2], creation_id: parts[3]) rescue nil
- end
- end
+ def get_objectid(definition)
+ parts = definition.try(:split, ":")
+ Chouette::Objectid::Netex.new(provider_id: parts[0], object_type: parts[1], local_id: parts[2], creation_id: parts[3]) rescue nil
end
end
\ No newline at end of file
diff --git a/app/models/chouette/objectid_formatter/stif_codifligne.rb b/app/models/chouette/objectid_formatter/stif_codifligne.rb
index 3bc29d89e..f575a4001 100644
--- a/app/models/chouette/objectid_formatter/stif_codifligne.rb
+++ b/app/models/chouette/objectid_formatter/stif_codifligne.rb
@@ -5,14 +5,12 @@ module Chouette
# unused method in this context
end
- def after_create(model)
- # unused method in this context
- end
+ def after_commit(model)
+ # unused method in this context
+ end
- def get_objectid(definition)
- parts = definition.try(:split, ":")
- Chouette::Objectid::StifCodifligne.new(provider_id: parts[0], sync_id: parts[1], object_type: parts[2], local_id: parts[3]) rescue nil
- end
- end
+ def get_objectid(definition)
+ parts = definition.try(:split, ":")
+ Chouette::Objectid::StifCodifligne.new(provider_id: parts[0], sync_id: parts[1], object_type: parts[2], local_id: parts[3]) rescue nil
end
end
\ No newline at end of file
diff --git a/app/models/chouette/objectid_formatter/stif_netex.rb b/app/models/chouette/objectid_formatter/stif_netex.rb
index 0256754bf..904d8503b 100644
--- a/app/models/chouette/objectid_formatter/stif_netex.rb
+++ b/app/models/chouette/objectid_formatter/stif_netex.rb
@@ -9,10 +9,8 @@ module Chouette
model.update_attributes(objectid: Chouette::Objectid::StifNetex.new(provider_id: "stif", object_type: model.class.name.gsub(/Chouette::/,''), local_id: model.local_id).to_s)
end
- def get_objectid(definition)
- parts = definition.try(:split, ":")
- Chouette::Objectid::StifNetex.new(provider_id: parts[0], object_type: parts[1], local_id: parts[2], creation_id: parts[3]) rescue nil
- end
- end
+ def get_objectid(definition)
+ parts = definition.try(:split, ":")
+ Chouette::Objectid::StifNetex.new(provider_id: parts[0], object_type: parts[1], local_id: parts[2], creation_id: parts[3]) rescue nil
end
end
\ No newline at end of file
diff --git a/app/models/chouette/objectid_formatter/stif_reflex.rb b/app/models/chouette/objectid_formatter/stif_reflex.rb
index 287c7b756..ba1022c2b 100644
--- a/app/models/chouette/objectid_formatter/stif_reflex.rb
+++ b/app/models/chouette/objectid_formatter/stif_reflex.rb
@@ -5,14 +5,12 @@ module Chouette
# unused method in this context
end
- def after_create(model)
- # unused method in this context
- end
+ def after_commit(model)
+ # unused method in this context
+ end
- def get_objectid(definition)
- parts = definition.try(:split, ":")
- Chouette::Objectid::StifReflex.new(country_code: parts[0], zip_code: parts[1], object_type: parts[2], local_id: parts[3], provider_id: parts[4]) rescue nil
- end
- end
+ def get_objectid(definition)
+ parts = definition.try(:split, ":")
+ Chouette::Objectid::StifReflex.new(country_code: parts[0], zip_code: parts[1], object_type: parts[2], local_id: parts[3], provider_id: parts[4]) rescue nil
end
end
\ No newline at end of file
diff --git a/app/models/chouette/stop_point.rb b/app/models/chouette/stop_point.rb
index f4c9b3800..b03eca6ae 100644
--- a/app/models/chouette/stop_point.rb
+++ b/app/models/chouette/stop_point.rb
@@ -1,23 +1,23 @@
module Chouette
class StopPoint < Chouette::TridentActiveRecord
- def self.policy_class
- RoutePolicy
- end
+ def self.policy_class
+ RoutePolicy
+ end
- include ForBoardingEnumerations
- include ForAlightingEnumerations
- include ObjectidSupport
+ include ForBoardingEnumerations
+ include ForAlightingEnumerations
+ include ObjectidSupport
- # FIXME http://jira.codehaus.org/browse/JRUBY-6358
- self.primary_key = "id"
+ # FIXME http://jira.codehaus.org/browse/JRUBY-6358
+ self.primary_key = "id"
- belongs_to :stop_area
- belongs_to :route, inverse_of: :stop_points
- has_many :vehicle_journey_at_stops, :dependent => :destroy
- has_many :vehicle_journeys, -> {uniq}, :through => :vehicle_journey_at_stops
+ belongs_to :stop_area
+ belongs_to :route, inverse_of: :stop_points
+ has_many :vehicle_journey_at_stops, :dependent => :destroy
+ has_many :vehicle_journeys, -> {uniq}, :through => :vehicle_journey_at_stops
- acts_as_list :scope => :route, top_of_list: 0
+ acts_as_list :scope => :route, top_of_list: 0
validates_presence_of :stop_area
@@ -27,34 +27,35 @@ module Chouette
errors.add(:stop_area_id, I18n.t("stop_areas.errors.empty"))
end
end
+ end
- scope :default_order, -> { order("position") }
+ scope :default_order, -> { order("position") }
- delegate :name, to: :stop_area
+ delegate :name, to: :stop_area
- before_destroy :remove_dependent_journey_pattern_stop_points
- def remove_dependent_journey_pattern_stop_points
- route.journey_patterns.each do |jp|
- if jp.stop_point_ids.include?( id)
- jp.stop_point_ids = jp.stop_point_ids - [id]
- end
+ before_destroy :remove_dependent_journey_pattern_stop_points
+ def remove_dependent_journey_pattern_stop_points
+ route.journey_patterns.each do |jp|
+ if jp.stop_point_ids.include?( id)
+ jp.stop_point_ids = jp.stop_point_ids - [id]
end
end
+ end
- def duplicate(for_route:)
- keys_for_create = attributes.keys - %w{id objectid created_at updated_at}
- atts_for_create = attributes
- .slice(*keys_for_create)
- .merge('route_id' => for_route.id)
- self.class.create!(atts_for_create)
- end
+ def duplicate(for_route:)
+ keys_for_create = attributes.keys - %w{id objectid created_at updated_at}
+ atts_for_create = attributes
+ .slice(*keys_for_create)
+ .merge('route_id' => for_route.id)
+ self.class.create!(atts_for_create)
+ end
- def local_id
- "IBOO-#{self.referential.id}-#{self.route.line.get_objectid.local_id}-#{self.route.id}-#{self.id}"
- end
+ def local_id
+ "IBOO-#{self.referential.id}-#{self.route.line.get_objectid.local_id}-#{self.route.id}-#{self.id}"
+ end
- def self.area_candidates
- Chouette::StopArea.where(:area_type => ['Quay', 'BoardingPosition'])
- end
+ def self.area_candidates
+ Chouette::StopArea.where(:area_type => ['Quay', 'BoardingPosition'])
end
+
end
\ No newline at end of file
diff --git a/app/models/chouette/timeband.rb b/app/models/chouette/timeband.rb
index 21c81ab1c..ec3ad43b9 100644
--- a/app/models/chouette/timeband.rb
+++ b/app/models/chouette/timeband.rb
@@ -15,6 +15,9 @@ module Chouette
validates :start_time, :end_time, presence: true
validates_with Chouette::TimebandValidator
+ validates :start_time, :end_time, presence: true
+ validates_with Chouette::TimebandValidator
+
default_scope { order(:start_time) }
def self.object_id_key
diff --git a/app/models/chouette/vehicle_journey.rb b/app/models/chouette/vehicle_journey.rb
index b68909795..1508360ce 100644
--- a/app/models/chouette/vehicle_journey.rb
+++ b/app/models/chouette/vehicle_journey.rb
@@ -7,301 +7,301 @@ module Chouette
# FIXME http://jira.codehaus.org/browse/JRUBY-6358
self.primary_key = "id"
- enum journey_category: { timed: 0, frequency: 1 }
+ enum journey_category: { timed: 0, frequency: 1 }
- default_scope { where(journey_category: journey_categories[:timed]) }
+ default_scope { where(journey_category: journey_categories[:timed]) }
- attr_reader :time_table_tokens
+ attr_reader :time_table_tokens
- def self.nullable_attributes
- [:transport_mode, :published_journey_name, :vehicle_type_identifier, :published_journey_identifier, :comment, :status_value]
- end
+ def self.nullable_attributes
+ [:transport_mode, :published_journey_name, :vehicle_type_identifier, :published_journey_identifier, :comment, :status_value]
+ end
- belongs_to :company
- belongs_to :route
- belongs_to :journey_pattern
+ belongs_to :company
+ belongs_to :route
+ belongs_to :journey_pattern
- has_and_belongs_to_many :footnotes, :class_name => 'Chouette::Footnote'
+ has_and_belongs_to_many :footnotes, :class_name => 'Chouette::Footnote'
- validates_presence_of :route
- validates_presence_of :journey_pattern
- # validates :vehicle_journey_at_stops,
- # Validation temporarily removed for day offsets
- # :vjas_departure_time_must_be_before_next_stop_arrival_time,
+ validates_presence_of :route
+ validates_presence_of :journey_pattern
+ # validates :vehicle_journey_at_stops,
+ # Validation temporarily removed for day offsets
+ # :vjas_departure_time_must_be_before_next_stop_arrival_time,
- # vehicle_journey_at_stops_are_in_increasing_time_order: false
- validates_presence_of :number
+ # vehicle_journey_at_stops_are_in_increasing_time_order: false
+ validates_presence_of :number
- has_many :vehicle_journey_at_stops, -> { includes(:stop_point).order("stop_points.position") }, :dependent => :destroy
- has_and_belongs_to_many :time_tables, :class_name => 'Chouette::TimeTable', :foreign_key => "vehicle_journey_id", :association_foreign_key => "time_table_id"
- has_many :stop_points, -> { order("stop_points.position") }, :through => :vehicle_journey_at_stops
+ has_many :vehicle_journey_at_stops, -> { includes(:stop_point).order("stop_points.position") }, :dependent => :destroy
+ has_and_belongs_to_many :time_tables, :class_name => 'Chouette::TimeTable', :foreign_key => "vehicle_journey_id", :association_foreign_key => "time_table_id"
+ has_many :stop_points, -> { order("stop_points.position") }, :through => :vehicle_journey_at_stops
- before_validation :set_default_values,
- :calculate_vehicle_journey_at_stop_day_offset
+ before_validation :set_default_values,
+ :calculate_vehicle_journey_at_stop_day_offset
- # TODO: Remove this validator
- # We've eliminated this validation because it prevented vehicle journeys
- # from being saved with at-stops having a day offset greater than 0,
- # because these would have times that were "earlier" than the previous
- # at-stop. TBD by Luc whether we're deleting this validation altogether or
- # instead rejiggering it to work with day offsets.
- def vjas_departure_time_must_be_before_next_stop_arrival_time
- notice = 'departure time must be before next stop arrival time'
- vehicle_journey_at_stops.each_with_index do |current_stop, index|
- next_stop = vehicle_journey_at_stops[index + 1]
+ # TODO: Remove this validator
+ # We've eliminated this validation because it prevented vehicle journeys
+ # from being saved with at-stops having a day offset greater than 0,
+ # because these would have times that were "earlier" than the previous
+ # at-stop. TBD by Luc whether we're deleting this validation altogether or
+ # instead rejiggering it to work with day offsets.
+ def vjas_departure_time_must_be_before_next_stop_arrival_time
+ notice = 'departure time must be before next stop arrival time'
+ vehicle_journey_at_stops.each_with_index do |current_stop, index|
+ next_stop = vehicle_journey_at_stops[index + 1]
- next unless next_stop && (next_stop[:arrival_time] < current_stop[:departure_time])
+ next unless next_stop && (next_stop[:arrival_time] < current_stop[:departure_time])
- current_stop.errors.add(:departure_time, notice)
- self.errors.add(:vehicle_journey_at_stops, notice)
- end
+ current_stop.errors.add(:departure_time, notice)
+ self.errors.add(:vehicle_journey_at_stops, notice)
end
+ end
- def local_id
- "IBOO-#{self.referential.id}-#{self.route.line.get_objectid.local_id}-#{self.id}"
- end
+ def local_id
+ "IBOO-#{self.referential.id}-#{self.route.line.get_objectid.local_id}-#{self.id}"
+ end
- def checksum_attributes
- [].tap do |attrs|
- attrs << self.published_journey_name
- attrs << self.published_journey_identifier
- attrs << self.try(:company).try(:objectid).try(:local_id)
- attrs << self.footnotes.map(&:checksum).sort
- attrs << self.vehicle_journey_at_stops.map(&:checksum).sort
- end
+ def checksum_attributes
+ [].tap do |attrs|
+ attrs << self.published_journey_name
+ attrs << self.published_journey_identifier
+ attrs << self.try(:company).try(:objectid).try(:local_id)
+ attrs << self.footnotes.map(&:checksum).sort
+ attrs << self.vehicle_journey_at_stops.map(&:checksum).sort
end
+ end
- def set_default_values
- if number.nil?
- self.number = 0
- end
+ def set_default_values
+ if number.nil?
+ self.number = 0
end
+ end
- def calculate_vehicle_journey_at_stop_day_offset
- Chouette::VehicleJourneyAtStopsDayOffset.new(
- vehicle_journey_at_stops
- ).update
- end
+ def calculate_vehicle_journey_at_stop_day_offset
+ Chouette::VehicleJourneyAtStopsDayOffset.new(
+ vehicle_journey_at_stops
+ ).update
+ end
- scope :without_any_time_table, -> { joins('LEFT JOIN "time_tables_vehicle_journeys" ON "time_tables_vehicle_journeys"."vehicle_journey_id" = "vehicle_journeys"."id" LEFT JOIN "time_tables" ON "time_tables"."id" = "time_tables_vehicle_journeys"."time_table_id"').where(:time_tables => { :id => nil}) }
- scope :without_any_passing_time, -> { joins('LEFT JOIN "vehicle_journey_at_stops" ON "vehicle_journey_at_stops"."vehicle_journey_id" = "vehicle_journeys"."id"').where(vehicle_journey_at_stops: { id: nil }) }
+ scope :without_any_time_table, -> { joins('LEFT JOIN "time_tables_vehicle_journeys" ON "time_tables_vehicle_journeys"."vehicle_journey_id" = "vehicle_journeys"."id" LEFT JOIN "time_tables" ON "time_tables"."id" = "time_tables_vehicle_journeys"."time_table_id"').where(:time_tables => { :id => nil}) }
+ scope :without_any_passing_time, -> { joins('LEFT JOIN "vehicle_journey_at_stops" ON "vehicle_journey_at_stops"."vehicle_journey_id" = "vehicle_journeys"."id"').where(vehicle_journey_at_stops: { id: nil }) }
- accepts_nested_attributes_for :vehicle_journey_at_stops, :allow_destroy => true
+ accepts_nested_attributes_for :vehicle_journey_at_stops, :allow_destroy => true
- def presenter
- @presenter ||= ::VehicleJourneyPresenter.new( self)
- end
+ def presenter
+ @presenter ||= ::VehicleJourneyPresenter.new( self)
+ end
- def vehicle_journey_at_stops_matrix
- at_stops = self.vehicle_journey_at_stops.to_a.dup
- active_stop_point_ids = journey_pattern.stop_points.map(&:id)
+ def vehicle_journey_at_stops_matrix
+ at_stops = self.vehicle_journey_at_stops.to_a.dup
+ active_stop_point_ids = journey_pattern.stop_points.map(&:id)
- (route.stop_points.map(&:id) - at_stops.map(&:stop_point_id)).each do |id|
- vjas = Chouette::VehicleJourneyAtStop.new(stop_point_id: id)
- vjas.dummy = !active_stop_point_ids.include?(id)
- at_stops.insert(route.stop_points.map(&:id).index(id), vjas)
- end
- at_stops
+ (route.stop_points.map(&:id) - at_stops.map(&:stop_point_id)).each do |id|
+ vjas = Chouette::VehicleJourneyAtStop.new(stop_point_id: id)
+ vjas.dummy = !active_stop_point_ids.include?(id)
+ at_stops.insert(route.stop_points.map(&:id).index(id), vjas)
end
+ at_stops
+ end
- def create_or_find_vjas_from_state vjas
- return vehicle_journey_at_stops.find(vjas['id']) if vjas['id']
- stop_point = Chouette::StopPoint.find_by(objectid: vjas['stop_point_objectid'])
- stop = vehicle_journey_at_stops.create(stop_point: stop_point)
- vjas['id'] = stop.id
- vjas['new_record'] = true
- stop
- end
+ def create_or_find_vjas_from_state vjas
+ return vehicle_journey_at_stops.find(vjas['id']) if vjas['id']
+ stop_point = Chouette::StopPoint.find_by(objectid: vjas['stop_point_objectid'])
+ stop = vehicle_journey_at_stops.create(stop_point: stop_point)
+ vjas['id'] = stop.id
+ vjas['new_record'] = true
+ stop
+ end
- def update_vjas_from_state state
- state.each do |vjas|
- next if vjas["dummy"]
- params = {}.tap do |el|
- ['arrival_time', 'departure_time'].each do |field|
- time = "#{vjas[field]['hour']}:#{vjas[field]['minute']}"
- el[field.to_sym] = Time.parse("2000-01-01 #{time}:00 UTC")
- end
+ def update_vjas_from_state state
+ state.each do |vjas|
+ next if vjas["dummy"]
+ params = {}.tap do |el|
+ ['arrival_time', 'departure_time'].each do |field|
+ time = "#{vjas[field]['hour']}:#{vjas[field]['minute']}"
+ el[field.to_sym] = Time.parse("2000-01-01 #{time}:00 UTC")
end
- stop = create_or_find_vjas_from_state(vjas)
- stop.update_attributes(params)
- vjas.delete('errors')
- vjas['errors'] = stop.errors if stop.errors.any?
end
+ stop = create_or_find_vjas_from_state(vjas)
+ stop.update_attributes(params)
+ vjas.delete('errors')
+ vjas['errors'] = stop.errors if stop.errors.any?
end
+ end
- def state_update_vjas? vehicle_journey_at_stops
- departure_times = vehicle_journey_at_stops.map do |vjas|
- "#{vjas['departure_time']['hour']}:#{vjas['departure_time']['minute']}"
- end
- times = departure_times.uniq
- (times.count == 1 && times[0] == '00:00') ? false : true
+ def state_update_vjas? vehicle_journey_at_stops
+ departure_times = vehicle_journey_at_stops.map do |vjas|
+ "#{vjas['departure_time']['hour']}:#{vjas['departure_time']['minute']}"
end
+ times = departure_times.uniq
+ (times.count == 1 && times[0] == '00:00') ? false : true
+ end
- def update_has_and_belongs_to_many_from_state item
- ['time_tables', 'footnotes'].each do |assos|
- saved = self.send(assos).map(&:id)
+ def update_has_and_belongs_to_many_from_state item
+ ['time_tables', 'footnotes'].each do |assos|
+ saved = self.send(assos).map(&:id)
- (saved - item[assos].map{|t| t['id']}).each do |id|
- self.send(assos).delete(self.send(assos).find(id))
- end
+ (saved - item[assos].map{|t| t['id']}).each do |id|
+ self.send(assos).delete(self.send(assos).find(id))
+ end
- item[assos].each do |t|
- klass = "Chouette::#{assos.classify}".constantize
- unless saved.include?(t['id'])
- self.send(assos) << klass.find(t['id'])
- end
+ item[assos].each do |t|
+ klass = "Chouette::#{assos.classify}".constantize
+ unless saved.include?(t['id'])
+ self.send(assos) << klass.find(t['id'])
end
end
end
+ end
- def self.state_update route, state
- transaction do
- state.each do |item|
- item.delete('errors')
- vj = find_by(objectid: item['objectid']) || state_create_instance(route, item)
- next if item['deletable'] && vj.persisted? && vj.destroy
-
- if vj.state_update_vjas?(item['vehicle_journey_at_stops'])
- vj.update_vjas_from_state(item['vehicle_journey_at_stops'])
- end
+ def self.state_update route, state
+ transaction do
+ state.each do |item|
+ item.delete('errors')
+ vj = find_by(objectid: item['objectid']) || state_create_instance(route, item)
+ next if item['deletable'] && vj.persisted? && vj.destroy
- vj.update_attributes(state_permited_attributes(item))
- vj.update_has_and_belongs_to_many_from_state(item)
- item['errors'] = vj.errors.full_messages.uniq if vj.errors.any?
+ if vj.state_update_vjas?(item['vehicle_journey_at_stops'])
+ vj.update_vjas_from_state(item['vehicle_journey_at_stops'])
end
- # Delete ids of new object from state if we had to rollback
- if state.any? {|item| item['errors']}
- state.map do |item|
- item.delete('objectid') if item['new_record']
- item['vehicle_journey_at_stops'].map {|vjas| vjas.delete('id') if vjas['new_record'] }
- end
- raise ::ActiveRecord::Rollback
- end
+ vj.update_attributes(state_permited_attributes(item))
+ vj.update_has_and_belongs_to_many_from_state(item)
+ item['errors'] = vj.errors.full_messages.uniq if vj.errors.any?
end
- # Remove new_record flag && deleted item from state if transaction has been saved
- state.map do |item|
- item.delete('new_record')
- item['vehicle_journey_at_stops'].map {|vjas| vjas.delete('new_record') }
+ # Delete ids of new object from state if we had to rollback
+ if state.any? {|item| item['errors']}
+ state.map do |item|
+ item.delete('objectid') if item['new_record']
+ item['vehicle_journey_at_stops'].map {|vjas| vjas.delete('id') if vjas['new_record'] }
+ end
+ raise ::ActiveRecord::Rollback
end
- state.delete_if {|item| item['deletable']}
end
- def self.state_create_instance route, item
- # Flag new record, so we can unset object_id if transaction rollback
- vj = route.vehicle_journeys.create(state_permited_attributes(item))
- item['objectid'] = vj.objectid
- item['new_record'] = true
- vj
+ # Remove new_record flag && deleted item from state if transaction has been saved
+ state.map do |item|
+ item.delete('new_record')
+ item['vehicle_journey_at_stops'].map {|vjas| vjas.delete('new_record') }
end
+ state.delete_if {|item| item['deletable']}
+ end
- def self.state_permited_attributes item
- attrs = item.slice('published_journey_identifier', 'published_journey_name', 'journey_pattern_id', 'company_id').to_hash
- ['company', 'journey_pattern'].map do |association|
- attrs["#{association}_id"] = item[association]['id'] if item[association]
- end
- attrs
- end
+ def self.state_create_instance route, item
+ # Flag new record, so we can unset object_id if transaction rollback
+ vj = route.vehicle_journeys.create(state_permited_attributes(item))
+ item['objectid'] = vj.objectid
+ item['new_record'] = true
+ vj
+ end
- def missing_stops_in_relation_to_a_journey_pattern(selected_journey_pattern)
- selected_journey_pattern.stop_points - self.stop_points
- end
- def extra_stops_in_relation_to_a_journey_pattern(selected_journey_pattern)
- self.stop_points - selected_journey_pattern.stop_points
- end
- def extra_vjas_in_relation_to_a_journey_pattern(selected_journey_pattern)
- extra_stops = self.extra_stops_in_relation_to_a_journey_pattern(selected_journey_pattern)
- self.vehicle_journey_at_stops.select { |vjas| extra_stops.include?( vjas.stop_point)}
- end
- def time_table_tokens=(ids)
- self.time_table_ids = ids.split(",")
+ def self.state_permited_attributes item
+ attrs = item.slice('published_journey_identifier', 'published_journey_name', 'journey_pattern_id', 'company_id').to_hash
+ ['company', 'journey_pattern'].map do |association|
+ attrs["#{association}_id"] = item[association]['id'] if item[association]
end
- def bounding_dates
- dates = []
+ attrs
+ end
- time_tables.each do |tm|
- dates << tm.start_date if tm.start_date
- dates << tm.end_date if tm.end_date
- end
+ def missing_stops_in_relation_to_a_journey_pattern(selected_journey_pattern)
+ selected_journey_pattern.stop_points - self.stop_points
+ end
+ def extra_stops_in_relation_to_a_journey_pattern(selected_journey_pattern)
+ self.stop_points - selected_journey_pattern.stop_points
+ end
+ def extra_vjas_in_relation_to_a_journey_pattern(selected_journey_pattern)
+ extra_stops = self.extra_stops_in_relation_to_a_journey_pattern(selected_journey_pattern)
+ self.vehicle_journey_at_stops.select { |vjas| extra_stops.include?( vjas.stop_point)}
+ end
+ def time_table_tokens=(ids)
+ self.time_table_ids = ids.split(",")
+ end
+ def bounding_dates
+ dates = []
- dates.empty? ? [] : [dates.min, dates.max]
+ time_tables.each do |tm|
+ dates << tm.start_date if tm.start_date
+ dates << tm.end_date if tm.end_date
end
- def update_journey_pattern( selected_journey_pattern)
- return unless selected_journey_pattern.route_id==self.route_id
+ dates.empty? ? [] : [dates.min, dates.max]
+ end
- missing_stops_in_relation_to_a_journey_pattern(selected_journey_pattern).each do |sp|
- self.vehicle_journey_at_stops.build( :stop_point => sp)
- end
- extra_vjas_in_relation_to_a_journey_pattern(selected_journey_pattern).each do |vjas|
- vjas._destroy = true
- end
- end
+ def update_journey_pattern( selected_journey_pattern)
+ return unless selected_journey_pattern.route_id==self.route_id
- def self.matrix(vehicle_journeys)
- {}.tap do |hash|
- vehicle_journeys.map{ |vj|
- vj.vehicle_journey_at_stops.map{ |vjas |hash[ "#{vj.id}-#{vjas.stop_point_id}"] = vjas }
- }
- end
+ missing_stops_in_relation_to_a_journey_pattern(selected_journey_pattern).each do |sp|
+ self.vehicle_journey_at_stops.build( :stop_point => sp)
end
-
- def self.with_stops
- self
- .joins(:journey_pattern)
- .joins('
- LEFT JOIN "vehicle_journey_at_stops"
- ON "vehicle_journey_at_stops"."vehicle_journey_id" =
- "vehicle_journeys"."id"
- AND "vehicle_journey_at_stops"."stop_point_id" =
- "journey_patterns"."departure_stop_point_id"
- ')
- .order('"vehicle_journey_at_stops"."departure_time"')
+ extra_vjas_in_relation_to_a_journey_pattern(selected_journey_pattern).each do |vjas|
+ vjas._destroy = true
end
+ end
- # Requires a SELECT DISTINCT and a join with
- # "vehicle_journey_at_stops".
- #
- # Example:
- # .select('DISTINCT "vehicle_journeys".*')
- # .joins('
- # LEFT JOIN "vehicle_journey_at_stops"
- # ON "vehicle_journey_at_stops"."vehicle_journey_id" =
- # "vehicle_journeys"."id"
- # ')
- # .where_departure_time_between('08:00', '09:45')
- def self.where_departure_time_between(
- start_time,
- end_time,
- allow_empty: false
- )
- self
- .where(
- %Q(
- "vehicle_journey_at_stops"."departure_time" >= ?
- AND "vehicle_journey_at_stops"."departure_time" <= ?
- #{
- if allow_empty
- 'OR "vehicle_journey_at_stops"."id" IS NULL'
- end
- }
- ),
- "2000-01-01 #{start_time}:00 UTC",
- "2000-01-01 #{end_time}:00 UTC"
- )
+ def self.matrix(vehicle_journeys)
+ {}.tap do |hash|
+ vehicle_journeys.map{ |vj|
+ vj.vehicle_journey_at_stops.map{ |vjas |hash[ "#{vj.id}-#{vjas.stop_point_id}"] = vjas }
+ }
end
+ end
- def self.without_time_tables
- # Joins the VehicleJourney–TimeTable through table to select only those
- # VehicleJourneys that don't have an associated TimeTable.
- self
- .joins('
- LEFT JOIN "time_tables_vehicle_journeys"
- ON "time_tables_vehicle_journeys"."vehicle_journey_id" =
- "vehicle_journeys"."id"
- ')
- .where('"time_tables_vehicle_journeys"."vehicle_journey_id" IS NULL')
- end
+ def self.with_stops
+ self
+ .joins(:journey_pattern)
+ .joins('
+ LEFT JOIN "vehicle_journey_at_stops"
+ ON "vehicle_journey_at_stops"."vehicle_journey_id" =
+ "vehicle_journeys"."id"
+ AND "vehicle_journey_at_stops"."stop_point_id" =
+ "journey_patterns"."departure_stop_point_id"
+ ')
+ .order('"vehicle_journey_at_stops"."departure_time"')
+ end
+
+ # Requires a SELECT DISTINCT and a join with
+ # "vehicle_journey_at_stops".
+ #
+ # Example:
+ # .select('DISTINCT "vehicle_journeys".*')
+ # .joins('
+ # LEFT JOIN "vehicle_journey_at_stops"
+ # ON "vehicle_journey_at_stops"."vehicle_journey_id" =
+ # "vehicle_journeys"."id"
+ # ')
+ # .where_departure_time_between('08:00', '09:45')
+ def self.where_departure_time_between(
+ start_time,
+ end_time,
+ allow_empty: false
+ )
+ self
+ .where(
+ %Q(
+ "vehicle_journey_at_stops"."departure_time" >= ?
+ AND "vehicle_journey_at_stops"."departure_time" <= ?
+ #{
+ if allow_empty
+ 'OR "vehicle_journey_at_stops"."id" IS NULL'
+ end
+ }
+ ),
+ "2000-01-01 #{start_time}:00 UTC",
+ "2000-01-01 #{end_time}:00 UTC"
+ )
end
+
+ def self.without_time_tables
+ # Joins the VehicleJourney–TimeTable through table to select only those
+ # VehicleJourneys that don't have an associated TimeTable.
+ self
+ .joins('
+ LEFT JOIN "time_tables_vehicle_journeys"
+ ON "time_tables_vehicle_journeys"."vehicle_journey_id" =
+ "vehicle_journeys"."id"
+ ')
+ .where('"time_tables_vehicle_journeys"."vehicle_journey_id" IS NULL')
+ end
+
end
\ No newline at end of file
diff --git a/app/models/chouette/vehicle_journey_at_stop.rb b/app/models/chouette/vehicle_journey_at_stop.rb
index 6f0119e74..8167dab47 100644
--- a/app/models/chouette/vehicle_journey_at_stop.rb
+++ b/app/models/chouette/vehicle_journey_at_stop.rb
@@ -4,76 +4,75 @@ module Chouette
include Chouette::ForAlightingEnumerations
include ChecksumSupport
- DAY_OFFSET_MAX = 1
+ DAY_OFFSET_MAX = 1
- # FIXME http://jira.codehaus.org/browse/JRUBY-6358
- self.primary_key = "id"
+ # FIXME http://jira.codehaus.org/browse/JRUBY-6358
+ self.primary_key = "id"
- belongs_to :stop_point
- belongs_to :vehicle_journey
+ belongs_to :stop_point
+ belongs_to :vehicle_journey
- attr_accessor :_destroy, :dummy
+ attr_accessor :_destroy, :dummy
- validate :arrival_must_be_before_departure
- def arrival_must_be_before_departure
- # security against nil values
- return unless arrival_time && departure_time
+ validate :arrival_must_be_before_departure
+ def arrival_must_be_before_departure
+ # security against nil values
+ return unless arrival_time && departure_time
- if TimeDuration.exceeds_gap?(4.hours, arrival_time, departure_time)
- errors.add(
- :arrival_time,
- I18n.t("activerecord.errors.models.vehicle_journey_at_stop.arrival_must_be_before_departure")
- )
- end
+ if TimeDuration.exceeds_gap?(4.hours, arrival_time, departure_time)
+ errors.add(
+ :arrival_time,
+ I18n.t("activerecord.errors.models.vehicle_journey_at_stop.arrival_must_be_before_departure")
+ )
end
+ end
- validate :day_offset_must_be_within_range
+ validate :day_offset_must_be_within_range
- after_initialize :set_virtual_attributes
- def set_virtual_attributes
- @_destroy = false
- @dummy = false
- end
+ after_initialize :set_virtual_attributes
+ def set_virtual_attributes
+ @_destroy = false
+ @dummy = false
+ end
- def day_offset_must_be_within_range
- if day_offset_outside_range?(arrival_day_offset)
- errors.add(
- :arrival_day_offset,
- I18n.t(
- 'vehicle_journey_at_stops.errors.day_offset_must_not_exceed_max',
- short_id: vehicle_journey.get_objectid.short_id,
- max: DAY_OFFSET_MAX + 1
- )
+ def day_offset_must_be_within_range
+ if day_offset_outside_range?(arrival_day_offset)
+ errors.add(
+ :arrival_day_offset,
+ I18n.t(
+ 'vehicle_journey_at_stops.errors.day_offset_must_not_exceed_max',
+ short_id: vehicle_journey.get_objectid.short_id,
+ max: DAY_OFFSET_MAX + 1
)
- end
+ )
+ end
- if day_offset_outside_range?(departure_day_offset)
- errors.add(
- :departure_day_offset,
- I18n.t(
- 'vehicle_journey_at_stops.errors.day_offset_must_not_exceed_max',
- short_id: vehicle_journey.get_objectid.short_id,
- max: DAY_OFFSET_MAX + 1
- )
+ if day_offset_outside_range?(departure_day_offset)
+ errors.add(
+ :departure_day_offset,
+ I18n.t(
+ 'vehicle_journey_at_stops.errors.day_offset_must_not_exceed_max',
+ short_id: vehicle_journey.get_objectid.short_id,
+ max: DAY_OFFSET_MAX + 1
)
- end
+ )
end
+ end
- def day_offset_outside_range?(offset)
- # At-stops that were created before the database-default of 0 will have
- # nil offsets. Handle these gracefully by forcing them to a 0 offset.
- offset ||= 0
+ def day_offset_outside_range?(offset)
+ # At-stops that were created before the database-default of 0 will have
+ # nil offsets. Handle these gracefully by forcing them to a 0 offset.
+ offset ||= 0
- offset < 0 || offset > DAY_OFFSET_MAX
- end
+ offset < 0 || offset > DAY_OFFSET_MAX
+ end
- def checksum_attributes
- [].tap do |attrs|
- attrs << self.departure_time.try(:to_s, :time)
- attrs << self.arrival_time.try(:to_s, :time)
- attrs << self.departure_day_offset.to_s
- attrs << self.arrival_day_offset.to_s
- end
+ def checksum_attributes
+ [].tap do |attrs|
+ attrs << self.departure_time.try(:to_s, :time)
+ attrs << self.arrival_time.try(:to_s, :time)
+ attrs << self.departure_day_offset.to_s
+ attrs << self.arrival_day_offset.to_s
end
end
end
\ No newline at end of file
diff --git a/app/models/chouette/vehicle_journey_at_stops_are_in_increasing_time_order_validator.rb b/app/models/chouette/vehicle_journey_at_stops_are_in_increasing_time_order_validator.rb
index b4e6a047d..0d8bc2fca 100644
--- a/app/models/chouette/vehicle_journey_at_stops_are_in_increasing_time_order_validator.rb
+++ b/app/models/chouette/vehicle_journey_at_stops_are_in_increasing_time_order_validator.rb
@@ -1,49 +1,54 @@
+<<<<<<< HEAD
module Chouette
class VehicleJourneyAtStopsAreInIncreasingTimeOrderValidator < ActiveModel::EachValidator
def validate_each(vehicle_journey, attribute, value)
previous_at_stop = nil
+=======
+class Chouette::VehicleJourneyAtStopsAreInIncreasingTimeOrderValidator < ActiveModel::EachValidator
+ def validate_each(vehicle_journey, attribute, value)
+ previous_at_stop = nil
+>>>>>>> Change the use of namespace and remove modules
- vehicle_journey
- .vehicle_journey_at_stops
- .select { |vjas| vjas.departure_time && vjas.arrival_time }
- .each do |vjas|
- unless self.class.validate_at_stop_times_must_increase(
- vjas,
- previous_at_stop
+ vehicle_journey
+ .vehicle_journey_at_stops
+ .select { |vjas| vjas.departure_time && vjas.arrival_time }
+ .each do |vjas|
+ unless self.class.validate_at_stop_times_must_increase(
+ vjas,
+ previous_at_stop
+ )
+ vehicle_journey.errors.add(
+ :vehicle_journey_at_stops,
+ 'time gap overflow'
)
- vehicle_journey.errors.add(
- :vehicle_journey_at_stops,
- 'time gap overflow'
- )
- end
-
- previous_at_stop = vjas
end
- end
- def self.validate_at_stop_times_must_increase(at_stop, previous_at_stop)
- valid = true
- return valid unless previous_at_stop
-
- if TimeDuration.exceeds_gap?(
- 4.hours,
- previous_at_stop.departure_time,
- at_stop.departure_time
- )
- valid = false
- at_stop.errors.add(:departure_time, 'departure time gap overflow')
+ previous_at_stop = vjas
end
+ end
- if TimeDuration.exceeds_gap?(
- 4.hours,
- previous_at_stop.arrival_time,
- at_stop.arrival_time
- )
- valid = false
- at_stop.errors.add(:arrival_time, 'arrival time gap overflow')
- end
+ def self.validate_at_stop_times_must_increase(at_stop, previous_at_stop)
+ valid = true
+ return valid unless previous_at_stop
+
+ if TimeDuration.exceeds_gap?(
+ 4.hours,
+ previous_at_stop.departure_time,
+ at_stop.departure_time
+ )
+ valid = false
+ at_stop.errors.add(:departure_time, 'departure time gap overflow')
+ end
- valid
+ if TimeDuration.exceeds_gap?(
+ 4.hours,
+ previous_at_stop.arrival_time,
+ at_stop.arrival_time
+ )
+ valid = false
+ at_stop.errors.add(:arrival_time, 'arrival time gap overflow')
end
+
+ valid
end
end
\ No newline at end of file
diff --git a/app/models/chouette/vehicle_journey_at_stops_day_offset.rb b/app/models/chouette/vehicle_journey_at_stops_day_offset.rb
index b2cb90d11..60b8c2edf 100644
--- a/app/models/chouette/vehicle_journey_at_stops_day_offset.rb
+++ b/app/models/chouette/vehicle_journey_at_stops_day_offset.rb
@@ -1,42 +1,40 @@
-module Chouette
- class VehicleJourneyAtStopsDayOffset
- def initialize(at_stops)
- @at_stops = at_stops
- end
+class Chouette::VehicleJourneyAtStopsDayOffset
+ def initialize(at_stops)
+ @at_stops = at_stops
+ end
- def calculate!
- arrival_offset = 0
- departure_offset = 0
+ def calculate!
+ arrival_offset = 0
+ departure_offset = 0
- @at_stops.inject(nil) do |prior_stop, stop|
- next stop if prior_stop.nil?
+ @at_stops.inject(nil) do |prior_stop, stop|
+ next stop if prior_stop.nil?
- if stop.arrival_time < prior_stop.departure_time ||
- stop.arrival_time < prior_stop.arrival_time
- arrival_offset += 1
- end
+ if stop.arrival_time < prior_stop.departure_time ||
+ stop.arrival_time < prior_stop.arrival_time
+ arrival_offset += 1
+ end
- if stop.departure_time < stop.arrival_time ||
- stop.departure_time < prior_stop.departure_time
- departure_offset += 1
- end
+ if stop.departure_time < stop.arrival_time ||
+ stop.departure_time < prior_stop.departure_time
+ departure_offset += 1
+ end
- stop.arrival_day_offset = arrival_offset
- stop.departure_day_offset = departure_offset
+ stop.arrival_day_offset = arrival_offset
+ stop.departure_day_offset = departure_offset
- stop
- end
+ stop
end
+ end
- def save
- @at_stops.each do |at_stop|
- at_stop.save
- end
+ def save
+ @at_stops.each do |at_stop|
+ at_stop.save
end
+ end
- def update
- calculate!
- save
- end
+ def update
+ calculate!
+ save
end
end
\ No newline at end of file
diff --git a/app/models/chouette/vehicle_journey_frequency.rb b/app/models/chouette/vehicle_journey_frequency.rb
index 53e85121f..28619912f 100644
--- a/app/models/chouette/vehicle_journey_frequency.rb
+++ b/app/models/chouette/vehicle_journey_frequency.rb
@@ -1,69 +1,68 @@
module Chouette
class VehicleJourneyFrequency < Chouette::VehicleJourney
- after_initialize :fill_journey_category
+ after_initialize :fill_journey_category
- default_scope { where(journey_category: journey_categories[:frequency]) }
+ default_scope { where(journey_category: journey_categories[:frequency]) }
- has_many :journey_frequencies, dependent: :destroy, foreign_key: 'vehicle_journey_id'
- accepts_nested_attributes_for :journey_frequencies, allow_destroy: true
+ has_many :journey_frequencies, dependent: :destroy, foreign_key: 'vehicle_journey_id'
+ accepts_nested_attributes_for :journey_frequencies, allow_destroy: true
- validate :require_at_least_one_frequency
+ validate :require_at_least_one_frequency
- def self.matrix(vehicle_journeys)
- hash = {}
- vehicle_journeys.each do |vj|
- vj.journey_frequencies.each do |jf|
- next if jf.scheduled_headway_interval.hour == 0 && jf.scheduled_headway_interval.min == 0
- interval = jf.scheduled_headway_interval.hour.hours + jf.scheduled_headway_interval.min.minutes
- first_departure_time = jf.first_departure_time
- while first_departure_time <= jf.last_departure_time
- hash[first_departure_time] = vj
- first_departure_time += interval
- end
+ def self.matrix(vehicle_journeys)
+ hash = {}
+ vehicle_journeys.each do |vj|
+ vj.journey_frequencies.each do |jf|
+ next if jf.scheduled_headway_interval.hour == 0 && jf.scheduled_headway_interval.min == 0
+ interval = jf.scheduled_headway_interval.hour.hours + jf.scheduled_headway_interval.min.minutes
+ first_departure_time = jf.first_departure_time
+ while first_departure_time <= jf.last_departure_time
+ hash[first_departure_time] = vj
+ first_departure_time += interval
end
end
- hash.sort.to_h
end
+ hash.sort.to_h
+ end
- def self.matrix_interval(matrix)
- hash = prepare_matrix(matrix)
- matrix.each do |departure_time, vj|
- @base_departure_time = departure_time
- vj.vehicle_journey_at_stops.each_cons(2) { |vjas, vjas_next|
- vjas_dup = vjas.dup
- vjas_dup.departure_time = @base_departure_time
- hash[vjas.stop_point.stop_area.name][departure_time.to_i] = vjas_dup
- @base_departure_time = vjas_dup.departure_time + (vjas_next.departure_time - vjas.departure_time)
- @last_vjas_next = vjas_next.dup
- }
- # Add last stop_point
- @last_vjas_next.departure_time = @base_departure_time
- hash[@last_vjas_next.stop_point.stop_area.name][departure_time.to_i] = @last_vjas_next
- end
- hash
+ def self.matrix_interval(matrix)
+ hash = prepare_matrix(matrix)
+ matrix.each do |departure_time, vj|
+ @base_departure_time = departure_time
+ vj.vehicle_journey_at_stops.each_cons(2) { |vjas, vjas_next|
+ vjas_dup = vjas.dup
+ vjas_dup.departure_time = @base_departure_time
+ hash[vjas.stop_point.stop_area.name][departure_time.to_i] = vjas_dup
+ @base_departure_time = vjas_dup.departure_time + (vjas_next.departure_time - vjas.departure_time)
+ @last_vjas_next = vjas_next.dup
+ }
+ # Add last stop_point
+ @last_vjas_next.departure_time = @base_departure_time
+ hash[@last_vjas_next.stop_point.stop_area.name][departure_time.to_i] = @last_vjas_next
end
+ hash
+ end
- private
+ private
- def self.prepare_matrix(matrix)
- matrix.map{ |departure_time, vj|
- Hash[
- vj.vehicle_journey_at_stops.map{ |sp|
- [
- sp.stop_point.stop_area.name, Hash[matrix.map{ |departure_time2, vj2| [departure_time2.to_i, nil] }]
- ]
- }
- ]
- }.inject(&:merge)
- end
+ def self.prepare_matrix(matrix)
+ matrix.map{ |departure_time, vj|
+ Hash[
+ vj.vehicle_journey_at_stops.map{ |sp|
+ [
+ sp.stop_point.stop_area.name, Hash[matrix.map{ |departure_time2, vj2| [departure_time2.to_i, nil] }]
+ ]
+ }
+ ]
+ }.inject(&:merge)
+ end
- def fill_journey_category
- self.journey_category = :frequency
- end
+ def fill_journey_category
+ self.journey_category = :frequency
+ end
- def require_at_least_one_frequency
- errors.add(:base, I18n.t('vehicle_journey_frequency.require_at_least_one_frequency')) unless journey_frequencies.size > 0
- end
+ def require_at_least_one_frequency
+ errors.add(:base, I18n.t('vehicle_journey_frequency.require_at_least_one_frequency')) unless journey_frequencies.size > 0
end
end
\ No newline at end of file
diff --git a/app/models/concerns/objectid_support.rb b/app/models/concerns/objectid_support.rb
index bd41beb01..97af9019c 100644
--- a/app/models/concerns/objectid_support.rb
+++ b/app/models/concerns/objectid_support.rb
@@ -11,8 +11,8 @@ module ObjectidSupport
self.referential.objectid_formater.before_validation self
end
- def after_create_objectid
- self.referential.objectid_formater.after_create self
+ def after_commit_objectid
+ self.referential.objectid_formater.after_commit self
end
def get_objectid
diff --git a/spec/controllers/routes_controller_spec.rb b/spec/controllers/routes_controller_spec.rb
index c5e0cdf20..f8e8697ec 100644
--- a/spec/controllers/routes_controller_spec.rb
+++ b/spec/controllers/routes_controller_spec.rb
@@ -87,8 +87,8 @@ RSpec.describe RoutesController, type: :controller do
id: route.id
end.to change { Chouette::Route.count }.by(1)
- expect(Route.last.name).to eq( I18n.t('activerecord.copy', name: route.name))
- expect(Route.last.published_name).to eq(route.published_name)
+ expect(Chouette::Route.last.name).to eq(I18n.t('activerecord.copy', name: route.name))
+ expect(Chouette::Route.last.published_name).to eq(route.published_name)
end
end
end
--
cgit v1.2.3
From 9304f16e56c219fd63fa12b7d42a7cbf16b2914a Mon Sep 17 00:00:00 2001
From: cedricnjanga
Date: Tue, 21 Nov 2017 15:32:22 +0100
Subject: Change the way we name classes We now always use modules for
namespaces => same structure for models, decorators, policies...
---
app/controllers/companies_controller.rb | 2 +-
.../journey_patterns_collections_controller.rb | 2 +-
app/controllers/lines_controller.rb | 2 +-
app/controllers/networks_controller.rb | 2 +-
app/controllers/referential_lines_controller.rb | 2 +-
app/controllers/routes_controller.rb | 2 +-
.../routing_constraint_zones_controller.rb | 2 +-
app/controllers/stop_areas_controller.rb | 2 +-
app/controllers/time_tables_controller.rb | 2 +-
app/controllers/vehicle_journeys_controller.rb | 2 +-
app/decorators/referential_network_decorator.rb | 12 +-
app/models/chouette/access_link.rb | 89 ++--
app/models/chouette/journey_frequency.rb | 4 +-
app/models/chouette/journey_pattern.rb | 187 ++++----
app/models/chouette/objectid/netex.rb | 46 +-
app/models/chouette/objectid/stif_codifligne.rb | 12 +-
app/models/chouette/objectid/stif_netex.rb | 18 +-
app/models/chouette/objectid/stif_reflex.rb | 13 +-
app/models/chouette/objectid_formatter/netex.rb | 14 +-
.../chouette/objectid_formatter/stif_codifligne.rb | 14 +-
.../chouette/objectid_formatter/stif_netex.rb | 8 +-
.../chouette/objectid_formatter/stif_reflex.rb | 14 +-
app/models/chouette/stop_point.rb | 69 ++-
app/models/chouette/vehicle_journey.rb | 468 ++++++++++-----------
app/models/chouette/vehicle_journey_at_stop.rb | 107 ++---
...stops_are_in_increasing_time_order_validator.rb | 76 ++--
.../vehicle_journey_at_stops_day_offset.rb | 58 +--
app/models/chouette/vehicle_journey_frequency.rb | 101 ++---
app/policies/compliance_check_set_policy.rb | 2 +-
bin/bundle | 3 -
bin/setup | 29 --
bin/webpack | 17 -
bin/webpack-dev-server | 17 -
spec/features/line_footnotes_permissions_spec.rb | 2 +-
spec/features/lines_permissions_spec.rb | 4 +-
.../features/referential_lines_permissions_spec.rb | 2 +-
spec/features/routes_permissions_spec.rb | 4 +-
spec/features/time_tables_permissions_spec.rb | 2 +-
spec/policies/access_link_policy_spec.rb | 2 +-
spec/policies/access_point_policy_spec.rb | 2 +-
spec/policies/company_policy_spec.rb | 2 +-
spec/policies/connection_link_policy_spec.rb | 2 +-
spec/policies/group_of_line_policy_spec.rb | 2 +-
spec/policies/journey_pattern_policy_spec.rb | 2 +-
spec/policies/line_policy_spec.rb | 2 +-
spec/policies/network_policy_spec.rb | 2 +-
spec/policies/route_policy_spec.rb | 2 +-
.../routing_constraint_zone_policy_spec.rb | 2 +-
spec/policies/stop_area_policy_spec.rb | 2 +-
spec/policies/time_table_policy_spec.rb | 2 +-
spec/views/routes/show.html.erb_spec.rb | 2 +-
51 files changed, 697 insertions(+), 741 deletions(-)
delete mode 100755 bin/bundle
delete mode 100755 bin/setup
delete mode 100755 bin/webpack
delete mode 100755 bin/webpack-dev-server
diff --git a/app/controllers/companies_controller.rb b/app/controllers/companies_controller.rb
index bc5bedd7f..ec695bcbf 100644
--- a/app/controllers/companies_controller.rb
+++ b/app/controllers/companies_controller.rb
@@ -77,7 +77,7 @@ class CompaniesController < InheritedResources::Base
def decorate_companies(companies)
ModelDecorator.decorate(
companies,
- with: CompanyDecorator,
+ with: Chouette::CompanyDecorator,
context: {
referential: line_referential
}
diff --git a/app/controllers/journey_patterns_collections_controller.rb b/app/controllers/journey_patterns_collections_controller.rb
index 546158fa8..f217dccb3 100644
--- a/app/controllers/journey_patterns_collections_controller.rb
+++ b/app/controllers/journey_patterns_collections_controller.rb
@@ -48,7 +48,7 @@ class JourneyPatternsCollectionsController < ChouetteController
end
def user_permissions
- policy = policy(:journey_pattern)
+ policy = policy(:"chouette/journey_pattern")
@perms =
%w{create destroy update}.inject({}) do | permissions, action |
permissions.merge( "journey_patterns.#{action}" => policy.authorizes_action?(action) )
diff --git a/app/controllers/lines_controller.rb b/app/controllers/lines_controller.rb
index cf2908500..49a8ca2c5 100644
--- a/app/controllers/lines_controller.rb
+++ b/app/controllers/lines_controller.rb
@@ -15,7 +15,7 @@ class LinesController < InheritedResources::Base
index! do |format|
@lines = ModelDecorator.decorate(
@lines,
- with: LineDecorator,
+ with: Chouette::LineDecorator,
context: {
line_referential: @line_referential,
current_organisation: current_organisation
diff --git a/app/controllers/networks_controller.rb b/app/controllers/networks_controller.rb
index 98c840777..d90af0ed8 100644
--- a/app/controllers/networks_controller.rb
+++ b/app/controllers/networks_controller.rb
@@ -85,7 +85,7 @@ class NetworksController < InheritedResources::Base
def decorate_networks(networks)
ModelDecorator.decorate(
networks,
- with: NetworkDecorator,
+ with: Chouette::NetworkDecorator,
context: {
line_referential: line_referential
}
diff --git a/app/controllers/referential_lines_controller.rb b/app/controllers/referential_lines_controller.rb
index b9f8c0050..75e574da3 100644
--- a/app/controllers/referential_lines_controller.rb
+++ b/app/controllers/referential_lines_controller.rb
@@ -29,7 +29,7 @@ class ReferentialLinesController < ChouetteController
@routes = ModelDecorator.decorate(
@routes,
- with: RouteDecorator,
+ with: Chouette::RouteDecorator,
context: {
referential: referential,
line: @line
diff --git a/app/controllers/routes_controller.rb b/app/controllers/routes_controller.rb
index 1a6c82484..c8813dbcb 100644
--- a/app/controllers/routes_controller.rb
+++ b/app/controllers/routes_controller.rb
@@ -48,7 +48,7 @@ class RoutesController < ChouetteController
@route_sp = ModelDecorator.decorate(
@route_sp,
- with: StopPointDecorator
+ with: Chouette::StopPointDecorator
)
end
end
diff --git a/app/controllers/routing_constraint_zones_controller.rb b/app/controllers/routing_constraint_zones_controller.rb
index 6c3da5980..8261373a6 100644
--- a/app/controllers/routing_constraint_zones_controller.rb
+++ b/app/controllers/routing_constraint_zones_controller.rb
@@ -14,7 +14,7 @@ class RoutingConstraintZonesController < ChouetteController
index! do |format|
@routing_constraint_zones = ModelDecorator.decorate(
@routing_constraint_zones,
- with: RoutingConstraintZoneDecorator,
+ with: Chouette::RoutingConstraintZoneDecorator,
context: {
referential: referential,
line: parent
diff --git a/app/controllers/stop_areas_controller.rb b/app/controllers/stop_areas_controller.rb
index 1d6f88068..2732c5f99 100644
--- a/app/controllers/stop_areas_controller.rb
+++ b/app/controllers/stop_areas_controller.rb
@@ -56,7 +56,7 @@ class StopAreasController < InheritedResources::Base
@stop_areas = ModelDecorator.decorate(
@stop_areas,
- with: StopAreaDecorator
+ with: Chouette::StopAreaDecorator
)
}
end
diff --git a/app/controllers/time_tables_controller.rb b/app/controllers/time_tables_controller.rb
index 0c1769ad7..34b1ca89d 100644
--- a/app/controllers/time_tables_controller.rb
+++ b/app/controllers/time_tables_controller.rb
@@ -168,7 +168,7 @@ class TimeTablesController < ChouetteController
def decorate_time_tables(time_tables)
ModelDecorator.decorate(
time_tables,
- with: TimeTableDecorator,
+ with: Chouette::TimeTableDecorator,
context: {
referential: @referential
}
diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb
index 050f2f219..e74957ffc 100644
--- a/app/controllers/vehicle_journeys_controller.rb
+++ b/app/controllers/vehicle_journeys_controller.rb
@@ -158,7 +158,7 @@ class VehicleJourneysController < ChouetteController
end
def user_permissions
- policy = policy(:vehicle_journey)
+ policy = policy(:"chouette/vehicle_journey")
@perms =
%w{create destroy update}.inject({}) do | permissions, action |
permissions.merge( "vehicle_journeys.#{action}" => policy.authorizes_action?(action) )
diff --git a/app/decorators/referential_network_decorator.rb b/app/decorators/referential_network_decorator.rb
index 9eb94c8d2..7b1c6ada9 100644
--- a/app/decorators/referential_network_decorator.rb
+++ b/app/decorators/referential_network_decorator.rb
@@ -1,7 +1,8 @@
-class ReferentialNetworkDecorator < Draper::Decorator
- decorates Chouette::Network
+module Chouette
+ class NetworkDecorator < Draper::Decorator
+ decorates Chouette::Network
- delegate_all
+ delegate_all
# Requires:
# context: {
@@ -33,6 +34,7 @@ class ReferentialNetworkDecorator < Draper::Decorator
)
end
- links
+ links
+ end
end
-end
+end
\ No newline at end of file
diff --git a/app/models/chouette/access_link.rb b/app/models/chouette/access_link.rb
index 5e44704fd..46fbcb631 100644
--- a/app/models/chouette/access_link.rb
+++ b/app/models/chouette/access_link.rb
@@ -4,62 +4,63 @@ module Chouette
# FIXME http://jira.codehaus.org/browse/JRUBY-6358
self.primary_key = "id"
- attr_accessor :access_link_type, :link_orientation_type, :link_key
+ attr_accessor :access_link_type, :link_orientation_type, :link_key
- belongs_to :access_point, :class_name => 'Chouette::AccessPoint'
- belongs_to :stop_area, :class_name => 'Chouette::StopArea'
+ belongs_to :access_point, :class_name => 'Chouette::AccessPoint'
+ belongs_to :stop_area, :class_name => 'Chouette::StopArea'
- validates_presence_of :name
- validates_presence_of :link_orientation
+ validates_presence_of :name
+ validates_presence_of :link_orientation
- def self.nullable_attributes
- [:link_distance, :default_duration, :frequent_traveller_duration, :occasional_traveller_duration,
- :mobility_restricted_traveller_duration, :link_type]
- end
+ def self.nullable_attributes
+ [:link_distance, :default_duration, :frequent_traveller_duration, :occasional_traveller_duration,
+ :mobility_restricted_traveller_duration, :link_type]
+ end
- def access_link_type
- link_type && Chouette::ConnectionLinkType.new(link_type.underscore)
- end
+ def access_link_type
+ link_type && Chouette::ConnectionLinkType.new(link_type.underscore)
+ end
- def access_link_type=(access_link_type)
- self.link_type = (access_link_type ? access_link_type.camelcase : nil)
- end
+ def access_link_type=(access_link_type)
+ self.link_type = (access_link_type ? access_link_type.camelcase : nil)
+ end
- @@access_link_types = nil
- def self.access_link_types
- @@access_link_types ||= Chouette::ConnectionLinkType.all
- end
+ @@access_link_types = nil
+ def self.access_link_types
+ @@access_link_types ||= Chouette::ConnectionLinkType.all
+ end
- def link_orientation_type
- link_orientation && Chouette::LinkOrientationType.new(link_orientation.underscore)
- end
+ def link_orientation_type
+ link_orientation && Chouette::LinkOrientationType.new(link_orientation.underscore)
+ end
- def link_orientation_type=(link_orientation_type)
- self.link_orientation = (link_orientation_type ? link_orientation_type.camelcase : nil)
- end
+ def link_orientation_type=(link_orientation_type)
+ self.link_orientation = (link_orientation_type ? link_orientation_type.camelcase : nil)
+ end
- @@link_orientation_types = nil
- def self.link_orientation_types
- @@link_orientation_types ||= Chouette::LinkOrientationType.all
- end
+ @@link_orientation_types = nil
+ def self.link_orientation_types
+ @@link_orientation_types ||= Chouette::LinkOrientationType.all
+ end
- def geometry
- GeoRuby::SimpleFeatures::LineString.from_points( [ access_point.geometry, stop_area.geometry], 4326) if access_point.geometry and stop_area.geometry
- end
+ def geometry
+ GeoRuby::SimpleFeatures::LineString.from_points( [ access_point.geometry, stop_area.geometry], 4326) if access_point.geometry and stop_area.geometry
+ end
- def link_key
- Chouette::AccessLink.build_link_key(access_point,stop_area,link_orientation_type)
- end
-
- def self.build_link_key(access_point,stop_area,link_orientation_type)
- if link_orientation_type == "access_point_to_stop_area"
- "A_#{access_point.id}-S_#{stop_area.id}"
- else
- "S_#{stop_area.id}-A_#{access_point.id}"
+ def link_key
+ Chouette::AccessLink.build_link_key(access_point,stop_area,link_orientation_type)
+ end
+
+ def self.build_link_key(access_point,stop_area,link_orientation_type)
+ if link_orientation_type == "access_point_to_stop_area"
+ "A_#{access_point.id}-S_#{stop_area.id}"
+ else
+ "S_#{stop_area.id}-A_#{access_point.id}"
+ end
end
- end
- def geometry_presenter
- Chouette::Geometry::AccessLinkPresenter.new self
+ def geometry_presenter
+ Chouette::Geometry::AccessLinkPresenter.new self
+ end
end
end
\ No newline at end of file
diff --git a/app/models/chouette/journey_frequency.rb b/app/models/chouette/journey_frequency.rb
index 8e7dd1819..1b4efe96e 100644
--- a/app/models/chouette/journey_frequency.rb
+++ b/app/models/chouette/journey_frequency.rb
@@ -18,8 +18,8 @@ module Chouette
if record.first_departure_time == record.last_departure_time
record.errors[:last_departure_time] << I18n.t('activerecord.errors.models.journey_frequency.end_must_be_different_from_first')
end
- unless last_departure_time.between? timeband_start_time, timeband_end_time
- record.errors[:last_departure_time] << I18n.t('activerecord.errors.models.journey_frequency.end_must_be_before_timeband')
+ if record.scheduled_headway_interval.blank? || (record.scheduled_headway_interval.strftime( "%H%M%S%N" ) == Time.current.midnight.strftime( "%H%M%S%N" ))
+ record.errors[:scheduled_headway_interval] << I18n.t('activerecord.errors.models.journey_frequency.scheduled_headway_interval_greater_than_zero')
end
end
end
diff --git a/app/models/chouette/journey_pattern.rb b/app/models/chouette/journey_pattern.rb
index 31b7c56be..797b6adb1 100644
--- a/app/models/chouette/journey_pattern.rb
+++ b/app/models/chouette/journey_pattern.rb
@@ -26,124 +26,125 @@ module Chouette
"IBOO-#{self.referential.id}-#{self.route.line.get_objectid.local_id}-#{self.id}"
end
- def checksum_attributes
- values = self.slice(*['name', 'published_name', 'registration_number']).values
- values << self.stop_points.map(&:stop_area).map(&:user_objectid)
- values.flatten
- end
+ def checksum_attributes
+ values = self.slice(*['name', 'published_name', 'registration_number']).values
+ values << self.stop_points.map(&:stop_area).map(&:user_objectid)
+ values.flatten
+ end
- def self.state_update route, state
- transaction do
- state.each do |item|
- item.delete('errors')
- jp = find_by(objectid: item['object_id']) || state_create_instance(route, item)
- next if item['deletable'] && jp.persisted? && jp.destroy
- # Update attributes and stop_points associations
- jp.update_attributes(state_permited_attributes(item)) unless item['new_record']
- jp.state_stop_points_update(item) if !jp.errors.any? && jp.persisted?
- item['errors'] = jp.errors if jp.errors.any?
+ def self.state_update route, state
+ transaction do
+ state.each do |item|
+ item.delete('errors')
+ jp = find_by(objectid: item['object_id']) || state_create_instance(route, item)
+ next if item['deletable'] && jp.persisted? && jp.destroy
+ # Update attributes and stop_points associations
+ jp.update_attributes(state_permited_attributes(item)) unless item['new_record']
+ jp.state_stop_points_update(item) if !jp.errors.any? && jp.persisted?
+ item['errors'] = jp.errors if jp.errors.any?
+ end
+
+ if state.any? {|item| item['errors']}
+ state.map {|item| item.delete('object_id') if item['new_record']}
+ raise ::ActiveRecord::Rollback
+ end
end
- if state.any? {|item| item['errors']}
- state.map {|item| item.delete('object_id') if item['new_record']}
- raise ActiveRecord::Rollback
- end
+ state.map {|item| item.delete('new_record')}
+ state.delete_if {|item| item['deletable']}
end
- state.map {|item| item.delete('new_record')}
- state.delete_if {|item| item['deletable']}
- end
-
- def self.state_permited_attributes item
- {
- name: item['name'],
- published_name: item['published_name'],
- registration_number: item['registration_number']
- }
- end
-
- def self.state_create_instance route, item
- # Flag new record, so we can unset object_id if transaction rollback
- jp = route.journey_patterns.create(state_permited_attributes(item))
+ def self.state_permited_attributes item
+ {
+ name: item['name'],
+ published_name: item['published_name'],
+ registration_number: item['registration_number']
+ }
+ end
- # FIXME
- # DefaultAttributesSupport will trigger some weird validation on after save
- # wich will call to valid?, wich will populate errors
- # In this case, we mark jp to be valid if persisted? return true
- jp.errors.clear if jp.persisted?
+ def self.state_create_instance route, item
+ # Flag new record, so we can unset object_id if transaction rollback
+ jp = route.journey_patterns.create(state_permited_attributes(item))
- item['object_id'] = jp.objectid
- item['new_record'] = true
- jp
- end
+ # FIXME
+ # DefaultAttributesSupport will trigger some weird validation on after save
+ # wich will call to valid?, wich will populate errors
+ # In this case, we mark jp to be valid if persisted? return true
+ jp.errors.clear if jp.persisted?
- def state_stop_points_update item
- item['stop_points'].each do |sp|
- exist = stop_area_ids.include?(sp['id'])
- next if exist && sp['checked']
+ item['object_id'] = jp.objectid
+ item['new_record'] = true
+ jp
+ end
- stop_point = route.stop_points.find_by(stop_area_id: sp['id'])
- if !exist && sp['checked']
- stop_points << stop_point
- end
- if exist && !sp['checked']
- stop_points.delete(stop_point)
+ def state_stop_points_update item
+ item['stop_points'].each do |sp|
+ exist = stop_area_ids.include?(sp['id'])
+ next if exist && sp['checked']
+
+ stop_point = route.stop_points.find_by(stop_area_id: sp['id'])
+ if !exist && sp['checked']
+ stop_points << stop_point
+ end
+ if exist && !sp['checked']
+ stop_points.delete(stop_point)
+ end
end
end
- end
- # TODO: this a workarround
- # otherwise, we loose the first stop_point
- # when creating a new journey_pattern
- def special_update
- bck_sp = self.stop_points.map {|s| s}
- self.update_attributes :stop_points => []
- self.update_attributes :stop_points => bck_sp
- end
+ # TODO: this a workarround
+ # otherwise, we loose the first stop_point
+ # when creating a new journey_pattern
+ def special_update
+ bck_sp = self.stop_points.map {|s| s}
+ self.update_attributes :stop_points => []
+ self.update_attributes :stop_points => bck_sp
+ end
- def departure_stop_point
- return unless departure_stop_point_id
- Chouette::StopPoint.find( departure_stop_point_id)
- end
+ def departure_stop_point
+ return unless departure_stop_point_id
+ Chouette::StopPoint.find( departure_stop_point_id)
+ end
- def arrival_stop_point
- return unless arrival_stop_point_id
- Chouette::StopPoint.find( arrival_stop_point_id)
- end
+ def arrival_stop_point
+ return unless arrival_stop_point_id
+ Chouette::StopPoint.find( arrival_stop_point_id)
+ end
- def shortcuts_update_for_add( stop_point)
- stop_points << stop_point unless stop_points.include?( stop_point)
+ def shortcuts_update_for_add( stop_point)
+ stop_points << stop_point unless stop_points.include?( stop_point)
- ordered_stop_points = stop_points
- ordered_stop_points = ordered_stop_points.sort { |a,b| a.position <=> b.position} unless ordered_stop_points.empty?
+ ordered_stop_points = stop_points
+ ordered_stop_points = ordered_stop_points.sort { |a,b| a.position <=> b.position} unless ordered_stop_points.empty?
- self.update_attributes( :departure_stop_point_id => (ordered_stop_points.first && ordered_stop_points.first.id),
- :arrival_stop_point_id => (ordered_stop_points.last && ordered_stop_points.last.id))
- end
+ self.update_attributes( :departure_stop_point_id => (ordered_stop_points.first && ordered_stop_points.first.id),
+ :arrival_stop_point_id => (ordered_stop_points.last && ordered_stop_points.last.id))
+ end
- def shortcuts_update_for_remove( stop_point)
- stop_points.delete( stop_point) if stop_points.include?( stop_point)
+ def shortcuts_update_for_remove( stop_point)
+ stop_points.delete( stop_point) if stop_points.include?( stop_point)
- ordered_stop_points = stop_points
- ordered_stop_points = ordered_stop_points.sort { |a,b| a.position <=> b.position} unless ordered_stop_points.empty?
+ ordered_stop_points = stop_points
+ ordered_stop_points = ordered_stop_points.sort { |a,b| a.position <=> b.position} unless ordered_stop_points.empty?
- self.update_attributes( :departure_stop_point_id => (ordered_stop_points.first && ordered_stop_points.first.id),
- :arrival_stop_point_id => (ordered_stop_points.last && ordered_stop_points.last.id))
- end
+ self.update_attributes( :departure_stop_point_id => (ordered_stop_points.first && ordered_stop_points.first.id),
+ :arrival_stop_point_id => (ordered_stop_points.last && ordered_stop_points.last.id))
+ end
- def vjas_add( stop_point)
- return if new_record?
+ def vjas_add( stop_point)
+ return if new_record?
- vehicle_journeys.each do |vj|
- vjas = vj.vehicle_journey_at_stops.create :stop_point_id => stop_point.id
+ vehicle_journeys.each do |vj|
+ vjas = vj.vehicle_journey_at_stops.create :stop_point_id => stop_point.id
+ end
end
- end
- def vjas_remove( stop_point)
- return if new_record?
+ def vjas_remove( stop_point)
+ return if new_record?
- vehicle_journey_at_stops.where( :stop_point_id => stop_point.id).each do |vjas|
- vjas.destroy
+ vehicle_journey_at_stops.where( :stop_point_id => stop_point.id).each do |vjas|
+ vjas.destroy
+ end
end
end
end
diff --git a/app/models/chouette/objectid/netex.rb b/app/models/chouette/objectid/netex.rb
index b83ef7b8d..7953c6b12 100644
--- a/app/models/chouette/objectid/netex.rb
+++ b/app/models/chouette/objectid/netex.rb
@@ -1,29 +1,33 @@
-class Chouette::Objectid::Netex
- include ActiveModel::Model
+module Chouette
+ module Objectid
+ class Netex
+ include ActiveModel::Model
- attr_accessor :provider_id, :object_type, :local_id, :creation_id
- validates_presence_of :provider_id, :object_type, :local_id, :creation_id
- validate :must_respect_format
+ attr_accessor :provider_id, :object_type, :local_id, :creation_id
+ validates_presence_of :provider_id, :object_type, :local_id, :creation_id
+ validate :must_respect_format
- def initialize(**attributes)
- @provider_id ||= (attributes[:provider_id] ||= 'chouette')
- @object_type = attributes[:object_type]
- @local_id = attributes[:local_id]
- @creation_id = (attributes[:creation_id] ||= 'LOC')
- end
+ def initialize(**attributes)
+ @provider_id ||= (attributes[:provider_id] ||= 'chouette')
+ @object_type = attributes[:object_type]
+ @local_id = attributes[:local_id]
+ @creation_id = (attributes[:creation_id] ||= 'LOC')
+ end
- @@format = /^([A-Za-z_-]+):([A-Za-z]+):([0-9A-Za-z_-]+):([A-Za-z]+)$/
- cattr_reader :format
+ @@format = /^([A-Za-z_-]+):([A-Za-z]+):([0-9A-Za-z_-]+):([A-Za-z]+)$/
+ cattr_reader :format
- def to_s
- "#{self.provider_id}:#{self.object_type}:#{self.local_id}:#{self.creation_id}"
- end
+ def to_s
+ "#{self.provider_id}:#{self.object_type}:#{self.local_id}:#{self.creation_id}"
+ end
- def must_respect_format
- self.to_s.match(format)
- end
+ def must_respect_format
+ self.to_s.match(format)
+ end
- def short_id
- local_id
+ def short_id
+ local_id
+ end
+ end
end
end
\ No newline at end of file
diff --git a/app/models/chouette/objectid/stif_codifligne.rb b/app/models/chouette/objectid/stif_codifligne.rb
index d1a1e7862..a1e40f0a1 100644
--- a/app/models/chouette/objectid/stif_codifligne.rb
+++ b/app/models/chouette/objectid/stif_codifligne.rb
@@ -1,10 +1,12 @@
-class Chouette::Objectid::StifCodifligne < Chouette::Objectid::Netex
+module Chouette
+ module Objectid
+ class StifCodifligne < Chouette::Objectid::Netex
- attr_accessor :sync_id
- validates_presence_of :sync_id
- validates :creation_id, presence: false
+ attr_accessor :sync_id
+ validates_presence_of :sync_id
+ validates :creation_id, presence: false
- @@format = /^([A-Za-z_]+):([A-Za-z]+):([A-Za-z]+):([0-9A-Za-z_-]+)$/
+ @@format = /^([A-Za-z_]+):([A-Za-z]+):([A-Za-z]+):([0-9A-Za-z_-]+)$/
def initialize(**attributes)
@provider_id = attributes[:provider_id]
diff --git a/app/models/chouette/objectid/stif_netex.rb b/app/models/chouette/objectid/stif_netex.rb
index 26700bf4b..80208af56 100644
--- a/app/models/chouette/objectid/stif_netex.rb
+++ b/app/models/chouette/objectid/stif_netex.rb
@@ -1,11 +1,15 @@
-class Chouette::Objectid::StifNetex < Chouette::Objectid::Netex
+module Chouette
+ module Objectid
+ class StifNetex < Chouette::Objectid::Netex
- def initialize(**attributes)
- @provider_id = (attributes[:provider_id] ||= 'stif')
- super
- end
+ def initialize(**attributes)
+ @provider_id = (attributes[:provider_id] ||= 'stif')
+ super
+ end
- def short_id
- local_id.try(:split, "-").try(:[], -1)
+ def short_id
+ local_id.try(:split, "-").try(:[], -1)
+ end
+ end
end
end
\ No newline at end of file
diff --git a/app/models/chouette/objectid/stif_reflex.rb b/app/models/chouette/objectid/stif_reflex.rb
index 6ffaf7c0e..69a3f52fa 100644
--- a/app/models/chouette/objectid/stif_reflex.rb
+++ b/app/models/chouette/objectid/stif_reflex.rb
@@ -1,10 +1,12 @@
-class Chouette::Objectid::StifReflex < Chouette::Objectid::Netex
+module Chouette
+ module Objectid
+ class StifReflex < Chouette::Objectid::Netex
- attr_accessor :country_code, :zip_code
- validates_presence_of :country_code, :zip_code
- validates :creation_id, presence: false
+ attr_accessor :country_code, :zip_code
+ validates_presence_of :country_code, :zip_code
+ validates :creation_id, presence: false
- @@format = /^([A-Za-z_]+):([0-9A-Za-z_-]+):([A-Za-z]+):([0-9A-Za-z_-]+):([A-Za-z]+)$/
+ @@format = /^([A-Za-z_]+):([0-9A-Za-z_-]+):([A-Za-z]+):([0-9A-Za-z_-]+):([A-Za-z]+)$/
def initialize(**attributes)
@provider_id = attributes[:provider_id]
@@ -18,5 +20,4 @@ class Chouette::Objectid::StifReflex < Chouette::Objectid::Netex
end
end
end
-
end
\ No newline at end of file
diff --git a/app/models/chouette/objectid_formatter/netex.rb b/app/models/chouette/objectid_formatter/netex.rb
index 6b64b8f82..7279fdaa5 100644
--- a/app/models/chouette/objectid_formatter/netex.rb
+++ b/app/models/chouette/objectid_formatter/netex.rb
@@ -5,12 +5,14 @@ module Chouette
model.update_attributes(objectid: Chouette::Objectid::Netex.new(local_id: SecureRandom.uuid, object_type: model.class.name.gsub(/Chouette::/,'')).to_s) unless model.read_attribute(:objectid)
end
- def after_commit(model)
- # unused method in this context
- end
+ def after_commit(model)
+ # unused method in this context
+ end
- def get_objectid(definition)
- parts = definition.try(:split, ":")
- Chouette::Objectid::Netex.new(provider_id: parts[0], object_type: parts[1], local_id: parts[2], creation_id: parts[3]) rescue nil
+ def get_objectid(definition)
+ parts = definition.try(:split, ":")
+ Chouette::Objectid::Netex.new(provider_id: parts[0], object_type: parts[1], local_id: parts[2], creation_id: parts[3]) rescue nil
+ end
+ end
end
end
\ No newline at end of file
diff --git a/app/models/chouette/objectid_formatter/stif_codifligne.rb b/app/models/chouette/objectid_formatter/stif_codifligne.rb
index f575a4001..0624fc8a8 100644
--- a/app/models/chouette/objectid_formatter/stif_codifligne.rb
+++ b/app/models/chouette/objectid_formatter/stif_codifligne.rb
@@ -5,12 +5,14 @@ module Chouette
# unused method in this context
end
- def after_commit(model)
- # unused method in this context
- end
+ def after_commit(model)
+ # unused method in this context
+ end
- def get_objectid(definition)
- parts = definition.try(:split, ":")
- Chouette::Objectid::StifCodifligne.new(provider_id: parts[0], sync_id: parts[1], object_type: parts[2], local_id: parts[3]) rescue nil
+ def get_objectid(definition)
+ parts = definition.try(:split, ":")
+ Chouette::Objectid::StifCodifligne.new(provider_id: parts[0], sync_id: parts[1], object_type: parts[2], local_id: parts[3]) rescue nil
+ end
+ end
end
end
\ No newline at end of file
diff --git a/app/models/chouette/objectid_formatter/stif_netex.rb b/app/models/chouette/objectid_formatter/stif_netex.rb
index 904d8503b..0256754bf 100644
--- a/app/models/chouette/objectid_formatter/stif_netex.rb
+++ b/app/models/chouette/objectid_formatter/stif_netex.rb
@@ -9,8 +9,10 @@ module Chouette
model.update_attributes(objectid: Chouette::Objectid::StifNetex.new(provider_id: "stif", object_type: model.class.name.gsub(/Chouette::/,''), local_id: model.local_id).to_s)
end
- def get_objectid(definition)
- parts = definition.try(:split, ":")
- Chouette::Objectid::StifNetex.new(provider_id: parts[0], object_type: parts[1], local_id: parts[2], creation_id: parts[3]) rescue nil
+ def get_objectid(definition)
+ parts = definition.try(:split, ":")
+ Chouette::Objectid::StifNetex.new(provider_id: parts[0], object_type: parts[1], local_id: parts[2], creation_id: parts[3]) rescue nil
+ end
+ end
end
end
\ No newline at end of file
diff --git a/app/models/chouette/objectid_formatter/stif_reflex.rb b/app/models/chouette/objectid_formatter/stif_reflex.rb
index ba1022c2b..5637f2806 100644
--- a/app/models/chouette/objectid_formatter/stif_reflex.rb
+++ b/app/models/chouette/objectid_formatter/stif_reflex.rb
@@ -5,12 +5,14 @@ module Chouette
# unused method in this context
end
- def after_commit(model)
- # unused method in this context
- end
+ def after_commit(model)
+ # unused method in this context
+ end
- def get_objectid(definition)
- parts = definition.try(:split, ":")
- Chouette::Objectid::StifReflex.new(country_code: parts[0], zip_code: parts[1], object_type: parts[2], local_id: parts[3], provider_id: parts[4]) rescue nil
+ def get_objectid(definition)
+ parts = definition.try(:split, ":")
+ Chouette::Objectid::StifReflex.new(country_code: parts[0], zip_code: parts[1], object_type: parts[2], local_id: parts[3], provider_id: parts[4]) rescue nil
+ end
+ end
end
end
\ No newline at end of file
diff --git a/app/models/chouette/stop_point.rb b/app/models/chouette/stop_point.rb
index b03eca6ae..86be39d70 100644
--- a/app/models/chouette/stop_point.rb
+++ b/app/models/chouette/stop_point.rb
@@ -1,23 +1,23 @@
module Chouette
class StopPoint < Chouette::TridentActiveRecord
- def self.policy_class
- RoutePolicy
- end
+ def self.policy_class
+ Chouette::RoutePolicy
+ end
- include ForBoardingEnumerations
- include ForAlightingEnumerations
- include ObjectidSupport
+ include ForBoardingEnumerations
+ include ForAlightingEnumerations
+ include ObjectidSupport
- # FIXME http://jira.codehaus.org/browse/JRUBY-6358
- self.primary_key = "id"
+ # FIXME http://jira.codehaus.org/browse/JRUBY-6358
+ self.primary_key = "id"
- belongs_to :stop_area
- belongs_to :route, inverse_of: :stop_points
- has_many :vehicle_journey_at_stops, :dependent => :destroy
- has_many :vehicle_journeys, -> {uniq}, :through => :vehicle_journey_at_stops
+ belongs_to :stop_area
+ belongs_to :route, inverse_of: :stop_points
+ has_many :vehicle_journey_at_stops, :dependent => :destroy
+ has_many :vehicle_journeys, -> {uniq}, :through => :vehicle_journey_at_stops
- acts_as_list :scope => :route, top_of_list: 0
+ acts_as_list :scope => :route, top_of_list: 0
validates_presence_of :stop_area
@@ -27,35 +27,34 @@ module Chouette
errors.add(:stop_area_id, I18n.t("stop_areas.errors.empty"))
end
end
- end
- scope :default_order, -> { order("position") }
+ scope :default_order, -> { order("position") }
- delegate :name, to: :stop_area
+ delegate :name, to: :stop_area
- before_destroy :remove_dependent_journey_pattern_stop_points
- def remove_dependent_journey_pattern_stop_points
- route.journey_patterns.each do |jp|
- if jp.stop_point_ids.include?( id)
- jp.stop_point_ids = jp.stop_point_ids - [id]
+ before_destroy :remove_dependent_journey_pattern_stop_points
+ def remove_dependent_journey_pattern_stop_points
+ route.journey_patterns.each do |jp|
+ if jp.stop_point_ids.include?( id)
+ jp.stop_point_ids = jp.stop_point_ids - [id]
+ end
end
end
- end
- def duplicate(for_route:)
- keys_for_create = attributes.keys - %w{id objectid created_at updated_at}
- atts_for_create = attributes
- .slice(*keys_for_create)
- .merge('route_id' => for_route.id)
- self.class.create!(atts_for_create)
- end
+ def duplicate(for_route:)
+ keys_for_create = attributes.keys - %w{id objectid created_at updated_at}
+ atts_for_create = attributes
+ .slice(*keys_for_create)
+ .merge('route_id' => for_route.id)
+ self.class.create!(atts_for_create)
+ end
- def local_id
- "IBOO-#{self.referential.id}-#{self.route.line.get_objectid.local_id}-#{self.route.id}-#{self.id}"
- end
+ def local_id
+ "IBOO-#{self.referential.id}-#{self.route.line.get_objectid.local_id}-#{self.route.id}-#{self.id}"
+ end
- def self.area_candidates
- Chouette::StopArea.where(:area_type => ['Quay', 'BoardingPosition'])
+ def self.area_candidates
+ Chouette::StopArea.where(:area_type => ['Quay', 'BoardingPosition'])
+ end
end
-
end
\ No newline at end of file
diff --git a/app/models/chouette/vehicle_journey.rb b/app/models/chouette/vehicle_journey.rb
index 1508360ce..b68909795 100644
--- a/app/models/chouette/vehicle_journey.rb
+++ b/app/models/chouette/vehicle_journey.rb
@@ -7,301 +7,301 @@ module Chouette
# FIXME http://jira.codehaus.org/browse/JRUBY-6358
self.primary_key = "id"
- enum journey_category: { timed: 0, frequency: 1 }
+ enum journey_category: { timed: 0, frequency: 1 }
- default_scope { where(journey_category: journey_categories[:timed]) }
+ default_scope { where(journey_category: journey_categories[:timed]) }
- attr_reader :time_table_tokens
+ attr_reader :time_table_tokens
- def self.nullable_attributes
- [:transport_mode, :published_journey_name, :vehicle_type_identifier, :published_journey_identifier, :comment, :status_value]
- end
+ def self.nullable_attributes
+ [:transport_mode, :published_journey_name, :vehicle_type_identifier, :published_journey_identifier, :comment, :status_value]
+ end
- belongs_to :company
- belongs_to :route
- belongs_to :journey_pattern
+ belongs_to :company
+ belongs_to :route
+ belongs_to :journey_pattern
- has_and_belongs_to_many :footnotes, :class_name => 'Chouette::Footnote'
+ has_and_belongs_to_many :footnotes, :class_name => 'Chouette::Footnote'
- validates_presence_of :route
- validates_presence_of :journey_pattern
- # validates :vehicle_journey_at_stops,
- # Validation temporarily removed for day offsets
- # :vjas_departure_time_must_be_before_next_stop_arrival_time,
+ validates_presence_of :route
+ validates_presence_of :journey_pattern
+ # validates :vehicle_journey_at_stops,
+ # Validation temporarily removed for day offsets
+ # :vjas_departure_time_must_be_before_next_stop_arrival_time,
- # vehicle_journey_at_stops_are_in_increasing_time_order: false
- validates_presence_of :number
+ # vehicle_journey_at_stops_are_in_increasing_time_order: false
+ validates_presence_of :number
- has_many :vehicle_journey_at_stops, -> { includes(:stop_point).order("stop_points.position") }, :dependent => :destroy
- has_and_belongs_to_many :time_tables, :class_name => 'Chouette::TimeTable', :foreign_key => "vehicle_journey_id", :association_foreign_key => "time_table_id"
- has_many :stop_points, -> { order("stop_points.position") }, :through => :vehicle_journey_at_stops
+ has_many :vehicle_journey_at_stops, -> { includes(:stop_point).order("stop_points.position") }, :dependent => :destroy
+ has_and_belongs_to_many :time_tables, :class_name => 'Chouette::TimeTable', :foreign_key => "vehicle_journey_id", :association_foreign_key => "time_table_id"
+ has_many :stop_points, -> { order("stop_points.position") }, :through => :vehicle_journey_at_stops
- before_validation :set_default_values,
- :calculate_vehicle_journey_at_stop_day_offset
+ before_validation :set_default_values,
+ :calculate_vehicle_journey_at_stop_day_offset
- # TODO: Remove this validator
- # We've eliminated this validation because it prevented vehicle journeys
- # from being saved with at-stops having a day offset greater than 0,
- # because these would have times that were "earlier" than the previous
- # at-stop. TBD by Luc whether we're deleting this validation altogether or
- # instead rejiggering it to work with day offsets.
- def vjas_departure_time_must_be_before_next_stop_arrival_time
- notice = 'departure time must be before next stop arrival time'
- vehicle_journey_at_stops.each_with_index do |current_stop, index|
- next_stop = vehicle_journey_at_stops[index + 1]
+ # TODO: Remove this validator
+ # We've eliminated this validation because it prevented vehicle journeys
+ # from being saved with at-stops having a day offset greater than 0,
+ # because these would have times that were "earlier" than the previous
+ # at-stop. TBD by Luc whether we're deleting this validation altogether or
+ # instead rejiggering it to work with day offsets.
+ def vjas_departure_time_must_be_before_next_stop_arrival_time
+ notice = 'departure time must be before next stop arrival time'
+ vehicle_journey_at_stops.each_with_index do |current_stop, index|
+ next_stop = vehicle_journey_at_stops[index + 1]
- next unless next_stop && (next_stop[:arrival_time] < current_stop[:departure_time])
+ next unless next_stop && (next_stop[:arrival_time] < current_stop[:departure_time])
- current_stop.errors.add(:departure_time, notice)
- self.errors.add(:vehicle_journey_at_stops, notice)
+ current_stop.errors.add(:departure_time, notice)
+ self.errors.add(:vehicle_journey_at_stops, notice)
+ end
end
- end
- def local_id
- "IBOO-#{self.referential.id}-#{self.route.line.get_objectid.local_id}-#{self.id}"
- end
+ def local_id
+ "IBOO-#{self.referential.id}-#{self.route.line.get_objectid.local_id}-#{self.id}"
+ end
- def checksum_attributes
- [].tap do |attrs|
- attrs << self.published_journey_name
- attrs << self.published_journey_identifier
- attrs << self.try(:company).try(:objectid).try(:local_id)
- attrs << self.footnotes.map(&:checksum).sort
- attrs << self.vehicle_journey_at_stops.map(&:checksum).sort
+ def checksum_attributes
+ [].tap do |attrs|
+ attrs << self.published_journey_name
+ attrs << self.published_journey_identifier
+ attrs << self.try(:company).try(:objectid).try(:local_id)
+ attrs << self.footnotes.map(&:checksum).sort
+ attrs << self.vehicle_journey_at_stops.map(&:checksum).sort
+ end
end
- end
- def set_default_values
- if number.nil?
- self.number = 0
+ def set_default_values
+ if number.nil?
+ self.number = 0
+ end
end
- end
- def calculate_vehicle_journey_at_stop_day_offset
- Chouette::VehicleJourneyAtStopsDayOffset.new(
- vehicle_journey_at_stops
- ).update
- end
+ def calculate_vehicle_journey_at_stop_day_offset
+ Chouette::VehicleJourneyAtStopsDayOffset.new(
+ vehicle_journey_at_stops
+ ).update
+ end
- scope :without_any_time_table, -> { joins('LEFT JOIN "time_tables_vehicle_journeys" ON "time_tables_vehicle_journeys"."vehicle_journey_id" = "vehicle_journeys"."id" LEFT JOIN "time_tables" ON "time_tables"."id" = "time_tables_vehicle_journeys"."time_table_id"').where(:time_tables => { :id => nil}) }
- scope :without_any_passing_time, -> { joins('LEFT JOIN "vehicle_journey_at_stops" ON "vehicle_journey_at_stops"."vehicle_journey_id" = "vehicle_journeys"."id"').where(vehicle_journey_at_stops: { id: nil }) }
+ scope :without_any_time_table, -> { joins('LEFT JOIN "time_tables_vehicle_journeys" ON "time_tables_vehicle_journeys"."vehicle_journey_id" = "vehicle_journeys"."id" LEFT JOIN "time_tables" ON "time_tables"."id" = "time_tables_vehicle_journeys"."time_table_id"').where(:time_tables => { :id => nil}) }
+ scope :without_any_passing_time, -> { joins('LEFT JOIN "vehicle_journey_at_stops" ON "vehicle_journey_at_stops"."vehicle_journey_id" = "vehicle_journeys"."id"').where(vehicle_journey_at_stops: { id: nil }) }
- accepts_nested_attributes_for :vehicle_journey_at_stops, :allow_destroy => true
+ accepts_nested_attributes_for :vehicle_journey_at_stops, :allow_destroy => true
- def presenter
- @presenter ||= ::VehicleJourneyPresenter.new( self)
- end
+ def presenter
+ @presenter ||= ::VehicleJourneyPresenter.new( self)
+ end
- def vehicle_journey_at_stops_matrix
- at_stops = self.vehicle_journey_at_stops.to_a.dup
- active_stop_point_ids = journey_pattern.stop_points.map(&:id)
+ def vehicle_journey_at_stops_matrix
+ at_stops = self.vehicle_journey_at_stops.to_a.dup
+ active_stop_point_ids = journey_pattern.stop_points.map(&:id)
- (route.stop_points.map(&:id) - at_stops.map(&:stop_point_id)).each do |id|
- vjas = Chouette::VehicleJourneyAtStop.new(stop_point_id: id)
- vjas.dummy = !active_stop_point_ids.include?(id)
- at_stops.insert(route.stop_points.map(&:id).index(id), vjas)
+ (route.stop_points.map(&:id) - at_stops.map(&:stop_point_id)).each do |id|
+ vjas = Chouette::VehicleJourneyAtStop.new(stop_point_id: id)
+ vjas.dummy = !active_stop_point_ids.include?(id)
+ at_stops.insert(route.stop_points.map(&:id).index(id), vjas)
+ end
+ at_stops
end
- at_stops
- end
- def create_or_find_vjas_from_state vjas
- return vehicle_journey_at_stops.find(vjas['id']) if vjas['id']
- stop_point = Chouette::StopPoint.find_by(objectid: vjas['stop_point_objectid'])
- stop = vehicle_journey_at_stops.create(stop_point: stop_point)
- vjas['id'] = stop.id
- vjas['new_record'] = true
- stop
- end
+ def create_or_find_vjas_from_state vjas
+ return vehicle_journey_at_stops.find(vjas['id']) if vjas['id']
+ stop_point = Chouette::StopPoint.find_by(objectid: vjas['stop_point_objectid'])
+ stop = vehicle_journey_at_stops.create(stop_point: stop_point)
+ vjas['id'] = stop.id
+ vjas['new_record'] = true
+ stop
+ end
- def update_vjas_from_state state
- state.each do |vjas|
- next if vjas["dummy"]
- params = {}.tap do |el|
- ['arrival_time', 'departure_time'].each do |field|
- time = "#{vjas[field]['hour']}:#{vjas[field]['minute']}"
- el[field.to_sym] = Time.parse("2000-01-01 #{time}:00 UTC")
+ def update_vjas_from_state state
+ state.each do |vjas|
+ next if vjas["dummy"]
+ params = {}.tap do |el|
+ ['arrival_time', 'departure_time'].each do |field|
+ time = "#{vjas[field]['hour']}:#{vjas[field]['minute']}"
+ el[field.to_sym] = Time.parse("2000-01-01 #{time}:00 UTC")
+ end
end
+ stop = create_or_find_vjas_from_state(vjas)
+ stop.update_attributes(params)
+ vjas.delete('errors')
+ vjas['errors'] = stop.errors if stop.errors.any?
end
- stop = create_or_find_vjas_from_state(vjas)
- stop.update_attributes(params)
- vjas.delete('errors')
- vjas['errors'] = stop.errors if stop.errors.any?
end
- end
- def state_update_vjas? vehicle_journey_at_stops
- departure_times = vehicle_journey_at_stops.map do |vjas|
- "#{vjas['departure_time']['hour']}:#{vjas['departure_time']['minute']}"
+ def state_update_vjas? vehicle_journey_at_stops
+ departure_times = vehicle_journey_at_stops.map do |vjas|
+ "#{vjas['departure_time']['hour']}:#{vjas['departure_time']['minute']}"
+ end
+ times = departure_times.uniq
+ (times.count == 1 && times[0] == '00:00') ? false : true
end
- times = departure_times.uniq
- (times.count == 1 && times[0] == '00:00') ? false : true
- end
- def update_has_and_belongs_to_many_from_state item
- ['time_tables', 'footnotes'].each do |assos|
- saved = self.send(assos).map(&:id)
+ def update_has_and_belongs_to_many_from_state item
+ ['time_tables', 'footnotes'].each do |assos|
+ saved = self.send(assos).map(&:id)
- (saved - item[assos].map{|t| t['id']}).each do |id|
- self.send(assos).delete(self.send(assos).find(id))
- end
+ (saved - item[assos].map{|t| t['id']}).each do |id|
+ self.send(assos).delete(self.send(assos).find(id))
+ end
- item[assos].each do |t|
- klass = "Chouette::#{assos.classify}".constantize
- unless saved.include?(t['id'])
- self.send(assos) << klass.find(t['id'])
+ item[assos].each do |t|
+ klass = "Chouette::#{assos.classify}".constantize
+ unless saved.include?(t['id'])
+ self.send(assos) << klass.find(t['id'])
+ end
end
end
end
- end
- def self.state_update route, state
- transaction do
- state.each do |item|
- item.delete('errors')
- vj = find_by(objectid: item['objectid']) || state_create_instance(route, item)
- next if item['deletable'] && vj.persisted? && vj.destroy
+ def self.state_update route, state
+ transaction do
+ state.each do |item|
+ item.delete('errors')
+ vj = find_by(objectid: item['objectid']) || state_create_instance(route, item)
+ next if item['deletable'] && vj.persisted? && vj.destroy
- if vj.state_update_vjas?(item['vehicle_journey_at_stops'])
- vj.update_vjas_from_state(item['vehicle_journey_at_stops'])
+ if vj.state_update_vjas?(item['vehicle_journey_at_stops'])
+ vj.update_vjas_from_state(item['vehicle_journey_at_stops'])
+ end
+
+ vj.update_attributes(state_permited_attributes(item))
+ vj.update_has_and_belongs_to_many_from_state(item)
+ item['errors'] = vj.errors.full_messages.uniq if vj.errors.any?
end
- vj.update_attributes(state_permited_attributes(item))
- vj.update_has_and_belongs_to_many_from_state(item)
- item['errors'] = vj.errors.full_messages.uniq if vj.errors.any?
+ # Delete ids of new object from state if we had to rollback
+ if state.any? {|item| item['errors']}
+ state.map do |item|
+ item.delete('objectid') if item['new_record']
+ item['vehicle_journey_at_stops'].map {|vjas| vjas.delete('id') if vjas['new_record'] }
+ end
+ raise ::ActiveRecord::Rollback
+ end
end
- # Delete ids of new object from state if we had to rollback
- if state.any? {|item| item['errors']}
- state.map do |item|
- item.delete('objectid') if item['new_record']
- item['vehicle_journey_at_stops'].map {|vjas| vjas.delete('id') if vjas['new_record'] }
- end
- raise ::ActiveRecord::Rollback
+ # Remove new_record flag && deleted item from state if transaction has been saved
+ state.map do |item|
+ item.delete('new_record')
+ item['vehicle_journey_at_stops'].map {|vjas| vjas.delete('new_record') }
end
+ state.delete_if {|item| item['deletable']}
end
- # Remove new_record flag && deleted item from state if transaction has been saved
- state.map do |item|
- item.delete('new_record')
- item['vehicle_journey_at_stops'].map {|vjas| vjas.delete('new_record') }
+ def self.state_create_instance route, item
+ # Flag new record, so we can unset object_id if transaction rollback
+ vj = route.vehicle_journeys.create(state_permited_attributes(item))
+ item['objectid'] = vj.objectid
+ item['new_record'] = true
+ vj
end
- state.delete_if {|item| item['deletable']}
- end
- def self.state_create_instance route, item
- # Flag new record, so we can unset object_id if transaction rollback
- vj = route.vehicle_journeys.create(state_permited_attributes(item))
- item['objectid'] = vj.objectid
- item['new_record'] = true
- vj
- end
+ def self.state_permited_attributes item
+ attrs = item.slice('published_journey_identifier', 'published_journey_name', 'journey_pattern_id', 'company_id').to_hash
+ ['company', 'journey_pattern'].map do |association|
+ attrs["#{association}_id"] = item[association]['id'] if item[association]
+ end
+ attrs
+ end
- def self.state_permited_attributes item
- attrs = item.slice('published_journey_identifier', 'published_journey_name', 'journey_pattern_id', 'company_id').to_hash
- ['company', 'journey_pattern'].map do |association|
- attrs["#{association}_id"] = item[association]['id'] if item[association]
+ def missing_stops_in_relation_to_a_journey_pattern(selected_journey_pattern)
+ selected_journey_pattern.stop_points - self.stop_points
end
- attrs
- end
+ def extra_stops_in_relation_to_a_journey_pattern(selected_journey_pattern)
+ self.stop_points - selected_journey_pattern.stop_points
+ end
+ def extra_vjas_in_relation_to_a_journey_pattern(selected_journey_pattern)
+ extra_stops = self.extra_stops_in_relation_to_a_journey_pattern(selected_journey_pattern)
+ self.vehicle_journey_at_stops.select { |vjas| extra_stops.include?( vjas.stop_point)}
+ end
+ def time_table_tokens=(ids)
+ self.time_table_ids = ids.split(",")
+ end
+ def bounding_dates
+ dates = []
- def missing_stops_in_relation_to_a_journey_pattern(selected_journey_pattern)
- selected_journey_pattern.stop_points - self.stop_points
- end
- def extra_stops_in_relation_to_a_journey_pattern(selected_journey_pattern)
- self.stop_points - selected_journey_pattern.stop_points
- end
- def extra_vjas_in_relation_to_a_journey_pattern(selected_journey_pattern)
- extra_stops = self.extra_stops_in_relation_to_a_journey_pattern(selected_journey_pattern)
- self.vehicle_journey_at_stops.select { |vjas| extra_stops.include?( vjas.stop_point)}
- end
- def time_table_tokens=(ids)
- self.time_table_ids = ids.split(",")
- end
- def bounding_dates
- dates = []
+ time_tables.each do |tm|
+ dates << tm.start_date if tm.start_date
+ dates << tm.end_date if tm.end_date
+ end
- time_tables.each do |tm|
- dates << tm.start_date if tm.start_date
- dates << tm.end_date if tm.end_date
+ dates.empty? ? [] : [dates.min, dates.max]
end
- dates.empty? ? [] : [dates.min, dates.max]
- end
+ def update_journey_pattern( selected_journey_pattern)
+ return unless selected_journey_pattern.route_id==self.route_id
- def update_journey_pattern( selected_journey_pattern)
- return unless selected_journey_pattern.route_id==self.route_id
-
- missing_stops_in_relation_to_a_journey_pattern(selected_journey_pattern).each do |sp|
- self.vehicle_journey_at_stops.build( :stop_point => sp)
- end
- extra_vjas_in_relation_to_a_journey_pattern(selected_journey_pattern).each do |vjas|
- vjas._destroy = true
+ missing_stops_in_relation_to_a_journey_pattern(selected_journey_pattern).each do |sp|
+ self.vehicle_journey_at_stops.build( :stop_point => sp)
+ end
+ extra_vjas_in_relation_to_a_journey_pattern(selected_journey_pattern).each do |vjas|
+ vjas._destroy = true
+ end
end
- end
- def self.matrix(vehicle_journeys)
- {}.tap do |hash|
- vehicle_journeys.map{ |vj|
- vj.vehicle_journey_at_stops.map{ |vjas |hash[ "#{vj.id}-#{vjas.stop_point_id}"] = vjas }
- }
+ def self.matrix(vehicle_journeys)
+ {}.tap do |hash|
+ vehicle_journeys.map{ |vj|
+ vj.vehicle_journey_at_stops.map{ |vjas |hash[ "#{vj.id}-#{vjas.stop_point_id}"] = vjas }
+ }
+ end
end
- end
- def self.with_stops
- self
- .joins(:journey_pattern)
- .joins('
- LEFT JOIN "vehicle_journey_at_stops"
- ON "vehicle_journey_at_stops"."vehicle_journey_id" =
- "vehicle_journeys"."id"
- AND "vehicle_journey_at_stops"."stop_point_id" =
- "journey_patterns"."departure_stop_point_id"
- ')
- .order('"vehicle_journey_at_stops"."departure_time"')
- end
+ def self.with_stops
+ self
+ .joins(:journey_pattern)
+ .joins('
+ LEFT JOIN "vehicle_journey_at_stops"
+ ON "vehicle_journey_at_stops"."vehicle_journey_id" =
+ "vehicle_journeys"."id"
+ AND "vehicle_journey_at_stops"."stop_point_id" =
+ "journey_patterns"."departure_stop_point_id"
+ ')
+ .order('"vehicle_journey_at_stops"."departure_time"')
+ end
- # Requires a SELECT DISTINCT and a join with
- # "vehicle_journey_at_stops".
- #
- # Example:
- # .select('DISTINCT "vehicle_journeys".*')
- # .joins('
- # LEFT JOIN "vehicle_journey_at_stops"
- # ON "vehicle_journey_at_stops"."vehicle_journey_id" =
- # "vehicle_journeys"."id"
- # ')
- # .where_departure_time_between('08:00', '09:45')
- def self.where_departure_time_between(
- start_time,
- end_time,
- allow_empty: false
- )
- self
- .where(
- %Q(
- "vehicle_journey_at_stops"."departure_time" >= ?
- AND "vehicle_journey_at_stops"."departure_time" <= ?
- #{
- if allow_empty
- 'OR "vehicle_journey_at_stops"."id" IS NULL'
- end
- }
- ),
- "2000-01-01 #{start_time}:00 UTC",
- "2000-01-01 #{end_time}:00 UTC"
- )
- end
+ # Requires a SELECT DISTINCT and a join with
+ # "vehicle_journey_at_stops".
+ #
+ # Example:
+ # .select('DISTINCT "vehicle_journeys".*')
+ # .joins('
+ # LEFT JOIN "vehicle_journey_at_stops"
+ # ON "vehicle_journey_at_stops"."vehicle_journey_id" =
+ # "vehicle_journeys"."id"
+ # ')
+ # .where_departure_time_between('08:00', '09:45')
+ def self.where_departure_time_between(
+ start_time,
+ end_time,
+ allow_empty: false
+ )
+ self
+ .where(
+ %Q(
+ "vehicle_journey_at_stops"."departure_time" >= ?
+ AND "vehicle_journey_at_stops"."departure_time" <= ?
+ #{
+ if allow_empty
+ 'OR "vehicle_journey_at_stops"."id" IS NULL'
+ end
+ }
+ ),
+ "2000-01-01 #{start_time}:00 UTC",
+ "2000-01-01 #{end_time}:00 UTC"
+ )
+ end
- def self.without_time_tables
- # Joins the VehicleJourney–TimeTable through table to select only those
- # VehicleJourneys that don't have an associated TimeTable.
- self
- .joins('
- LEFT JOIN "time_tables_vehicle_journeys"
- ON "time_tables_vehicle_journeys"."vehicle_journey_id" =
- "vehicle_journeys"."id"
- ')
- .where('"time_tables_vehicle_journeys"."vehicle_journey_id" IS NULL')
+ def self.without_time_tables
+ # Joins the VehicleJourney–TimeTable through table to select only those
+ # VehicleJourneys that don't have an associated TimeTable.
+ self
+ .joins('
+ LEFT JOIN "time_tables_vehicle_journeys"
+ ON "time_tables_vehicle_journeys"."vehicle_journey_id" =
+ "vehicle_journeys"."id"
+ ')
+ .where('"time_tables_vehicle_journeys"."vehicle_journey_id" IS NULL')
+ end
end
-
end
\ No newline at end of file
diff --git a/app/models/chouette/vehicle_journey_at_stop.rb b/app/models/chouette/vehicle_journey_at_stop.rb
index 8167dab47..6f0119e74 100644
--- a/app/models/chouette/vehicle_journey_at_stop.rb
+++ b/app/models/chouette/vehicle_journey_at_stop.rb
@@ -4,75 +4,76 @@ module Chouette
include Chouette::ForAlightingEnumerations
include ChecksumSupport
- DAY_OFFSET_MAX = 1
+ DAY_OFFSET_MAX = 1
- # FIXME http://jira.codehaus.org/browse/JRUBY-6358
- self.primary_key = "id"
+ # FIXME http://jira.codehaus.org/browse/JRUBY-6358
+ self.primary_key = "id"
- belongs_to :stop_point
- belongs_to :vehicle_journey
+ belongs_to :stop_point
+ belongs_to :vehicle_journey
- attr_accessor :_destroy, :dummy
+ attr_accessor :_destroy, :dummy
- validate :arrival_must_be_before_departure
- def arrival_must_be_before_departure
- # security against nil values
- return unless arrival_time && departure_time
+ validate :arrival_must_be_before_departure
+ def arrival_must_be_before_departure
+ # security against nil values
+ return unless arrival_time && departure_time
- if TimeDuration.exceeds_gap?(4.hours, arrival_time, departure_time)
- errors.add(
- :arrival_time,
- I18n.t("activerecord.errors.models.vehicle_journey_at_stop.arrival_must_be_before_departure")
- )
+ if TimeDuration.exceeds_gap?(4.hours, arrival_time, departure_time)
+ errors.add(
+ :arrival_time,
+ I18n.t("activerecord.errors.models.vehicle_journey_at_stop.arrival_must_be_before_departure")
+ )
+ end
end
- end
- validate :day_offset_must_be_within_range
+ validate :day_offset_must_be_within_range
- after_initialize :set_virtual_attributes
- def set_virtual_attributes
- @_destroy = false
- @dummy = false
- end
+ after_initialize :set_virtual_attributes
+ def set_virtual_attributes
+ @_destroy = false
+ @dummy = false
+ end
- def day_offset_must_be_within_range
- if day_offset_outside_range?(arrival_day_offset)
- errors.add(
- :arrival_day_offset,
- I18n.t(
- 'vehicle_journey_at_stops.errors.day_offset_must_not_exceed_max',
- short_id: vehicle_journey.get_objectid.short_id,
- max: DAY_OFFSET_MAX + 1
+ def day_offset_must_be_within_range
+ if day_offset_outside_range?(arrival_day_offset)
+ errors.add(
+ :arrival_day_offset,
+ I18n.t(
+ 'vehicle_journey_at_stops.errors.day_offset_must_not_exceed_max',
+ short_id: vehicle_journey.get_objectid.short_id,
+ max: DAY_OFFSET_MAX + 1
+ )
)
- )
- end
+ end
- if day_offset_outside_range?(departure_day_offset)
- errors.add(
- :departure_day_offset,
- I18n.t(
- 'vehicle_journey_at_stops.errors.day_offset_must_not_exceed_max',
- short_id: vehicle_journey.get_objectid.short_id,
- max: DAY_OFFSET_MAX + 1
+ if day_offset_outside_range?(departure_day_offset)
+ errors.add(
+ :departure_day_offset,
+ I18n.t(
+ 'vehicle_journey_at_stops.errors.day_offset_must_not_exceed_max',
+ short_id: vehicle_journey.get_objectid.short_id,
+ max: DAY_OFFSET_MAX + 1
+ )
)
- )
+ end
end
- end
- def day_offset_outside_range?(offset)
- # At-stops that were created before the database-default of 0 will have
- # nil offsets. Handle these gracefully by forcing them to a 0 offset.
- offset ||= 0
+ def day_offset_outside_range?(offset)
+ # At-stops that were created before the database-default of 0 will have
+ # nil offsets. Handle these gracefully by forcing them to a 0 offset.
+ offset ||= 0
- offset < 0 || offset > DAY_OFFSET_MAX
- end
+ offset < 0 || offset > DAY_OFFSET_MAX
+ end
- def checksum_attributes
- [].tap do |attrs|
- attrs << self.departure_time.try(:to_s, :time)
- attrs << self.arrival_time.try(:to_s, :time)
- attrs << self.departure_day_offset.to_s
- attrs << self.arrival_day_offset.to_s
+ def checksum_attributes
+ [].tap do |attrs|
+ attrs << self.departure_time.try(:to_s, :time)
+ attrs << self.arrival_time.try(:to_s, :time)
+ attrs << self.departure_day_offset.to_s
+ attrs << self.arrival_day_offset.to_s
+ end
end
end
end
\ No newline at end of file
diff --git a/app/models/chouette/vehicle_journey_at_stops_are_in_increasing_time_order_validator.rb b/app/models/chouette/vehicle_journey_at_stops_are_in_increasing_time_order_validator.rb
index 0d8bc2fca..db48a6108 100644
--- a/app/models/chouette/vehicle_journey_at_stops_are_in_increasing_time_order_validator.rb
+++ b/app/models/chouette/vehicle_journey_at_stops_are_in_increasing_time_order_validator.rb
@@ -1,54 +1,50 @@
-<<<<<<< HEAD
+
module Chouette
class VehicleJourneyAtStopsAreInIncreasingTimeOrderValidator < ActiveModel::EachValidator
def validate_each(vehicle_journey, attribute, value)
previous_at_stop = nil
-=======
-class Chouette::VehicleJourneyAtStopsAreInIncreasingTimeOrderValidator < ActiveModel::EachValidator
- def validate_each(vehicle_journey, attribute, value)
- previous_at_stop = nil
->>>>>>> Change the use of namespace and remove modules
- vehicle_journey
- .vehicle_journey_at_stops
- .select { |vjas| vjas.departure_time && vjas.arrival_time }
- .each do |vjas|
- unless self.class.validate_at_stop_times_must_increase(
- vjas,
- previous_at_stop
- )
- vehicle_journey.errors.add(
- :vehicle_journey_at_stops,
- 'time gap overflow'
+ vehicle_journey
+ .vehicle_journey_at_stops
+ .select { |vjas| vjas.departure_time && vjas.arrival_time }
+ .each do |vjas|
+ unless self.class.validate_at_stop_times_must_increase(
+ vjas,
+ previous_at_stop
)
+ vehicle_journey.errors.add(
+ :vehicle_journey_at_stops,
+ 'time gap overflow'
+ )
+ end
+
+ previous_at_stop = vjas
end
+ end
- previous_at_stop = vjas
- end
- end
+ def self.validate_at_stop_times_must_increase(at_stop, previous_at_stop)
+ valid = true
+ return valid unless previous_at_stop
- def self.validate_at_stop_times_must_increase(at_stop, previous_at_stop)
- valid = true
- return valid unless previous_at_stop
+ if TimeDuration.exceeds_gap?(
+ 4.hours,
+ previous_at_stop.departure_time,
+ at_stop.departure_time
+ )
+ valid = false
+ at_stop.errors.add(:departure_time, 'departure time gap overflow')
+ end
- if TimeDuration.exceeds_gap?(
- 4.hours,
- previous_at_stop.departure_time,
- at_stop.departure_time
- )
- valid = false
- at_stop.errors.add(:departure_time, 'departure time gap overflow')
- end
+ if TimeDuration.exceeds_gap?(
+ 4.hours,
+ previous_at_stop.arrival_time,
+ at_stop.arrival_time
+ )
+ valid = false
+ at_stop.errors.add(:arrival_time, 'arrival time gap overflow')
+ end
- if TimeDuration.exceeds_gap?(
- 4.hours,
- previous_at_stop.arrival_time,
- at_stop.arrival_time
- )
- valid = false
- at_stop.errors.add(:arrival_time, 'arrival time gap overflow')
+ valid
end
-
- valid
end
end
\ No newline at end of file
diff --git a/app/models/chouette/vehicle_journey_at_stops_day_offset.rb b/app/models/chouette/vehicle_journey_at_stops_day_offset.rb
index 60b8c2edf..b2cb90d11 100644
--- a/app/models/chouette/vehicle_journey_at_stops_day_offset.rb
+++ b/app/models/chouette/vehicle_journey_at_stops_day_offset.rb
@@ -1,40 +1,42 @@
-class Chouette::VehicleJourneyAtStopsDayOffset
- def initialize(at_stops)
- @at_stops = at_stops
- end
+module Chouette
+ class VehicleJourneyAtStopsDayOffset
+ def initialize(at_stops)
+ @at_stops = at_stops
+ end
- def calculate!
- arrival_offset = 0
- departure_offset = 0
+ def calculate!
+ arrival_offset = 0
+ departure_offset = 0
- @at_stops.inject(nil) do |prior_stop, stop|
- next stop if prior_stop.nil?
+ @at_stops.inject(nil) do |prior_stop, stop|
+ next stop if prior_stop.nil?
- if stop.arrival_time < prior_stop.departure_time ||
- stop.arrival_time < prior_stop.arrival_time
- arrival_offset += 1
- end
+ if stop.arrival_time < prior_stop.departure_time ||
+ stop.arrival_time < prior_stop.arrival_time
+ arrival_offset += 1
+ end
- if stop.departure_time < stop.arrival_time ||
- stop.departure_time < prior_stop.departure_time
- departure_offset += 1
- end
+ if stop.departure_time < stop.arrival_time ||
+ stop.departure_time < prior_stop.departure_time
+ departure_offset += 1
+ end
- stop.arrival_day_offset = arrival_offset
- stop.departure_day_offset = departure_offset
+ stop.arrival_day_offset = arrival_offset
+ stop.departure_day_offset = departure_offset
- stop
+ stop
+ end
end
- end
- def save
- @at_stops.each do |at_stop|
- at_stop.save
+ def save
+ @at_stops.each do |at_stop|
+ at_stop.save
+ end
end
- end
- def update
- calculate!
- save
+ def update
+ calculate!
+ save
+ end
end
end
\ No newline at end of file
diff --git a/app/models/chouette/vehicle_journey_frequency.rb b/app/models/chouette/vehicle_journey_frequency.rb
index 28619912f..53e85121f 100644
--- a/app/models/chouette/vehicle_journey_frequency.rb
+++ b/app/models/chouette/vehicle_journey_frequency.rb
@@ -1,68 +1,69 @@
module Chouette
class VehicleJourneyFrequency < Chouette::VehicleJourney
- after_initialize :fill_journey_category
+ after_initialize :fill_journey_category
- default_scope { where(journey_category: journey_categories[:frequency]) }
+ default_scope { where(journey_category: journey_categories[:frequency]) }
- has_many :journey_frequencies, dependent: :destroy, foreign_key: 'vehicle_journey_id'
- accepts_nested_attributes_for :journey_frequencies, allow_destroy: true
+ has_many :journey_frequencies, dependent: :destroy, foreign_key: 'vehicle_journey_id'
+ accepts_nested_attributes_for :journey_frequencies, allow_destroy: true
- validate :require_at_least_one_frequency
+ validate :require_at_least_one_frequency
- def self.matrix(vehicle_journeys)
- hash = {}
- vehicle_journeys.each do |vj|
- vj.journey_frequencies.each do |jf|
- next if jf.scheduled_headway_interval.hour == 0 && jf.scheduled_headway_interval.min == 0
- interval = jf.scheduled_headway_interval.hour.hours + jf.scheduled_headway_interval.min.minutes
- first_departure_time = jf.first_departure_time
- while first_departure_time <= jf.last_departure_time
- hash[first_departure_time] = vj
- first_departure_time += interval
+ def self.matrix(vehicle_journeys)
+ hash = {}
+ vehicle_journeys.each do |vj|
+ vj.journey_frequencies.each do |jf|
+ next if jf.scheduled_headway_interval.hour == 0 && jf.scheduled_headway_interval.min == 0
+ interval = jf.scheduled_headway_interval.hour.hours + jf.scheduled_headway_interval.min.minutes
+ first_departure_time = jf.first_departure_time
+ while first_departure_time <= jf.last_departure_time
+ hash[first_departure_time] = vj
+ first_departure_time += interval
+ end
end
end
+ hash.sort.to_h
end
- hash.sort.to_h
- end
- def self.matrix_interval(matrix)
- hash = prepare_matrix(matrix)
- matrix.each do |departure_time, vj|
- @base_departure_time = departure_time
- vj.vehicle_journey_at_stops.each_cons(2) { |vjas, vjas_next|
- vjas_dup = vjas.dup
- vjas_dup.departure_time = @base_departure_time
- hash[vjas.stop_point.stop_area.name][departure_time.to_i] = vjas_dup
- @base_departure_time = vjas_dup.departure_time + (vjas_next.departure_time - vjas.departure_time)
- @last_vjas_next = vjas_next.dup
- }
- # Add last stop_point
- @last_vjas_next.departure_time = @base_departure_time
- hash[@last_vjas_next.stop_point.stop_area.name][departure_time.to_i] = @last_vjas_next
+ def self.matrix_interval(matrix)
+ hash = prepare_matrix(matrix)
+ matrix.each do |departure_time, vj|
+ @base_departure_time = departure_time
+ vj.vehicle_journey_at_stops.each_cons(2) { |vjas, vjas_next|
+ vjas_dup = vjas.dup
+ vjas_dup.departure_time = @base_departure_time
+ hash[vjas.stop_point.stop_area.name][departure_time.to_i] = vjas_dup
+ @base_departure_time = vjas_dup.departure_time + (vjas_next.departure_time - vjas.departure_time)
+ @last_vjas_next = vjas_next.dup
+ }
+ # Add last stop_point
+ @last_vjas_next.departure_time = @base_departure_time
+ hash[@last_vjas_next.stop_point.stop_area.name][departure_time.to_i] = @last_vjas_next
+ end
+ hash
end
- hash
- end
- private
+ private
- def self.prepare_matrix(matrix)
- matrix.map{ |departure_time, vj|
- Hash[
- vj.vehicle_journey_at_stops.map{ |sp|
- [
- sp.stop_point.stop_area.name, Hash[matrix.map{ |departure_time2, vj2| [departure_time2.to_i, nil] }]
- ]
- }
- ]
- }.inject(&:merge)
- end
+ def self.prepare_matrix(matrix)
+ matrix.map{ |departure_time, vj|
+ Hash[
+ vj.vehicle_journey_at_stops.map{ |sp|
+ [
+ sp.stop_point.stop_area.name, Hash[matrix.map{ |departure_time2, vj2| [departure_time2.to_i, nil] }]
+ ]
+ }
+ ]
+ }.inject(&:merge)
+ end
- def fill_journey_category
- self.journey_category = :frequency
- end
+ def fill_journey_category
+ self.journey_category = :frequency
+ end
- def require_at_least_one_frequency
- errors.add(:base, I18n.t('vehicle_journey_frequency.require_at_least_one_frequency')) unless journey_frequencies.size > 0
+ def require_at_least_one_frequency
+ errors.add(:base, I18n.t('vehicle_journey_frequency.require_at_least_one_frequency')) unless journey_frequencies.size > 0
+ end
end
end
\ No newline at end of file
diff --git a/app/policies/compliance_check_set_policy.rb b/app/policies/compliance_check_set_policy.rb
index 3f715649e..171a33347 100644
--- a/app/policies/compliance_check_set_policy.rb
+++ b/app/policies/compliance_check_set_policy.rb
@@ -4,4 +4,4 @@ class ComplianceCheckSetPolicy < ApplicationPolicy
scope
end
end
-end
+end
\ No newline at end of file
diff --git a/bin/bundle b/bin/bundle
deleted file mode 100755
index 66e9889e8..000000000
--- a/bin/bundle
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-load Gem.bin_path('bundler', 'bundle')
diff --git a/bin/setup b/bin/setup
deleted file mode 100755
index acdb2c138..000000000
--- a/bin/setup
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-require 'pathname'
-
-# path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
-
-Dir.chdir APP_ROOT do
- # This script is a starting point to setup your application.
- # Add necessary setup steps to this file:
-
- puts "== Installing dependencies =="
- system "gem install bundler --conservative"
- system "bundle check || bundle install"
-
- # puts "\n== Copying sample files =="
- # unless File.exist?("config/database.yml")
- # system "cp config/database.yml.sample config/database.yml"
- # end
-
- puts "\n== Preparing database =="
- system "bin/rake db:setup"
-
- puts "\n== Removing old logs and tempfiles =="
- system "rm -f log/*"
- system "rm -rf tmp/cache"
-
- puts "\n== Restarting application server =="
- system "touch tmp/restart.txt"
-end
diff --git a/bin/webpack b/bin/webpack
deleted file mode 100755
index 9d3800c74..000000000
--- a/bin/webpack
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# This file was generated by Bundler.
-#
-# The application 'webpack' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
- Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("webpacker", "webpack")
diff --git a/bin/webpack-dev-server b/bin/webpack-dev-server
deleted file mode 100755
index cf701102a..000000000
--- a/bin/webpack-dev-server
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# This file was generated by Bundler.
-#
-# The application 'webpack-dev-server' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
- Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("webpacker", "webpack-dev-server")
diff --git a/spec/features/line_footnotes_permissions_spec.rb b/spec/features/line_footnotes_permissions_spec.rb
index 62adbfcd5..deac8e8fc 100644
--- a/spec/features/line_footnotes_permissions_spec.rb
+++ b/spec/features/line_footnotes_permissions_spec.rb
@@ -10,7 +10,7 @@ describe 'Line Footnotes', type: :feature do
describe 'permissions' do
before do
- allow_any_instance_of(LinePolicy).to receive(:update_footnote?).and_return permission
+ allow_any_instance_of(Chouette::LinePolicy).to receive(:update_footnote?).and_return permission
visit path
end
diff --git a/spec/features/lines_permissions_spec.rb b/spec/features/lines_permissions_spec.rb
index 5d53d6568..903868fae 100644
--- a/spec/features/lines_permissions_spec.rb
+++ b/spec/features/lines_permissions_spec.rb
@@ -13,8 +13,8 @@ describe "Lines", :type => :feature do
create :group_of_line
line_referential.lines << line
line_referential.organisations << Organisation.first
- allow_any_instance_of(LinePolicy).to receive(:create?).and_return permission
- allow_any_instance_of(LinePolicy).to receive(:destroy?).and_return permission
+ allow_any_instance_of(Chouette::LinePolicy).to receive(:create?).and_return permission
+ allow_any_instance_of(Chouette::LinePolicy).to receive(:destroy?).and_return permission
visit path
end
diff --git a/spec/features/referential_lines_permissions_spec.rb b/spec/features/referential_lines_permissions_spec.rb
index 0d156f0d6..bedec3d07 100644
--- a/spec/features/referential_lines_permissions_spec.rb
+++ b/spec/features/referential_lines_permissions_spec.rb
@@ -7,7 +7,7 @@ describe 'ReferentialLines', type: :feature do
context 'permissions' do
before do
- allow_any_instance_of(RoutePolicy).to receive(:create?).and_return permission
+ allow_any_instance_of(Chouette::RoutePolicy).to receive(:create?).and_return permission
visit path
end
diff --git a/spec/features/routes_permissions_spec.rb b/spec/features/routes_permissions_spec.rb
index 36c13b24a..467d8479d 100644
--- a/spec/features/routes_permissions_spec.rb
+++ b/spec/features/routes_permissions_spec.rb
@@ -11,8 +11,8 @@ describe "Routes", :type => :feature do
describe 'permissions' do
before do
@user.update(organisation: referential.organisation)
- allow_any_instance_of(RoutePolicy).to receive(:edit?).and_return permission
- allow_any_instance_of(RoutePolicy).to receive(:destroy?).and_return permission
+ allow_any_instance_of(Chouette::RoutePolicy).to receive(:edit?).and_return permission
+ allow_any_instance_of(Chouette::RoutePolicy).to receive(:destroy?).and_return permission
visit path
end
diff --git a/spec/features/time_tables_permissions_spec.rb b/spec/features/time_tables_permissions_spec.rb
index bd94a3aa1..01c7c2ed2 100644
--- a/spec/features/time_tables_permissions_spec.rb
+++ b/spec/features/time_tables_permissions_spec.rb
@@ -8,7 +8,7 @@ describe "TimeTables", :type => :feature do
describe 'permissions' do
before do
- allow_any_instance_of(TimeTablePolicy).to receive(:duplicate?).and_return permission
+ allow_any_instance_of(Chouette::TimeTablePolicy).to receive(:duplicate?).and_return permission
visit path
end
diff --git a/spec/policies/access_link_policy_spec.rb b/spec/policies/access_link_policy_spec.rb
index 6194ae55c..392ad7f92 100644
--- a/spec/policies/access_link_policy_spec.rb
+++ b/spec/policies/access_link_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe AccessLinkPolicy, type: :policy do
+RSpec.describe Chouette::AccessLinkPolicy, type: :policy do
let( :record ){ build_stubbed :access_link }
diff --git a/spec/policies/access_point_policy_spec.rb b/spec/policies/access_point_policy_spec.rb
index b6bc46eb4..8154b3d24 100644
--- a/spec/policies/access_point_policy_spec.rb
+++ b/spec/policies/access_point_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe AccessPointPolicy, type: :policy do
+RSpec.describe Chouette::AccessPointPolicy, type: :policy do
let( :record ){ build_stubbed :access_point }
diff --git a/spec/policies/company_policy_spec.rb b/spec/policies/company_policy_spec.rb
index 2d249a2be..f374e31d2 100644
--- a/spec/policies/company_policy_spec.rb
+++ b/spec/policies/company_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe CompanyPolicy, type: :policy do
+RSpec.describe Chouette::CompanyPolicy, type: :policy do
let( :record ){ build_stubbed :company }
before { stub_policy_scope(record) }
diff --git a/spec/policies/connection_link_policy_spec.rb b/spec/policies/connection_link_policy_spec.rb
index 23e40abe3..17cfdeb04 100644
--- a/spec/policies/connection_link_policy_spec.rb
+++ b/spec/policies/connection_link_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe ConnectionLinkPolicy, type: :policy do
+RSpec.describe Chouette::ConnectionLinkPolicy, type: :policy do
let( :record ){ build_stubbed :connection_link }
diff --git a/spec/policies/group_of_line_policy_spec.rb b/spec/policies/group_of_line_policy_spec.rb
index 29fbb1bfb..7a58a7f0e 100644
--- a/spec/policies/group_of_line_policy_spec.rb
+++ b/spec/policies/group_of_line_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe GroupOfLinePolicy, type: :policy do
+RSpec.describe Chouette::GroupOfLinePolicy, type: :policy do
let( :record ){ build_stubbed :group_of_line }
before { stub_policy_scope(record) }
diff --git a/spec/policies/journey_pattern_policy_spec.rb b/spec/policies/journey_pattern_policy_spec.rb
index 39f849277..a7de379a2 100644
--- a/spec/policies/journey_pattern_policy_spec.rb
+++ b/spec/policies/journey_pattern_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe JourneyPatternPolicy, type: :policy do
+RSpec.describe Chouette::JourneyPatternPolicy, type: :policy do
let( :record ){ build_stubbed :journey_pattern }
diff --git a/spec/policies/line_policy_spec.rb b/spec/policies/line_policy_spec.rb
index 334073506..d2248e750 100644
--- a/spec/policies/line_policy_spec.rb
+++ b/spec/policies/line_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe LinePolicy, type: :policy do
+RSpec.describe Chouette::LinePolicy, type: :policy do
let( :record ){ build_stubbed :line }
before { stub_policy_scope(record) }
diff --git a/spec/policies/network_policy_spec.rb b/spec/policies/network_policy_spec.rb
index ae4ffa03a..c09546c22 100644
--- a/spec/policies/network_policy_spec.rb
+++ b/spec/policies/network_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe NetworkPolicy, type: :policy do
+RSpec.describe Chouette::NetworkPolicy, type: :policy do
let( :record ){ build_stubbed :network }
before { stub_policy_scope(record) }
diff --git a/spec/policies/route_policy_spec.rb b/spec/policies/route_policy_spec.rb
index d7edceaef..df2e41a89 100644
--- a/spec/policies/route_policy_spec.rb
+++ b/spec/policies/route_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe RoutePolicy, type: :policy do
+RSpec.describe Chouette::RoutePolicy, type: :policy do
let( :record ){ build_stubbed :route }
diff --git a/spec/policies/routing_constraint_zone_policy_spec.rb b/spec/policies/routing_constraint_zone_policy_spec.rb
index 2ef15fa95..903e3671a 100644
--- a/spec/policies/routing_constraint_zone_policy_spec.rb
+++ b/spec/policies/routing_constraint_zone_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe RoutingConstraintZonePolicy, type: :policy do
+RSpec.describe Chouette::RoutingConstraintZonePolicy, type: :policy do
let( :record ){ build_stubbed :routing_constraint_zone }
diff --git a/spec/policies/stop_area_policy_spec.rb b/spec/policies/stop_area_policy_spec.rb
index 8fe59c8e3..1295ecd68 100644
--- a/spec/policies/stop_area_policy_spec.rb
+++ b/spec/policies/stop_area_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe StopAreaPolicy, type: :policy do
+RSpec.describe Chouette::StopAreaPolicy, type: :policy do
let( :record ){ build_stubbed :stop_area }
before { stub_policy_scope(record) }
diff --git a/spec/policies/time_table_policy_spec.rb b/spec/policies/time_table_policy_spec.rb
index dad3c13bc..6f1e13844 100644
--- a/spec/policies/time_table_policy_spec.rb
+++ b/spec/policies/time_table_policy_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe TimeTablePolicy, type: :policy do
+RSpec.describe Chouette::TimeTablePolicy, type: :policy do
let( :record ){ build_stubbed :time_table }
diff --git a/spec/views/routes/show.html.erb_spec.rb b/spec/views/routes/show.html.erb_spec.rb
index dae8c9ed3..ee917127f 100644
--- a/spec/views/routes/show.html.erb_spec.rb
+++ b/spec/views/routes/show.html.erb_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe "/routes/show", type: :view do
let!(:route_sp) do
assign :route_sp, ModelDecorator.decorate(
route.stop_points,
- with: StopPointDecorator
+ with: Chouette::StopPointDecorator
)
end
--
cgit v1.2.3
From f7b9b6ad5280179367c225e1d35d123bad67dcaf Mon Sep 17 00:00:00 2001
From: cedricnjanga
Date: Wed, 22 Nov 2017 12:30:38 +0100
Subject: Fix last spec and add short_id method to Netex Objectid
---
app/models/chouette/journey_pattern.rb | 2 --
app/models/chouette/objectid/netex.rb | 2 +-
app/models/chouette/objectid/stif_codifligne.rb | 4 ++++
app/models/chouette/objectid/stif_reflex.rb | 4 ++++
db/schema.rb | 4 ++--
spec/helpers/table_builder_helper_spec.rb | 8 ++++----
6 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/app/models/chouette/journey_pattern.rb b/app/models/chouette/journey_pattern.rb
index 797b6adb1..c1f9fb4f8 100644
--- a/app/models/chouette/journey_pattern.rb
+++ b/app/models/chouette/journey_pattern.rb
@@ -11,8 +11,6 @@ module Chouette
has_many :vehicle_journey_at_stops, :through => :vehicle_journeys
has_and_belongs_to_many :stop_points, -> { order("stop_points.position") }, :before_add => :vjas_add, :before_remove => :vjas_remove, :after_add => :shortcuts_update_for_add, :after_remove => :shortcuts_update_for_remove
has_many :stop_areas, through: :stop_points
- has_many :journey_pattern_sections
- has_many :route_sections, through: :journey_pattern_sections, dependent: :destroy
validates_presence_of :route
validates_presence_of :name
diff --git a/app/models/chouette/objectid/netex.rb b/app/models/chouette/objectid/netex.rb
index 7953c6b12..57415ac98 100644
--- a/app/models/chouette/objectid/netex.rb
+++ b/app/models/chouette/objectid/netex.rb
@@ -26,7 +26,7 @@ module Chouette
end
def short_id
- local_id
+ local_id.try(:split, "-").try(:first)
end
end
end
diff --git a/app/models/chouette/objectid/stif_codifligne.rb b/app/models/chouette/objectid/stif_codifligne.rb
index a1e40f0a1..903ebc2dc 100644
--- a/app/models/chouette/objectid/stif_codifligne.rb
+++ b/app/models/chouette/objectid/stif_codifligne.rb
@@ -19,6 +19,10 @@ module Chouette
def to_s
"#{self.provider_id}:#{self.sync_id}:#{self.object_type}:#{self.local_id}"
end
+
+ def short_id
+ local_id
+ end
end
end
end
\ No newline at end of file
diff --git a/app/models/chouette/objectid/stif_reflex.rb b/app/models/chouette/objectid/stif_reflex.rb
index 69a3f52fa..cd0f62298 100644
--- a/app/models/chouette/objectid/stif_reflex.rb
+++ b/app/models/chouette/objectid/stif_reflex.rb
@@ -18,6 +18,10 @@ module Chouette
def to_s
"#{self.country_code}:#{self.zip_code}:#{self.object_type}:#{self.local_id}:#{self.provider_id}"
end
+
+ def short_id
+ local_id
+ end
end
end
end
\ No newline at end of file
diff --git a/db/schema.rb b/db/schema.rb
index 830e3ca25..21aa73cd8 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20171109101605) do
+ActiveRecord::Schema.define(version: 20171114102438) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -408,9 +408,9 @@ ActiveRecord::Schema.define(version: 20171109101605) do
t.string "type"
t.integer "parent_id", limit: 8
t.string "parent_type"
- t.datetime "notified_parent_at"
t.integer "current_step", default: 0
t.integer "total_steps", default: 0
+ t.datetime "notified_parent_at"
t.string "creator"
end
diff --git a/spec/helpers/table_builder_helper_spec.rb b/spec/helpers/table_builder_helper_spec.rb
index de81a85af..3b0a18379 100644
--- a/spec/helpers/table_builder_helper_spec.rb
+++ b/spec/helpers/table_builder_helper_spec.rb
@@ -37,7 +37,7 @@ describe TableBuilderHelper, type: :helper do
referentials = ModelDecorator.decorate(
referentials,
- with: Chouette::ReferentialDecorator
+ with: ReferentialDecorator
)
expected = <<-HTML
@@ -214,7 +214,7 @@ describe TableBuilderHelper, type: :helper do