ninoxe 1.1.1 → 1.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjI5NWI3ODA1YWU1ZDQyNGNlNmE5NGRiOWFlOWJhMTczYjk1MDA1OQ==
+    M2JhZTNmODI3ZDYwMDQyODJjZWVmNDVmZTU4ZTFjYmNlNjZlMmU5MA==
   data.tar.gz: !binary |-
-    YjM0Nzg2MjNmMDI4YTM3NDJlNjY0ODkxNDAzMmRjMGIzODYzYTM5OQ==
+    YzZlYWNlOGIwMzE3ZDQwZGM3ZmU5YWNlODEzMWYyODNkZGUyYWQ2MA==
 SHA512:
   metadata.gz: !binary |-
-    MjA4M2E1NjkxMDg5Zjk2N2YwYjNlZGY0ZTZjYWU1NDZkNDIyNTQ2YTIyZTQ4
-    MTJlOWRmMWM4YTFjNjc4YjUzNTNjZDdjMzQyYjUyYjJhMmNmMWQzN2Y0NDlh
-    YzU3ZTM3NjczN2RkYTM4ZTk0YzQyYjExYWUxNTlkNzkyMWNiMzU=
+    ZjYzNWFmNjQ5Yzk1Njg2NzRjMWRhMTJjMzA0ZDZjZDc3MThjNzE1MzNhOTU2
+    NjM5NjE3ZWIyOWQyYTcyOTZmZGZjOWNjYWM2ZTRiZjA4YTAwZDA1NzhhNzU1
+    OWZkN2I0MWRjNmY1ZTU0MDFkOWE1MDM2MmE0ZDg1NzEwMjMxOTQ=
   data.tar.gz: !binary |-
-    YWM1MmUwY2IwMmVkYmIxZjM1MGUxMjNkY2U4MWM5NTRhM2Y3ZWYwZjRlMDBm
-    NjIzYmNlNjk4N2E1YWEwM2MwZjI5ZDdkYmRkNGY1ZWViNmY1NmY2Y2IzNGEz
-    ZGU3ZTYzNTAwMTJlNjZiMjc4ZGM5YWI2YmMxMTQ3MTkxZGJmMzc=
+    OGZlN2JkNmQ0YjVjZmFlZDg1OTNhM2RiYzE1MjllYjhkM2Y0N2Q5NjY0OTBk
+    Njk1MzNkYzA0MzkyZmU2ZjFlOGEzODc0MGUzOTU3MjFlMjVkZTJiZWExYWE1
+    MDBlODk3ZGJiOTEzZjc5YjljNDA4Y2QwZTc5MDgyNDVlZTY1OGE=

data/app/models/chouette/time_table.rb

@@ -17,8 +17,10 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord
 
   has_and_belongs_to_many :vehicle_journeys, :class_name => 'Chouette::VehicleJourney'
 
-  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
+  has_many :dates, inverse_of: :time_table, :validate => :true, :class_name => "Chouette::TimeTableDate", :order => :date, :dependent => :destroy
+  has_many :periods, inverse_of: :time_table, :validate => :true, :class_name => "Chouette::TimeTablePeriod", :order => :period_start, :dependent => :destroy
+
+  after_save :save_shortcuts
 
   def self.object_id_key
     "Timetable"
@@ -39,6 +41,12 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord
     [Chouette::TimeTable.maximum(:end_date)].compact.max
   end
 
+  def save_shortcuts
+      shortcuts_update
+      self.update_column(:start_date, start_date)
+      self.update_column(:end_date, end_date)
+  end
+
   def shortcuts_update(date=nil)
     dates_array = bounding_dates
     #if new_record?

data/app/models/chouette/time_table_date.rb

@@ -8,14 +8,9 @@ class Chouette::TimeTableDate < Chouette::ActiveRecord
 
   attr_accessible :date, :position, :time_table_id, :time_table, :in_out
 
-  after_update :update_parent
-
   def self.model_name
     ActiveModel::Name.new Chouette::TimeTableDate, Chouette, "TimeTableDate"
   end
 
-  def update_parent
-    time_table.shortcuts_update
-  end
 end
 

data/app/models/chouette/time_table_period.rb

@@ -10,7 +10,6 @@ class Chouette::TimeTablePeriod < Chouette::ActiveRecord
   
   validate :start_must_be_before_end
 
-  after_update :update_parent
   
   def self.model_name
     ActiveModel::Name.new Chouette::TimeTablePeriod, Chouette, "TimeTablePeriod"
@@ -25,11 +24,7 @@ class Chouette::TimeTablePeriod < Chouette::ActiveRecord
       errors.add(:period_end,I18n.t("activerecord.errors.models.time_table_period.start_must_be_before_end"))
     end
   end
-  
-  def update_parent
-    time_table.shortcuts_update
-  end
-  
+    
   def copy
     Chouette::TimeTablePeriod.new(:period_start => self.period_start,:period_end => self.period_end)
   end

data/lib/factories/chouette_time_table.rb

@@ -18,5 +18,6 @@ Factory.define :time_table, :class => "Chouette::TimeTable" do |time_table|
       start_date = start_date + 20
       end_date = start_date + 10
     end
+    t.save_shortcuts
   }
 end

data/lib/ninoxe/version.rb

@@ -1,3 +1,3 @@
 module Ninoxe
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ninoxe
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Marc Florisson
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-14 00:00:00.000000000 Z
+date: 2014-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: georuby-ext