diff options
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 11 | ||||
| -rw-r--r-- | config/initializers/ninoxe.rb | 33 | ||||
| -rw-r--r-- | config/initializers/ui_datepicker-rails3.rb | 2 | ||||
| -rw-r--r-- | spec/models/chouette/line_spec.rb | 15 |
5 files changed, 8 insertions, 56 deletions
@@ -55,8 +55,7 @@ gem 'will_paginate', '~> 3.0' gem 'ransack' gem 'squeel' -# gem 'chouette-ninoxe', :git => 'git://chouette.dryade.priv/ninoxe'#, :path => '~/projects/ninoxe' -gem 'chouette-ninoxe', :path => '~/workspace/chouette/ninoxe' +gem 'ninoxe', :git => 'git://chouette.dryade.priv/ninoxe'#, :path => '~/projects/ninoxe' group :development do gem 'autotest-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 5fb5b06ea..51851270e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,13 @@ GIT remote: git://chouette.dryade.priv/ninoxe - revision: c25a9d283461439ec01005c96804bcd0edfe0e2d + revision: 9e968fd6886f46dd0db471d8a7d8518e932b9e79 specs: - chouette-ninoxe (0.0.8) + ninoxe (0.0.8) GeoRuby - activerecord - composite_primary_keys + activerecord (~> 3.1.3) + composite_primary_keys (= 4.1.2) geokit + rails (= 3.1.3) GIT remote: git://github.com/dryade/activerecord-jdbc-adapter.git @@ -338,7 +339,6 @@ DEPENDENCIES capistrano capistrano-ext capybara - chouette-ninoxe! coffee-rails (~> 3.1.1) coffee-script-source cucumber @@ -356,6 +356,7 @@ DEPENDENCIES json launchy map_layers (~> 0.0.4) + ninoxe! pg (~> 0.11.0) pickle! rails (= 3.1.3) diff --git a/config/initializers/ninoxe.rb b/config/initializers/ninoxe.rb deleted file mode 100644 index 4003e2a15..000000000 --- a/config/initializers/ninoxe.rb +++ /dev/null @@ -1,33 +0,0 @@ -Chouette::ActiveRecord.establish_chouette_connection = false - -class Chouette::Line - - def self.model_name - ActiveModel::Name.new Chouette::Line, Chouette, "Line" - end - -end - -class Chouette::Network - - def self.model_name - ActiveModel::Name.new Chouette::Network, Chouette, "Network" - end - -end - -class Chouette::Company - - def self.model_name - ActiveModel::Name.new Chouette::Company, Chouette, "Company" - end - -end - -class Chouette::StopArea - - def self.model_name - ActiveModel::Name.new Chouette::StopArea, Chouette, "StopArea" - end - -end diff --git a/config/initializers/ui_datepicker-rails3.rb b/config/initializers/ui_datepicker-rails3.rb index 7c53bb46a..b07fd1c7f 100644 --- a/config/initializers/ui_datepicker-rails3.rb +++ b/config/initializers/ui_datepicker-rails3.rb @@ -1 +1 @@ -UiDatePickerRails3.activate :formtastic
\ No newline at end of file +#UiDatePickerRails3.activate :formtastic diff --git a/spec/models/chouette/line_spec.rb b/spec/models/chouette/line_spec.rb deleted file mode 100644 index f5f7286c3..000000000 --- a/spec/models/chouette/line_spec.rb +++ /dev/null @@ -1,15 +0,0 @@ -require 'spec_helper' - -describe Chouette::Line do - - subject { Factory :line } - - it { should validate_presence_of :name } - - it { should validate_presence_of :objectid } - - it { should validate_numericality_of :version } - - it { should validate_uniqueness_of :registrationnumber } - -end |