ninoxe 0.1.6 → 1.0.0

data/app/models/chouette/command.rb

@@ -17,7 +17,7 @@ class Chouette::Command
   @@command = "chouette"
   cattr_accessor :command
 
-  attr_accessor :database, :schema, :host, :user, :password
+  attr_accessor :database, :schema, :host, :user, :password, :port
 
   def initialize(options = {})
     database_options_from_active_record.merge(options).each do |k,v|
@@ -31,6 +31,7 @@ class Chouette::Command
       :database => config[:database], 
       :user => config[:username],
       :password => config[:password],
+      :port => config[:port],
       :host => (config[:host] or "localhost")
     }
   end
@@ -45,7 +46,7 @@ class Chouette::Command
         #f.puts "database.showsql = true"
         f.puts "hibernate.username = #{user}"
         f.puts "hibernate.password = #{password}"
-        f.puts "jdbc.url=jdbc:postgresql://#{host}:5432/#{database}"
+        f.puts "jdbc.url=jdbc:postgresql://#{host}:#{port}/#{database}"
         f.puts "jdbc.username = #{user}"
         f.puts "jdbc.password = #{password}"
         #f.puts "database.hbm2ddl.auto=update"

data/app/models/chouette/route.rb

@@ -6,7 +6,7 @@ class Chouette::Route < Chouette::TridentActiveRecord
   attr_accessor :direction_code
 
   attr_accessible :direction_code, :wayback_code, :line_id, :objectid, :object_version, :creation_time, :creator_id, :name
-  attr_accessible :comment, :opposite_route_id, :published_name, :number, :direction, :wayback
+  attr_accessible :comment, :opposite_route_id, :published_name, :number, :direction, :wayback, :stop_points_attributes
 
   def self.nullable_attributes
     [:published_name, :comment, :number]
@@ -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, :order => 'position', :dependent => :destroy do
+  has_many :stop_points, inverse_of: :route, :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
@@ -39,7 +39,7 @@ class Chouette::Route < Chouette::TridentActiveRecord
           endpoint
         else
           raise ActiveRecord::RecordNotFound.new("Can't determine position in route #{proxy_owner.id} with #{departure.inspect}")
-        end        
+        end
       end
       where(" position between ? and ? ", between_positions.first, between_positions.last)
     end
@@ -52,14 +52,15 @@ class Chouette::Route < Chouette::TridentActiveRecord
       proxy_owner.stop_points.between(departure, arrival).includes(:stop_area).collect(&:stop_area)
     end
   end
+  accepts_nested_attributes_for :stop_points, :allow_destroy => :true
 
   validates_presence_of :name
   validates_presence_of :line
   validates_presence_of :direction_code
   validates_presence_of :wayback_code
-  
+
   before_destroy :dereference_opposite_route
-  
+
   def geometry_presenter
     Chouette::Geometry::RoutePresenter.new self
   end
@@ -86,12 +87,12 @@ class Chouette::Route < Chouette::TridentActiveRecord
   end
 
   def self.direction_binding
-    { "A" => "straight_forward", 
+    { "A" => "straight_forward",
       "R" => "backward",
       "ClockWise" => "clock_wise",
       "CounterClockWise" => "counter_clock_wise",
       "North" => "north",
-      "NorthWest" => "north_west", 
+      "NorthWest" => "north_west",
       "West" => "west",
       "SouthWest" => "south_west",
       "South" => "south",
@@ -105,7 +106,7 @@ class Chouette::Route < Chouette::TridentActiveRecord
   end
   def direction_code=(direction_code)
     self.direction = nil
-    self.class.direction_binding.each do |k,v| 
+    self.class.direction_binding.each do |k,v|
       self.direction = k if v==direction_code
     end
   end
@@ -122,7 +123,7 @@ class Chouette::Route < Chouette::TridentActiveRecord
   end
   def wayback_code=(wayback_code)
     self.wayback = nil
-    self.class.wayback_binding.each do |k,v| 
+    self.class.wayback_binding.each do |k,v|
       self.wayback = k if v==wayback_code
     end
   end
@@ -130,14 +131,14 @@ class Chouette::Route < Chouette::TridentActiveRecord
   def self.waybacks
     @@waybacks ||= Chouette::Wayback.all
   end
-  
+
   def stop_point_permutation?( stop_point_ids)
     stop_points.map(&:id).map(&:to_s).sort == stop_point_ids.map(&:to_s).sort
   end
 
   def reorder!( stop_point_ids)
     return false unless stop_point_permutation?( stop_point_ids)
-    
+
     stop_area_id_by_stop_point_id = {}
     stop_points.each do |sp|
       stop_area_id_by_stop_point_id.merge!( sp.id => sp.stop_area_id)

data/app/models/chouette/stop_point.rb

@@ -3,21 +3,27 @@ class Chouette::StopPoint < Chouette::TridentActiveRecord
   self.primary_key = "id"
 
   belongs_to :stop_area
-  belongs_to :route
+  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
-  validates_presence_of :route
-  
+  validate :stop_area_id_validation
+
   scope :default_order, order("position")
 
+  def stop_area_id_validation
+      if stop_area_id.nil?
+          errors.add(:stop_area_id, I18n.t("errors.messages.empty"))
+      end
+  end
+
   def self.area_candidates
     Chouette::StopArea.where( :area_type => ['Quay', 'BoardingPosition'])
   end

data/app/models/chouette/time_table.rb

@@ -7,8 +7,8 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord
   attr_accessible :start_date, :end_date
   attr_accessor :monday,:tuesday,:wednesday,:thursday,:friday,:saturday,:sunday
 
-  has_many :dates, :class_name => "Chouette::TimeTableDate", :order => :date, :dependent => :destroy, :after_add => :shortcuts_update, :after_remove => :shortcuts_update
-  has_many :periods, :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, :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
 
   def self.object_id_key
     "Timetable"
@@ -19,6 +19,8 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord
   attr_accessible :dates_attributes,:periods_attributes
 
   validates_presence_of :comment
+  validates_associated :dates
+  validates_associated :periods
 
   def self.start_validity_period
     [Chouette::TimeTable.minimum(:start_date)].compact.min 
@@ -29,11 +31,21 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord
 
   def shortcuts_update(date=nil)
     dates_array = bounding_dates
-    if dates_array.empty?
-      update_attributes :start_date => nil, :end_date => nil
-    else
-      update_attributes :start_date => dates_array.min, :end_date => dates_array.max
-    end
+    #if new_record?
+      if dates_array.empty?
+        self.start_date=nil
+        self.end_date=nil
+      else
+        self.start_date=dates_array.min
+        self.end_date=dates_array.max
+      end      
+    #else
+     # if dates_array.empty?
+     #   update_attributes :start_date => nil, :end_date => nil
+     # else
+     #   update_attributes :start_date => dates_array.min, :end_date => dates_array.max
+     # end
+    #end
   end
 
   def validity_out_from_on?(expected_date)

data/app/models/chouette/time_table_date.rb

@@ -1,14 +1,21 @@
 class Chouette::TimeTableDate < Chouette::ActiveRecord
   self.primary_key = "id"
-  belongs_to :time_table
+  belongs_to :time_table, inverse_of: :dates
   acts_as_list :scope => 'time_table_id = #{time_table_id}',:top_of_list => 0
   
   validates_presence_of :date
   validates_uniqueness_of :date, :scope => :time_table_id
 
   attr_accessible :date, :position, :time_table_id, :time_table
+  
+  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

@@ -1,6 +1,6 @@
 class Chouette::TimeTablePeriod < Chouette::ActiveRecord
   self.primary_key = "id"
-  belongs_to :time_table
+  belongs_to :time_table, inverse_of: :periods
   acts_as_list :scope => 'time_table_id = #{time_table_id}',:top_of_list => 0
 
   attr_accessible :period_start, :period_end, :position,:time_table_id,:time_table
@@ -10,6 +10,8 @@ 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"
   end
@@ -23,4 +25,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
 end

data/app/models/chouette/trident_active_record.rb

@@ -1,5 +1,7 @@
 class Chouette::TridentActiveRecord < Chouette::ActiveRecord
     before_validation :prepare_auto_columns
+    after_validation :reset_auto_columns
+    
     after_save :build_objectid
 
     self.abstract_class = true
@@ -39,6 +41,16 @@ class Chouette::TridentActiveRecord < Chouette::ActiveRecord
       self.creator_id = 'chouette'
     end
     
+    def reset_auto_columns
+      clean_object_id unless self.errors.nil? || self.errors.empty?
+    end
+    
+    def clean_object_id
+      if self.objectid.include?("__pending_id__")
+        self.objectid=nil
+      end
+    end  
+    
     def build_objectid
       #logger.info 'start after_create : '+self.objectid
       if self.objectid.include? ':__pending_id__'

data/config/database.yml

@@ -1,9 +1,11 @@
 development:
   adapter: postgresql
   database: ninoxe_dev
+  port: 5432
   username: <%= ENV['USER'] %>
   
 test:
   adapter: postgresql
   database: ninoxe_test
+  port: 5432  
   username: <%= ENV['USER'] %>

data/{spec/dummy/config/database.yml → config/database.yml.me}

@@ -2,8 +2,10 @@ development:
   adapter: postgresql
   database: ninoxe_dev
   username: <%= ENV['USER'] %>
+  password: <%= ENV['USER'] %>
   
 test:
   adapter: postgresql
   database: ninoxe_test
   username: <%= ENV['USER'] %>
+  password: <%= ENV['USER'] %>

data/lib/ninoxe/version.rb

@@ -1,3 +1,3 @@
 module Ninoxe
-  VERSION = "0.1.6"
+  VERSION = "1.0.0"
 end

data/lib/ninoxe.rb~

@@ -0,0 +1,7 @@
+require "ninoxe/engine"
+
+require "acts_as_list"
+require "composite_primary_keys"
+
+module Ninoxe
+end