rails_admin 0.1.1 → 0.1.2

data/spec/unit/config/fields/date_spec.rb

@@ -14,14 +14,14 @@ describe RailsAdmin::Config::Fields::Types::Date do
 
     it "should read %B %d, %Y by default" do
       @object.date_field = @field.parse_input({ :date_field => @time.strftime("%B %d, %Y") })
-      @object.date_field.should eql(::Date.parse(@time.to_s))
+      expect(@object.date_field).to eq(::Date.parse(@time.to_s))
     end
 
     it "should cover a timezone lag even if in UTC+n:00 timezone." do
       Time.zone = 'Tokyo' # +09:00
 
       @object.date_field = @field.parse_input({ :date_field => @time.strftime("%B %d, %Y") })
-      @object.date_field.should eql(::Date.parse(@time.to_s))
+      expect(@object.date_field).to eq(::Date.parse(@time.to_s))
     end
 
     it "should have a simple customization option" do
@@ -34,7 +34,7 @@ describe RailsAdmin::Config::Fields::Types::Date do
       end
 
       @object.date_field = @field.parse_input({ :date_field => @time.strftime("%Y-%m-%d") })
-      @object.date_field.should eql(::Date.parse(@time.to_s))
+      expect(@object.date_field).to eq(::Date.parse(@time.to_s))
     end
 
     it "should have a customization option" do
@@ -47,7 +47,7 @@ describe RailsAdmin::Config::Fields::Types::Date do
       end
 
       @object.date_field = @field.parse_input({ :date_field => @time.strftime("%Y/%m/%d") })
-      @object.date_field.should eql(::Date.parse(@time.to_s))
+      expect(@object.date_field).to eq(::Date.parse(@time.to_s))
     end
   end
-end
+end

data/spec/unit/config/fields/datetime_spec.rb

@@ -15,7 +15,7 @@ describe RailsAdmin::Config::Fields::Types::Datetime do
     it "should be able to read %B %d, %Y %H:%M" do
       @object = FactoryGirl.create(:field_test)
       @object.datetime_field = @field.parse_input({ :datetime_field => @time.strftime("%B %d, %Y %H:%M") })
-      @object.datetime_field.strftime("%Y-%m-%d %H:%M").should eql(@time.strftime("%Y-%m-%d %H:%M"))     
+      expect(@object.datetime_field.strftime("%Y-%m-%d %H:%M")).to eq(@time.strftime("%Y-%m-%d %H:%M"))
     end
 
     it "should be able to read %a, %d %b %Y %H:%M:%S" do
@@ -28,7 +28,7 @@ describe RailsAdmin::Config::Fields::Types::Datetime do
       end
       @object = FactoryGirl.create(:field_test)
       @object.datetime_field = @field.parse_input({ :datetime_field => @time.strftime("%a, %d %b %Y %H:%M:%S") })
-      @object.datetime_field.to_s(:rfc822).should eql(@time.to_s(:rfc822))     
+      expect(@object.datetime_field.to_s(:rfc822)).to eq(@time.to_s(:rfc822))
     end
 
     it "should have a customization option" do
@@ -41,14 +41,14 @@ describe RailsAdmin::Config::Fields::Types::Datetime do
       end
       @object = FactoryGirl.create(:field_test)
       @object.datetime_field = @field.parse_input({ :datetime_field => @time.strftime("%Y-%m-%d %H:%M:%S") })
-      @object.datetime_field.to_s(:rfc822).should eql(@time.to_s(:rfc822))     
+      expect(@object.datetime_field.to_s(:rfc822)).to eq(@time.to_s(:rfc822))
     end
 
     it "should do round-trip saving properly with non-UTC timezones" do
       Time.zone = 'Vienna'
       @object = FactoryGirl.create(:field_test)
       @object.datetime_field = @field.parse_input({ :datetime_field => '2012-09-01 12:00:00 +02:00' })
-      @object.datetime_field.should == Time.zone.parse('2012-09-01 12:00:00 +02:00')
+      expect(@object.datetime_field).to eq(Time.zone.parse('2012-09-01 12:00:00 +02:00'))
     end
   end
 end

data/spec/unit/config/fields/time_spec.rb

@@ -14,13 +14,13 @@ describe RailsAdmin::Config::Fields::Types::Time do
 
     it "should read %H:%M" do
       @object.time_field = @field.parse_input({ :time_field => @time.strftime("%H:%M") })
-      @object.time_field.strftime("%H:%M").should eql(@time.strftime("%H:%M"))
+      expect(@object.time_field.strftime("%H:%M")).to eq(@time.strftime("%H:%M"))
     end
 
     it "should interpret time value as UTC when timezone is specified" do
       Time.zone = 'Eastern Time (US & Canada)' # -05:00
       @object.time_field = @field.parse_input({ :time_field => @time.strftime("%H:%M") })
-      @object.time_field.strftime("%H:%M").should eql(@time.strftime("%H:%M"))
+      expect(@object.time_field.strftime("%H:%M")).to eq(@time.strftime("%H:%M"))
     end
 
     it "should have a customization option" do
@@ -32,7 +32,7 @@ describe RailsAdmin::Config::Fields::Types::Time do
         end
       end
       @object.time_field = @field.parse_input({ :time_field => @time.strftime("%I:%M %p") })
-      @object.time_field.strftime("%H:%M").should eql(@time.strftime("%H:%M"))
+      expect(@object.time_field.strftime("%H:%M")).to eq(@time.strftime("%H:%M"))
     end
   end
 end

data/spec/unit/config/fields/timestamp_spec.rb

@@ -14,7 +14,7 @@ describe RailsAdmin::Config::Fields::Types::Timestamp do
 
     it "should read %B %d, %Y %H:%M" do
       @object.timestamp_field = @field.parse_input({ :timestamp_field => @time.strftime("%B %d, %Y %H:%M") })
-      @object.timestamp_field.strftime("%Y-%m-%d %H:%M").should eql(@time.strftime("%Y-%m-%d %H:%M"))
+      expect(@object.timestamp_field.strftime("%Y-%m-%d %H:%M")).to eq(@time.strftime("%Y-%m-%d %H:%M"))
     end
   end
 end

data/spec/unit/config/model_spec.rb

@@ -10,8 +10,8 @@ describe RailsAdmin::Config::Model do
     end
 
     it "should say false when included, true otherwise" do
-      RailsAdmin.config(Player).excluded?.should == true
-      RailsAdmin.config(Comment).excluded?.should == false
+      expect(RailsAdmin.config(Player).excluded?).to be_true
+      expect(RailsAdmin.config(Comment).excluded?).to be_false
     end
   end
 
@@ -24,52 +24,52 @@ describe RailsAdmin::Config::Model do
 
     it "should send object_label_method to binding[:object]" do
       c = Comment.new(:content => 'test')
-      RailsAdmin.config(Comment).with(:object => c).object_label.should == 'test'
+      expect(RailsAdmin.config(Comment).with(:object => c).object_label).to eq('test')
     end
   end
 
   describe "#object_label_method" do
     it "should be first of Config.label_methods if found as a column on model, or :rails_admin_default_object_label_method" do
-      RailsAdmin.config(Comment).object_label_method.should == :rails_admin_default_object_label_method
-      RailsAdmin.config(Division).object_label_method.should == :name
+      expect(RailsAdmin.config(Comment).object_label_method).to eq(:rails_admin_default_object_label_method)
+      expect(RailsAdmin.config(Division).object_label_method).to eq(:name)
     end
   end
 
   describe "#label" do
     it "should be pretty" do
-      RailsAdmin.config(Comment).label.should == 'Comment'
+      expect(RailsAdmin.config(Comment).label).to eq('Comment')
     end
   end
 
   describe "#label_plural" do
     it "should be pretty" do
-      RailsAdmin.config(Comment).label_plural.should == 'Comments'
+      expect(RailsAdmin.config(Comment).label_plural).to eq('Comments')
     end
   end
 
   describe "#weight" do
     it "should be 0" do
-      RailsAdmin.config(Comment).weight.should == 0
+      expect(RailsAdmin.config(Comment).weight).to eq(0)
     end
   end
 
   describe "#parent" do
     it "should be nil for ActiveRecord::Base inherited models" do
-      RailsAdmin.config(Comment).parent.should be_nil
+      expect(RailsAdmin.config(Comment).parent).to be_nil
     end
 
     it "should be parent model otherwise" do
-      RailsAdmin.config(Hardball).parent.should == Ball
+      expect(RailsAdmin.config(Hardball).parent).to eq(Ball)
     end
   end
 
   describe "#navigation_label" do
     it "should be nil if parent module is Object" do
-      RailsAdmin.config(Comment).navigation_label.should be_nil
+      expect(RailsAdmin.config(Comment).navigation_label).to be_nil
     end
 
     it "should be parent module otherwise" do
-      RailsAdmin.config(Cms::BasicPage).navigation_label.should == "Cms"
+      expect(RailsAdmin.config(Cms::BasicPage).navigation_label).to eq("Cms")
     end
   end
 end

data/spec/unit/config/sections_spec.rb

@@ -12,8 +12,8 @@ describe RailsAdmin::Config::Sections do
         end
       end
       fields = RailsAdmin.config(Team).edit.fields
-      fields.find{|f| f.name == :name }.label.should == "Renamed"
-      fields.count.should >= 19 # not 1
+      expect(fields.find{|f| f.name == :name }.label).to eq("Renamed")
+      expect(fields.count).to be >= 19 # not 1
     end
 
     it "should not change the section list if set" do
@@ -26,8 +26,8 @@ describe RailsAdmin::Config::Sections do
         end
       end
       fields = RailsAdmin.config(Team).edit.fields
-      fields.first.name.should == :manager
-      fields.count.should == 1 # not 19
+      expect(fields.first.name).to eq(:manager)
+      expect(fields.count).to eq(1) # not 19
     end
   end
 
@@ -64,13 +64,13 @@ describe RailsAdmin::Config::Sections do
         end
 
       end
-      RailsAdmin.config(Fan).visible_fields.count.should == 1
-      RailsAdmin.config(Fan).visible_fields.first.label.should == 'modified base His Name'
-      RailsAdmin.config(Fan).list.visible_fields.first.label.should == 'modified list His Name'
-      RailsAdmin.config(Fan).export.visible_fields.first.label.should == 'modified base His Name'
-      RailsAdmin.config(Fan).edit.visible_fields.first.label.should == 'modified edit His Name'
-      RailsAdmin.config(Fan).create.visible_fields.first.label.should == 'modified create His Name'
-      RailsAdmin.config(Fan).update.visible_fields.first.label.should == 'modified edit His Name'
+      expect(RailsAdmin.config(Fan).visible_fields.count).to eq(1)
+      expect(RailsAdmin.config(Fan).visible_fields.first.label).to eq('modified base His Name')
+      expect(RailsAdmin.config(Fan).list.visible_fields.first.label).to eq('modified list His Name')
+      expect(RailsAdmin.config(Fan).export.visible_fields.first.label).to eq('modified base His Name')
+      expect(RailsAdmin.config(Fan).edit.visible_fields.first.label).to eq('modified edit His Name')
+      expect(RailsAdmin.config(Fan).create.visible_fields.first.label).to eq('modified create His Name')
+      expect(RailsAdmin.config(Fan).update.visible_fields.first.label).to eq('modified edit His Name')
     end
   end
 
@@ -112,12 +112,12 @@ describe RailsAdmin::Config::Sections do
         end
       end
 
-      RailsAdmin.config(Team).list.visible_groups.map{|g| g.visible_fields.map(&:name) }.should == [[:founded], [:name, :wins]]
-      RailsAdmin.config(Team).edit.visible_groups.map{|g| g.visible_fields.map(&:name) }.should == [[:name], [:founded, :wins]]
-      RailsAdmin.config(Team).create.visible_groups.map{|g| g.visible_fields.map(&:name) }.should == [[:name], [:founded, :wins]]
-      RailsAdmin.config(Team).update.visible_groups.map{|g| g.visible_fields.map(&:name) }.should == [[:name], [:founded], [:wins], [:losses]]
-      RailsAdmin.config(Team).visible_groups.map{|g| g.visible_fields.map(&:name) }.flatten.count.should == 19
-      RailsAdmin.config(Team).export.visible_groups.map{|g| g.visible_fields.map(&:name) }.flatten.count.should == 19
+      expect(RailsAdmin.config(Team).list.visible_groups.map{|g| g.visible_fields.map(&:name) }).to eq([[:founded], [:name, :wins]])
+      expect(RailsAdmin.config(Team).edit.visible_groups.map{|g| g.visible_fields.map(&:name) }).to eq([[:name], [:founded, :wins]])
+      expect(RailsAdmin.config(Team).create.visible_groups.map{|g| g.visible_fields.map(&:name) }).to eq([[:name], [:founded, :wins]])
+      expect(RailsAdmin.config(Team).update.visible_groups.map{|g| g.visible_fields.map(&:name) }).to eq([[:name], [:founded], [:wins], [:losses]])
+      expect(RailsAdmin.config(Team).visible_groups.map{|g| g.visible_fields.map(&:name) }.flatten.count).to eq(19)
+      expect(RailsAdmin.config(Team).export.visible_groups.map{|g| g.visible_fields.map(&:name) }.flatten.count).to eq(19)
     end
   end
 end

data/spec/unit/config_spec.rb

@@ -1,27 +1,27 @@
 require 'spec_helper'
 
 describe RailsAdmin::Config do
-  
+
   describe ".included_models" do
 
     it 'should only use included models' do
       RailsAdmin.config.included_models = [Team, League]
-      RailsAdmin::AbstractModel.all.map(&:model).should == [League, Team] #it gets sorted
+      expect(RailsAdmin::AbstractModel.all.map(&:model)).to eq([League, Team]) # it gets sorted
     end
 
     it 'should not restrict models if included_models is left empty' do
       RailsAdmin.config.included_models = []
-      RailsAdmin::AbstractModel.all.map(&:model).should include(Team, League)
+      expect(RailsAdmin::AbstractModel.all.map(&:model)).to include(Team, League)
     end
 
     it 'should further remove excluded models (whitelist - blacklist)' do
       RailsAdmin.config.excluded_models = [Team]
       RailsAdmin.config.included_models = [Team, League]
-      RailsAdmin::AbstractModel.all.map(&:model).should == [League]
+      expect(RailsAdmin::AbstractModel.all.map(&:model)).to eq([League])
     end
 
     it 'should always exclude history', :active_record => true do
-      RailsAdmin::AbstractModel.all.map(&:model).should_not include(RailsAdmin::History)
+      expect(RailsAdmin::AbstractModel.all.map(&:model)).not_to include(RailsAdmin::History)
     end
 
     it 'excluded? returns true for any model not on the list' do
@@ -30,12 +30,11 @@ describe RailsAdmin::Config do
       team_config = RailsAdmin::AbstractModel.new('Team').config
       fan_config = RailsAdmin::AbstractModel.new('Fan').config
 
-      fan_config.should be_excluded
-      team_config.should_not be_excluded
+      expect(fan_config).to be_excluded
+      expect(team_config).not_to be_excluded
     end
   end
 
-
   describe ".add_extension" do
     before do
       silence_warnings do
@@ -45,7 +44,7 @@ describe RailsAdmin::Config do
 
     it "registers the extension with RailsAdmin" do
       RailsAdmin.add_extension(:example, ExampleModule)
-      RailsAdmin::EXTENSIONS.select { |name| name == :example }.length.should == 1
+      expect(RailsAdmin::EXTENSIONS.select { |name| name == :example }.length).to eq(1)
     end
 
     context "given an extension with an authorization adapter" do
@@ -53,7 +52,7 @@ describe RailsAdmin::Config do
         RailsAdmin.add_extension(:example, ExampleModule, {
           :authorization => true
         })
-        RailsAdmin::AUTHORIZATION_ADAPTERS[:example].should == ExampleModule::AuthorizationAdapter
+        expect(RailsAdmin::AUTHORIZATION_ADAPTERS[:example]).to eq(ExampleModule::AuthorizationAdapter)
       end
     end
 
@@ -62,7 +61,7 @@ describe RailsAdmin::Config do
         RailsAdmin.add_extension(:example, ExampleModule, {
           :auditing => true
         })
-        RailsAdmin::AUDITING_ADAPTERS[:example].should == ExampleModule::AuditingAdapter
+        expect(RailsAdmin::AUDITING_ADAPTERS[:example]).to eq(ExampleModule::AuditingAdapter)
       end
     end
 
@@ -71,14 +70,14 @@ describe RailsAdmin::Config do
         RailsAdmin.add_extension(:example, ExampleModule, {
           :configuration => true
         })
-        RailsAdmin::CONFIGURATION_ADAPTERS[:example].should == ExampleModule::ConfigurationAdapter
+        expect(RailsAdmin::CONFIGURATION_ADAPTERS[:example]).to eq(ExampleModule::ConfigurationAdapter)
       end
     end
   end
 
   describe ".attr_accessible_role" do
     it "sould be :default by default" do
-      RailsAdmin.config.attr_accessible_role.call.should == :default
+      expect(RailsAdmin.config.attr_accessible_role.call).to eq(:default)
     end
 
     it "sould be configurable with user role for example" do
@@ -88,21 +87,21 @@ describe RailsAdmin::Config do
         end
       end
 
-      RailsAdmin.config.attr_accessible_role.call.should == :admin
+      expect(RailsAdmin.config.attr_accessible_role.call).to eq(:admin)
     end
   end
 
   describe ".main_app_name" do
 
     it "as a default meaningful dynamic value" do
-      RailsAdmin.config.main_app_name.call.should == ['Dummy App', 'Admin']
+      expect(RailsAdmin.config.main_app_name.call).to eq(['Dummy App', 'Admin'])
     end
 
     it "can be configured" do
       RailsAdmin.config do |config|
         config.main_app_name = ['static','value']
       end
-      RailsAdmin.config.main_app_name.should == ['static','value']
+      expect(RailsAdmin.config.main_app_name).to eq(['static','value'])
     end
   end
 
@@ -170,7 +169,7 @@ describe RailsAdmin::Config do
         RailsAdmin.config do |config|
           config.audit_with(:example)
         end
-        RailsAdmin.config.audit_with.call.should_not raise_exception ArgumentError
+        expect(RailsAdmin.config.audit_with.call).not_to raise_exception ArgumentError
       end
     end
   end
@@ -198,7 +197,7 @@ describe RailsAdmin::Config do
             configurator = configuration_adapter
           end
         end
-        configurator.should be_a(ExampleModule::ConfigurationAdapter)
+        expect(configurator).to be_a(ExampleModule::ConfigurationAdapter)
       end
     end
   end
@@ -209,7 +208,7 @@ describe RailsAdmin::Config do
         RailsAdmin.config do |config|
           config.default_search_operator = 'starts_with'
         end
-        RailsAdmin::Config.default_search_operator.should == 'starts_with'
+        expect(RailsAdmin::Config.default_search_operator).to eq('starts_with')
       end
 
       it "errors on unrecognized search operator" do
@@ -221,7 +220,7 @@ describe RailsAdmin::Config do
       end
 
       it "defaults to 'default'" do
-        RailsAdmin::Config.default_search_operator.should == 'default'
+        expect(RailsAdmin::Config.default_search_operator).to eq('default')
       end
     end
   end
@@ -250,15 +249,15 @@ describe RailsAdmin::Config do
         end
       end
 
-      RailsAdmin.config.visible_models(:controller => double(:_current_user => double(:role => :admin), :authorized? => true)).map(&:abstract_model).map(&:model).should =~ [Fan, Comment]
+      expect(RailsAdmin.config.visible_models(:controller => double(:_current_user => double(:role => :admin), :authorized? => true)).map(&:abstract_model).map(&:model)).to match_array [Fan, Comment]
     end
 
     it 'hides unallowed models' do
       RailsAdmin.config do |config|
         config.included_models = [Comment]
       end
-      RailsAdmin.config.visible_models(:controller => double(:authorized? => true)).map(&:abstract_model).map(&:model).should == [Comment]
-      RailsAdmin.config.visible_models(:controller => double(:authorized? => false)).map(&:abstract_model).map(&:model).should == []
+      expect(RailsAdmin.config.visible_models(:controller => double(:authorized? => true)).map(&:abstract_model).map(&:model)).to eq([Comment])
+      expect(RailsAdmin.config.visible_models(:controller => double(:authorized? => false)).map(&:abstract_model).map(&:model)).to eq([])
     end
 
     it "should not contain embedded model", :mongoid => true do
@@ -266,7 +265,7 @@ describe RailsAdmin::Config do
         config.included_models = [FieldTest, Comment, Embed]
       end
 
-      RailsAdmin.config.visible_models(:controller => double(:_current_user => double(:role => :admin), :authorized? => true)).map(&:abstract_model).map(&:model).should =~ [FieldTest, Comment]
+      expect(RailsAdmin.config.visible_models(:controller => double(:_current_user => double(:role => :admin), :authorized? => true)).map(&:abstract_model).map(&:model)).to match_array [FieldTest, Comment]
      end
   end
 end

data/spec/unit/support/csv_converter_spec.rb

@@ -8,9 +8,9 @@ describe RailsAdmin::CSVConverter do
         field :name
       end
     end
-    
+
     objects = [FactoryGirl.create(:player)]
     schema = {:only =>[:number, :name]}
-    RailsAdmin::CSVConverter.new(objects, schema).to_csv({})[2].should =~ /Number,Name/
+    expect(RailsAdmin::CSVConverter.new(objects, schema).to_csv({})[2]).to match /Number,Name/
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
+date: 2012-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nested_form
@@ -62,6 +62,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: font-awesome-sass-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
@@ -493,7 +509,7 @@ files:
 - app/assets/stylesheets/rails_admin/aristo/images/ui-icons_454545_256x240.png
 - app/assets/stylesheets/rails_admin/aristo/jquery-ui-1.8.7.custom.css.scss
 - app/assets/stylesheets/rails_admin/base/mixins.css.scss
-- app/assets/stylesheets/rails_admin/base/README
+- app/assets/stylesheets/rails_admin/base/README.txt
 - app/assets/stylesheets/rails_admin/base/theming.css.scss
 - app/assets/stylesheets/rails_admin/base/variables.css.scss
 - app/assets/stylesheets/rails_admin/custom/mixins.css.scss