mongoid_money_field 4.0.8 → 5.0.0

data/spec/ruby_money_spec.rb

@@ -15,48 +15,48 @@ describe Money do
 
   context "mongoize" do
     it "mongoizes correctly a Money object to a hash of cents and currency" do
-      expect(priceable.price.cents).to eq(100)
-      expect(priceable.price.currency).to eq(Money::Currency.find('EUR'))
+      priceable.price.cents.should == 100
+      priceable.price.currency.should == Money::Currency.find('EUR')
     end
 
     it "mongoizes correctly a Numeric object to a hash of cents and currency" do
-      expect(priceable_from_num.price.cents).to eq(100)
-      expect(priceable_from_num.price.currency).to eq(Money.default_currency)
+      priceable_from_num.price.cents.should == 100
+      priceable_from_num.price.currency.should == Money.default_currency
     end
 
     it "mongoizes correctly a String object to a hash of cents and currency" do
-      expect(priceable_from_string.price.cents).to eq(100)
-      expect(priceable_from_string.price.currency).to eq(Money::Currency.find('EUR'))
+      priceable_from_string.price.cents.should == 100
+      priceable_from_string.price.currency.should == Money::Currency.find('EUR')
     end
 
     it "mongoizes correctly a hash of cents and currency" do
-      expect(priceable_from_hash.price.cents).to eq(100)
-      expect(priceable_from_hash.price.currency).to eq(Money::Currency.find('EUR'))
+      priceable_from_hash.price.cents.should == 100
+      priceable_from_hash.price.currency.should == Money::Currency.find('EUR')
     end
 
     it "mongoizes correctly a HashWithIndifferentAccess of cents and currency" do
-      expect(priceable_from_hash_with_indifferent_access.price.cents).to eq(100)
-      expect(priceable_from_hash_with_indifferent_access.price.currency).to eq(Money::Currency.find('EUR'))
+      priceable_from_hash_with_indifferent_access.price.cents.should == 100
+      priceable_from_hash_with_indifferent_access.price.currency.should == Money::Currency.find('EUR')
     end
   end
 
   context "demongoize" do
     subject { Priceable.first.price }
-    it { is_expected.to be_an_instance_of(Money) }
-    it { is_expected.to eq(Money.new(100, 'EUR')) }
+    it { should be_an_instance_of(Money) }
+    it { should == Money.new(100, 'EUR') }
     it "returns nil if a nil value was stored" do
       nil_priceable = Priceable.create(:price => nil)
-      expect(nil_priceable.price).to be_nil
+      nil_priceable.price.should be_nil
     end
     it 'returns nil if an unknown value was stored' do
       zero_priceable = Priceable.create(:price => [])
-      expect(zero_priceable.price).to be_nil
+      zero_priceable.price.should be_nil
     end
   end
 
   context "evolve" do
     it "transforms correctly a Money object to a Mongo friendly value" do
-      expect(Priceable.where(:price => Money.new(100, 'EUR')).first).to eq(priceable)
+      Priceable.where(:price => Money.new(100, 'EUR')).first.should == priceable
     end
   end
 end

data/spec/support/dummy_money.rb

@@ -6,5 +6,5 @@ class DummyMoney
   
   field :description
   
-  money_field :price, default: 0
+  money_field :price
 end

data/spec/support/dummy_money_required.rb

@@ -1,10 +1,10 @@
-# coding: utf-8
-
-class DummyMoneyRequired
-  include Mongoid::Document
-  include Mongoid::MoneyField
-
-  field :description
-
-  money_field :price, required: true, default_currency: nil
+# coding: utf-8
+
+class DummyMoneyRequired
+  include Mongoid::Document
+  include Mongoid::MoneyField
+
+  field :description
+
+  money_field :price, required: true, default_currency: nil
 end

data/spec/support/dummy_money_with_default.rb

@@ -1,10 +1,10 @@
-# coding: utf-8
-
-class DummyMoneyWithDefault
-  include Mongoid::Document
-  include Mongoid::MoneyField
-
-  field :description
-
-  money_field :price, default: 1.00
+# coding: utf-8
+
+class DummyMoneyWithDefault
+  include Mongoid::Document
+  include Mongoid::MoneyField
+
+  field :description
+
+  money_field :price, default: 1.00
 end

data/spec/support/money3.rb

@@ -24,7 +24,7 @@ class Money3Compat
 
   field :description
 
-  money_field :price
+  money_field :price, default: 0
   money_field :price_no_default
   money_field :price_with_fix, fixed_currency: 'GBP'
 end

metadata

@@ -1,161 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_money_field
 version: !ruby/object:Gem::Version
-  version: 4.0.8
+  version: 5.0.0
 platform: ruby
 authors:
 - Gleb Tv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-10 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '4.1'
-- !ruby/object:Gem::Dependency
-  name: monetize
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: money
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 6.1.1
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 6.1.1
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: mongoid-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.0
 description: Use RubyMoney with mongoid
 email:
 - glebtv@gmail.com
@@ -163,26 +143,27 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".document"
-- ".gitignore"
-- ".rspec"
-- ".ruby-gemset"
-- ".ruby-version"
-- ".travis.yml"
+- .document
+- .gitignore
+- .rspec
+- .ruby-gemset
+- .ruby-version
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - 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
 - lib/mongoid_money_field/field.rb
-- lib/mongoid_money_field/rails_admin.rb
 - lib/mongoid_money_field/simple_form/money_input.rb
+- lib/mongoid_money_field/type.rb
 - lib/mongoid_money_field/version.rb
 - mongoid_money_field.gemspec
-- spec/model_spec.rb
-- spec/money3_compat_spec.rb
-- spec/money3_spec.rb
 - spec/money_spec.rb
 - spec/ruby_money_spec.rb
 - spec/spec_helper.rb
@@ -211,24 +192,21 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Use RubyMoney with mongoid
 test_files:
-- spec/model_spec.rb
-- spec/money3_compat_spec.rb
-- spec/money3_spec.rb
 - spec/money_spec.rb
 - spec/ruby_money_spec.rb
 - spec/spec_helper.rb

data/lib/mongoid_money_field/rails_admin.rb

@@ -1,46 +0,0 @@
-require 'rails_admin/adapters/mongoid'
-require 'rails_admin/config/fields/types/string'
-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)
-        end
-      end
-    end
-  end
-
-  module Config
-    module Fields
-      module Types
-        class MoneyField < RailsAdmin::Config::Fields::Types::String
-          # Register field type for the type loader
-          RailsAdmin::Config::Fields::Types::register(self)
-
-          register_instance_option :pretty_value do
-            ret = if value.class.name == 'Hash'
-              value.stringify_keys!
-              if value['cents']
-                "%.2f" % ::Money.new(value['cents'], value['currency_iso']).to_f
-              else
-                value
-              end
-            elsif value.respond_to?(:cents)
-              "%.2f" % value.to_f
-            else
-              value
-            end
-          end
-
-          register_instance_option :formatted_value do
-            pretty_value
-          end
-        end
-      end
-    end
-  end
-end

data/spec/model_spec.rb

@@ -1,8 +0,0 @@
-# coding: utf-8
-
-require 'spec_helper'
-
-describe DummyMoney do
-  it { is_expected.to allow_mass_assignment_of(:description) }
-  it { is_expected.to allow_mass_assignment_of(:price) }
-end

data/spec/money3_compat_spec.rb

@@ -1,123 +0,0 @@
-# coding: utf-8
-
-require 'spec_helper'
-
-describe Money3Compat do
-  it { is_expected.to allow_mass_assignment_of(:description) }
-  it { is_expected.to allow_mass_assignment_of(:price) }
-
-  it 'correctly reads old fields data' do
-    Money3.create!(price_currency: 'GBP', price_cents: '12000')
-    expect(Money3Compat.first.price.cents).to eq 12000
-    expect(Money3Compat.first.price.currency.iso_code).to eq 'GBP'
-  end
-
-  it 'correctly works after save' do
-    Money3.create!(price_currency: 'GBP', price_cents: '12000')
-    expect(Money3Compat.first.save).to be_truthy
-
-    expect(Money3Compat.first.price.cents).to eq 12000
-    expect(Money3Compat.first.price.currency.iso_code).to eq 'GBP'
-  end
-
-  it 'correctly migrates data' do
-    Money3.create!(price_currency: 'GBP', price_cents: '12000')
-
-    expect(Money3.first.read_attribute(:price_currency)).not_to be_nil
-    expect(Money3.first.read_attribute(:price_cents)).not_to be_nil
-
-    expect(Money3.first.read_attribute(:price_currency)).to eq 'GBP'
-    expect(Money3.first.read_attribute(:price_cents)).to eq 12000
-
-    Money3Compat.migrate_from_money_field_3!(:price)
-
-    expect(Money3Compat.first.price.cents).to eq 12000
-    expect(Money3Compat.first.price.currency.iso_code).to eq 'GBP'
-
-    expect(Money3.first.read_attribute(:price_currency)).to be_nil
-    expect(Money3.first.read_attribute(:price_cents)).to be_nil
-
-    expect(Money3Compat.first.read_attribute(:price_currency)).to be_nil
-    expect(Money3Compat.first.read_attribute(:price_cents)).to be_nil
-
-    f = Money3Compat.first
-    f.price = '32.00 GBP'
-    expect(f.save).to be_truthy
-
-    expect(Money3Compat.first.price.cents).to eq 3200
-    expect(Money3Compat.first.price.currency.iso_code).to eq 'GBP'
-  end
-
-  describe 'with fixed currency' do
-    it 'correctly reads old' do
-      Money3.create!(price_with_fix_cents: '12000')
-      expect(Money3Compat.first.price_with_fix.cents).to eq 12000
-      expect(Money3Compat.first.price_with_fix.currency.iso_code).to eq 'GBP'
-    end
-
-    it 'correctly works after save' do
-      Money3.create!(price_with_fix_cents: '12000')
-      expect(Money3Compat.first.save).to be_truthy
-      expect(Money3Compat.first.price_with_fix.cents).to eq 12000
-      expect(Money3Compat.first.price_with_fix.currency.iso_code).to eq 'GBP'
-    end
-
-    it 'correctly migrates data' do
-      Money3.create!(price_with_fix_cents: '12000')
-      Money3Compat.migrate_from_money_field_3!(:price_with_fix)
-
-      expect(Money3Compat.first.read_attribute(:price_with_fix_currency)).to be_nil
-      expect(Money3Compat.first.read_attribute(:price_with_fix_cents)).to be_nil
-
-      expect(Money3Compat.first.price_with_fix.cents).to eq 12000
-      expect(Money3Compat.first.price_with_fix.currency.iso_code).to eq 'GBP'
-    end
-  end
-
-  describe 'with no default' do
-    it 'correctly reads old' do
-      Money3.create!(price_no_default_currency: 'GBP', price_no_default_cents: '12000')
-      expect(Money3Compat.first.price_no_default.cents).to eq 12000
-      expect(Money3Compat.first.price_no_default.currency.iso_code).to eq 'GBP'
-    end
-
-    it 'correctly works after save' do
-      Money3.create!(price_no_default_currency: 'GBP', price_no_default_cents: '12000')
-      expect(Money3Compat.first.save).to be_truthy
-      expect(Money3Compat.first.price_no_default.cents).to eq 12000
-      expect(Money3Compat.first.price_no_default.currency.iso_code).to eq 'GBP'
-    end
-
-    it 'correctly migrates data' do
-      Money3.create!(price_no_default_currency: 'GBP', price_no_default_cents: '12000')
-      Money3Compat.migrate_from_money_field_3!(:price_no_default)
-
-      expect(Money3Compat.first.read_attribute(:price_no_default_currency)).to be_nil
-      expect(Money3Compat.first.read_attribute(:price_no_default_cents)).to be_nil
-
-      expect(Money3Compat.first.price_no_default.cents).to eq 12000
-      expect(Money3Compat.first.price_no_default.currency.iso_code).to eq 'GBP'
-    end
-
-    it 'correctly migrates data with no currency' do
-      Money3.create!(price_no_default_cents: '12000')
-      Money3Compat.migrate_from_money_field_3!(:price_no_default)
-
-      expect(Money3Compat.first.read_attribute(:price_no_default_currency)).to be_nil
-      expect(Money3Compat.first.read_attribute(:price_no_default_cents)).to be_nil
-
-      expect(Money3Compat.first.price_no_default.cents).to eq 12000
-      expect(Money3Compat.first.price_no_default.currency.iso_code).to eq 'RUB'
-    end
-
-    it 'correctly migrates data with no cents' do
-      Money3.create!()
-      Money3Compat.migrate_from_money_field_3!(:price_no_default)
-
-      expect(Money3Compat.first.read_attribute(:price_no_default_currency)).to be_nil
-      expect(Money3Compat.first.read_attribute(:price_no_default_cents)).to be_nil
-
-      expect(Money3Compat.first.price_no_default).to be_nil
-    end
-  end
-end