rails_admin 0.4.5 → 0.4.6

data/spec/integration/rails_admin_spec.rb

@@ -143,8 +143,7 @@ describe RailsAdmin do
 
     it "shows a log out link" do
       visit dashboard_path
-      click_link "Log out"
-      should have_content("Sign in")
+      should have_content "Log out"
     end
   end
 end

data/spec/rails_admin/adapters/active_record_spec.rb

@@ -354,9 +354,46 @@ describe "RailsAdmin::Adapters::ActiveRecord", :active_record => true do
       expect(@abstract_model.send(:build_statement, :field, :integer, ['', 'word3', 'word4'], 'between')).to be_nil
     end
 
-    it "supports decimal type query" do
+    it "supports both decimal and float type queries" do
       expect(@abstract_model.send(:build_statement, :field, :decimal, "1.1", nil)).to eq(["(field = ?)", 1.1])
       expect(@abstract_model.send(:build_statement, :field, :decimal, 'word', nil)).to be_nil
+      expect(@abstract_model.send(:build_statement, :field, :decimal, "1.1"   , 'default')).to eq(["(field = ?)", 1.1])
+      expect(@abstract_model.send(:build_statement, :field, :decimal, 'word', 'default')).to be_nil
+      expect(@abstract_model.send(:build_statement, :field, :decimal, "1.1"   , 'between')).to eq(["(field = ?)", 1.1])
+      expect(@abstract_model.send(:build_statement, :field, :decimal, 'word', 'between')).to be_nil
+      expect(@abstract_model.send(:build_statement, :field, :decimal, ['6.1', ''  , ''  ], 'default')).to eq(["(field = ?)", 6.1])
+      expect(@abstract_model.send(:build_statement, :field, :decimal, ['7.1', '10.1', ''  ], 'default')).to eq(["(field = ?)", 7.1])
+      expect(@abstract_model.send(:build_statement, :field, :decimal, ['8.1', ''  , '20.1'], 'default')).to eq(["(field = ?)", 8.1])
+      expect(@abstract_model.send(:build_statement, :field, :decimal, ['9.1', '10.1', '20.1'], 'default')).to eq(["(field = ?)", 9.1])
+      expect(@abstract_model.send(:build_statement, :field, :decimal, ['', '', ''], 'between')).to be_nil
+      expect(@abstract_model.send(:build_statement, :field, :decimal, ['2.1', '', ''], 'between')).to be_nil
+      expect(@abstract_model.send(:build_statement, :field, :decimal, ['', '3.1', ''], 'between')).to eq(["(field >= ?)", 3.1])
+      expect(@abstract_model.send(:build_statement, :field, :decimal, ['', '', '5.1'], 'between')).to eq(["(field <= ?)", 5.1])
+      expect(@abstract_model.send(:build_statement, :field, :decimal, [''  , '10.1', '20.1'], 'between')).to eq(["(field BETWEEN ? AND ?)", 10.1, 20.1])
+      expect(@abstract_model.send(:build_statement, :field, :decimal, ['15.1', '10.1', '20.1'], 'between')).to eq(["(field BETWEEN ? AND ?)", 10.1, 20.1])
+      expect(@abstract_model.send(:build_statement, :field, :decimal, ['', 'word1', ''     ], 'between')).to be_nil
+      expect(@abstract_model.send(:build_statement, :field, :decimal, ['', ''     , 'word2'], 'between')).to be_nil
+      expect(@abstract_model.send(:build_statement, :field, :decimal, ['', 'word3', 'word4'], 'between')).to be_nil
+
+      expect(@abstract_model.send(:build_statement, :field, :float, "1.1", nil)).to eq(["(field = ?)", 1.1])
+      expect(@abstract_model.send(:build_statement, :field, :float, 'word', nil)).to be_nil
+      expect(@abstract_model.send(:build_statement, :field, :float, "1.1"   , 'default')).to eq(["(field = ?)", 1.1])
+      expect(@abstract_model.send(:build_statement, :field, :float, 'word', 'default')).to be_nil
+      expect(@abstract_model.send(:build_statement, :field, :float, "1.1"   , 'between')).to eq(["(field = ?)", 1.1])
+      expect(@abstract_model.send(:build_statement, :field, :float, 'word', 'between')).to be_nil
+      expect(@abstract_model.send(:build_statement, :field, :float, ['6.1', ''  , ''  ], 'default')).to eq(["(field = ?)", 6.1])
+      expect(@abstract_model.send(:build_statement, :field, :float, ['7.1', '10.1', ''  ], 'default')).to eq(["(field = ?)", 7.1])
+      expect(@abstract_model.send(:build_statement, :field, :float, ['8.1', ''  , '20.1'], 'default')).to eq(["(field = ?)", 8.1])
+      expect(@abstract_model.send(:build_statement, :field, :float, ['9.1', '10.1', '20.1'], 'default')).to eq(["(field = ?)", 9.1])
+      expect(@abstract_model.send(:build_statement, :field, :float, ['', '', ''], 'between')).to be_nil
+      expect(@abstract_model.send(:build_statement, :field, :float, ['2.1', '', ''], 'between')).to be_nil
+      expect(@abstract_model.send(:build_statement, :field, :float, ['', '3.1', ''], 'between')).to eq(["(field >= ?)", 3.1])
+      expect(@abstract_model.send(:build_statement, :field, :float, ['', '', '5.1'], 'between')).to eq(["(field <= ?)", 5.1])
+      expect(@abstract_model.send(:build_statement, :field, :float, [''  , '10.1', '20.1'], 'between')).to eq(["(field BETWEEN ? AND ?)", 10.1, 20.1])
+      expect(@abstract_model.send(:build_statement, :field, :float, ['15.1', '10.1', '20.1'], 'between')).to eq(["(field BETWEEN ? AND ?)", 10.1, 20.1])
+      expect(@abstract_model.send(:build_statement, :field, :float, ['', 'word1', ''     ], 'between')).to be_nil
+      expect(@abstract_model.send(:build_statement, :field, :float, ['', ''     , 'word2'], 'between')).to be_nil
+      expect(@abstract_model.send(:build_statement, :field, :float, ['', 'word3', 'word4'], 'between')).to be_nil
     end
 
     it "supports string type query" do

data/spec/rails_admin/adapters/mongoid_spec.rb

@@ -275,7 +275,7 @@ describe "RailsAdmin::Adapters::Mongoid", :mongoid => true do
     end
 
     it "maps Mongoid column types to RA types" do
-      expect(@abstract_model.properties.select{|p| %w(_id _type array_field big_decimal_field
+      expect(@abstract_model.properties.select{|p| %w(_id array_field big_decimal_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).
@@ -286,12 +286,6 @@ describe "RailsAdmin::Adapters::Mongoid", :mongoid => true do
           :serial? => true,
           :type => :bson_object_id,
           :length => nil },
-        { :name => :_type,
-          :pretty_name => "Type",
-          :nullable? => true,
-          :serial? => false,
-          :type => :text,
-          :length => nil },
         { :name => :array_field,
           :pretty_name => "Array field",
           :nullable? => true,
@@ -701,15 +695,57 @@ describe "RailsAdmin::Adapters::Mongoid", :mongoid => true do
     end
 
     it "supports integer type range query" do
-      expect(@abstract_model.send(:build_statement, :field, :integer, ['', '', ''], nil)).to be_nil
-      expect(@abstract_model.send(:build_statement, :field, :integer, ['2', '', ''], nil)).to eq({:field => 2})
-      expect(@abstract_model.send(:build_statement, :field, :integer, ['', '3', ''], nil)).to eq({:field => {"$gte" => 3}})
-      expect(@abstract_model.send(:build_statement, :field, :integer, ['', '', '5'], nil)).to eq({:field => {"$lte" => 5}})
-      expect(@abstract_model.send(:build_statement, :field, :integer, [''  , '10', '20'], nil)).to eq({:field => {"$gte" => 10, "$lte" => 20}})
-      expect(@abstract_model.send(:build_statement, :field, :integer, ['15', '10', '20'], nil)).to eq({:field => {"$gte" => 10, "$lte" => 20}})
-      expect(@abstract_model.send(:build_statement, :field, :integer, ['', 'word1', ''     ], nil)).to be_nil
-      expect(@abstract_model.send(:build_statement, :field, :integer, ['', ''     , 'word2'], nil)).to be_nil
-      expect(@abstract_model.send(:build_statement, :field, :integer, ['', 'word3', 'word4'], nil)).to be_nil
+      expect(@abstract_model.send(:build_statement, :field, :integer, ['', '', ''], 'between')).to be_nil
+      expect(@abstract_model.send(:build_statement, :field, :integer, ['2', '', ''], 'between')).to be_nil
+      expect(@abstract_model.send(:build_statement, :field, :integer, ['', '3', ''], 'between')).to eq({:field => {"$gte" => 3}})
+      expect(@abstract_model.send(:build_statement, :field, :integer, ['', '', '5'], 'between')).to eq({:field => {"$lte" => 5}})
+      expect(@abstract_model.send(:build_statement, :field, :integer, [''  , '10', '20'], 'between')).to eq({:field => {"$gte" => 10, "$lte" => 20}})
+      expect(@abstract_model.send(:build_statement, :field, :integer, ['15', '10', '20'], 'between')).to eq({:field => {"$gte" => 10, "$lte" => 20}})
+      expect(@abstract_model.send(:build_statement, :field, :integer, ['', 'word1', ''     ], 'between')).to be_nil
+      expect(@abstract_model.send(:build_statement, :field, :integer, ['', ''     , 'word2'], 'between')).to be_nil
+      expect(@abstract_model.send(:build_statement, :field, :integer, ['', 'word3', 'word4'], 'between')).to be_nil
+    end
+
+    it "supports both decimal and float type queries" do
+      expect(@abstract_model.send(:build_statement, :field, :decimal, "1.1", nil)).to eq({:field => 1.1})
+      expect(@abstract_model.send(:build_statement, :field, :decimal, 'word', nil)).to be_nil
+      expect(@abstract_model.send(:build_statement, :field, :decimal, "1.1"   , 'default')).to eq({:field => 1.1})
+      expect(@abstract_model.send(:build_statement, :field, :decimal, 'word', 'default')).to be_nil
+      expect(@abstract_model.send(:build_statement, :field, :decimal, "1.1"   , 'between')).to eq({:field => 1.1})
+      expect(@abstract_model.send(:build_statement, :field, :decimal, 'word', 'between')).to be_nil
+      expect(@abstract_model.send(:build_statement, :field, :decimal, ['6.1', ''  , ''  ], 'default')).to eq({:field => 6.1})
+      expect(@abstract_model.send(:build_statement, :field, :decimal, ['7.1', '10.1', ''  ], 'default')).to eq({:field => 7.1})
+      expect(@abstract_model.send(:build_statement, :field, :decimal, ['8.1', ''  , '20.1'], 'default')).to eq({:field => 8.1})
+      expect(@abstract_model.send(:build_statement, :field, :decimal, ['9.1', '10.1', '20.1'], 'default')).to eq({:field => 9.1})
+      expect(@abstract_model.send(:build_statement, :field, :decimal, ['', '', ''], 'between')).to be_nil
+      expect(@abstract_model.send(:build_statement, :field, :decimal, ['2.1', '', ''], 'between')).to be_nil
+      expect(@abstract_model.send(:build_statement, :field, :decimal, ['', '3.1', ''], 'between')).to eq({:field => {"$gte" => 3.1}})
+      expect(@abstract_model.send(:build_statement, :field, :decimal, ['', '', '5.1'], 'between')).to eq({:field => {"$lte" => 5.1}})
+      expect(@abstract_model.send(:build_statement, :field, :decimal, [''  , '10.1', '20.1'], 'between')).to eq({:field => {"$gte" => 10.1, "$lte" => 20.1}})
+      expect(@abstract_model.send(:build_statement, :field, :decimal, ['15.1', '10.1', '20.1'], 'between')).to eq({:field => {"$gte" => 10.1, "$lte" => 20.1}})
+      expect(@abstract_model.send(:build_statement, :field, :decimal, ['', 'word1', ''     ], 'between')).to be_nil
+      expect(@abstract_model.send(:build_statement, :field, :decimal, ['', ''     , 'word2'], 'between')).to be_nil
+      expect(@abstract_model.send(:build_statement, :field, :decimal, ['', 'word3', 'word4'], 'between')).to be_nil
+
+      expect(@abstract_model.send(:build_statement, :field, :float, "1.1", nil)).to eq({:field => 1.1})
+      expect(@abstract_model.send(:build_statement, :field, :float, 'word', nil)).to be_nil
+      expect(@abstract_model.send(:build_statement, :field, :float, "1.1"   , 'default')).to eq({:field => 1.1})
+      expect(@abstract_model.send(:build_statement, :field, :float, 'word', 'default')).to be_nil
+      expect(@abstract_model.send(:build_statement, :field, :float, "1.1"   , 'between')).to eq({:field => 1.1})
+      expect(@abstract_model.send(:build_statement, :field, :float, 'word', 'between')).to be_nil
+      expect(@abstract_model.send(:build_statement, :field, :float, ['6.1', ''  , ''  ], 'default')).to eq({:field => 6.1})
+      expect(@abstract_model.send(:build_statement, :field, :float, ['7.1', '10.1', ''  ], 'default')).to eq({:field => 7.1})
+      expect(@abstract_model.send(:build_statement, :field, :float, ['8.1', ''  , '20.1'], 'default')).to eq({:field => 8.1})
+      expect(@abstract_model.send(:build_statement, :field, :float, ['9.1', '10.1', '20.1'], 'default')).to eq({:field => 9.1})
+      expect(@abstract_model.send(:build_statement, :field, :float, ['', '', ''], 'between')).to be_nil
+      expect(@abstract_model.send(:build_statement, :field, :float, ['2.1', '', ''], 'between')).to be_nil
+      expect(@abstract_model.send(:build_statement, :field, :float, ['', '3.1', ''], 'between')).to eq({:field => {"$gte" => 3.1}})
+      expect(@abstract_model.send(:build_statement, :field, :float, ['', '', '5.1'], 'between')).to eq({:field => {"$lte" => 5.1}})
+      expect(@abstract_model.send(:build_statement, :field, :float, [''  , '10.1', '20.1'], 'between')).to eq({:field => {"$gte" => 10.1, "$lte" => 20.1}})
+      expect(@abstract_model.send(:build_statement, :field, :float, ['15.1', '10.1', '20.1'], 'between')).to eq({:field => {"$gte" => 10.1, "$lte" => 20.1}})
+      expect(@abstract_model.send(:build_statement, :field, :float, ['', 'word1', ''     ], 'between')).to be_nil
+      expect(@abstract_model.send(:build_statement, :field, :float, ['', ''     , 'word2'], 'between')).to be_nil
+      expect(@abstract_model.send(:build_statement, :field, :float, ['', 'word3', 'word4'], 'between')).to be_nil
     end
 
     it "supports string type query" do

data/spec/spec_helper.rb

@@ -5,10 +5,14 @@ CI_ORM = (ENV['CI_ORM'] || :active_record).to_sym
 CI_TARGET_ORMS = [:active_record, :mongoid]
 PK_COLUMN = {:active_record=>:id, :mongoid=>:_id}[CI_ORM]
 
-if ENV['INVOKE_SIMPLECOV']
-  require 'simplecov'
-  SimpleCov.start 'rails'
-end
+require 'simplecov'
+require 'coveralls'
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start
 
 require File.expand_path('../dummy_app/config/environment', __FILE__)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -39,7 +39,7 @@ cert_chain:
   U0xxV3ZRUnNCbHlwSGZoczZKSnVMbHlaUEdoVTNSL3YKU2YzbFZLcEJDV2dS
   cEdUdnk0NVhWcEIrNTl5MzNQSm1FdVExUFRFT1l2UXlhbzlVS01BQWFBTi83
   cVdRdGpsMApobHc9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-date: 2013-02-14 00:00:00.000000000 Z
+date: 2013-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
@@ -734,7 +734,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Admin for Rails