rails_admin 0.1.2 → 0.2.0

data/lib/tasks/rails_admin.rake

@@ -6,7 +6,7 @@ namespace :rails_admin do
       puts "[RailsAdmin] RailsAdmin initialization disabled by default. Pass SKIP_RAILS_ADMIN_INITIALIZER=false if you need it."
     end
   end
-  
+
   desc "Install rails_admin"
   task :install do
     system 'rails g rails_admin:install'
@@ -16,7 +16,7 @@ namespace :rails_admin do
   task :uninstall do
     system 'rails g rails_admin:uninstall'
   end
-  
+
   desc "CI env for Travis"
   task :prepare_ci_env do
     ENV['SKIP_RAILS_ADMIN_INITIALIZER'] = 'true'

data/spec/controllers/main_controller_spec.rb

@@ -9,12 +9,12 @@ describe RailsAdmin::MainController do
       controller.stub(:render).and_return(true) # no rendering
     end
 
-    it "should show statistics by default" do
+    it "shows statistics by default" do
       RailsAdmin.config(Player).abstract_model.should_receive(:count).and_return(0)
       controller.dashboard
     end
 
-    it "should not show statistics if turned off" do
+    it "does not show statistics if turned off" do
       RailsAdmin.config do |c|
         c.actions do
           dashboard do
@@ -30,7 +30,7 @@ describe RailsAdmin::MainController do
 
   describe "#check_for_cancel" do
 
-    it "should redirect to back if params[:bulk_ids] is nil when params[:bulk_action] is present" do
+    it "redirects to back if params[:bulk_ids] is nil when params[:bulk_action] is present" do
       controller.stub(:back_or_index) { raise StandardError.new('redirected back') }
       expect { get :bulk_delete, { :model_name => "player", :bulk_action =>"bulk_delete" } }.to raise_error('redirected back')
       expect { get :bulk_delete, { :model_name => "player", :bulk_action =>"bulk_delete", :bulk_ids => [] } }.to_not raise_error('redirected back')
@@ -38,12 +38,12 @@ describe RailsAdmin::MainController do
   end
 
   describe "#get_sort_hash" do
-    it 'should work with belongs_to associations with label method virtual' do
+    it "works with belongs_to associations with label method virtual" do
       controller.params = { :sort => "parent_category", :model_name =>"categories" }
       expect(controller.send(:get_sort_hash, RailsAdmin.config(Category))).to eq({:sort=>"categories.parent_category_id", :sort_reverse=>true})
     end
 
-    it 'should work with belongs_to associations with label method real column' do
+    it "works with belongs_to associations with label method real column" do
       controller.params = { :sort => "team", :model_name =>"players" }
       expect(controller.send(:get_sort_hash, RailsAdmin.config(Player))).to eq({:sort=>"teams.name", :sort_reverse=>true})
     end
@@ -55,7 +55,7 @@ describe RailsAdmin::MainController do
       controller.params = { :model_name => "teams" }
     end
 
-    it "should paginate" do
+    it "paginates" do
       expect(controller.list_entries(RailsAdmin.config(Team), :index, nil, false).to_a.length).to eq(21)
       expect(controller.list_entries(RailsAdmin.config(Team), :index, nil, true).to_a.length).to eq(20)
     end
@@ -67,7 +67,7 @@ describe RailsAdmin::MainController do
       controller.params = { :model_name => "teams", :bulk_action => "bulk_delete", :bulk_ids => @teams.map(&:id) }
     end
 
-    it "should not paginate" do
+    it "does not paginate" do
       expect(controller.list_entries(RailsAdmin.config(Team), :bulk_delete).to_a.length).to eq(21)
     end
   end
@@ -174,56 +174,124 @@ describe RailsAdmin::MainController do
   end
 
   describe "sanitize_params_for!" do
-    it 'sanitize params recursively in nested forms' do
-      RailsAdmin.config Comment do
-        configure :created_at do
-          show
-        end
+    context "in France" do
+      before do
+        I18n.locale = :fr
+      end
+      after do
+        I18n.locale = :en
       end
 
-      RailsAdmin.config NestedFieldTest do
-        configure :created_at do
-          show
+      it "sanitize params recursively in nested forms" do
+        RailsAdmin.config Comment do
+          configure :created_at do
+            show
+          end
         end
-      end
 
-      I18n.locale = :fr
-      controller.params = {
-        "field_test"=>{
-          :"datetime_field"=>"1 août 2010",
-          "nested_field_tests_attributes"=>{
-            "new_1330520162002"=>{
-              "comment_attributes"=>{
-                :"created_at"=>"2 août 2010"
-              },
-              :"created_at"=>"3 août 2010"
+        RailsAdmin.config NestedFieldTest do
+          configure :created_at do
+            show
+          end
+        end
+      
+        controller.params = HashWithIndifferentAccess.new({
+          "field_test"=>{
+            "unallowed_field" => "I shouldn't be here",
+            "datetime_field"=>"1 août 2010",
+            "nested_field_tests_attributes"=>{
+              "new_1330520162002"=>{
+                "comment_attributes"=>{
+                  "unallowed_field" => "I shouldn't be here",
+                  "created_at"=>"2 août 2010"
+                },
+                "created_at"=>"3 août 2010"
+              }
+            },
+            "comment_attributes"=>{
+              "unallowed_field" => "I shouldn't be here",
+              "created_at"=>"4 août 2010"
             }
-          },
-          "comment_attributes"=>{
-            :"created_at"=>"4 août 2010"
           }
+        })
+
+        controller.send(:sanitize_params_for!, :create, RailsAdmin.config(FieldTest), controller.params['field_test'])
+
+        expect(controller.params).to eq({
+          "field_test"=>{
+            "datetime_field"=>'Sun, 01 Aug 2010 00:00:00 UTC +00:00',
+            "nested_field_tests_attributes"=>{
+              "new_1330520162002"=>{
+                "comment_attributes"=>{
+                  "created_at"=>'Mon, 02 Aug 2010 00:00:00 UTC +00:00'
+                },
+                "created_at"=>'Tue, 03 Aug 2010 00:00:00 UTC +00:00'
+              }
+            },
+            "comment_attributes"=>{
+              "created_at"=>'Wed, 04 Aug 2010 00:00:00 UTC +00:00'
+            }
+          }
+        })
+      end
+    end
+    
+    it "allows for delete method with Carrierwave" do
+
+      RailsAdmin.config FieldTest do
+        field :carrierwave_asset
+        field :dragonfly_asset
+        field :paperclip_asset do
+          delete_method :delete_paperclip_asset
+        end
+      end
+      controller.params = HashWithIndifferentAccess.new({
+        "field_test"=>{
+          "carrierwave_asset" => "test",
+          "carrierwave_asset_cache" => "test", 
+          "remove_carrierwave_asset" => "test", 
+          "dragonfly_asset" => "test",
+          "remove_dragonfly_asset" => "test",
+          "retained_dragonfly_asset" => "test",
+          "paperclip_asset" => "test",
+          "delete_paperclip_asset" => "test",
+          "should_not_be_here" => "test"
         }
-      }
+      })
 
       controller.send(:sanitize_params_for!, :create, RailsAdmin.config(FieldTest), controller.params['field_test'])
-
-      expect(controller.params).to eq({
+      expect(controller.params).to eq(
         "field_test"=>{
-          :datetime_field=>'Sun, 01 Aug 2010 00:00:00 UTC +00:00',
-          "nested_field_tests_attributes"=>{
-            "new_1330520162002"=>{
-              "comment_attributes"=>{
-                :created_at=>'Mon, 02 Aug 2010 00:00:00 UTC +00:00'
-              },
-              :created_at=>'Tue, 03 Aug 2010 00:00:00 UTC +00:00'
-            }
-          },
-          "comment_attributes"=>{
-            :created_at=>'Wed, 04 Aug 2010 00:00:00 UTC +00:00'
-          }
+          "carrierwave_asset"=>"test", 
+          "remove_carrierwave_asset"=>"test", 
+          "carrierwave_asset_cache"=>"test", 
+          "dragonfly_asset"=>"test", 
+          "remove_dragonfly_asset"=>"test", 
+          "retained_dragonfly_asset"=>"test", 
+          "paperclip_asset"=>"test",
+          "delete_paperclip_asset"=>"test"
+        })
+    end
+    
+    it "allows for polymorphic associations parameters" do
+      RailsAdmin.config Comment do
+        field :commentable
+      end
+      
+      controller.params = HashWithIndifferentAccess.new({
+        "comment"=>{
+          "commentable_id" => "test",
+          "commentable_type" => "test"
         }
       })
-      I18n.locale = :en
+      controller.send(:sanitize_params_for!, :create, RailsAdmin.config(Comment), controller.params['comment'])
+      expect(controller.params).to eq(
+        "comment"=>{
+          "commentable_id" => "test",
+          "commentable_type" => "test"
+        })
     end
   end
+  
+  
 end

data/spec/dummy_app/Gemfile

@@ -1,21 +1,12 @@
 source 'https://rubygems.org'
 
 gem 'rails', '~> 3.2'
+gem 'strong_parameters', github: 'rails/strong_parameters' # 0.1.5 min, not released yet
 
 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
+    gem 'activerecord-jdbcsqlite3-adapter', '~> 1.2'
+    gem 'jdbc-sqlite3', '~> 3.6'
   end
 
   platforms :ruby, :mswin, :mingw do
@@ -23,7 +14,7 @@ group :active_record do
     when 'mysql'
       gem 'mysql', '~> 2.8'
     when 'postgresql'
-      gem 'pg', '~> 0.10'
+      gem 'pg', '~> 0.13'
     else
       gem 'sqlite3', '~> 1.3'
     end
@@ -32,18 +23,17 @@ end
 
 group :mongoid do
   gem 'mongoid', '~> 3.0'
-  gem 'mongoid-paperclip', :require => 'mongoid_paperclip', :git => 'git://github.com/meskyanichi/mongoid-paperclip.git', :branch => 'develop'
+  gem 'mongoid-paperclip', '~> 0.0.8', :require => 'mongoid_paperclip'
   gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid', :git => 'git://github.com/jnicklas/carrierwave-mongoid.git', :branch => 'mongoid-3.0'
 end
 
-gem 'paperclip'
-gem 'carrierwave'
-gem 'dragonfly'
-
-gem 'devise', '~> 2.0'
-gem 'rails_admin', :path => '../../'
+gem 'carrierwave', '~> 0.6'
+gem 'devise', '~> 2.1'
+gem 'dragonfly', '~> 0.9'
+gem 'mini_magick', '~> 3.4'
 gem 'mlb', '~> 0.5'
-gem 'mini_magick'
+gem 'paperclip', '~> 3.3'
+gem 'rails_admin', :path => '../../'
 
 # Gems used only for assets and not required
 # in production environments by default.
@@ -56,7 +46,3 @@ group :assets do
 
   gem 'uglifier', '>= 1.0.3'
 end
-
-platforms :jruby, :mingw_18, :ruby_18 do
-  gem 'fastercsv', '~> 1.5'
-end

data/spec/dummy_app/Gemfile.lock

@@ -0,0 +1,214 @@
+GIT
+  remote: git://github.com/jnicklas/carrierwave-mongoid.git
+  revision: 28a9b718d42b8aba47d2eb951f73bd9d872b6eb0
+  branch: mongoid-3.0
+  specs:
+    carrierwave-mongoid (0.3.0.alpha)
+      carrierwave (~> 0.6.1)
+      mongoid (~> 3.0.0)
+      mongoid-grid_fs (~> 1.3.1)
+
+PATH
+  remote: ../../
+  specs:
+    rails_admin (0.1.2)
+      bootstrap-sass (~> 2.0)
+      builder (~> 3.0)
+      coffee-rails (~> 3.1)
+      font-awesome-sass-rails (~> 2.0)
+      haml (~> 3.1)
+      jquery-rails (~> 2.0)
+      jquery-ui-rails (~> 2.0)
+      kaminari (~> 0.12)
+      nested_form (~> 0.2.3)
+      rack-pjax (~> 0.5)
+      rails (~> 3.1)
+      remotipart (~> 1.0)
+      sass-rails (~> 3.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (3.2.8)
+      actionpack (= 3.2.8)
+      mail (~> 2.4.4)
+    actionpack (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+    activerecord (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+    activesupport (3.2.8)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    bcrypt-ruby (3.0.1)
+    bootstrap-sass (2.1.0.0)
+    builder (3.0.3)
+    carrierwave (0.6.2)
+      activemodel (>= 3.2.0)
+      activesupport (>= 3.2.0)
+    cocaine (0.4.0)
+    coffee-rails (3.2.2)
+      coffee-script (>= 2.2.0)
+      railties (~> 3.2.0)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.3.3)
+    devise (2.1.2)
+      bcrypt-ruby (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (~> 3.1)
+      warden (~> 1.2.1)
+    dragonfly (0.9.12)
+      rack
+    erubis (2.7.0)
+    execjs (1.4.0)
+      multi_json (~> 1.0)
+    faraday (0.8.4)
+      multipart-post (~> 1.1)
+    faraday_middleware (0.8.8)
+      faraday (>= 0.7.4, < 0.9)
+    font-awesome-sass-rails (2.0.0.0)
+      railties (>= 3.1.1)
+      sass-rails (>= 3.1.1)
+    haml (3.1.7)
+    hike (1.2.1)
+    i18n (0.6.1)
+    journey (1.0.4)
+    jquery-rails (2.1.3)
+      railties (>= 3.1.0, < 5.0)
+      thor (~> 0.14)
+    jquery-ui-rails (2.0.2)
+      jquery-rails
+      railties (>= 3.1.0)
+    json (1.7.5)
+    kaminari (0.14.1)
+      actionpack (>= 3.0.0)
+      activesupport (>= 3.0.0)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.19)
+    mini_magick (3.4)
+      subexec (~> 0.2.1)
+    mlb (0.6.1)
+      faraday (~> 0.8)
+      faraday_middleware (~> 0.8)
+      json (~> 1.7)
+      multi_json (~> 1.3)
+    mongoid (3.0.6)
+      activemodel (~> 3.1)
+      moped (~> 1.1)
+      origin (~> 1.0)
+      tzinfo (~> 0.3.22)
+    mongoid-grid_fs (1.3.2)
+      mime-types (~> 1.19)
+      mongoid (~> 3.0)
+    mongoid-paperclip (0.0.8)
+      paperclip (>= 2.3.6)
+    moped (1.2.7)
+    multi_json (1.3.6)
+    multipart-post (1.1.5)
+    nested_form (0.2.3)
+    nokogiri (1.5.5)
+    origin (1.0.9)
+    orm_adapter (0.4.0)
+    paperclip (3.3.0)
+      activemodel (>= 3.0.0)
+      activerecord (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      cocaine (~> 0.4.0)
+      mime-types
+    polyglot (0.3.3)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-pjax (0.6.0)
+      nokogiri (~> 1.5)
+      rack (~> 1.3)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.8)
+      actionmailer (= 3.2.8)
+      actionpack (= 3.2.8)
+      activerecord (= 3.2.8)
+      activeresource (= 3.2.8)
+      activesupport (= 3.2.8)
+      bundler (~> 1.0)
+      railties (= 3.2.8)
+    railties (3.2.8)
+      actionpack (= 3.2.8)
+      activesupport (= 3.2.8)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    remotipart (1.0.2)
+    sass (3.2.1)
+    sass-rails (3.2.5)
+      railties (~> 3.2.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
+    sprockets (2.1.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.6)
+    subexec (0.2.2)
+    thor (0.16.0)
+    tilt (1.3.3)
+    treetop (1.4.11)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.33)
+    uglifier (1.3.0)
+      execjs (>= 0.3.0)
+      multi_json (~> 1.0, >= 1.0.2)
+    warden (1.2.1)
+      rack (>= 1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord-jdbcsqlite3-adapter (~> 1.2)
+  carrierwave (~> 0.6)
+  carrierwave-mongoid!
+  coffee-rails (~> 3.2)
+  devise (~> 2.1)
+  dragonfly (~> 0.9)
+  jdbc-sqlite3 (~> 3.6)
+  jruby-openssl (~> 0.7)
+  mini_magick (~> 3.4)
+  mlb (~> 0.5)
+  mongoid (~> 3.0)
+  mongoid-paperclip (~> 0.0.8)
+  paperclip (~> 3.3)
+  rails (~> 3.2)
+  rails_admin!
+  sass-rails (~> 3.2)
+  sqlite3 (~> 1.3)
+  uglifier (>= 1.0.3)