ninoxe 1.0.3 → 1.1.0

data/app/models/chouette/time_table_period.rb

@@ -25,7 +25,23 @@ 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
+  
+  # Test to see if a period overlap this period
+  def overlap?(p)
+     (p.period_start >= self.period_start && p.period_start <= self.period_end) || (p.period_end >= self.period_start && p.period_end <= self.period_end)
+  end
+
+  # Test to see if a period is included in this period
+  def contains?(p)
+     (p.period_start >= self.period_start && p.period_end <= self.period_end)
+  end
+  
 end

data/app/models/chouette/trident_active_record.rb

@@ -19,12 +19,13 @@ class Chouette::TridentActiveRecord < Chouette::ActiveRecord
     def prepare_auto_columns
       # logger.info 'calling before_validation'
       # logger.info 'start before_validation : '+self.objectid.to_s
-      if self.objectid.blank?
+      if self.objectid.nil? || self.objectid.blank?
         # if empty, generate a pending objectid which will be completed after creation
         if self.id.nil?
            self.objectid = "#{prefix}:#{self.class.object_id_key}:__pending_id__#{rand(1000)}"
         else
            self.objectid = "#{prefix}:#{self.class.object_id_key}:#{self.id}"
+           fix_uniq_objectid
         end
       elsif not self.objectid.include? ':'
         # if one token : technical token : completed by prefix and key
@@ -51,11 +52,25 @@ class Chouette::TridentActiveRecord < Chouette::ActiveRecord
       end
     end  
     
+    def fix_uniq_objectid
+        base_objectid = self.objectid.rpartition(":").first
+        self.objectid = "#{base_objectid}:#{self.id}"
+        if !self.valid?
+          base_objectid="#{self.objectid}_"
+          cnt=1
+          while !self.valid? 
+            self.objectid = "#{base_objectid}#{cnt}"
+            cnt += 1
+          end
+        end
+      
+    end
+    
     def build_objectid
       #logger.info 'start after_create : '+self.objectid
       if self.objectid.include? ':__pending_id__'
-        base_objectid = self.objectid.rpartition(":").first
-        self.update_attributes( :objectid => "#{base_objectid}:#{self.id}", :object_version => (self.object_version - 1) )
+        fix_uniq_objectid
+        self.update_attributes( :objectid => self.objectid, :object_version => (self.object_version - 1) )
       end
       #logger.info 'end after_create : '+self.objectid
     end
@@ -76,6 +91,15 @@ class Chouette::TridentActiveRecord < Chouette::ActiveRecord
       end
     end
   end
+  
+  def uniq_objectid
+    i = 0
+    baseobjectid = self.objectid
+    while self.class.exists?(:objectid => self.objectid) 
+      i += 1
+      self.objectid = baseobjectid+"_"+i.to_s
+    end
+  end
 
   def self.model_name
     ActiveModel::Name.new self, Chouette, self.name.demodulize

data/app/models/chouette/vehicle_journey.rb

@@ -6,7 +6,7 @@ class Chouette::VehicleJourney < Chouette::TridentActiveRecord
   attr_accessor :transport_mode_name
   attr_accessible :route_id, :journey_pattern_id, :time_slot_id, :company_id, :objectid, :object_version, :creation_time, :creator_id, :comment, :status_value
   attr_accessible :route, :transport_mode,:transport_mode_name, :published_journey_name, :published_journey_identifier, :facility, :vehicle_type_identifier, :number
-  attr_accessible :vehicle_journey_at_stops_attributes, :time_table_tokens, :time_tables
+  attr_accessible :vehicle_journey_at_stops_attributes, :time_table_tokens, :time_tables, :mobility_restricted_suitability, :flexible_service
   attr_reader :time_table_tokens
 
   def self.nullable_attributes

data/config/locales/en.yml

@@ -1,5 +1,6 @@
 en:
   activerecord:
+    copy: "Copy of %{name}"
     errors:
       models:
         trident:

data/config/locales/fr.yml

@@ -1,5 +1,6 @@
 fr:
   activerecord:
+    copy: "Copie de %{name}"
     errors:
       models:
         trident:

data/db/migrate/20140617131630_add_on_demand_transportation_to_line.rb

@@ -0,0 +1,5 @@
+class AddOnDemandTransportationToLine < ActiveRecord::Migration
+  def change
+    add_column :lines, :on_demand_transportation, :boolean
+  end
+end

data/db/migrate/20140617132236_add_details_to_vehicle_journey.rb

@@ -0,0 +1,6 @@
+class AddDetailsToVehicleJourney < ActiveRecord::Migration
+  def change
+    add_column :vehicle_journeys, :mobility_restricted_suitability, :boolean
+    add_column :vehicle_journeys, :on_demand_transportation, :boolean
+  end
+end

data/db/migrate/20140618071147_fix_column_name.rb

@@ -0,0 +1,11 @@
+class FixColumnName < ActiveRecord::Migration
+  def up
+    rename_column :lines, :on_demand_transportation, :flexible_service
+    rename_column :vehicle_journeys, :on_demand_transportation, :flexible_service
+  end
+
+  def down
+    rename_column :lines, :flexible_service, :on_demand_transportation
+    rename_column :vehicle_journeys, :flexible_service, :on_demand_transportation
+  end
+end

data/db/migrate/20140625143030_add_in_out_to_timetable_date.rb

@@ -0,0 +1,5 @@
+class AddInOutToTimetableDate < ActiveRecord::Migration
+  def change
+    add_column "time_table_dates", "in_out", "boolean"
+  end
+end

data/db/migrate/20140626054725_set_in_out_to_timetable_date.rb

@@ -0,0 +1,8 @@
+class SetInOutToTimetableDate < ActiveRecord::Migration
+  def up
+    Chouette::TimeTableDate.update_all( :in_out => true)
+  end
+
+  def down
+  end
+end

data/db/migrate/20140718141703_acts_as_taggable_on_migration.acts_as_taggable_on_engine.rb

@@ -0,0 +1,31 @@
+# This migration comes from acts_as_taggable_on_engine (originally 1)
+class ActsAsTaggableOnMigration < ActiveRecord::Migration
+  def self.up
+    create_table :tags do |t|
+      t.string :name
+    end
+
+    create_table :taggings do |t|
+      t.references :tag
+
+      # You should make sure that the column created is
+      # long enough to store the required class names.
+      t.references :taggable, polymorphic: true
+      t.references :tagger, polymorphic: true
+
+      # Limit is created to prevent MySQL error on index
+      # length for MyISAM table type: http://bit.ly/vgW2Ql
+      t.string :context, limit: 128
+
+      t.datetime :created_at
+    end
+
+    add_index :taggings, :tag_id
+    add_index :taggings, [:taggable_id, :taggable_type, :context]
+  end
+
+  def self.down
+    drop_table :taggings
+    drop_table :tags
+  end
+end

data/db/migrate/20140718141704_add_missing_unique_indices.acts_as_taggable_on_engine.rb

@@ -0,0 +1,20 @@
+# This migration comes from acts_as_taggable_on_engine (originally 2)
+class AddMissingUniqueIndices < ActiveRecord::Migration
+  def self.up
+    add_index :tags, :name, unique: true
+
+    remove_index :taggings, :tag_id
+    remove_index :taggings, [:taggable_id, :taggable_type, :context]
+    add_index :taggings,
+              [:tag_id, :taggable_id, :taggable_type, :context, :tagger_id, :tagger_type],
+              unique: true, name: 'taggings_idx'
+  end
+
+  def self.down
+    remove_index :tags, :name
+
+    remove_index :taggings, name: 'taggings_idx'
+    add_index :taggings, :tag_id
+    add_index :taggings, [:taggable_id, :taggable_type, :context]
+  end
+end

data/db/migrate/20140718141705_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb

@@ -0,0 +1,15 @@
+# This migration comes from acts_as_taggable_on_engine (originally 3)
+class AddTaggingsCounterCacheToTags < ActiveRecord::Migration
+  def self.up
+    add_column :tags, :taggings_count, :integer, default: 0
+
+    ActsAsTaggableOn::Tag.reset_column_information
+    ActsAsTaggableOn::Tag.find_each do |tag|
+      ActsAsTaggableOn::Tag.reset_counters(tag.id, :taggings)
+    end
+  end
+
+  def self.down
+    remove_column :tags, :taggings_count
+  end
+end

data/db/migrate/20140718141706_add_missing_taggable_index.acts_as_taggable_on_engine.rb

@@ -0,0 +1,10 @@
+# This migration comes from acts_as_taggable_on_engine (originally 4)
+class AddMissingTaggableIndex < ActiveRecord::Migration
+  def self.up
+    add_index :taggings, [:taggable_id, :taggable_type, :context]
+  end
+
+  def self.down
+    remove_index :taggings, [:taggable_id, :taggable_type, :context]
+  end
+end

data/db/migrate/20140820060801_add_zip_code_and_city_name_to_stop_area.rb

@@ -0,0 +1,8 @@
+class AddZipCodeAndCityNameToStopArea < ActiveRecord::Migration
+  def change
+    change_table :stop_areas do |t|
+      t.string :zip_code
+      t.string :city_name
+    end
+  end
+end

data/db/migrate/20140820060814_add_zip_code_and_city_name_to_access_point.rb

@@ -0,0 +1,8 @@
+class AddZipCodeAndCityNameToAccessPoint < ActiveRecord::Migration
+  def change
+    change_table :access_points do |t|
+      t.string :zip_code
+      t.string :city_name
+    end
+  end
+end

data/lib/factories/chouette_routes.rb

@@ -1,4 +1,4 @@
-Factory.define :route, :class => "Chouette::Route" do |route|
+Factory.define :route_common, :class => "Chouette::Route" do |route|
   route.sequence(:name) { |n| "Route #{n}" }
   route.sequence(:published_name) { |n| "Long route #{n}" }
   route.sequence(:number) { |n| "#{n}" }
@@ -7,7 +7,9 @@ Factory.define :route, :class => "Chouette::Route" do |route|
   route.sequence(:objectid) { |n| "test:Route:#{n}" }
 
   route.association :line, :factory => :line
+end
 
+Factory.define :route, :class => "Chouette::Route", :parent => :route_common do |route|
   route.after_create do |r|
     0.upto(4) do |i|
       Factory(:stop_point, :position => i, :route => r)

data/lib/factories/chouette_time_table.rb

@@ -7,9 +7,9 @@ Factory.define :time_table, :class => "Chouette::TimeTable" do |time_table|
   time_table.sequence(:comment) { |n| "Timetable #{n}" }
   time_table.sequence(:objectid) { |n| "test:Timetable:#{n}" }
   time_table.sequence(:int_day_types) { (1..7).to_a.map{ |n| 2**(n+1)}.sum }
-  time_table.after_create { |t| 
+  time_table.after_create { |t|
     0.upto(4) do |i|
-      t.dates.create(Factory.attributes_for(:time_table_date, :date => i.days.since.to_date))
+      t.dates.create(Factory.attributes_for(:time_table_date, :date => i.days.since.to_date, :in_out => true))
     end
     start_date = Date.today
     end_date = start_date + 10

data/lib/factories/chouette_vehicle_journey.rb

@@ -1,6 +1,7 @@
 Factory.define :vehicle_journey_common, :class => "Chouette::VehicleJourney" do |v|
   v.sequence(:objectid) { |n| "test:VehicleJourney:#{n}" }
 end
+
 Factory.define :vehicle_journey, :parent => :vehicle_journey_common do |v|
   v.association :journey_pattern, :factory => :journey_pattern
   v.after_build do |vj|

data/lib/ninoxe/version.rb

@@ -1,3 +1,3 @@
 module Ninoxe
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

data/lib/ninoxe.rb

@@ -3,6 +3,7 @@ require "ninoxe/engine"
 require "acts_as_list"
 require "foreigner"
 require "acts_as_tree"
+require "acts-as-taggable-on"
 
 module Ninoxe
 end