rails_admin 0.3.0 → 0.4.0

data/spec/integration/config/list/rails_admin_config_list_spec.rb

@@ -290,8 +290,10 @@ describe "RailsAdmin Config DSL List Section" do
       end
       @fans = 2.times.map { FactoryGirl.create :fan }
       visit index_path(:model_name => "fan")
-      expect(find('style')).to have_content("#list th.#{PK_COLUMN}_field")
-      expect(find('style')).to have_content("#list td.#{PK_COLUMN}_field")
+      # NOTE: Capybara really doesn't want us to look at invisible text. This test
+      # could break at any moment.
+      expect(find('style').native.text).to include("#list th.#{PK_COLUMN}_field")
+      expect(find('style').native.text).to include("#list td.#{PK_COLUMN}_field")
     end
 
     it "has option to customize output formatting" do
@@ -362,10 +364,6 @@ describe "RailsAdmin Config DSL List Section" do
 
   # sort_by and sort_reverse options
   describe "default sorting" do
-    before(:each) do
-      RailsAdmin.config(Player){ list { field :name } }
-    end
-
     let(:today){ Date.today }
     let(:players) do
       [{ :name => "Jackie Robinson",  :created_at => today,            :team_id => rand(99999), :number => 42 },
@@ -388,6 +386,7 @@ describe "RailsAdmin Config DSL List Section" do
           list do
             sort_by :created_at
             sort_reverse true
+            field :name
           end
         end
         visit index_path(:model_name => "player")
@@ -401,6 +400,7 @@ describe "RailsAdmin Config DSL List Section" do
       RailsAdmin.config Player do
         list do
           sort_by :created_at
+          field :name
         end
       end
       visit index_path(:model_name => "player")
@@ -414,6 +414,7 @@ describe "RailsAdmin Config DSL List Section" do
         list do
           sort_by :created_at
           sort_reverse false
+          field :name
         end
       end
       visit index_path(:model_name => "player")

data/spec/integration/config/show/rails_admin_config_show_spec.rb

@@ -54,7 +54,7 @@ describe "RailsAdmin Config DSL Show Section" do
   describe "css hooks" do
     it "is present" do
       do_request
-      
+
       should have_selector("dt .name_field.string_type")
     end
   end

data/spec/integration/rails_admin_spec.rb

@@ -8,6 +8,7 @@ describe RailsAdmin do
     it "is disableable" do
       logout
       RailsAdmin.config do |config|
+        config.included_models = []
         config.authenticate_with {}
       end
       visit dashboard_path
@@ -19,6 +20,7 @@ describe RailsAdmin do
   # file as template for a new translation).
   describe "localization" do
     it "defaults to English" do
+      RailsAdmin.config.included_models = []
       visit dashboard_path
 
       should have_content("Site administration")

data/spec/{unit → rails_admin}/abstract_model_spec.rb

@@ -1,6 +1,13 @@
 require 'spec_helper'
 
 describe RailsAdmin::AbstractModel do
+
+  describe "#to_s" do
+    it 'returns model\'s name' do
+      expect(RailsAdmin::AbstractModel.new(Cms::BasicPage).to_s).to eq Cms::BasicPage.to_s
+    end
+  end
+
   describe "filters" do
     before do
       @abstract_model = RailsAdmin::AbstractModel.new('FieldTest')

data/spec/{unit → rails_admin}/adapters/mongoid_spec.rb

@@ -276,7 +276,7 @@ describe "RailsAdmin::Adapters::Mongoid", :mongoid => true do
 
     it "maps Mongoid column types to RA types" do
       expect(@abstract_model.properties.select{|p| %w(_id _type array_field big_decimal_field
-        boolean_field bson_object_id_field date_field datetime_field default_field float_field
+        boolean_field bson_object_id_field date_field datetime_field time_with_zone_field default_field float_field
         hash_field integer_field name object_field range_field short_text string_field subject
         symbol_field text_field time_field title).
         include? p[:name].to_s}).to match_array [
@@ -328,6 +328,12 @@ describe "RailsAdmin::Adapters::Mongoid", :mongoid => true do
           :serial? => false,
           :type => :datetime,
           :length => nil },
+        { :name => :time_with_zone_field,
+          :pretty_name => "Time with zone field",
+          :nullable? => true,
+          :serial? => false,
+          :type => :datetime,
+          :length => nil },
         { :name => :default_field,
           :pretty_name => "Default field",
           :nullable? => true,

data/spec/rails_admin/config/fields/types/datetime_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe RailsAdmin::Config::Fields::Types::Datetime do
+  describe 'formatted_date_value' do
+    it 'gets object value' do
+      expect(RailsAdmin.config(FieldTest).fields.find{|f| f.name ==:datetime_field}.with(object: FieldTest.new(datetime_field: DateTime.parse('02/01/2012'))).formatted_date_value).to eq 'January 02, 2012'
+    end
+
+    it 'gets default value for new objects if value is nil' do
+      RailsAdmin.config(FieldTest) do |config|
+        field :datetime_field do
+          default_value DateTime.parse('01/01/2012')
+        end
+      end
+      expect(RailsAdmin.config(FieldTest).fields.find{|f| f.name ==:datetime_field}.with(object: FieldTest.new).formatted_date_value).to eq 'January 01, 2012'
+    end
+  end
+end

data/spec/rails_admin/config/has_fields_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe RailsAdmin::Config::HasFields do
+
+  it 'shows hidden fields when added through the DSL' do
+    expect(RailsAdmin.config(Team).fields.find{|f| f.name == :division_id}).to_not be_visible
+
+    RailsAdmin.config do |config|
+      config.model Team do
+        field :division_id
+      end
+    end
+
+    expect(RailsAdmin.config(Team).fields.find{|f| f.name == :division_id}).to be_visible
+  end
+
+  it 'does not set visibility for fields with bindings' do
+    RailsAdmin.config do |config|
+      config.model Team do
+        field :division do
+          visible do
+            bindings[:controller].current_user.email == 'test@email.com'
+          end
+        end
+      end
+    end
+    expect {RailsAdmin.config(Team).fields.find{|f| f.name == :division }}.to_not raise_error
+    expect {RailsAdmin.config(Team).fields.find{|f| f.name == :division }.visible?}.to raise_error "undefined method `[]' for nil:NilClass"
+  end
+end

data/spec/rails_admin/config/lazy_model_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe RailsAdmin::Config::LazyModel do
+  describe "#store" do
+    let(:block) { Proc.new { register_instance_option('parameter') } } # an arbitrary instance method we can spy on
+    let(:other_block) { Proc.new { register_instance_option('other parameter') } }
+
+    it "doesn't evaluate the block immediately" do
+      RailsAdmin::Config::Model.any_instance.should_not_receive(:register_instance_option)
+
+      RailsAdmin::Config::LazyModel.new(:Team, &block)
+    end
+
+    it "evaluates block when reading" do
+      RailsAdmin::Config::Model.any_instance.should_receive(:register_instance_option).with('parameter')
+
+      lazy_model = RailsAdmin::Config::LazyModel.new(:Team, &block)
+      lazy_model.groups # an arbitrary instance method on RailsAdmin::Config::Model to wake up lazy_model
+    end
+
+    it "evaluates config block only once" do
+      RailsAdmin::Config::Model.any_instance.should_receive(:register_instance_option).once.with('parameter')
+
+      lazy_model = RailsAdmin::Config::LazyModel.new(:Team, &block)
+      lazy_model.groups
+      lazy_model.groups
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -55,6 +55,8 @@ RSpec.configure do |config|
 
   config.include Warden::Test::Helpers
 
+  config.include Capybara::DSL, type: :request
+
   config.before(:each) do
     DatabaseCleaner.start
     RailsAdmin::Config.reset

metadata

@@ -2,7 +2,7 @@
 name: rails_admin
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Erik Michaels-Ober
@@ -12,29 +12,23 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-02 00:00:00.000000000 Z
+date: 2013-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
-      - !ruby/object:Gem::Version
-        version: 0.2.3
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.2'
     none: false
   name: nested_form
   type: :runtime
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
-      - !ruby/object:Gem::Version
-        version: 0.2.3
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.2'
     none: false
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -73,7 +67,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
     none: false
   name: font-awesome-sass-rails
   type: :runtime
@@ -82,7 +76,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
     none: false
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -436,6 +430,7 @@ files:
 - lib/rails_admin/config/has_fields.rb
 - lib/rails_admin/config/has_groups.rb
 - lib/rails_admin/config/hideable.rb
+- lib/rails_admin/config/lazy_model.rb
 - lib/rails_admin/config/model.rb
 - lib/rails_admin/config/proxyable/proxy.rb
 - lib/rails_admin/config/proxyable.rb
@@ -467,8 +462,8 @@ files:
 - lib/rails_admin.rb
 - lib/tasks/rails_admin.rake
 - spec/ci.sh
-- spec/controllers/application_controller_spec.rb
-- spec/controllers/main_controller_spec.rb
+- spec/controllers/rails_admin/application_controller_spec.rb
+- spec/controllers/rails_admin/main_controller_spec.rb
 - spec/dummy_app/app/active_record/abstract.rb
 - spec/dummy_app/app/active_record/another_field_test.rb
 - spec/dummy_app/app/active_record/ball.rb
@@ -580,8 +575,10 @@ files:
 - spec/dummy_app/db/migrate/20120720075608_create_another_field_tests.rb
 - spec/dummy_app/db/migrate/20120928075608_create_images.rb
 - spec/dummy_app/db/seeds.rb
+- spec/dummy_app/db/test.sqlite3
 - spec/dummy_app/doc/README_FOR_APP
 - spec/dummy_app/Gemfile
+- spec/dummy_app/log/test.log
 - spec/dummy_app/public/404.html
 - spec/dummy_app/public/422.html
 - spec/dummy_app/public/500.html
@@ -606,8 +603,8 @@ files:
 - spec/dummy_app/Rakefile
 - spec/dummy_app/script/rails
 - spec/factories.rb
-- spec/helpers/application_helper_spec.rb
-- spec/helpers/form_builder_spec.rb
+- spec/helpers/rails_admin/application_helper_spec.rb
+- spec/helpers/rails_admin/form_builder_spec.rb
 - spec/integration/authorization/cancan_spec.rb
 - spec/integration/basic/bulk_action/rails_admin_basic_bulk_action_spec.rb
 - spec/integration/basic/bulk_destroy/rails_admin_basic_bulk_destroy_spec.rb
@@ -630,26 +627,29 @@ files:
 - spec/integration/relation_spec.rb
 - spec/orm/active_record.rb
 - spec/orm/mongoid.rb
+- spec/rails_admin/abstract_model_spec.rb
+- spec/rails_admin/active_record_extension_spec.rb
+- spec/rails_admin/adapters/active_record/abstract_object_spec.rb
+- spec/rails_admin/adapters/active_record_spec.rb
+- spec/rails_admin/adapters/mongoid/abstract_object_spec.rb
+- spec/rails_admin/adapters/mongoid_spec.rb
+- spec/rails_admin/config/actions/base_spec.rb
+- spec/rails_admin/config/actions_spec.rb
+- spec/rails_admin/config/fields/base_spec.rb
+- spec/rails_admin/config/fields/date_spec.rb
+- spec/rails_admin/config/fields/datetime_spec.rb
+- spec/rails_admin/config/fields/file_upload_spec.rb
+- spec/rails_admin/config/fields/time_spec.rb
+- spec/rails_admin/config/fields/timestamp_spec.rb
+- spec/rails_admin/config/fields/types/datetime_spec.rb
+- spec/rails_admin/config/fields_spec.rb
+- spec/rails_admin/config/has_fields_spec.rb
+- spec/rails_admin/config/lazy_model_spec.rb
+- spec/rails_admin/config/model_spec.rb
+- spec/rails_admin/config/sections_spec.rb
+- spec/rails_admin/config_spec.rb
+- spec/rails_admin/support/csv_converter_spec.rb
 - spec/spec_helper.rb
-- spec/unit/abstract_model_spec.rb
-- spec/unit/active_record_extension_spec.rb
-- spec/unit/adapters/active_record/abstract_object_spec.rb
-- spec/unit/adapters/active_record_spec.rb
-- spec/unit/adapters/mongoid/abstract_object_spec.rb
-- spec/unit/adapters/mongoid_spec.rb
-- spec/unit/config/actions/base_spec.rb
-- spec/unit/config/actions_spec.rb
-- spec/unit/config/fields/base_spec.rb
-- spec/unit/config/fields/date_spec.rb
-- spec/unit/config/fields/datetime_spec.rb
-- spec/unit/config/fields/file_upload_spec.rb
-- spec/unit/config/fields/time_spec.rb
-- spec/unit/config/fields/timestamp_spec.rb
-- spec/unit/config/fields_spec.rb
-- spec/unit/config/model_spec.rb
-- spec/unit/config/sections_spec.rb
-- spec/unit/config_spec.rb
-- spec/unit/support/csv_converter_spec.rb
 homepage: https://github.com/sferik/rails_admin
 licenses:
 - MIT
@@ -677,8 +677,8 @@ specification_version: 3
 summary: Admin for Rails
 test_files:
 - spec/ci.sh
-- spec/controllers/application_controller_spec.rb
-- spec/controllers/main_controller_spec.rb
+- spec/controllers/rails_admin/application_controller_spec.rb
+- spec/controllers/rails_admin/main_controller_spec.rb
 - spec/dummy_app/app/active_record/abstract.rb
 - spec/dummy_app/app/active_record/another_field_test.rb
 - spec/dummy_app/app/active_record/ball.rb
@@ -790,8 +790,10 @@ test_files:
 - spec/dummy_app/db/migrate/20120720075608_create_another_field_tests.rb
 - spec/dummy_app/db/migrate/20120928075608_create_images.rb
 - spec/dummy_app/db/seeds.rb
+- spec/dummy_app/db/test.sqlite3
 - spec/dummy_app/doc/README_FOR_APP
 - spec/dummy_app/Gemfile
+- spec/dummy_app/log/test.log
 - spec/dummy_app/public/404.html
 - spec/dummy_app/public/422.html
 - spec/dummy_app/public/500.html
@@ -816,8 +818,8 @@ test_files:
 - spec/dummy_app/Rakefile
 - spec/dummy_app/script/rails
 - spec/factories.rb
-- spec/helpers/application_helper_spec.rb
-- spec/helpers/form_builder_spec.rb
+- spec/helpers/rails_admin/application_helper_spec.rb
+- spec/helpers/rails_admin/form_builder_spec.rb
 - spec/integration/authorization/cancan_spec.rb
 - spec/integration/basic/bulk_action/rails_admin_basic_bulk_action_spec.rb
 - spec/integration/basic/bulk_destroy/rails_admin_basic_bulk_destroy_spec.rb
@@ -840,24 +842,27 @@ test_files:
 - spec/integration/relation_spec.rb
 - spec/orm/active_record.rb
 - spec/orm/mongoid.rb
+- spec/rails_admin/abstract_model_spec.rb
+- spec/rails_admin/active_record_extension_spec.rb
+- spec/rails_admin/adapters/active_record/abstract_object_spec.rb
+- spec/rails_admin/adapters/active_record_spec.rb
+- spec/rails_admin/adapters/mongoid/abstract_object_spec.rb
+- spec/rails_admin/adapters/mongoid_spec.rb
+- spec/rails_admin/config/actions/base_spec.rb
+- spec/rails_admin/config/actions_spec.rb
+- spec/rails_admin/config/fields/base_spec.rb
+- spec/rails_admin/config/fields/date_spec.rb
+- spec/rails_admin/config/fields/datetime_spec.rb
+- spec/rails_admin/config/fields/file_upload_spec.rb
+- spec/rails_admin/config/fields/time_spec.rb
+- spec/rails_admin/config/fields/timestamp_spec.rb
+- spec/rails_admin/config/fields/types/datetime_spec.rb
+- spec/rails_admin/config/fields_spec.rb
+- spec/rails_admin/config/has_fields_spec.rb
+- spec/rails_admin/config/lazy_model_spec.rb
+- spec/rails_admin/config/model_spec.rb
+- spec/rails_admin/config/sections_spec.rb
+- spec/rails_admin/config_spec.rb
+- spec/rails_admin/support/csv_converter_spec.rb
 - spec/spec_helper.rb
-- spec/unit/abstract_model_spec.rb
-- spec/unit/active_record_extension_spec.rb
-- spec/unit/adapters/active_record/abstract_object_spec.rb
-- spec/unit/adapters/active_record_spec.rb
-- spec/unit/adapters/mongoid/abstract_object_spec.rb
-- spec/unit/adapters/mongoid_spec.rb
-- spec/unit/config/actions/base_spec.rb
-- spec/unit/config/actions_spec.rb
-- spec/unit/config/fields/base_spec.rb
-- spec/unit/config/fields/date_spec.rb
-- spec/unit/config/fields/datetime_spec.rb
-- spec/unit/config/fields/file_upload_spec.rb
-- spec/unit/config/fields/time_spec.rb
-- spec/unit/config/fields/timestamp_spec.rb
-- spec/unit/config/fields_spec.rb
-- spec/unit/config/model_spec.rb
-- spec/unit/config/sections_spec.rb
-- spec/unit/config_spec.rb
-- spec/unit/support/csv_converter_spec.rb
 has_rdoc: