mongoid_money_field 5.1.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d597501e969ab92ffc3a6958e242515f734da04
-  data.tar.gz: 8605ccc7c7666f68cd05f37937f206e5f8e61430
+  metadata.gz: 24b9899833c2b5c8039757b9cee3964333e3883a
+  data.tar.gz: e6350015be4ed57d7a5e9e5d052fc6ad0f83ed29
 SHA512:
-  metadata.gz: 61a4e7253dc18ff0f3e05edc1385a03ec3fe5f684b2f9b9757070429d4c5dc0025e41d47c0fe4a520f34de1ce0a6e0ff8b7bc0a7e4a5c7efd344717cf1e3191f
-  data.tar.gz: f61ba0e48c01a9a32eeac0f5bf5e272790e4288c558de3f0926094d27f562300a45eeea770918af3a64356ac339fe1e84352dc75e7ca9010deac6872d9a5dbf0
+  metadata.gz: 0dd93ee6e9400cb2322a3273c2a7a1d55a1aab5828d08825c521c910d75245ef01b1cef6a3a4a5b1fef0930e28343677237b04bc3b7226b261e4ec19bb821b81
+  data.tar.gz: d3a185d812fa39e31740faeffd10530630502541969be1d0accee20d2fe8c376184e95c286a5f4237baae653c1666c9d927997a148f7609ef3cb4dc94726ccd2

data/.travis.yml

@@ -3,9 +3,9 @@ language: ruby
 services: mongodb
 
 gemfile:
-  - gemfiles/money51-mongoid31.gemfile
-  - gemfiles/money51-mongoid4.gemfile
-  
+  - gemfiles/money6-mongoid31.gemfile
+  - gemfiles/money6-mongoid4.gemfile
+
 rvm:
   - 1.9.3
   - 2.0.0

data/gemfiles/money6-mongoid31.gemfile

@@ -1,6 +1,5 @@
 source "https://rubygems.org"
 
 gem "mongoid", '~> 3.1.0'
-gem "money", "~> 6.0.0.pre5"
 
 gemspec path: "../"

data/gemfiles/money6-mongoid4.gemfile

@@ -1,6 +1,5 @@
 source "https://rubygems.org"
 
 gem "mongoid", github: "mongoid/mongoid", branch: "master"
-gem "money", "~> 6.0.0.pre5"
 
 gemspec path: "../"

data/lib/mongoid_money_field/rails_admin.rb

@@ -1,19 +1,28 @@
 require 'rails_admin/adapters/mongoid'
-require 'rails_admin/config/fields/types/string'
+begin
+  require 'rails_admin/adapters/mongoid/property'
+rescue Exception => e 
+end
+
 module RailsAdmin
   module Adapters
     module Mongoid
-      alias_method :type_lookup_without_money, :type_lookup
-      def type_lookup(name, field)
-        if field.type.to_s == 'Money' || field.type.class.name == 'MoneyType'
-          { :type => :money_field }
-        else
-          type_lookup_without_money(name, field)
+      class Property
+        alias_method :type_without_money_field, :type
+        def type
+          if property.type.to_s == 'Money' || property.type.class.name == 'MoneyType'
+            :money_field
+          else
+            type_without_money_field
+          end
         end
       end
     end
   end
+end
 
+require 'rails_admin/config/fields/types/string'
+module RailsAdmin
   module Config
     module Fields
       module Types
@@ -39,4 +48,3 @@ module RailsAdmin
     end
   end
 end
-

data/lib/mongoid_money_field/version.rb

@@ -1,3 +1,3 @@
 module MongoidMoneyField
-  VERSION = "5.1.0"
+  VERSION = "5.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_money_field
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.2.0
 platform: ruby
 authors:
 - Gleb Tv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -168,8 +168,6 @@ files:
 - LICENSE.txt
 - README.rdoc
 - Rakefile
-- gemfiles/money51-mongoid31.gemfile
-- gemfiles/money51-mongoid4.gemfile
 - gemfiles/money6-mongoid31.gemfile
 - gemfiles/money6-mongoid4.gemfile
 - lib/mongoid_money_field.rb

data/gemfiles/money51-mongoid31.gemfile

@@ -1,6 +0,0 @@
-source "http://rubygems.org"
-
-gem 'mongoid', '~> 3.1.0'
-gem "money", "~> 5.1.1"
-
-gemspec path: "../"

data/gemfiles/money51-mongoid4.gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-gem "mongoid", github: "mongoid/mongoid", branch: "master"
-gem "money", "~> 5.1.1"
-
-gemspec path: "../"