Permalink
Browse files

Merge branch 'master' of git://github.com/sferik/rails_admin into see…

…ds-orm-agnostic
  • Loading branch information...
timkurvers committed Apr 15, 2012
2 parents c981437 + adc9a7a commit 4c6814a3a58435b9fd8bdbf6148dc19de5be3d6f
Showing with 354 additions and 354 deletions.
  1. +0 −1 .gitignore
  2. +7 −59 .travis.yml
  3. +8 −10 Gemfile
  4. +0 −74 Gemfile31
  5. +154 −81 app/assets/javascripts/rails_admin/jquery.pjax.js
  6. +4 −4 app/assets/javascripts/rails_admin/ra.widgets.coffee
  7. +1 −0 app/assets/stylesheets/rails_admin/imports.css.scss.erb
  8. +3 −1 app/helpers/rails_admin/application_helper.rb
  9. +10 −1 app/helpers/rails_admin/form_builder.rb
  10. +2 −2 app/views/rails_admin/main/export.html.haml
  11. +10 −16 lib/rails_admin/abstract_model.rb
  12. +13 −13 lib/rails_admin/adapters/active_record.rb
  13. +18 −15 lib/rails_admin/adapters/mongoid.rb
  14. +3 −2 lib/rails_admin/config.rb
  15. +0 −1 lib/rails_admin/config/fields/types/all.rb
  16. +0 −25 lib/rails_admin/config/fields/types/mongoid_type.rb
  17. +1 −0 lib/rails_admin/config/sections.rb
  18. +10 −0 lib/rails_admin/config/sections/modal.rb
  19. +4 −2 rails_admin.gemspec
  20. +1 −1 spec/dummy_app/Gemfile
  21. +0 −2 spec/dummy_app/app/helpers/application_helper.rb
  22. +1 −1 spec/dummy_app/app/mongoid/field_test.rb
  23. +1 −1 spec/dummy_app/app/mongoid/nested_field_test.rb
  24. +0 −2 spec/dummy_app/config/application.rb
  25. +1 −1 spec/dummy_app/config/boot.rb
  26. +2 −2 spec/integration/basic/export/rails_admin_basic_export_spec.rb
  27. +3 −2 spec/integration/basic/update/rails_admin_basic_update_spec.rb
  28. +1 −1 spec/integration/config/edit/rails_admin_config_edit_spec.rb
  29. +1 −0 spec/orm/mongoid.rb
  30. +45 −0 spec/unit/abstract_model_spec.rb
  31. +5 −5 spec/unit/adapters/active_record/abstract_object_spec.rb
  32. +12 −14 spec/unit/adapters/active_record_spec.rb
  33. +12 −15 spec/unit/adapters/mongoid_spec.rb
  34. +21 −0 spec/unit/config/fields/base_spec.rb
View
@@ -2,7 +2,6 @@
*.log
*.rbc
*.swp
-.DS_Store
.bundle
.idea/
.rvmrc
View
@@ -1,79 +1,27 @@
bundler_args: "--without debug"
-script: spec/ci.sh
rvm:
+ - jruby-19mode
- 1.8.7
- 1.9.3
- - jruby-18mode
env:
- "CI_ORM=active_record CI_DB_ADAPTER=sqlite3"
- "CI_ORM=active_record CI_DB_ADAPTER=postgresql CI_DB_USERNAME=postgres"
- "CI_ORM=active_record CI_DB_ADAPTER=mysql"
- "CI_ORM=mongoid"
- "CI_ORM=mongoid CI_ORM_VERSION=head"
-gemfile:
- - Gemfile
- - Gemfile31
language: ruby
matrix:
exclude:
- - rvm: 1.8.7
- env: "CI_ORM=active_record CI_DB_ADAPTER=sqlite3"
- gemfile: Gemfile
- - rvm: 1.8.7
- env: "CI_ORM=active_record CI_DB_ADAPTER=sqlite3"
- gemfile: Gemfile31
- - rvm: 1.8.7
- env: "CI_ORM=active_record CI_DB_ADAPTER=postgresql CI_DB_USERNAME=postgres"
- gemfile: Gemfile
- - rvm: 1.8.7
+ - rvm: jruby-19mode
env: "CI_ORM=active_record CI_DB_ADAPTER=postgresql CI_DB_USERNAME=postgres"
- gemfile: Gemfile31
- - rvm: 1.8.7
- gemfile: Gemfile31
+ - rvm: jruby-19mode
env: "CI_ORM=active_record CI_DB_ADAPTER=mysql"
- - rvm: 1.8.7
- gemfile: Gemfile
+ - rvm: jruby-19mode
env: "CI_ORM=mongoid CI_ORM_VERSION=head"
- rvm: 1.8.7
- gemfile: Gemfile31
- env: "CI_ORM=mongoid"
- - rvm: 1.8.7
- gemfile: Gemfile31
env: "CI_ORM=mongoid CI_ORM_VERSION=head"
-
- - rvm: jruby-18mode
- env: "CI_ORM=active_record CI_DB_ADAPTER=mysql"
- gemfile: Gemfile
- - rvm: jruby-18mode
- env: "CI_ORM=active_record CI_DB_ADAPTER=mysql"
- gemfile: Gemfile31
- - rvm: jruby-18mode
- env: "CI_ORM=active_record CI_DB_ADAPTER=postgresql CI_DB_USERNAME=postgres"
- gemfile: Gemfile
- - rvm: jruby-18mode
- env: "CI_ORM=active_record CI_DB_ADAPTER=postgresql CI_DB_USERNAME=postgres"
- gemfile: Gemfile31
- - rvm: jruby-18mode
- env: "CI_ORM=active_record CI_DB_ADAPTER=sqlite3"
- gemfile: Gemfile31
- - rvm: jruby-18mode
- gemfile: Gemfile
- env: "CI_ORM=mongoid CI_ORM_VERSION=head"
- - rvm: jruby-18mode
- gemfile: Gemfile31
- env: "CI_ORM=mongoid"
- - rvm: jruby-18mode
- gemfile: Gemfile31
- env: "CI_ORM=mongoid CI_ORM_VERSION=head"
-
- - rvm: 1.9.3
- env: "CI_ORM=active_record CI_DB_ADAPTER=mysql"
- gemfile: Gemfile
- - rvm: 1.9.3
- env: "CI_ORM=active_record CI_DB_ADAPTER=mysql"
- gemfile: Gemfile31
- - rvm: 1.9.3
- gemfile: Gemfile31
- env: "CI_ORM=active_record CI_DB_ADAPTER=postgresql CI_DB_USERNAME=postgres"
+ allow_failures:
+ - env: "CI_ORM=mongoid CI_ORM_VERSION=head"
notifications:
irc: "irc.freenode.org#railsadmin"
+script: spec/ci.sh
View
18 Gemfile
@@ -28,29 +28,21 @@ group :active_record do
gem 'sqlite3', '~> 1.3'
end
end
- gem 'paperclip', '~>2.4'
gem 'carrierwave'
- gem 'dragonfly'
end
group :mongoid do
- gem 'bson_ext'
+ gem 'bson_ext', :platforms => [:ruby, :mswin, :mingw]
case ENV['CI_ORM_VERSION']
when 'head'
gem 'mongoid', :git => 'git://github.com/mongoid/mongoid.git'
- # For now, carrierwave-mongooid's mongoid dependency is restricted to '~> 2.1'
+ # For now, carrierwave-mongoid's mongoid dependency is restricted to '~> 2.1'
gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid', :git => 'git://github.com/tanordheim/carrierwave-mongoid.git', :branch => 'mongoid_3_0'
else
gem 'mongoid'
gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'
end
gem 'mongoid-paperclip', :require => 'mongoid_paperclip'
- gem 'paperclip', '~>2.4'
- gem 'dragonfly'
-end
-
-group :development, :test do
- gem 'cancan'
end
group :debug do
@@ -73,4 +65,10 @@ platforms :jruby, :mingw_18, :ruby_18 do
gem 'fastercsv', '~> 1.5'
end
+group :development, :test do
+ gem 'cancan'
+ gem 'devise'
+ gem 'paperclip', '~> 2.7'
+end
+
gemspec
View
@@ -1,74 +0,0 @@
-source 'https://rubygems.org'
-
-# Bundle gems for the local environment. Make sure to
-# put test-only gems in this group so their generators
-# and rake tasks are available in development mode:
-gem 'rails', '~> 3.1.3'
-
-group :active_record do
- platforms :jruby do
- gem 'jruby-openssl', '~> 0.7'
- case ENV['CI_DB_ADAPTER']
- when 'mysql'
- gem 'activerecord-jdbcmysql-adapter', '~> 1.2'
- gem 'jdbc-mysql', '~> 5.1'
- when 'postgresql'
- gem 'activerecord-jdbcpostgresql-adapter', '~> 1.2'
- gem 'jdbc-postgres', '~> 9.0'
- else
- gem 'activerecord-jdbcsqlite3-adapter', '~> 1.2'
- gem 'jdbc-sqlite3', '~> 3.6'
- end
- end
-
- platforms :ruby, :mswin, :mingw do
- case ENV['CI_DB_ADAPTER']
- when 'mysql'
- gem 'mysql', '~> 2.8'
- when 'postgresql'
- gem 'pg', '~> 0.13'
- else
- gem 'sqlite3', '~> 1.3'
- end
- end
- gem 'paperclip', '~>2.4'
- gem 'carrierwave'
- gem 'dragonfly'
-end
-
-group :mongoid do
- gem 'bson_ext'
- case ENV['CI_ORM_VERSION']
- when 'head'
- gem 'mongoid', :git => 'git://github.com/mongoid/mongoid.git'
- # For now, carrierwave-mongooid's mongoid dependency is restricted to '~> 2.1'
- gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid', :git => 'git://github.com/tanordheim/carrierwave-mongoid.git', :branch => 'mongoid_3_0'
- else
- gem 'mongoid'
- gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'
- end
- gem 'mongoid-paperclip', :require => 'mongoid_paperclip'
- gem 'paperclip', '~>2.4'
- gem 'dragonfly'
-end
-
-group :development, :test do
- gem 'cancan'
-end
-
-group :debug do
- platform :mri_18 do
- gem 'ruby-debug'
- gem 'linecache'
- end
-
- platform :mri_19 do
- gem 'ruby-debug19'
- end
-end
-
-platforms :jruby, :mingw_18, :ruby_18 do
- gem 'fastercsv', '~> 1.5'
-end
-
-gemspec
Oops, something went wrong.

0 comments on commit 4c6814a

Please sign in to comment.