ninoxe 1.1.3 → 1.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTVmYzlhODAxNTc2NDUyNzA3ZjBlYTIwYTM2NDE2ODk4MWFhZmIzMA==
+    MmJlMTlmNjY1MmU2ZGY1OGRjOTZhYTI0ZWY5NDA4NDg4MWI3MTg3Nw==
   data.tar.gz: !binary |-
-    ZTJmOTZlMmMwYTY0ZmEyMzM3YmEzOGE3MGRmZjdkMWMxNTk2MjNiZg==
+    NzE5YjQ5Mjk2YjNmNTdlY2E5ODdjNTEyMzhhNThmZWMwNThmMTIzOQ==
 SHA512:
   metadata.gz: !binary |-
-    ZWExMzk3Nzk1MWYwMDgwNWY5NDY2Njk2Y2ZmOGM2MjNlMGI3NTM3OGE2MTgz
-    OWRmYzE5NzQ5MGZmNTk4YzUzMWE2ZjQyZGQyY2Y5MmRjMjZkNmNiYTRmNzQz
-    Y2M2MmE2ZGU5YjM4MjJlNDdjYWNlZjc0MWQ1Y2E3YzRkOTQxNjA=
+    MzNiODQxYjE0NzY4Yzk5NzkxNDNhMjI4ODdmYmRmMmFjY2FmOWE2MGZjNWFi
+    MDU4ZTJhZDBiNDllYmI1YzZhNTFkYmIxOTIyYWYxYzNkNGVhN2FjNzFhYzM1
+    ZDQ3OWY0MzkwOTkxNWJmOTM4MmIyYzZlZjkwZTRlZTRmNzNmMDE=
   data.tar.gz: !binary |-
-    NmZiZmY3Zjc3MTRhOTg2ODQ1MTcyMjU5NTIxYTlhZTVkNjE1M2VlMzdkMzgy
-    NTQ1ZjdiN2MwOWE4ZjVlZTgyMTg0ZGVhZmMwOTFhNGE5YmRjYmUxYzFjNjE1
-    MmNjNWJjNWQ4YWQ0ZDY3ZmRhNzRiNjdkZTJhZmEwMWVjZDE1NDE=
+    ZjM2YmM1Zjk4YWE1MDU3MGIwZjJlYTdiZTVhY2E1ZGQxMDc2ZGI0OWM0NWVh
+    ZGVkZTBjZThhZDI2NGE0ZmY5NDBlZDI1ZGFlNTA1Nzc4YjFiOWExNmRjYzk3
+    YjQ0ZmJlNWI1N2JiNGMxMzhjYTQ1MDVhYzEyZTRmODUwNmJlNjM=

data/app/models/chouette/for_alighting_enumerations.rb

@@ -0,0 +1,8 @@
+module Chouette
+  module ForAlightingEnumerations
+    extend Enumerize
+    extend ActiveModel::Naming
+    
+    enumerize :for_alighting, in: %w[normal forbidden request_stop is_flexible]
+  end
+end

data/app/models/chouette/for_boarding_enumerations.rb

@@ -0,0 +1,8 @@
+module Chouette
+  module ForBoardingEnumerations
+    extend Enumerize
+    extend ActiveModel::Naming
+
+    enumerize :for_boarding, in: %w[normal forbidden request_stop is_flexible]
+  end
+end

data/app/models/chouette/group_of_line.rb

@@ -6,7 +6,7 @@ class Chouette::GroupOfLine < Chouette::TridentActiveRecord
 
   validates_presence_of :name
 
-  attr_accessible :objectid, :object_version, :creation_time, :creator_id, :name, :comment, :lines  
+  attr_accessible :objectid, :object_version, :creation_time, :creator_id, :name, :comment, :lines, :registration_number 
   attr_accessible :line_tokens
   attr_reader :line_tokens
   

data/app/models/chouette/stop_point.rb

@@ -1,39 +1,43 @@
-class Chouette::StopPoint < Chouette::TridentActiveRecord
-  # FIXME http://jira.codehaus.org/browse/JRUBY-6358
-  self.primary_key = "id"
-
-  belongs_to :stop_area
-  belongs_to :route, inverse_of: :stop_points
-  acts_as_list :scope => 'route_id = \'#{route.id}\'',:top_of_list => 0
-
-  attr_accessible :route_id, :stop_area_id, :objectid, :object_version, :creation_time, :creator_id, :position
-
-  has_many :vehicle_journey_at_stops, :dependent => :destroy
-  has_many :vehicle_journeys, :through => :vehicle_journey_at_stops, :uniq => true
-
-  before_destroy :remove_dependent_journey_pattern_stop_points
-
-  validates_presence_of :stop_area
-  validate :stop_area_id_validation
-
-  scope :default_order, order("position")
+module Chouette
+  class StopPoint < TridentActiveRecord
+    include ForBoardingEnumerations
+    include ForAlightingEnumerations
+    
+    # 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, :through => :vehicle_journey_at_stops, :uniq => true
+    
+    acts_as_list :scope => 'route_id = \'#{route.id}\'',:top_of_list => 0
+
+    attr_accessible :route_id, :stop_area_id, :objectid, :object_version, :creation_time, :creator_id, :position, :for_boarding, :for_alighting
+
+    validates_presence_of :stop_area
+    validate :stop_area_id_validation
+
+    scope :default_order, order("position")
+    
+    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 stop_area_id_validation
+    def stop_area_id_validation
       if stop_area_id.nil?
-          errors.add(:stop_area_id, I18n.t("errors.messages.empty"))
+        errors.add(:stop_area_id, I18n.t("errors.messages.empty"))
       end
-  end
-
-  def self.area_candidates
-    Chouette::StopArea.where( :area_type => ['Quay', 'BoardingPosition'])
-  end
+    end
 
-  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
+    def self.area_candidates
+      Chouette::StopArea.where( :area_type => ['Quay', 'BoardingPosition'])
     end
-  end
 
+  end
 end

data/app/models/chouette/vehicle_journey_at_stop.rb

@@ -1,45 +1,49 @@
-class Chouette::VehicleJourneyAtStop < Chouette::ActiveRecord
-  self.primary_key = "id"
-  
-  belongs_to :stop_point
-  belongs_to :vehicle_journey
-
-  after_initialize :set_virtual_attributes
-
-  attr_accessor :_destroy
-  attr_accessible :vehicle_journey_id, :stop_point_id, :connecting_service_id, :boarding_alighting_possibility, :arrival_time, :departure_time, :waiting_time, :elapse_duration, :headway_frequency, :_destroy, :stop_point
-
-  validate :arrival_must_be_before_departure
-
-  def arrival_must_be_before_departure
-    # security against nil values
-    return unless arrival_time && departure_time
-
-    if exceeds_gap?( arrival_time, departure_time) 
-      errors.add(:arrival_time,I18n.t("activerecord.errors.models.vehicle_journey_at_stop.arrival_must_be_before_departure"))
+module Chouette
+  class VehicleJourneyAtStop < ActiveRecord
+    include ForBoardingEnumerations
+    include ForAlightingEnumerations
+
+    # FIXME http://jira.codehaus.org/browse/JRUBY-6358
+    self.primary_key = "id"
+    
+    belongs_to :stop_point
+    belongs_to :vehicle_journey
+
+    attr_accessor :_destroy
+    attr_accessible :vehicle_journey_id, :stop_point_id, :connecting_service_id, :boarding_alighting_possibility, :arrival_time, :departure_time, :waiting_time, :elapse_duration, :headway_frequency, :_destroy, :stop_point, :for_boarding, :for_alighting
+
+    validate :arrival_must_be_before_departure
+    def arrival_must_be_before_departure
+      # security against nil values
+      return unless arrival_time && departure_time
+
+      if exceeds_gap?( 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
-
-  def increasing_times_validate( previous)
-    result = true
-    return result unless previous
-
-    if exceeds_gap?( previous.departure_time, departure_time)
-      result = false
-      errors.add( :departure_time, 'departure time gap overflow')
+    
+    after_initialize :set_virtual_attributes
+    def set_virtual_attributes
+      @_destroy = false
     end
-    if exceeds_gap?( previous.arrival_time, arrival_time)
-      result = false
-      errors.add( :arrival_time, 'arrival time gap overflow')
+
+    def increasing_times_validate( previous)
+      result = true
+      return result unless previous
+
+      if exceeds_gap?( previous.departure_time, departure_time)
+        result = false
+        errors.add( :departure_time, 'departure time gap overflow')
+      end
+      if exceeds_gap?( previous.arrival_time, arrival_time)
+        result = false
+        errors.add( :arrival_time, 'arrival time gap overflow')
+      end
+      result
     end
-    result
-  end
-  def exceeds_gap?( first, second)
-    3600 < ( ( second-first)%( 3600 * 24))
-  end
+    def exceeds_gap?( first, second)
+      3600 < ( ( second-first)%( 3600 * 24))
+    end  
 
-  def set_virtual_attributes
-    @_destroy = false
   end
-
 end

data/db/migrate/20141210123519_add_boarding_and_alighting_to_stop_point.rb

@@ -0,0 +1,9 @@
+class AddBoardingAndAlightingToStopPoint < ActiveRecord::Migration
+  def change
+    add_column :stop_points, :for_boarding, :string
+    add_column :stop_points, :for_alighting, :string
+
+    add_column :vehicle_journey_at_stops, :for_boarding, :string
+    add_column :vehicle_journey_at_stops, :for_alighting, :string
+  end
+end

data/db/migrate/20141216084607_add_registration_number_to_group_of_lines.rb

@@ -0,0 +1,5 @@
+class AddRegistrationNumberToGroupOfLines < ActiveRecord::Migration
+  def change
+    add_column :group_of_lines, :registration_number, :string
+  end
+end

data/lib/factories/chouette_group_of_lines.rb

@@ -1,4 +1,5 @@
 Factory.define :group_of_line, :class => "Chouette::GroupOfLine" do |group_of_line|
   group_of_line.sequence(:name) { |n| "Group Of Line #{n}" }
   group_of_line.sequence(:objectid) { |n| "test:GroupOfLine:#{n}" }
+  group_of_line.sequence(:registration_number) { |n| "#{n}" }
 end

data/lib/ninoxe/version.rb

@@ -1,3 +1,3 @@
 module Ninoxe
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

data/lib/ninoxe.rb

@@ -4,6 +4,7 @@ require "acts_as_list"
 require "foreigner"
 require "acts_as_tree"
 require "acts-as-taggable-on"
+require "enumerize"
 
 module Ninoxe
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ninoxe
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Marc Florisson
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-27 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: georuby-ext
@@ -111,6 +111,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: enumerize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -295,6 +309,8 @@ files:
 - app/models/chouette/direction.rb
 - app/models/chouette/exporter.rb
 - app/models/chouette/file_validator.rb
+- app/models/chouette/for_alighting_enumerations.rb
+- app/models/chouette/for_boarding_enumerations.rb
 - app/models/chouette/group_of_line.rb
 - app/models/chouette/journey_pattern.rb
 - app/models/chouette/line.rb
@@ -378,6 +394,8 @@ files:
 - db/migrate/20141017075349_add_gtfs_fields_to_companies.rb
 - db/migrate/20141017075515_add_gtfs_fields_to_stop_areas.rb
 - db/migrate/20141017075627_add_gtfs_fields_to_lines.rb
+- db/migrate/20141210123519_add_boarding_and_alighting_to_stop_point.rb
+- db/migrate/20141216084607_add_registration_number_to_group_of_lines.rb
 - lib/chouette_factories.rb
 - lib/factories/chouette_access_links.rb
 - lib/factories/chouette_access_points.rb