money-rails 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efddf2fd0ce930972e24427f75fa976a18f915a6
-  data.tar.gz: a3ee629c92a46b729b6beb2eaeae7f6beb8166da
+  metadata.gz: 43aea3acfffc9b52e9d127a1c40ff582b68fbe71
+  data.tar.gz: a7f43a08d717c6f786e94bbf33c6952001816b97
 SHA512:
-  metadata.gz: 61d164c6d684028064e48d7a8b179c09eec0d31b968e2f8471dee8d013b84dae0cc8929cf14a2ba69d04daaaedbc31002c8345c75bb2de0981f3de16b7ba4ad5
-  data.tar.gz: dbadb3bde17a75b27ceaac420fd6c41859150c34dc1730410c43fcf38789f4cacb3099d34b1d8fe573d67916b776da3aacfd08569039fbd8502d528502ce8ebd
+  metadata.gz: 2a104c9d3cb7ba768d8c627e4b34d77d5f31b35bb3a8f414b5a1f2d1548447fae817e2784f41e83acc0ff4a41cb56d7dc7c4b5b0b0f1b95a88ef936e4a735387
+  data.tar.gz: 5e6fe0700129072ff2b0f44276223b3540c90eb5d015f6b30b345f3397b7ae44e39cd9e8877075c3047ea63a9e24093589104d0fe874f56f4bf3849b14b0562c

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.10.0
+
+- Bump money version to ~> 6.10.0
+- Optimize reading of the attribute when `allow_nil` is set to true
+
 ## 1.9.0
 
 - Allow the use of money-rails with plan ActiveRecord (without Rails)

data/README.md

@@ -261,6 +261,8 @@ MoneyRails.configure do |config|
 
 end
 ```
+For complete list of available currency: [ISO 4217](https://en.wikipedia.org/wiki/ISO_4217)
+
 
 If you need to set the default currency on a per-request basis, such as in a
 multi-tenant application, you may use a lambda to lazy-load the default currency

data/Rakefile

@@ -60,6 +60,9 @@ namespace :spec do
   desc "Run Tests against mongoid (version 2)"
   task(:mongoid2) { run_with_gemfile 'gemfiles/mongoid2.gemfile' }
 
+  desc "Run Tests against rails 5.1"
+  task(:rails51) { run_with_gemfile 'gemfiles/rails51.gemfile' }
+
   desc "Run Tests against rails 5.0"
   task(:rails50) { run_with_gemfile 'gemfiles/rails50.gemfile' }
 
@@ -79,7 +82,7 @@ namespace :spec do
   task :mongoid => [:mongoid2, :mongoid3, :mongoid4, :mongoid5]
 
   desc "Run Tests against rails 3 & 4 & 4.1 & 4.2 & 5.0"
-  task :rails => [:rails3, :rails4, :rails41, :rails42, :rails50]
+  task :rails => [:rails3, :rails4, :rails41, :rails42, :rails50, :rails51]
 
   desc "Run Tests against all ORMs"
   task :all => [:rails, :mongoid]

data/lib/money-rails/active_record/monetizable.rb

@@ -119,7 +119,7 @@ module MoneyRails
 
             # Getter for monetized attribute
             define_method name do |*args|
-              read_monetized name, subunit_name, *args
+              read_monetized name, subunit_name, options, *args
             end
 
             # Setter for monetized attribute
@@ -178,10 +178,11 @@ module MoneyRails
         end
       end
 
-      def read_monetized(name, subunit_name, *args)
+      def read_monetized(name, subunit_name, options = {}, *args)
         # Get the cents
         amount = public_send(subunit_name, *args)
 
+        return if amount.nil? && options[:allow_nil]
         # Get the currency object
         attr_currency = public_send("currency_for_#{name}")
 

data/lib/money-rails/version.rb

@@ -1,3 +1,3 @@
 module MoneyRails
-  VERSION = '1.9.0'
+  VERSION = '1.10.0'
 end

data/money-rails.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
 
   s.require_path = "lib"
 
-  s.add_dependency "money",         "~> 6.9.0"
+  s.add_dependency "money",         "~> 6.10.0"
   s.add_dependency "monetize",      "~> 1.7.0"
   s.add_dependency "activesupport", ">= 3.0"
   s.add_dependency "railties",      ">= 3.0"
@@ -34,6 +34,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rails",       ">= 3.0"
   s.add_development_dependency "rspec-rails", "~> 3.0"
-  s.add_development_dependency 'database_cleaner', ['>= 0.8.0', '< 1.4.0']
+  s.add_development_dependency 'database_cleaner', '~> 1.6.1'
   s.add_development_dependency 'test-unit', '~> 3.0' if RUBY_VERSION >= '2.2'
 end

data/spec/active_record/monetizable_spec.rb

@@ -78,13 +78,25 @@ if defined? ActiveRecord
       end
 
       it "assigns the correct value from params" do
-        params_clp = { amount: '20000', tax: '1000', currency:  'CLP' }
+        params_clp = { amount: '20000', tax: '1000', currency: 'CLP' }
         product = Transaction.create(params_clp)
         expect(product.valid?).to be_truthy
         expect(product.amount.currency.subunit_to_unit).to eq(1)
         expect(product.amount_cents).to eq(20000)
       end
 
+      # TODO: This is a slightly controversial example, btu it reflects the current behaviour
+      it "re-assigns cents amount when subunit/unit ratio changes preserving amount in units" do
+        transaction = Transaction.create(amount: '20000', tax: '1000', currency: 'USD')
+
+        expect(transaction.amount).to eq(Money.new(20000_00, 'USD'))
+
+        transaction.currency = 'CLP'
+
+        expect(transaction.amount).to eq(Money.new(20000, 'CLP'))
+        expect(transaction.amount_cents).to eq(20000)
+      end
+
       it "raises an error if trying to create two attributes with the same name" do
         expect do
           class Product
@@ -842,6 +854,30 @@ if defined? ActiveRecord
           expect(product.read_monetized(:price, :price_cents).to_s).to eq('14,0')
         end
       end
+
+      context "with a monetized attribute that is nil" do
+        let(:service) do
+          Service.create(discount_cents: nil)
+        end
+        let(:default_currency_lambda) { double("Default Currency Fallback") }
+        subject { service.read_monetized(:discount, :discount_cents, options) }
+
+        around(:each) do |example|
+          service # Instantiate instance which relies on Money.default_currency
+          original_default_currency = Money.default_currency
+          Money.default_currency = -> { default_currency_lambda.read_currency }
+          example.run
+          Money.default_currency = original_default_currency
+        end
+
+        context "when allow_nil options is set" do
+          let(:options) { { allow_nil: true } }
+          it "does not attempt to read the fallback default currency" do
+            expect(default_currency_lambda).not_to receive(:read_currency)
+            subject
+          end
+        end
+      end
     end
 
     describe "#write_monetized" do

data/spec/dummy/db/migrate/20120331190108_create_products.rb

@@ -1,4 +1,4 @@
-class CreateProducts < ActiveRecord::Migration
+class CreateProducts < (Rails::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[4.2] : ActiveRecord::Migration)
   def change
     create_table :products do |t|
       t.integer :price_cents

data/spec/dummy/db/migrate/20120402080348_add_bonus_cents_to_product.rb

@@ -1,4 +1,4 @@
-class AddBonusCentsToProduct < ActiveRecord::Migration
+class AddBonusCentsToProduct < (Rails::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[4.2] : ActiveRecord::Migration)
   def change
     add_column :products, :bonus_cents, :integer
 

data/spec/dummy/db/migrate/20120524052716_create_services.rb

@@ -1,4 +1,4 @@
-class CreateServices < ActiveRecord::Migration
+class CreateServices < (Rails::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[4.2] : ActiveRecord::Migration)
   def change
     create_table :services do |t|
       t.integer :charge_cents

data/spec/dummy/db/migrate/20120528181002_create_transactions.rb

@@ -1,4 +1,4 @@
-class CreateTransactions < ActiveRecord::Migration
+class CreateTransactions < (Rails::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[4.2] : ActiveRecord::Migration)
   def change
     create_table :transactions do |t|
       t.integer :amount_cents

data/spec/dummy/db/migrate/20120528210103_create_dummy_products.rb

@@ -1,4 +1,4 @@
-class CreateDummyProducts < ActiveRecord::Migration
+class CreateDummyProducts < (Rails::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[4.2] : ActiveRecord::Migration)
   def change
     create_table :dummy_products do |t|
       t.string :currency

data/spec/dummy/db/migrate/20120607210247_add_column_that_allows_nil.rb

@@ -1,4 +1,4 @@
-class AddColumnThatAllowsNil < ActiveRecord::Migration
+class AddColumnThatAllowsNil < (Rails::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[4.2] : ActiveRecord::Migration)
   def change
     add_column :products, :optional_price_cents, :integer
   end

data/spec/dummy/db/migrate/20120712202655_add_sale_price_cents_to_product.rb

@@ -1,4 +1,4 @@
-class AddSalePriceCentsToProduct < ActiveRecord::Migration
+class AddSalePriceCentsToProduct < (Rails::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[4.2] : ActiveRecord::Migration)
   def change
     add_column :products, :sale_price_amount, :integer,
                :default => 0, :null => false

data/spec/dummy/db/migrate/20130124023419_add_price_in_a_range_cents_to_products.rb

@@ -1,4 +1,4 @@
-class AddPriceInARangeCentsToProducts < ActiveRecord::Migration
+class AddPriceInARangeCentsToProducts < (Rails::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[4.2] : ActiveRecord::Migration)
   def change
     add_column :products, :price_in_a_range_cents, :integer
   end

data/spec/dummy/db/migrate/20140110194016_add_validates_method_amount_cents_to_products.rb

@@ -1,4 +1,4 @@
-class AddValidatesMethodAmountCentsToProducts < ActiveRecord::Migration
+class AddValidatesMethodAmountCentsToProducts < (Rails::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[4.2] : ActiveRecord::Migration)
   def change
     add_column :products, :validates_method_amount_cents, :integer
   end

data/spec/dummy/db/migrate/20141005075025_add_aliased_attr_to_products.rb

@@ -1,4 +1,4 @@
-class AddAliasedAttrToProducts < ActiveRecord::Migration
+class AddAliasedAttrToProducts < (Rails::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[4.2] : ActiveRecord::Migration)
   def change
     add_column :products, :aliased_cents, :integer
   end

data/spec/dummy/db/migrate/20150107061030_add_delivery_fee_cents_and_restock_fee_cents_to_product.rb

@@ -1,4 +1,4 @@
-class AddDeliveryFeeCentsAndRestockFeeCentsToProduct < ActiveRecord::Migration
+class AddDeliveryFeeCentsAndRestockFeeCentsToProduct < (Rails::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[4.2] : ActiveRecord::Migration)
   def change
     add_column :products, :delivery_fee_cents, :integer
     add_column :products, :restock_fee_cents, :integer

data/spec/dummy/db/migrate/20150126231442_add_reduced_price_to_products.rb

@@ -1,4 +1,4 @@
-class AddReducedPriceToProducts < ActiveRecord::Migration
+class AddReducedPriceToProducts < (Rails::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[4.2] : ActiveRecord::Migration)
   def change
     add_column :products, :reduced_price_cents, :integer
     add_column :products, :reduced_price_currency, :string

data/spec/dummy/db/migrate/20150213234410_add_special_price_to_products.rb

@@ -1,4 +1,4 @@
-class AddSpecialPriceToProducts < ActiveRecord::Migration
+class AddSpecialPriceToProducts < (Rails::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[4.2] : ActiveRecord::Migration)
   def change
     add_column :products, :special_price_cents, :integer
   end

data/spec/dummy/db/migrate/20150217222612_add_lambda_price_to_products.rb

@@ -1,4 +1,4 @@
-class AddLambdaPriceToProducts < ActiveRecord::Migration
+class AddLambdaPriceToProducts < (Rails::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[4.2] : ActiveRecord::Migration)
   def change
     add_column :products, :lambda_price_cents, :integer
   end

data/spec/dummy/db/migrate/20150303222230_add_skip_validation_price_cents_to_products.rb

@@ -1,4 +1,4 @@
-class AddSkipValidationPriceCentsToProducts < ActiveRecord::Migration
+class AddSkipValidationPriceCentsToProducts < (Rails::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[4.2] : ActiveRecord::Migration)
   def change
     add_column :products, :skip_validation_price_cents, :string
   end

data/spec/dummy/db/migrate/20151026220420_add_optional_amount_to_transactions.rb

@@ -1,4 +1,4 @@
-class AddOptionalAmountToTransactions < ActiveRecord::Migration
+class AddOptionalAmountToTransactions < (Rails::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[4.2] : ActiveRecord::Migration)
   def change
     add_column :transactions, :optional_amount_cents, :integer
   end

data/spec/mongoid/four_spec.rb

@@ -4,11 +4,11 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^4(.*)/
 
   describe Money do
     let!(:priceable) { Priceable.create(:price => Money.new(100, 'EUR')) }
-    let!(:priceable_from_nil) { Priceable.create(:price => nil) }
-    let!(:priceable_from_num) { Priceable.create(:price => 1) }
-    let!(:priceable_from_string) { Priceable.create(:price => '1 EUR' )}
-    let!(:priceable_from_hash) { Priceable.create(:price => {:cents=>100, :currency_iso=>"EUR"} )}
-    let!(:priceable_from_hash_with_indifferent_access) {
+    let(:priceable_from_nil) { Priceable.create(:price => nil) }
+    let(:priceable_from_num) { Priceable.create(:price => 1) }
+    let(:priceable_from_string) { Priceable.create(:price => '1 EUR' )}
+    let(:priceable_from_hash) { Priceable.create(:price => {:cents=>100, :currency_iso=>"EUR"} )}
+    let(:priceable_from_hash_with_indifferent_access) {
       Priceable.create(:price => {:cents=>100, :currency_iso=>"EUR"}.with_indifferent_access)
     }
     let(:priceable_from_string_with_hyphen) { Priceable.create(:price => '1-2 EUR' )}
@@ -99,6 +99,7 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^4(.*)/
 
     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')) }
 

data/spec/mongoid/three_spec.rb

@@ -4,11 +4,11 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^3(.*)/
 
   describe Money do
     let!(:priceable) { Priceable.create(:price => Money.new(100, 'EUR')) }
-    let!(:priceable_from_nil) { Priceable.create(:price => nil) }
-    let!(:priceable_from_num) { Priceable.create(:price => 1) }
-    let!(:priceable_from_string) { Priceable.create(:price => '1 EUR' )}
-    let!(:priceable_from_hash) { Priceable.create(:price => {:cents=>100, :currency_iso=>"EUR"} )}
-    let!(:priceable_from_hash_with_indifferent_access) {
+    let(:priceable_from_nil) { Priceable.create(:price => nil) }
+    let(:priceable_from_num) { Priceable.create(:price => 1) }
+    let(:priceable_from_string) { Priceable.create(:price => '1 EUR' )}
+    let(:priceable_from_hash) { Priceable.create(:price => {:cents=>100, :currency_iso=>"EUR"} )}
+    let(:priceable_from_hash_with_indifferent_access) {
       Priceable.create(:price => {:cents=>100, :currency_iso=>"EUR"}.with_indifferent_access)
     }
     let(:priceable_from_string_with_hyphen) { Priceable.create(:price => '1-2 EUR' )}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: money-rails
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Andreas Loupasakis
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2018-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.9.0
+        version: 6.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.9.0
+        version: 6.10.0
 - !ruby/object:Gem::Dependency
   name: monetize
   requirement: !ruby/object:Gem::Requirement
@@ -100,22 +100,16 @@ dependencies:
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement