ninoxe 1.0.1 → 1.0.2

data/app/models/chouette/journey_pattern.rb

@@ -8,6 +8,8 @@ class Chouette::JourneyPattern < Chouette::TridentActiveRecord
   has_and_belongs_to_many :stop_points, :class_name => 'Chouette::StopPoint', :order => 'stop_points.position', :before_add => :vjas_add, :before_remove => :vjas_remove, :after_add => :shortcuts_update_for_add, :after_remove => :shortcuts_update_for_remove
 
   attr_accessible :route_id, :objectid, :object_version, :creation_time, :creator_id, :name, :comment, :registration_number, :published_name, :departure_stop_point_id, :arrival_stop_point_id, :stop_point_ids, :stop_points
+
+  validates_presence_of :route
   
   # TODO: this a workarround
   # otherwise, we loose the first stop_point 
@@ -33,7 +35,7 @@ class Chouette::JourneyPattern < Chouette::TridentActiveRecord
     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),
+    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)
@@ -42,7 +44,7 @@ class Chouette::JourneyPattern < Chouette::TridentActiveRecord
     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),
+    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)

data/app/models/chouette/route.rb

@@ -21,7 +21,7 @@ class Chouette::Route < Chouette::TridentActiveRecord
     end
   end
   belongs_to :opposite_route, :class_name => 'Chouette::Route', :foreign_key => :opposite_route_id
-  has_many :stop_points, inverse_of: :route, :order => 'position', :dependent => :destroy do
+  has_many :stop_points, :order => 'position', :dependent => :destroy do
     def find_by_stop_area(stop_area)
       stop_area_ids = Integer === stop_area ? [stop_area] : (stop_area.children_in_depth + [stop_area]).map(&:id)
       where( :stop_area_id => stop_area_ids).first or

data/app/models/chouette/time_table.rb

@@ -5,7 +5,9 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord
   attr_accessible :objectid, :object_version, :creation_time, :creator_id, :version, :comment
   attr_accessible :int_day_types,:monday,:tuesday,:wednesday,:thursday,:friday,:saturday,:sunday
   attr_accessible :start_date, :end_date
+  attr_accessible :school_holliday,:public_holliday,:market_day
   attr_accessor :monday,:tuesday,:wednesday,:thursday,:friday,:saturday,:sunday
+  attr_accessor :school_holliday,:public_holliday,:market_day
 
   has_many :dates, inverse_of: :time_table, :validate => :true, :class_name => "Chouette::TimeTableDate", :order => :date, :dependent => :destroy, :after_add => :shortcuts_update, :after_remove => :shortcuts_update
   has_many :periods, inverse_of: :time_table, :validate => :true, :class_name => "Chouette::TimeTablePeriod", :order => :period_start, :dependent => :destroy, :after_add => :shortcuts_update, :after_remove => :shortcuts_update
@@ -183,6 +185,15 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord
   def sunday
     day_by_mask(256)
   end
+  def school_holliday
+    day_by_mask(512)
+  end  
+  def public_holliday
+    day_by_mask(1024)
+  end  
+  def market_day
+    day_by_mask(2048)
+  end  
   
   def set_day(day,flag)
     if (day == '1') 
@@ -214,6 +225,15 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord
   def sunday=(day)
     set_day(day,256)
   end
-  
+  def school_holliday=(day)
+    set_day(day,512)
+  end  
+  def public_holliday=(day)
+    set_day(day,1024)
+  end  
+  def market_day=(day)
+    set_day(day,2048)
+  end  
+
 end
 

data/lib/ninoxe/version.rb

@@ -1,3 +1,3 @@
 module Ninoxe
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/ninoxe.rb

@@ -2,6 +2,7 @@ require "ninoxe/engine"
 
 require "acts_as_list"
 require "foreigner"
+require "acts_as_tree"
 
 module Ninoxe
 end

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: ninoxe
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
 - Marc Florisson
 - Michel Etienne
 - Luc Donnet
+- Zakaria Bouziane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-14 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: georuby-ext
@@ -39,7 +40,7 @@ dependencies:
         version: 3.1.3
     - - <
       - !ruby/object:Gem::Version
-        version: 3.2.14
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -50,13 +51,13 @@ dependencies:
         version: 3.1.3
     - - <
       - !ruby/object:Gem::Version
-        version: 3.2.14
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.6
   type: :runtime
@@ -64,9 +65,25 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.6
+- !ruby/object:Gem::Dependency
+  name: acts_as_tree
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: foreigner
   requirement: !ruby/object:Gem::Requirement
@@ -88,7 +105,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
@@ -96,7 +113,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
@@ -184,25 +201,25 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.2
 - !ruby/object:Gem::Dependency
-  name: shoulda-matchers
+  name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.6
+        version: 2.14.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -210,23 +227,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.6
+        version: 2.14.6
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.9
+        version: 1.5.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.9
+        version: 1.5.6
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -248,22 +265,29 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.0'
 description: This library provides a model to navigate through Chouette database.
 email:
 - mflorisson@cityway.fr
 - metienne@cityway.fr
 - ldonnet@cityway.fr
+- zbouziane@cityway.fr
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -390,7 +414,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 648832328759611835
+      hash: 4466989225262963059
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -399,7 +423,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 648832328759611835
+      hash: 4466989225262963059
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23