rails_admin 0.4.9 → 0.5.0

data/lib/rails_admin/config/fields/types/wysihtml5.rb

@@ -0,0 +1,44 @@
+require 'rails_admin/config/fields/base'
+
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class Wysihtml5 < RailsAdmin::Config::Fields::Types::Text
+          # Register field type for the type loader
+          RailsAdmin::Config::Fields::Types::register(self)
+
+          # If you want to have a different toolbar configuration for wysihtml5
+          # you can use a Ruby hash to configure these options:
+          # https://github.com/jhollingworth/bootstrap-wysihtml5/#advanced
+          register_instance_option :config_options do
+            nil
+          end
+
+          register_instance_option :css_location do
+            '/assets/bootstrap-wysihtml5.css'
+          end
+
+          register_instance_option :js_location do
+            '/assets/bootstrap-wysihtml5.js'
+          end
+
+          register_instance_option :html_attributes do
+            {
+              :cols => '48',
+              :rows => '3'
+            }
+          end
+
+          register_instance_option :partial do
+            :form_wysihtml5
+          end
+
+          [:config_options, :css_location, :js_location].each do |key|
+            register_deprecated_instance_option :"bootstrap_wysihtml5_#{key}", key
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rails_admin/config/model.rb

@@ -56,7 +56,7 @@ module RailsAdmin
       end
 
       register_instance_option :label do
-        (@label ||= {})[::I18n.locale] ||= abstract_model.model.model_name.human(:default => abstract_model.model.model_name.demodulize.underscore.humanize)
+        (@label ||= {})[::I18n.locale] ||= abstract_model.model.model_name.human
       end
 
       register_instance_option :label_plural do

data/lib/rails_admin/extensions/history/history.rb

@@ -3,9 +3,11 @@ class RailsAdmin::History < ActiveRecord::Base
 
   IGNORED_ATTRS = Set[:id, :created_at, :created_on, :deleted_at, :updated_at, :updated_on, :deleted_on]
 
-  attr_accessible :message, :item, :table, :username
+  if defined?(ActiveModel::MassAssignmentSecurity) && ancestors.include?(ActiveModel::MassAssignmentSecurity)
+    attr_accessible :message, :item, :table, :username
+  end
 
-  default_scope order('id DESC')
+  default_scope { order('id DESC') }
 
   def self.latest
     self.limit(100)

data/lib/rails_admin/version.rb

@@ -1,8 +1,8 @@
 module RailsAdmin
   class Version
     MAJOR = 0 unless defined? MAJOR
-    MINOR = 4 unless defined? MINOR
-    PATCH = 9 unless defined? PATCH
+    MINOR = 5 unless defined? MINOR
+    PATCH = 0 unless defined? PATCH
     PRE = nil unless defined? PRE
 
     class << self

data/spec/controllers/rails_admin/main_controller_spec.rb

@@ -294,6 +294,27 @@ describe RailsAdmin::MainController do
       end
     end
 
+    describe "satisfy_strong_params!" do
+      before do
+        ActionController::Parameters.permit_all_parameters = false
+      end
+
+      after do
+        ActionController::Parameters.permit_all_parameters = true
+      end
+
+      it "enforces permit!" do
+        controller.params = HashWithIndifferentAccess.new({
+          "model_name"=>"player",
+          "player"=>{ "name" => "foo" }
+        })
+        controller.send(:get_model)
+        expect(controller.params['player'].permitted?).to be_false
+        controller.send(:satisfy_strong_params!)
+        expect(controller.params['player'].permitted?).to be_true
+      end
+    end
+
     it "allows for delete method with Carrierwave" do
 
       RailsAdmin.config FieldTest do

data/spec/dummy_app/Gemfile

@@ -1,7 +1,7 @@
-source :rubygems
+source 'https://rubygems.org'
 
-gem 'rails', '~> 3.2'
-gem 'strong_parameters', '>= 0.1.6'
+gem 'rails', '~> 4.0.0'
+gem 'rack-cache', :require => 'rack/cache'
 
 group :active_record do
   platforms :jruby do
@@ -20,8 +20,8 @@ group :active_record do
 
   platforms :ruby, :mswin, :mingw do
     case ENV['CI_DB_ADAPTER']
-    when 'mysql'
-      gem 'mysql', '~> 2.8.1'
+    when 'mysql2'
+      gem 'mysql2', '~> 0.3.11'
     when 'postgresql'
       gem 'pg', '>= 0.14'
     else
@@ -31,13 +31,14 @@ group :active_record do
 end
 
 group :mongoid do
-  gem 'mongoid', '>= 3.0'
+  gem 'mongoid', github: 'mongoid/mongoid'
   gem 'mongoid-paperclip', '>= 0.0.8', :require => 'mongoid_paperclip'
-  gem 'carrierwave-mongoid', '>= 0.4', :require => 'carrierwave/mongoid'
+  gem 'mongoid-grid_fs', github: 'ahoward/mongoid-grid_fs'
+  gem 'carrierwave-mongoid', github: 'jnicklas/carrierwave-mongoid', :require => 'carrierwave/mongoid'
 end
 
 gem 'carrierwave', '>= 0.8'
-gem 'devise', '>= 2.2'
+gem 'devise', '~> 3.0.0.rc'
 gem 'dragonfly', '>= 0.9'
 gem 'mini_magick', '>= 3.4'
 gem 'mlb', '>= 0.6'
@@ -47,8 +48,8 @@ gem 'rails_admin', :path => '../../'
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
-  gem 'sass-rails',   '~> 3.2'
-  gem 'coffee-rails', '~> 3.2'
+  gem 'sass-rails', '~> 4.0.0'
+  gem 'coffee-rails', '~> 4.0.0'
 
   # See https://github.com/sstephenson/execjs#readme for more supported runtimes
   # gem 'therubyracer'

data/spec/dummy_app/app/active_record/another_field_test.rb

@@ -1,4 +1,3 @@
 class AnotherFieldTest < ActiveRecord::Base
   has_many :nested_field_tests, :inverse_of => :another_field_test
-  attr_accessible :nested_field_test_ids
 end

data/spec/dummy_app/app/active_record/ball.rb

@@ -1,6 +1,4 @@
 class Ball < ActiveRecord::Base
-  attr_accessible :color
-
   validates_presence_of :color, :on => :create
 
   def to_param

data/spec/dummy_app/app/active_record/category.rb

@@ -1,5 +1,3 @@
 class Category < ActiveRecord::Base
-  attr_accessible :parent_category_id
-
   belongs_to :parent_category, :class_name => "Category"
 end

data/spec/dummy_app/app/active_record/cms/basic_page.rb

@@ -2,8 +2,6 @@ module Cms
   class BasicPage < ActiveRecord::Base
     self.table_name = :cms_basic_pages
 
-    attr_accessible :title, :content
-
     validates :title, :content, :presence => true
   end
 end

data/spec/dummy_app/app/active_record/comment.rb

@@ -1,5 +1,3 @@
 class Comment < ActiveRecord::Base
-  attr_accessible :commentable_id, :commentable_type, :content
-
   belongs_to :commentable, :polymorphic => true
 end

data/spec/dummy_app/app/active_record/comment/confirmed.rb

@@ -1,3 +1,3 @@
 class Comment::Confirmed < Comment
-  default_scope where(:content => 'something')
+  default_scope { where(:content => 'something') }
 end

data/spec/dummy_app/app/active_record/division.rb

@@ -5,8 +5,6 @@ class Division < ActiveRecord::Base
     self.primary_key = :custom_id
   end
 
-  attr_accessible :name, :league, :custom_league_id, :team_ids
-
   belongs_to :league, :foreign_key => 'custom_league_id'
   has_many :teams
 

data/spec/dummy_app/app/active_record/draft.rb

@@ -1,6 +1,4 @@
 class Draft < ActiveRecord::Base
-  attr_accessible :player_id, :team_id, :date, :round, :pick, :overall, :college, :notes
-
   belongs_to :team
   belongs_to :player
 

data/spec/dummy_app/app/active_record/fan.rb

@@ -1,6 +1,4 @@
 class Fan < ActiveRecord::Base
-  attr_accessible :name, :team_ids
-
   has_and_belongs_to_many :teams
 
   validates_presence_of(:name)

data/spec/dummy_app/app/active_record/field_test.rb

@@ -1,9 +1,4 @@
 class FieldTest < ActiveRecord::Base
-  basic_accessible_fields = [:comment_attributes, :nested_field_tests_attributes, :dragonfly_asset, :remove_dragonfly_asset, :retained_dragonfly_asset, :carrierwave_asset, :carrierwave_asset_cache, :remove_carrierwave_asset, :paperclip_asset, :delete_paperclip_asset, :comment_id, :string_field, :text_field, :integer_field, :float_field, :decimal_field, :datetime_field, :timestamp_field, :time_field, :date_field, :boolean_field, :created_at, :updated_at, :format]
-  attr_accessible *basic_accessible_fields
-  attr_accessible *(basic_accessible_fields + [:restricted_field, {:as => :custom_role}])
-  attr_accessible *(basic_accessible_fields + [:protected_field, {:as => :extra_safe_role}])
-
   has_many :nested_field_tests, :dependent => :destroy, :inverse_of => :field_test
   accepts_nested_attributes_for :nested_field_tests, :allow_destroy => true
 

data/spec/dummy_app/app/active_record/image.rb

@@ -1,6 +1,4 @@
 class Image < ActiveRecord::Base
-  attr_accessible :file
-
   has_attached_file :file, :styles => { :medium => "300x300>", :thumb => "100x100>" }
   validates_attachment_presence :file
 end

data/spec/dummy_app/app/active_record/league.rb

@@ -1,8 +1,6 @@
 class League < ActiveRecord::Base
-  attr_accessible :name, :division_ids, :team_ids, :created_at
-
   has_many :divisions, :foreign_key => 'custom_league_id'
-  has_many :teams, :through => :divisions, :readonly => true
+  has_many :teams, ->{ readonly }, :through => :divisions
 
   validates_presence_of(:name)
 

data/spec/dummy_app/app/active_record/nested_field_test.rb

@@ -1,6 +1,4 @@
 class NestedFieldTest < ActiveRecord::Base
-  attr_accessible :title, :field_test_id, :another_field_test_id, :comment_attributes
-
   belongs_to :field_test, :inverse_of => :nested_field_tests
   belongs_to :another_field_test, :inverse_of => :nested_field_tests
   has_one :comment, :as => :commentable

data/spec/dummy_app/app/active_record/player.rb

@@ -1,7 +1,4 @@
 class Player < ActiveRecord::Base
-  attr_accessible :name, :team_id, :position, :number, :retired, :injured, :born_on, :notes, :comment_ids, :created_at
-  attr_protected :suspended
-
   belongs_to :team, :inverse_of => :players
   has_one :draft, :dependent => :destroy
   has_many :comments, :as => :commentable

data/spec/dummy_app/app/active_record/team.rb

@@ -2,10 +2,7 @@
 
 
 class Team < ActiveRecord::Base
-  attr_accessible :name, :division, :division_id, :logo_url, :manager, :ballpark, :mascot, :founded, :wins, :losses, :win_percentage, :revenue, :color, :custom_field, :fan_ids, :player_ids, :comment_ids
-
-
-  has_many :players, :inverse_of => :team, :order => :id
+  has_many :players, -> { order :id }, :inverse_of => :team
   has_and_belongs_to_many :fans
   has_many :comments, :as => :commentable
 

data/spec/dummy_app/app/active_record/user.rb

@@ -5,10 +5,6 @@ class User < ActiveRecord::Base
 
   serialize :roles, Array
 
-  # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation, :remember_me, :roles, :avatar
-
-
   # Add Paperclip support for avatars
   has_attached_file :avatar, :styles => { :medium => "300x300>", :thumb => "100x100>" }
 

data/spec/dummy_app/app/mongoid/another_field_test.rb

@@ -2,5 +2,4 @@ class AnotherFieldTest
   include Mongoid::Document
 
   has_many :nested_field_tests, :inverse_of => :another_field_test
-  attr_accessible :nested_field_test_ids
 end

data/spec/dummy_app/app/mongoid/ball.rb

@@ -4,8 +4,6 @@ class Ball
 
   field :color, :type => String
 
-  attr_accessible :color
-
   validates_presence_of :color, :on => :create
 
   def to_param

data/spec/dummy_app/app/mongoid/category.rb

@@ -1,7 +1,5 @@
 class Category
   include Mongoid::Document
 
-  attr_accessible :parent_category_id
-
   belongs_to :parent_category, :class_name => "Category"
 end

data/spec/dummy_app/app/mongoid/cms/basic_page.rb

@@ -5,8 +5,6 @@ module Cms
     field :content, :type => String
     include Mongoid::Timestamps
 
-    attr_accessible :title, :content
-
     validates :title, :content, :presence => true
   end
 end

data/spec/dummy_app/app/mongoid/comment.rb

@@ -3,7 +3,5 @@ class Comment
   field :content, :type => String
   include Mongoid::Timestamps
 
-  attr_accessible :commentable_id, :commentable_type, :content
-
   belongs_to :commentable, :polymorphic => true
 end

data/spec/dummy_app/app/mongoid/division.rb

@@ -4,8 +4,6 @@ class Division
 
   field :name, :type => String
 
-  attr_accessible :name, :league, :custom_league_id, :team_ids
-
   belongs_to :league, :foreign_key => 'custom_league_id'
   has_many :teams
 

data/spec/dummy_app/app/mongoid/draft.rb

@@ -11,8 +11,6 @@ class Draft
   field :college, :type => String
   field :notes, :type => String
 
-  attr_accessible :player_id, :team_id, :date, :round, :pick, :overall, :college, :notes
-
   validates_presence_of(:player_id, :only_integer => true)
   validates_presence_of(:team_id, :only_integer => true)
   validates_presence_of(:date)

data/spec/dummy_app/app/mongoid/fan.rb

@@ -4,8 +4,6 @@ class Fan
 
   field :name, :type => String
 
-  attr_accessible :name, :team_ids
-
   has_and_belongs_to_many :teams
 
   validates_presence_of(:name)

data/spec/dummy_app/app/mongoid/field_test.rb

@@ -1,6 +1,7 @@
 class FieldTest
   include Mongoid::Document
   include Mongoid::Paperclip
+  include ActiveModel::ForbiddenAttributesProtection
 
   field :name, :type => String
   field :title, :type => String
@@ -31,11 +32,6 @@ class FieldTest
   field :protected_field, :type => String
   has_mongoid_attached_file :paperclip_asset, :styles => { :thumb => "100x100>" }
 
-  basic_accessible_fields = [:comment_attributes, :nested_field_tests_attributes, :embed_attributes, :embeds_attributes, :dragonfly_asset, :remove_dragonfly_asset, :retained_dragonfly_asset, :carrierwave_asset, :carrierwave_asset_cache, :remove_carrierwave_asset, :paperclip_asset, :delete_paperclip_asset, :comment_id, :name, :array_field, :big_decimal_field, :boolean_field, :bson_object_id_field, :bson_binary_field, :date_field, :datetime_field, :time_with_zone_field, :default_field, :float_field, :hash_field, :integer_field, :object_field, :range_field, :string_field, :symbol_field, :text_field, :time_field, :created_at, :updated_at, :format]
-  attr_accessible *basic_accessible_fields
-  attr_accessible *(basic_accessible_fields + [:restricted_field, {:as => :custom_role}])
-  attr_accessible *(basic_accessible_fields + [:protected_field, {:as => :extra_safe_role}])
-
   has_many :nested_field_tests, :dependent => :destroy, :inverse_of => :field_test, :autosave => true
   accepts_nested_attributes_for :nested_field_tests, :allow_destroy => true
 

data/spec/dummy_app/app/mongoid/image.rb

@@ -2,8 +2,6 @@ class Image
   include Mongoid::Document
   include Mongoid::Paperclip
 
-  attr_accessible :file
-
   has_mongoid_attached_file :file, :styles => { :medium => "300x300>", :thumb => "100x100>" }
   validates_attachment_presence :file
 end

data/spec/dummy_app/app/mongoid/league.rb

@@ -4,8 +4,6 @@ class League
   field :name, :type => String
   include Mongoid::Timestamps
 
-  attr_accessible :name, :division_ids, :team_ids, :created_at
-
   has_many :divisions, :foreign_key => 'custom_league_id'
 
   validates_presence_of(:name)

data/spec/dummy_app/app/mongoid/nested_field_test.rb

@@ -6,8 +6,6 @@ class NestedFieldTest
   belongs_to :another_field_test, :inverse_of => :nested_field_tests
   include Mongoid::Timestamps
 
-  attr_accessible :title, :field_test_id, :another_field_test_id, :comment_attributes
-
   has_one :comment, :as => :commentable, :autosave => true
   accepts_nested_attributes_for :comment, :allow_destroy => true, :reject_if => proc { |attributes| attributes["content"].blank? }
 end

data/spec/dummy_app/app/mongoid/player.rb

@@ -1,6 +1,7 @@
 class Player
   include Mongoid::Document
   include Mongoid::Timestamps
+  include ActiveModel::ForbiddenAttributesProtection
 
   field :deleted_at, :type => DateTime
   belongs_to :team, :inverse_of => :players
@@ -13,9 +14,6 @@ class Player
   field :notes, :type => String
   field :suspended, :type => Boolean, :default => false
 
-  attr_accessible :name, :team_id, :position, :number, :retired, :injured, :born_on, :notes, :comment_ids, :created_at
-  attr_protected :suspended
-
   validates_presence_of(:name)
   validates_numericality_of(:number, :only_integer => true)
   validates_uniqueness_of(:number, :scope => :team_id, :message => "There is already a player with that number on this team")

data/spec/dummy_app/app/mongoid/team.rb

@@ -18,8 +18,6 @@ class Team
   field :color, :type => String
   field :custom_field, :type => String
 
-  attr_accessible :name, :division, :division_id, :logo_url, :manager, :ballpark, :mascot, :founded, :wins, :losses, :win_percentage, :revenue, :color, :custom_field, :fan_ids, :player_ids, :comment_ids
-
   has_many :players, :inverse_of => :team, :order => :_id.asc
   has_and_belongs_to_many :fans
   has_many :comments, :as => :commentable