ninoxe 1.1.5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b9d5a1a328226ec78cde56890239d9e182c1dc6
-  data.tar.gz: 6fa77d618815fa1ae0845910a471fcc6ca3aaa24
+  metadata.gz: 00251189c84f005b277cc0237fea8d2d68674e4a
+  data.tar.gz: 45199b49e8b0e9483cf35d14981542783e4bf7b7
 SHA512:
-  metadata.gz: 73563d719a56e21c1c48d64d8e27163cd1d600b51513762d2c5d58d15646ca463d43aab64870fcdf3775de458b788c96d713870c374b3730f659417d3a9d231f
-  data.tar.gz: fc06f66345af8e3fcd13a1e5fd4fcde3747d56f6a287b27e628def3812d74acfd021c92713495210df8f67abaa4c357a0b7974238f87c66eb22e783750a7d0f9
+  metadata.gz: 65d6c2a966940aa23f9e1bddc7ddf29c5efa43ec27cacba74759d64c5a74e0fda9e33238bc6e58337d78a126941f331ebe7069c035dd799541e62de04b7b29d4
+  data.tar.gz: 6abccc002329cc535fe7df7586ea75baf09e80a14af49b2f9ee0f26a6e83f5a6d8a0f32aac45ec40d288e6d651cccdabd96ee83ecf0877d210d213fb4ffd0eb6

data/Rakefile

@@ -5,19 +5,10 @@ rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
-
-Bundler::GemHelper.install_tasks
-
 namespace :ci do
-  task :prepare do
-    cp "config/database.yml.ci", "config/database.yml"
-  end
-  task :travis do
+  task :db_travis_config do
     cp "config/database.yml.travis", "config/database.yml"
   end  
-  task :build => ["db:migrate", "spec"]
 end
 
 begin
@@ -36,14 +27,20 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+load 'rails/tasks/engine.rake'
+
+Bundler::GemHelper.install_tasks
+
 require 'rspec/core'
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :spec => "app:db:test:prepare"
-
 RSpec::Core::RakeTask.new(:rcov) do |t|
   t.rcov = true
   t.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/,lib\/database_cleaner\/}
 end
+
+task :spec => "app:db:test:prepare"
+

data/app/models/chouette/access_link.rb

@@ -1,67 +1,68 @@
-class Chouette::AccessLink < Chouette::TridentActiveRecord
-  # FIXME http://jira.codehaus.org/browse/JRUBY-6358
-  self.primary_key = "id"
+module Chouette
+  class AccessLink < TridentActiveRecord
+    # FIXME http://jira.codehaus.org/browse/JRUBY-6358
+    self.primary_key = "id"
 
-  attr_accessor :access_link_type, :link_orientation_type, :link_key
+    attr_accessor :access_link_type, :link_orientation_type, :link_key
 
-  attr_accessible :id, :access_link_type,:access_point_id, :stop_area_id
-  attr_accessible :objectid, :object_version, :creation_time, :creator_id, :name, :comment
-  attr_accessible :link_distance, :link_type, :default_duration, :frequent_traveller_duration, :occasional_traveller_duration
-  attr_accessible :mobility_restricted_traveller_duration, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs
-  attr_accessible :link_orientation
-  attr_accessible :link_orientation_type, :stop_area
+    # attr_accessible :id, :access_link_type,:access_point_id, :stop_area_id
+    # attr_accessible :objectid, :object_version, :creation_time, :creator_id, :name, :comment
+    # attr_accessible :link_distance, :link_type, :default_duration, :frequent_traveller_duration, :occasional_traveller_duration
+    # attr_accessible :mobility_restricted_traveller_duration, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs
+    # attr_accessible :link_orientation
+    # attr_accessible :link_orientation_type, :stop_area
 
-  belongs_to :access_point, :class_name => 'Chouette::AccessPoint'
-  belongs_to :stop_area, :class_name => 'Chouette::StopArea'
+    belongs_to :access_point, :class_name => 'Chouette::AccessPoint'
+    belongs_to :stop_area, :class_name => 'Chouette::StopArea'
 
-  validates_presence_of :name
-  validates_presence_of :link_type
-  validates_presence_of :link_orientation
+    validates_presence_of :name
+    validates_presence_of :link_type
+    validates_presence_of :link_orientation
 
-  def access_link_type
-    link_type && Chouette::ConnectionLinkType.new(link_type.underscore)
-  end
+    def access_link_type
+      link_type && Chouette::ConnectionLinkType.new(link_type.underscore)
+    end
 
-  def access_link_type=(access_link_type)
-    self.link_type = (access_link_type ? access_link_type.camelcase : nil)
-  end
+    def access_link_type=(access_link_type)
+      self.link_type = (access_link_type ? access_link_type.camelcase : nil)
+    end
 
-  @@access_link_types = nil
-  def self.access_link_types
-    @@access_link_types ||= Chouette::ConnectionLinkType.all
-  end
+    @@access_link_types = nil
+    def self.access_link_types
+      @@access_link_types ||= Chouette::ConnectionLinkType.all
+    end
 
-  def link_orientation_type
-    link_orientation && Chouette::LinkOrientationType.new(link_orientation.underscore)
-  end
+    def link_orientation_type
+      link_orientation && Chouette::LinkOrientationType.new(link_orientation.underscore)
+    end
 
-  def link_orientation_type=(link_orientation_type)
-    self.link_orientation = (link_orientation_type ? link_orientation_type.camelcase : nil)
-  end
+    def link_orientation_type=(link_orientation_type)
+      self.link_orientation = (link_orientation_type ? link_orientation_type.camelcase : nil)
+    end
 
-  @@link_orientation_types = nil
-  def self.link_orientation_types
-    @@link_orientation_types ||= Chouette::LinkOrientationType.all
-  end
+    @@link_orientation_types = nil
+    def self.link_orientation_types
+      @@link_orientation_types ||= Chouette::LinkOrientationType.all
+    end
 
-  def geometry
-    GeoRuby::SimpleFeatures::LineString.from_points( [ access_point.geometry, stop_area.geometry], 4326) if access_point.geometry and stop_area.geometry
-  end
+    def geometry
+      GeoRuby::SimpleFeatures::LineString.from_points( [ access_point.geometry, stop_area.geometry], 4326) if access_point.geometry and stop_area.geometry
+    end
 
-  def link_key
-    Chouette::AccessLink.build_link_key(access_point,stop_area,link_orientation_type)
-  end
-  
-  def self.build_link_key(access_point,stop_area,link_orientation_type)
-    if link_orientation_type == "access_point_to_stop_area"
-      "A_#{access_point.id}-S_#{stop_area.id}"
-    else  
-      "S_#{stop_area.id}-A_#{access_point.id}"
+    def link_key
+      Chouette::AccessLink.build_link_key(access_point,stop_area,link_orientation_type)
+    end
+    
+    def self.build_link_key(access_point,stop_area,link_orientation_type)
+      if link_orientation_type == "access_point_to_stop_area"
+        "A_#{access_point.id}-S_#{stop_area.id}"
+      else  
+        "S_#{stop_area.id}-A_#{access_point.id}"
+      end
     end
-  end
 
-  def geometry_presenter
-    Chouette::Geometry::AccessLinkPresenter.new self
+    def geometry_presenter
+      Chouette::Geometry::AccessLinkPresenter.new self
+    end
   end
 end
-

data/app/models/chouette/access_point.rb

@@ -11,13 +11,13 @@ class Chouette::AccessPoint < Chouette::TridentActiveRecord
   attr_accessor :access_point_type
   attr_writer :coordinates
 
-  attr_accessible :objectid, :object_version, :creation_time, :creator_id, :name, :comment
-  attr_accessible :longitude, :latitude, :long_lat_type
-  attr_accessible :country_code, :street_name, :zip_code, :city_name
-  attr_accessible :openning_time, :closing_time, :access_type, :access_point_type
-  attr_accessible :mobility_restricted_suitability, :stairs_availability, :lift_availability
-  attr_accessible :stop_area_id
-  attr_accessible :coordinates
+  # attr_accessible :objectid, :object_version, :creation_time, :creator_id, :name, :comment
+  # attr_accessible :longitude, :latitude, :long_lat_type
+  # attr_accessible :country_code, :street_name, :zip_code, :city_name
+  # attr_accessible :openning_time, :closing_time, :access_type, :access_point_type
+  # attr_accessible :mobility_restricted_suitability, :stairs_availability, :lift_availability
+  # attr_accessible :stop_area_id
+  # attr_accessible :coordinates
   
   validates_presence_of :name
   validates_presence_of :access_type

data/app/models/chouette/active_record.rb

@@ -21,46 +21,46 @@ module Chouette
       self.class.human_attribute_name(*args)
     end
 
-    class << self
-      alias_method :create_reflection_without_chouette_naming, :create_reflection
+    # class << self
+    #   alias_method :create_reflection_without_chouette_naming, :create_reflection
 
-      def create_reflection(macro, name, options, active_record)
-        options = 
-          Reflection.new(macro, name, options, active_record).options_with_default
+    #   def create_reflection(macro, name, options, active_record)
+    #     options = 
+    #       Reflection.new(macro, name, options, active_record).options_with_default
 
-        create_reflection_without_chouette_naming(macro, name, options, active_record)
-      end
-    end
+    #     create_reflection_without_chouette_naming(macro, name, options, active_record)
+    #   end
+    # end
 
 
 
-    class Reflection
+    # class Reflection
 
-      attr_reader :macro, :name, :options, :active_record
+    #   attr_reader :macro, :name, :options, :active_record
 
-      def initialize(macro, name, options, active_record)
-        @macro, @name, @options, @active_record = macro, name.to_s, options, active_record
-      end
+    #   def initialize(macro, name, options, active_record)
+    #     @macro, @name, @options, @active_record = macro, name.to_s, options, active_record
+    #   end
 
-      def collection?
-        macro == :has_many
-      end
+    #   def collection?
+    #     macro == :has_many
+    #   end
 
-      def singular_name
-        collection? ? name.singularize : name
-      end
+    #   def singular_name
+    #     collection? ? name.singularize : name
+    #   end
 
-      def class_name
-        "Chouette::#{singular_name.camelize}"
-      end
+    #   def class_name
+    #     "Chouette::#{singular_name.camelize}"
+    #   end
 
-      def options_with_default
-        options.dup.tap do |options|
-          options[:class_name] ||= class_name
-        end
-      end
+    #   def options_with_default
+    #     options.dup.tap do |options|
+    #       options[:class_name] ||= class_name
+    #     end
+    #   end
 
-    end
+    # end
 
   end
 end

data/app/models/chouette/company.rb

@@ -7,9 +7,9 @@ class Chouette::Company < Chouette::TridentActiveRecord
 
   validates_presence_of :name
 
-  attr_accessible :objectid, :object_version, :creation_time, :creator_id, :name, :short_name
-  attr_accessible :organizational_unit, :operating_department_name, :code, :phone, :fax, :email, :registration_number
-  attr_accessible :url, :time_zone
+  # attr_accessible :objectid, :object_version, :creation_time, :creator_id, :name, :short_name
+  # attr_accessible :organizational_unit, :operating_department_name, :code, :phone, :fax, :email, :registration_number
+  # attr_accessible :url, :time_zone
 
   validates_format_of :url, :with => %r{\Ahttps?:\/\/([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?\Z}, :allow_nil => true, :allow_blank => true
  

data/app/models/chouette/connection_link.rb

@@ -4,9 +4,9 @@ class Chouette::ConnectionLink < Chouette::TridentActiveRecord
 
   attr_accessor :connection_link_type
 
-  attr_accessible :connection_link_type,:departure_id, :arrival_id, :objectid, :object_version, :creation_time, :creator_id, :name, :comment
-  attr_accessible :link_distance, :link_type, :default_duration, :frequent_traveller_duration, :occasional_traveller_duration
-  attr_accessible :mobility_restricted_traveller_duration, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs
+  # attr_accessible :connection_link_type,:departure_id, :arrival_id, :objectid, :object_version, :creation_time, :creator_id, :name, :comment
+  # attr_accessible :link_distance, :link_type, :default_duration, :frequent_traveller_duration, :occasional_traveller_duration
+  # attr_accessible :mobility_restricted_traveller_duration, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs
 
   belongs_to :departure, :class_name => 'Chouette::StopArea'
   belongs_to :arrival, :class_name => 'Chouette::StopArea'

data/app/models/chouette/footnote.rb

@@ -1,6 +1,6 @@
 class Chouette::Footnote < Chouette::ActiveRecord
   # attr_accessible :title, :body
-  belongs_to :line
+  belongs_to :line, inverse_of: :footnotes
   has_and_belongs_to_many :vehicle_journeys, :class_name => 'Chouette::VehicleJourney'
 
   validates_presence_of :line

data/app/models/chouette/group_of_line.rb

@@ -6,8 +6,8 @@ class Chouette::GroupOfLine < Chouette::TridentActiveRecord
 
   validates_presence_of :name
 
-  attr_accessible :objectid, :object_version, :creation_time, :creator_id, :name, :comment, :lines, :registration_number 
-  attr_accessible :line_tokens
+  # attr_accessible :objectid, :object_version, :creation_time, :creator_id, :name, :comment, :lines, :registration_number 
+  # attr_accessible :line_tokens
   attr_reader :line_tokens
   
   def self.nullable_attributes

data/app/models/chouette/journey_pattern.rb

@@ -5,9 +5,9 @@ class Chouette::JourneyPattern < Chouette::TridentActiveRecord
   belongs_to :route
   has_many :vehicle_journeys, :dependent => :destroy
   has_many :vehicle_journey_at_stops, :through => :vehicle_journeys
-  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
+  has_and_belongs_to_many :stop_points, -> { 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
+  #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
   
@@ -24,6 +24,7 @@ class Chouette::JourneyPattern < Chouette::TridentActiveRecord
     return unless departure_stop_point_id
     Chouette::StopPoint.find( departure_stop_point_id)
   end
+  
   def arrival_stop_point
     return unless arrival_stop_point_id
     Chouette::StopPoint.find( arrival_stop_point_id)
@@ -38,6 +39,7 @@ class Chouette::JourneyPattern < Chouette::TridentActiveRecord
     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)
     stop_points.delete( stop_point) if stop_points.include?( stop_point)
     
@@ -47,6 +49,7 @@ class Chouette::JourneyPattern < Chouette::TridentActiveRecord
     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)
     return if new_record? 
 
@@ -54,9 +57,10 @@ class Chouette::JourneyPattern < Chouette::TridentActiveRecord
       vjas = vj.vehicle_journey_at_stops.create :stop_point_id => stop_point.id 
     end
   end
+  
   def vjas_remove( stop_point)
     return if new_record?
-
+    
     vehicle_journey_at_stops.where( :stop_point_id => stop_point.id).each do |vjas|
       vjas.destroy
     end

data/app/models/chouette/line.rb

@@ -2,11 +2,12 @@ class Chouette::Line < Chouette::TridentActiveRecord
   # FIXME http://jira.codehaus.org/browse/JRUBY-6358
   self.primary_key = "id"
 
-  attr_accessor :transport_mode
-  attr_accessible :transport_mode, :network_id, :company_id, :objectid, :object_version
-  attr_accessible :creation_time, :creator_id, :name, :number, :published_name, :transport_mode_name
-  attr_accessible :registration_number, :comment, :mobility_restricted_suitability, :int_user_needs
-  attr_accessible :flexible_service
+  # attr_accessible :transport_mode, :network_id, :company_id, :objectid, :object_version
+  # attr_accessible :creation_time, :creator_id, :name, :number, :published_name, :transport_mode_name
+  # attr_accessible :registration_number, :comment, :mobility_restricted_suitability, :int_user_needs
+  # attr_accessible :flexible_service
+  # attr_accessible :group_of_lines, :group_of_line_ids, :group_of_line_tokens
+  # attr_accessible :url, :color, :text_color
 
   belongs_to :company
   belongs_to :network
@@ -16,13 +17,14 @@ class Chouette::Line < Chouette::TridentActiveRecord
 
   has_and_belongs_to_many :group_of_lines, :class_name => 'Chouette::GroupOfLine', :order => 'group_of_lines.name'
 
-  has_many :footnotes, :dependent => :destroy
+  has_many :footnotes, :inverse_of => :line, :validate => :true, :dependent => :destroy
   accepts_nested_attributes_for :footnotes, :reject_if => :all_blank, :allow_destroy => true
-  attr_accessible :footnotes_attributes
+  #attr_accessible :footnotes_attributes
 
-  attr_accessible :group_of_lines, :group_of_line_ids, :group_of_line_tokens
-  attr_accessible :url, :color, :text_color
+  #attr_accessible :group_of_lines, :group_of_line_ids, :group_of_line_tokens
+  #attr_accessible :url, :color, :text_color
   attr_reader :group_of_line_tokens
+  attr_accessor :transport_mode
 
   validates_presence_of :network
   validates_presence_of :company

data/app/models/chouette/network.rb

@@ -10,8 +10,8 @@ class Chouette::Network < Chouette::TridentActiveRecord
 
   validates_presence_of :name
 
-  attr_accessible :objectid, :object_version, :creation_time, :creator_id, :version_date, :description, :name
-  attr_accessible :registration_number, :source_name, :source_type, :source_identifier, :comment
+  # attr_accessible :objectid, :object_version, :creation_time, :creator_id, :version_date, :description, :name
+  # attr_accessible :registration_number, :source_name, :source_type, :source_identifier, :comment
 
   def self.object_id_key
     "GroupOfLine"

data/app/models/chouette/pt_link.rb

@@ -4,7 +4,7 @@ class Chouette::PtLink < Chouette::ActiveRecord
   # FIXME http://jira.codehaus.org/browse/JRUBY-6358
   self.primary_key = "id"
 
-  attr_accessible :start_of_link_id, :end_of_link_id, :route_id, :objectid, :object_version, :creation_time, :creator_id, :name, :comment, :link_distance
+  # attr_accessible :start_of_link_id, :end_of_link_id, :route_id, :objectid, :object_version, :creation_time, :creator_id, :name, :comment, :link_distance
   include Geokit::Mappable
   
 

data/app/models/chouette/route.rb

@@ -5,11 +5,11 @@ class Chouette::Route < Chouette::TridentActiveRecord
   attr_accessor :wayback_code
   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, :stop_points_attributes
+  # 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, :stop_points_attributes
 
   def self.nullable_attributes
-    [:published_name, :comment, :number]
+    [:published_name, :comment, :number, :name]
   end
 
   belongs_to :line
@@ -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, -> { order('position ASC') }, :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
@@ -44,7 +44,7 @@ class Chouette::Route < Chouette::TridentActiveRecord
       where(" position between ? and ? ", between_positions.first, between_positions.last)
     end
   end
-  has_many :stop_areas, :through => :stop_points, :order => 'stop_points.position' do
+  has_many :stop_areas, -> { order('stop_points.position ASC') }, :through => :stop_points do
     def between(departure, arrival)
       departure, arrival = [departure, arrival].collect do |endpoint|
         String === endpoint ? Chouette::StopArea.find_by_objectid(endpoint) : endpoint
@@ -54,10 +54,10 @@ class Chouette::Route < Chouette::TridentActiveRecord
   end
   accepts_nested_attributes_for :stop_points, :allow_destroy => :true
 
-  validates_presence_of :name
+  # validates_presence_of :name
   validates_presence_of :line
-  validates_presence_of :direction_code
-  validates_presence_of :wayback_code
+  # validates_presence_of :direction_code
+  # validates_presence_of :wayback_code
 
   before_destroy :dereference_opposite_route
 
@@ -83,7 +83,7 @@ class Chouette::Route < Chouette::TridentActiveRecord
   end
 
   def sorted_vehicle_journeys
-    vehicle_journeys.includes( :vehicle_journey_at_stops, :journey_pattern).where( "vehicle_journey_at_stops.stop_point_id=journey_patterns.departure_stop_point_id").order( "vehicle_journey_at_stops.departure_time")
+    vehicle_journeys.joins(:journey_pattern, :vehicle_journey_at_stops).where("vehicle_journey_at_stops.stop_point_id=journey_patterns.departure_stop_point_id").order( "vehicle_journey_at_stops.departure_time")
   end
 
   def self.direction_binding
@@ -160,4 +160,3 @@ class Chouette::Route < Chouette::TridentActiveRecord
     return true
   end
 end
-

data/app/models/chouette/stop_area.rb

@@ -17,13 +17,13 @@ class Chouette::StopArea < Chouette::TridentActiveRecord
   attr_accessor :children_ids
   attr_writer :coordinates
   
-  attr_accessible :routing_stop_ids, :routing_line_ids, :children_ids, :stop_area_type, :parent_id, :objectid
-  attr_accessible :object_version, :creation_time, :creator_id, :name, :comment, :area_type, :registration_number
-  attr_accessible :nearest_topic_name, :fare_code, :longitude, :latitude, :long_lat_type
-  attr_accessible :country_code, :street_name, :zip_code, :city_name
-  attr_accessible :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs
-  attr_accessible :coordinates
-  attr_accessible :url, :time_zone
+  # attr_accessible :routing_stop_ids, :routing_line_ids, :children_ids, :stop_area_type, :parent_id, :objectid
+  # attr_accessible :object_version, :creation_time, :creator_id, :name, :comment, :area_type, :registration_number
+  # attr_accessible :nearest_topic_name, :fare_code, :longitude, :latitude, :long_lat_type
+  # attr_accessible :country_code, :street_name, :zip_code, :city_name
+  # attr_accessible :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs
+  # attr_accessible :coordinates
+  # attr_accessible :url, :time_zone
   
   validates_uniqueness_of :registration_number, :allow_nil => true, :allow_blank => true
   validates_format_of :registration_number, :with => %r{\A[\d\w_\-]+\Z}, :allow_blank => true
@@ -246,7 +246,7 @@ class Chouette::StopArea < Chouette::TridentActiveRecord
 
   def self.default_geometry!
     count = 0
-    scoped.find_each do |stop_area|
+    where(nil).find_each do |stop_area|
       Chouette::StopArea.unscoped do
         count += 1 if stop_area.default_geometry!
       end

data/app/models/chouette/stop_point.rb

@@ -9,17 +9,17 @@ module Chouette
     belongs_to :stop_area
     belongs_to :route, inverse_of: :stop_points
     has_many :vehicle_journey_at_stops, :dependent => :destroy
-    has_many :vehicle_journeys, :through => :vehicle_journey_at_stops, :uniq => true
+    has_many :vehicle_journeys, -> {uniq}, :through => :vehicle_journey_at_stops
     
     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, :for_boarding, :for_alighting
+    #attr_accessible :route_id, :stop_area_id, :objectid, :object_version, :creation_time, :creator_id, :position, :for_boarding, :for_alighting
 
     validates_presence_of :stop_area
     validate :stop_area_id_validation
 
     scope :default_order, order("position")
-    
+
     before_destroy :remove_dependent_journey_pattern_stop_points
     def remove_dependent_journey_pattern_stop_points
       route.journey_patterns.each do |jp|