diff options
| -rw-r--r-- | Gemfile | 69 | ||||
| -rw-r--r-- | Gemfile.lock | 189 | ||||
| -rw-r--r-- | db/schema.rb | 47 |
3 files changed, 136 insertions, 169 deletions
@@ -1,60 +1,60 @@ source 'http://rubygems.org' -gem 'rails', '3.2.6' -gem 'devise' -gem 'devise_invitable' -#gem 'devise-encryptable' - -gem "ffi-proj4", :git => 'git://github.com/dryade/ffi-proj4.git' +gem 'rails', '3.2.6' platforms :jruby do - gem 'activerecord-jdbcpostgresql-adapter', :git => 'git://github.com/dryade/activerecord-jdbc-adapter.git' + gem 'activerecord-jdbcpostgresql-adapter' gem 'activerecord-jdbcsqlite3-adapter' gem 'jruby-openssl' gem "jruby-rack-worker" gem 'warbler' + gem 'therubyrhino' end -platforms :ruby do +platforms :ruby do + gem 'therubyracer', '~> 0.10.2' gem 'pg', '~> 0.11.0' gem 'sqlite3' end -gem "map_layers", "~> 0.0.4" -gem "georuby-ext", :git => 'git://github.com/dryade/georuby-ext.git' +# Authentication +gem 'devise', '2.1.3' +gem 'devise_invitable' -gem 'user_interface', :git => 'git://github.com/dryade/user-interface.git' +# Map, Geolocalization +gem "map_layers", "0.0.4" +gem "georuby-ext", "0.0.2" -gem 'json' +# User interface +gem 'user_interface', "0.0.2" +gem 'gravatar_image_tag' +gem 'calendar_helper', "0.2.5" gem 'cocoon' gem 'formtastic' -gem 'inherited_resources' -gem 'will_paginate', '~> 3.0' -gem 'ransack' -gem 'squeel' gem 'RedCloth' gem 'jquery-rails' gem "modernizr-rails", "~> 2.0.6" -gem 'gravatar_image_tag' -gem 'calendar_helper', :git => "git://github.com/topfunky/calendar_helper.git" -gem "acts_as_tree", :git => "git://github.com/dryade/acts_as_tree.git" -#gem 'ninoxe', :git => 'git://github.com/dryade/ninoxe.git' -gem 'ninoxe', :git => 'git://github.com/dryade/ninoxe.git', :branch => 'master' -#gem 'ninoxe', :git => 'git://chouette.dryade.priv/ninoxe' #, :path => '~/Projects/Ninoxe' -#gem 'ninoxe', :path => '~/workspace/chouette/ninoxe' +# Format Output +gem 'json' + +# Controller +gem 'inherited_resources' + +# Model +gem 'will_paginate', '~> 3.0' +gem 'ransack' +gem 'squeel' +gem 'ninoxe', '0.1.0' gem 'acts_as_list', '0.1.6' -gem 'foreigner', '>=1.3.0' -#gem 'composite_primary_keys', '~> 5.0.8' +gem "acts_as_tree-1.8", '1.1.0', :require => "acts_as_tree" + gem 'delayed_job_active_record' -gem 'apartment',:git => 'git://github.com/dryade/apartment.git' +gem 'dr-apartment', :require => "apartment" # some views use coffee script gem 'coffee-rails', '~> 3.2.1' gem 'coffee-script-source' -gem 'therubyrhino', :platform => :jruby -gem 'therubyracer', '~> 0.10.2', :platform => :ruby - gem 'rabl' # Gems used only for assets and not required @@ -72,20 +72,15 @@ group :development do end group :test, :development do - gem "rspec" - gem "rspec-rails" + gem "rspec-rails", "~> 2.0" gem "remarkable", "~> 4.0.0.alpha4" gem "remarkable_activerecord", "~> 4.0.0.alpha4" gem "shoulda-matchers" - gem 'rb-inotify', :require => RUBY_PLATFORM.include?('linux') && 'rb-inotify' - gem 'rb-fsevent', :require => RUBY_PLATFORM.include?('darwin') && 'rb-fsevent' -end - -group :test do gem 'capybara' gem 'launchy' - gem 'database_cleaner', :git => 'git://github.com/dnagir/database_cleaner.git', :branch => 'postgre_jruby_issue' gem 'factory_girl_rails', '1.7' + gem 'rb-inotify', :require => RUBY_PLATFORM.include?('linux') && 'rb-inotify' + gem 'rb-fsevent', :require => RUBY_PLATFORM.include?('darwin') && 'rb-fsevent' end group :production do diff --git a/Gemfile.lock b/Gemfile.lock index 9afc3d254..f7a91bf68 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,83 +1,6 @@ -GIT - remote: git://github.com/dnagir/database_cleaner.git - revision: 0c0aa44f13ae392000a6f506b62d5d1602cb4e53 - branch: postgre_jruby_issue - specs: - database_cleaner (0.7.0) - -GIT - remote: git://github.com/dryade/activerecord-jdbc-adapter.git - revision: 0bf424bc3bcaf9f44646976cc4c1a8e9e57f11b4 - specs: - activerecord-jdbc-adapter (1.2.2) - activerecord-jdbcpostgresql-adapter (1.2.2) - activerecord-jdbc-adapter (~> 1.2.2) - jdbc-postgres (>= 9.0, < 9.2) - jdbc-sqlite3 (3.7.2) - -GIT - remote: git://github.com/dryade/acts_as_tree.git - revision: 36ced5234beafdb3b21c2c2e2aa1686d37061497 - specs: - acts_as_tree (1.1.0) - activerecord (>= 3.0.0) - -GIT - remote: git://github.com/dryade/apartment.git - revision: cd6185f55eb6d9df958599825e848af4e12a9eae - specs: - apartment (0.14.1) - -GIT - remote: git://github.com/dryade/ffi-proj4.git - revision: 7ae89176e8ddc1c2175192ecbff0e9cffbedcb99 - specs: - ffi-proj4 (0.0.1) - ffi (~> 1.0.0) - -GIT - remote: git://github.com/dryade/georuby-ext.git - revision: be03b9d2e43f970eb368ab52c19b9dbfc68cc540 - specs: - georuby-ext (0.0.1) - activesupport - ffi-geos (~> 0.0.4) - geokit - georuby - json_pure - rgeo (~> 0.3.8) - -GIT - remote: git://github.com/dryade/ninoxe.git - revision: fbc7d492337b48b4199ba7a6bc1db06579f356f1 - branch: master - specs: - ninoxe (0.0.8) - GeoRuby - activerecord (>= 3.1.3) - acts_as_list (>= 0.1.6) - foreigner (>= 1.3.0) - geokit - rails (>= 3.1.3) - -GIT - remote: git://github.com/dryade/user-interface.git - revision: 2a30a4eb3ff446f9d2b2de12ecacb5f923e5623c - specs: - user_interface (0.0.1) - rails (> 3.1.0) - -GIT - remote: git://github.com/topfunky/calendar_helper.git - revision: 763a497dbd8833b98d92815667b367ade938c00c - specs: - calendar_helper (0.2.5) - open4 - GEM remote: http://rubygems.org/ specs: - GeoRuby (1.3.4) RedCloth (4.2.9) RedCloth (4.2.9-java) SyslogLogger (1.4.1) @@ -102,6 +25,10 @@ GEM activesupport (= 3.2.6) arel (~> 3.0.2) tzinfo (~> 0.3.29) + activerecord-jdbc-adapter (1.2.7) + activerecord-jdbcpostgresql-adapter (1.2.7) + activerecord-jdbc-adapter (~> 1.2.7) + jdbc-postgres (>= 9.1, < 9.3) activerecord-jdbcsqlite3-adapter (1.2.1) activerecord-jdbc-adapter (~> 1.2.1) jdbc-sqlite3 (~> 3.7.2) @@ -112,12 +39,16 @@ GEM i18n (~> 0.6) multi_json (~> 1.0) acts_as_list (0.1.6) + acts_as_tree-1.8 (1.1.0) + activerecord (>= 3.0.0) addressable (2.2.8) arel (3.0.2) bcrypt-ruby (3.0.1) bcrypt-ruby (3.0.1-java) bouncy-castle-java (1.5.0146.1) builder (3.0.4) + calendar_helper (0.2.5) + open4 capistrano (2.13.5) highline net-scp (>= 1.0.0) @@ -143,21 +74,26 @@ GEM coffee-script-source execjs coffee-script-source (1.3.3) + dbf (2.0.3) + fastercsv (~> 1.5.4) delayed_job (3.0.3) activesupport (~> 3.0) delayed_job_active_record (0.3.2) activerecord (> 2.1.0) delayed_job (~> 3.0.0) - devise (2.1.2) + devise (2.1.3) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) - railties (~> 3.1)fbc7d492337b48b4199ba7a6bc1db06579f356f1 + railties (~> 3.1) warden (~> 1.2.1) devise_invitable (1.1.0) actionmailer (~> 3.0) devise (>= 2.1.0) railties (~> 3.0) - diff-lcs (1.1.3) + diff-lcs (1.2.1) + dr-apartment (0.14.1) + dr-ffi-proj4 (0.0.1) + ffi (>= 1.0.0) erubis (2.7.0) execjs (1.4.0) multi_json (~> 1.0) @@ -166,19 +102,30 @@ GEM factory_girl_rails (1.7.0) factory_girl (~> 2.6.0) railties (>= 3.0.0) + fastercsv (1.5.5) ffi (1.0.11) ffi (1.0.11-java) - ffi-geos (0.0.6) + ffi-geos (0.1.1) ffi (>= 1.0.0) rake (~> 0.9) rdoc - foreigner (1.3.0) + foreigner (1.4.0) activerecord (>= 3.0.0) formtastic (2.2.1) actionpack (>= 3.0) geokit (1.6.5) multi_json - georuby (1.9.7) + georuby (1.9.8) + georuby-ext (0.0.2) + activesupport + dbf + dr-ffi-proj4 (= 0.0.1) + ffi-geos (= 0.1.1) + geokit + georuby (= 1.9.8) + json_pure + nokogiri + rgeo (= 0.3.20) gravatar_image_tag (1.1.3) guard (1.3.2) listen (>= 0.4.2) @@ -192,7 +139,8 @@ GEM inherited_resources (1.3.1) has_scope (~> 0.5.0) responders (~> 0.6) - jdbc-postgres (9.0.801) + jdbc-postgres (9.2.1002.1) + jdbc-sqlite3 (3.7.2.1) journey (1.0.4) jquery-rails (2.1.1) railties (>= 3.1.0, < 5.0) @@ -203,8 +151,8 @@ GEM jruby-rack (1.1.9) jruby-rack-worker (0.4-java) jruby-rack (>= 1.1.1) - json (1.7.6) - json (1.7.6-java) + json (1.7.7) + json (1.7.7-java) json_pure (1.7.5) launchy (2.1.0) addressable (~> 2.2.6) @@ -223,10 +171,10 @@ GEM i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - map_layers (0.0.5) + map_layers (0.0.4) mime-types (1.19) modernizr-rails (2.0.6) - multi_json (1.4.0) + multi_json (1.6.1) net-scp (1.0.4) net-ssh (>= 1.99.1) net-sftp (2.0.5) @@ -234,6 +182,11 @@ GEM net-ssh (2.6.2) net-ssh-gateway (1.1.0) net-ssh (>= 1.99.1) + ninoxe (0.1.0) + activerecord (>= 3.1.3) + acts_as_list (= 0.1.6) + foreigner (= 1.4.0) + georuby-ext (= 0.0.2) nokogiri (1.5.5) nokogiri (1.5.5-java) open4 (1.3.0) @@ -245,10 +198,10 @@ GEM rabl (0.7.8) activesupport (>= 2.3.14) multi_json (~> 1.0) - rack (1.4.1) + rack (1.4.5) rack-cache (1.2) rack (>= 0.4) - rack-ssl (1.3.2) + rack-ssl (1.3.3) rack rack-test (0.6.2) rack (>= 1.0) @@ -267,7 +220,7 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (0.9.5) + rake (0.9.6) ransack (0.7.0) actionpack (~> 3.0) activerecord (~> 3.0) @@ -277,7 +230,7 @@ GEM rb-fsevent (0.9.1) rb-inotify (0.8.8) ffi (>= 0.5.0) - rdoc (3.12) + rdoc (3.12.2) json (~> 1.4) remarkable (4.0.0.alpha4) rspec (>= 2.0.0.alpha11) @@ -290,20 +243,22 @@ GEM rspec (>= 2.0.0.alpha11) responders (0.9.2) railties (~> 3.1) - rgeo (0.3.17) - rspec (2.11.0) - rspec-core (~> 2.11.0) - rspec-expectations (~> 2.11.0) - rspec-mocks (~> 2.11.0) - rspec-core (2.11.1) - rspec-expectations (2.11.2) - diff-lcs (~> 1.1.3) - rspec-mocks (2.11.2) - rspec-rails (2.11.0) + rgeo (0.3.20) + rspec (2.13.0) + rspec-core (~> 2.13.0) + rspec-expectations (~> 2.13.0) + rspec-mocks (~> 2.13.0) + rspec-core (2.13.0) + rspec-expectations (2.13.0) + diff-lcs (>= 1.1.3, < 2.0) + rspec-mocks (2.13.0) + rspec-rails (2.13.0) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec (~> 2.11.0) + rspec-core (~> 2.13.0) + rspec-expectations (~> 2.13.0) + rspec-mocks (~> 2.13.0) rubyzip (0.9.9) sass (3.2.1) sass-rails (3.2.5) @@ -332,7 +287,7 @@ GEM therubyrhino (2.0.1) therubyrhino_jar (>= 1.7.3) therubyrhino_jar (1.7.4) - thor (0.16.0) + thor (0.17.0) tilt (1.3.3) treetop (1.4.12) polyglot @@ -341,6 +296,8 @@ GEM uglifier (1.2.7) execjs (>= 0.3.0) multi_json (~> 1.3) + user_interface (0.0.2) + rails (> 3.1.0) warbler (1.3.6) jruby-jars (>= 1.4.0) jruby-rack (>= 1.0.0) @@ -359,27 +316,24 @@ PLATFORMS DEPENDENCIES RedCloth SyslogLogger - activerecord-jdbcpostgresql-adapter! + activerecord-jdbcpostgresql-adapter activerecord-jdbcsqlite3-adapter acts_as_list (= 0.1.6) - acts_as_tree! - apartment! - calendar_helper! + acts_as_tree-1.8 (= 1.1.0) + calendar_helper (= 0.2.5) capistrano capistrano-ext capybara cocoon coffee-rails (~> 3.2.1) coffee-script-source - database_cleaner! delayed_job_active_record - devise + devise (= 2.1.3) devise_invitable + dr-apartment factory_girl_rails (= 1.7) - ffi-proj4! - foreigner (>= 1.3.0) formtastic - georuby-ext! + georuby-ext (= 0.0.2) gravatar_image_tag guard guard-rspec @@ -389,9 +343,9 @@ DEPENDENCIES jruby-rack-worker json launchy - map_layers (~> 0.0.4) + map_layers (= 0.0.4) modernizr-rails (~> 2.0.6) - ninoxe! + ninoxe (= 0.1.0) pg (~> 0.11.0) rabl rails (= 3.2.6) @@ -400,8 +354,7 @@ DEPENDENCIES rb-inotify remarkable (~> 4.0.0.alpha4) remarkable_activerecord (~> 4.0.0.alpha4) - rspec - rspec-rails + rspec-rails (~> 2.0) sass-rails (~> 3.2.3) shoulda-matchers sqlite3 @@ -409,6 +362,6 @@ DEPENDENCIES therubyracer (~> 0.10.2) therubyrhino uglifier (>= 1.0.3) - user_interface! + user_interface (= 0.0.2) warbler will_paginate (~> 3.0) diff --git a/db/schema.rb b/db/schema.rb index 2b372d0b4..22203c823 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -123,8 +123,8 @@ ActiveRecord::Schema.define(:version => 20130207123618) do t.datetime "failed_at" t.string "locked_by" t.string "queue" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" end add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority" @@ -135,8 +135,8 @@ ActiveRecord::Schema.define(:version => 20130207123618) do t.string "arguments", :limit => 1000 t.integer "position" t.string "severity" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" end add_index "export_log_messages", ["export_id"], :name => "index_export_log_messages_on_export_id" @@ -146,8 +146,8 @@ ActiveRecord::Schema.define(:version => 20130207123618) do t.string "status" t.string "type" t.string "options" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" t.string "references_type" t.string "reference_ids" end @@ -207,6 +207,16 @@ ActiveRecord::Schema.define(:version => 20130207123618) do t.integer "organisation_id" end + create_table "geometry_columns", :id => false, :force => true do |t| + t.string "f_table_catalog", :limit => 256, :null => false + t.string "f_table_schema", :limit => 256, :null => false + t.string "f_table_name", :limit => 256, :null => false + t.string "f_geometry_column", :limit => 256, :null => false + t.integer "coord_dimension", :null => false + t.integer "srid", :null => false + t.string "type", :limit => 30, :null => false + end + create_table "group_of_lines", :force => true do |t| t.string "objectid", :null => false t.integer "object_version" @@ -229,8 +239,8 @@ ActiveRecord::Schema.define(:version => 20130207123618) do t.string "arguments", :limit => 1000 t.integer "position" t.string "severity" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" end add_index "import_log_messages", ["import_id"], :name => "index_import_log_messages_on_import_id" @@ -238,8 +248,8 @@ ActiveRecord::Schema.define(:version => 20130207123618) do create_table "imports", :force => true do |t| t.integer "referential_id" t.string "status" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" t.string "type" t.string "options" t.string "file_type" @@ -332,11 +342,12 @@ ActiveRecord::Schema.define(:version => 20130207123618) do create_table "referentials", :force => true do |t| t.string "name" t.string "slug" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" t.string "prefix" t.string "projection_type" t.string "time_zone" + t.string "the_geom" t.string "bounds" t.integer "organisation_id" end @@ -363,6 +374,14 @@ ActiveRecord::Schema.define(:version => 20130207123618) do t.integer "line_id", :limit => 8 end + create_table "spatial_ref_sys", :id => false, :force => true do |t| + t.integer "srid", :null => false + t.string "auth_name", :limit => 256 + t.integer "auth_srid" + t.string "srtext", :limit => 2048 + t.string "proj4text", :limit => 2048 + end + create_table "stop_areas", :force => true do |t| t.integer "parent_id", :limit => 8 t.string "objectid", :null => false @@ -467,8 +486,8 @@ ActiveRecord::Schema.define(:version => 20130207123618) do t.datetime "last_sign_in_at" t.string "current_sign_in_ip" t.string "last_sign_in_ip" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" t.integer "organisation_id" t.string "name" t.string "confirmation_token" |