ninoxe 1.2.1 → 1.2.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjIyZGZjMWU1NGQzMzYxOWIzNDQzOTU5YmYwNGFjZjhjZTU3Y2YwYw==
-  data.tar.gz: !binary |-
-    ZGIwOGEyODc1NWRkMWNiMDRjYTZjN2I2NDU3NTJlNjExNDhkNWZhYw==
+SHA1:
+  metadata.gz: 1b81f829d1bf9dc4cc382c97655e09affb023d23
+  data.tar.gz: f4273f82565d1325c847b4261fca28165632457e
 SHA512:
-  metadata.gz: !binary |-
-    ZTBhYjA0MzcxZmQ2ODExNmNlZDIyMjNiZjUzZmZhZDgwNjczODgwMWU3Mzhm
-    NjlkMWY1Yzg3NGEzYTk4MzU1ZWExODU1OGNlYTJhYWUyMjU0MmE2ZjRiZDU0
-    MmE4MjA4MTFhZmY0ZGVlOTc1ZTQzYTIyOWNiMDQxNDU2NmJmYWU=
-  data.tar.gz: !binary |-
-    ZDczOTVjNTJlN2I0NjVlNTI3ZTY1YmI2MzlkNzU5Y2E2ZGY5MTAxYzZhMDBh
-    NGUwZDM3NjYxZmE5N2IxNTI4MjEyOTRhYTcyMzdkZTBlYzhmYTBjNTJmYWY3
-    MDVkOGZjN2RhOWI4YmE5NTFlNmI2OTkxMjQxMGJiYzgxNGIxMzg=
+  metadata.gz: 73b387e179b5511078c5000914110685f18d1fc096a68da061ce9e53de5bfca71ca3173eef844c3ac2d28c6845cc78a4073468d56c188173ad9c04f159166166
+  data.tar.gz: 93eaa3f2d445a187caa8ab73ae1bb40e30ac41374922804396b8263e43e812738ea86f808ffa51c7e0925d4f090552cf1a7a2e43e2854dfb1dab32735ac9d647

data/app/models/chouette/access_link.rb

@@ -16,9 +16,13 @@ module Chouette
     belongs_to :stop_area, :class_name => 'Chouette::StopArea'
 
     validates_presence_of :name
-    validates_presence_of :link_type
     validates_presence_of :link_orientation
 
+    def self.nullable_attributes
+      [:link_distance, :default_duration, :frequent_traveller_duration, :occasional_traveller_duration,
+        :mobility_restricted_traveller_duration]
+    end
+
     def access_link_type
       link_type && Chouette::ConnectionLinkType.new(link_type.underscore)
     end

data/app/models/chouette/company.rb

@@ -1,8 +1,7 @@
 class Chouette::Company < Chouette::TridentActiveRecord
   has_many :lines
 
-  validates_presence_of :registration_number
-  validates_format_of :registration_number, :with => %r{\A[0-9A-Za-z_-]+\Z}
+  validates_format_of :registration_number, :with => %r{\A[0-9A-Za-z_-]+\Z}, :allow_nil => true, :allow_blank => true
 
   validates_presence_of :name
 

data/app/models/chouette/connection_link.rb

@@ -12,7 +12,11 @@ class Chouette::ConnectionLink < Chouette::TridentActiveRecord
   belongs_to :arrival, :class_name => 'Chouette::StopArea'
 
   validates_presence_of :name
-  validates_presence_of :link_type
+
+  def self.nullable_attributes
+    [:link_distance, :default_duration, :frequent_traveller_duration, :occasional_traveller_duration,
+      :mobility_restricted_traveller_duration]
+  end
 
   def connection_link_type
     link_type && Chouette::ConnectionLinkType.new( link_type.underscore)

data/app/models/chouette/line.rb

@@ -29,8 +29,8 @@ class Chouette::Line < Chouette::TridentActiveRecord
   validates_presence_of :network
   validates_presence_of :company
 
-  validates_presence_of :registration_number
-  validates_format_of :registration_number, :with => %r{\A[\d\w_\-]+\Z}
+  validates_format_of :registration_number, :with => %r{\A[\d\w_\-]+\Z}, :allow_nil => true, :allow_blank => true
+  validates_format_of :stable_id, :with => %r{\A[\d\w_\-]+\Z}, :allow_nil => true, :allow_blank => true
   validates_format_of :url, :with => %r{\Ahttps?:\/\/([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?\Z}, :allow_nil => true, :allow_blank => true
   validates_format_of :color, :with => %r{\A[0-9a-fA-F]{6}\Z}, :allow_nil => true, :allow_blank => true
   validates_format_of :text_color, :with => %r{\A[0-9a-fA-F]{6}\Z}, :allow_nil => true, :allow_blank => true
@@ -38,7 +38,7 @@ class Chouette::Line < Chouette::TridentActiveRecord
   validates_presence_of :name
 
   def self.nullable_attributes
-    [:published_name, :number, :comment, :url, :color, :text_color]
+    [:published_name, :number, :comment, :url, :color, :text_color, :stable_id]
   end
 
   def geometry_presenter

data/app/models/chouette/network.rb

@@ -4,8 +4,9 @@ class Chouette::Network < Chouette::TridentActiveRecord
 
   has_many :lines
 
-  validates_presence_of :registration_number
-  validates_format_of :registration_number, :with => %r{\A[0-9A-Za-z_-]+\Z}
+  attr_accessor :source_type_name
+
+  validates_format_of :registration_number, :with => %r{\A[0-9A-Za-z_-]+\Z}, :allow_nil => true, :allow_blank => true
 
   validates_presence_of :name
 
@@ -13,7 +14,7 @@ class Chouette::Network < Chouette::TridentActiveRecord
   # attr_accessible :registration_number, :source_name, :source_type, :source_identifier, :comment
 
   def self.object_id_key
-    "GroupOfLine"
+    "PTNetwork"
   end
 
   def self.nullable_attributes
@@ -28,5 +29,22 @@ class Chouette::Network < Chouette::TridentActiveRecord
     Chouette::StopArea.joins(:stop_points => [:route => [:line => :network] ]).where(:networks => {:id => self.id})
   end
 
+  def source_type_name
+    # return nil if source_type is nil
+    source_type && Chouette::SourceType.new( source_type.underscore)
+  end
+
+  def source_type_name=(source_type_name)
+    self.source_type = (source_type_name ? source_type_name.camelcase : nil)
+  end
+
+  @@source_type_names = nil
+  def self.source_type_names
+    @@source_type_names ||= Chouette::SourceType.all.select do |source_type_name|
+      source_type_name.to_i > 0
+    end
+  end
+
+
 end
 

data/app/models/chouette/source_type.rb

@@ -0,0 +1,56 @@
+class Chouette::SourceType < ActiveSupport::StringInquirer
+
+  def initialize(text_code, numerical_code)
+    super text_code.to_s
+    @numerical_code = numerical_code
+  end
+
+  def self.new(text_code, numerical_code = nil)
+    if text_code and numerical_code
+      super
+    elsif self === text_code 
+      text_code
+    else
+      if Fixnum === text_code
+        text_code, numerical_code = definitions.rassoc(text_code)
+      else
+        text_code, numerical_code = definitions.assoc(text_code.to_s)
+      end
+
+      super text_code, numerical_code
+    end
+  end
+
+  def to_i
+    @numerical_code
+  end
+
+  def inspect
+    "#{to_s}/#{to_i}"
+  end
+
+  def name
+    camelize
+  end
+
+  @@definitions = [
+    ["public_and_private_utilities", 0],
+    ["road_authorities", 1],
+    ["transit_operator", 2],
+    ["public_transport", 3],
+    ["passenger_transport_coordinating_authority", 4],
+    ["travel_information_service_provider", 5],
+    ["travel_agency", 6],
+    ["individual_subject_of_travel_itinerary", 7],
+    ["other_information", 8]
+  ]
+  cattr_reader :definitions
+
+  @@all = nil
+  def self.all
+    @@all ||= definitions.collect do |text_code, numerical_code|
+      new(text_code, numerical_code)
+    end
+  end
+
+end

data/app/models/chouette/trident_active_record.rb

@@ -84,11 +84,10 @@ class Chouette::TridentActiveRecord < Chouette::ActiveRecord
     if !self.objectid.valid?
       #errors.add(:objectid, "is not a valid ObjectId object")
       errors.add(:objectid,I18n.t("activerecord.errors.models.trident.invalid_object_id",:type => self.class.object_id_key))
-    else
-      unless self.objectid.object_type==self.class.object_id_key
-        #errors.add(:objectid, "doesn't have expected object_type: #{self.class.object_id_key}")
-        errors.add(:objectid,I18n.t("activerecord.errors.models.trident.invalid_object_id_type",:type => self.class.object_id_key))
-      end
+#    else
+#      unless self.objectid.object_type==self.class.object_id_key
+#        errors.add(:objectid,I18n.t("activerecord.errors.models.trident.invalid_object_id_type",:type => self.class.object_id_key))
+#      end
     end
   end
   

data/db/migrate/20150922093109_add_stable_id_to_line.rb

@@ -0,0 +1,7 @@
+class AddStableIdToLine < ActiveRecord::Migration
+  def change
+    change_table :lines do |t|
+      t.string :stable_id
+    end
+  end
+end

data/lib/ninoxe/version.rb

@@ -1,3 +1,3 @@
 module Ninoxe
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ninoxe
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Marc Florisson
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: georuby-ext
@@ -31,42 +31,42 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.1
 - !ruby/object:Gem::Dependency
   name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: acts_as_tree
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
@@ -87,182 +87,182 @@ dependencies:
   name: deep_cloneable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: enumerize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-migrate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.6
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.1
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.1
 description: This library provides a model to navigate through Chouette database.
@@ -307,6 +307,7 @@ files:
 - app/models/chouette/object_id.rb
 - app/models/chouette/pt_link.rb
 - app/models/chouette/route.rb
+- app/models/chouette/source_type.rb
 - app/models/chouette/stop_area.rb
 - app/models/chouette/stop_point.rb
 - app/models/chouette/time_table.rb
@@ -385,6 +386,7 @@ files:
 - db/migrate/20150119160029_create_vehicle_journey_footnotes.rb
 - db/migrate/20150526075108_add_foreign_key_to_routes.rb
 - db/migrate/20150630135517_remove_uniqueness_for_registration_number.rb
+- db/migrate/20150922093109_add_stable_id_to_line.rb
 - lib/chouette_factories.rb
 - lib/ninoxe.rb
 - lib/ninoxe.rb~
@@ -399,17 +401,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Library dedicated to Chouette access.