money-rails 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37b04a7be15864c3d863599f9459d060fb4438ee
-  data.tar.gz: 60663ea37c3f404e17af412b7243d7dfc1844c72
+  metadata.gz: 06fe320d8e4a586f4c77666ad7b84724dda8131d
+  data.tar.gz: 78fa897739471e33e09f80a25ae127284434041f
 SHA512:
-  metadata.gz: c0c1209bf5dbbae3363bd3ef19bd5dd0e4685357a874f8074e0a1948b40ebe55da05248aa90c335cdea61b5af0ab1a125239b1a275cbccff0ea0876a7d880de6
-  data.tar.gz: 110bd949e2b5077755d4f736e91e46167d6fc7e89ffadfd2f78cd6777b0730def9c9c2c811697a4eac059678a6ca73fe7c2220c0b058aeed250ac5aa8cdc75f0
+  metadata.gz: 770d0661ee7e420da951020b5b63ad584d3e6d211e129855d0994f95f8a4a45f31df1ca0f4724855f757d5ab8afc417ab354f2bf8c4e3e8f8c7c065e6deebb6f
+  data.tar.gz: 2d78aec95f0f07fbf2bfbf7d12d08ff8f7d938fb4337536de8377dba0305d7c53315d9053fb1eca66940fceec3a82a5a708edde784d1ce6cf5563e5cf3114dde

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.12.0
+
+- Bump money version to ~> 6.12.0
+- Bump monetize version to ~> 1.9.0
+
 ## 1.11.0
 
 - Bump money version to ~> 6.11.0

data/README.md

@@ -2,7 +2,6 @@
 
 [![Gem Version](https://badge.fury.io/rb/money-rails.svg)](http://badge.fury.io/rb/money-rails)
 [![Build Status](https://secure.travis-ci.org/RubyMoney/money-rails.svg?branch=master)](http://travis-ci.org/RubyMoney/money-rails)
-[![Dependency Status](https://gemnasium.com/RubyMoney/money-rails.svg)](https://gemnasium.com/RubyMoney/money-rails)
 [![Code Climate](https://codeclimate.com/github/RubyMoney/money-rails.svg)](https://codeclimate.com/github/RubyMoney/money-rails)
 [![License](http://img.shields.io/:license-mit-green.svg?style=flat)](http://opensource.org/licenses/MIT)
 
@@ -306,7 +305,7 @@ object using EUR as their currency, instead of the default USD.
 #### Attribute Currency (:with_currency)
 
 By passing the option ```:with_currency``` to the ```monetize``` macro call,
-with a currency code as its value, you can define a currency in a more granular
+with a currency code (symbol or string) or a callable object (object that responds to the method ```call```) that returns a currency code, as its value, you can define a currency in a more granular
 way. This will you attach the given currency only to the specified monetized model
 attribute (allowing you to, for example, monetize different attributes of the same model with different currencies.).
 
@@ -329,6 +328,30 @@ end
 In this case ```product.bonus``` will return a Money object with GBP as its
 currency, whereas ```product.discount.currency_as_string # => EUR ```
 
+As mentioned earlier you can use an object that responds to the method ```call``` and accepts the model instance as a parameter. That means you can use a ```Proc``` or ```lambda``` (we would recommend ```lambda``` over ```Proc``` because of their [different control flow characteristics](https://stackoverflow.com/questions/1740046/whats-the-difference-between-a-proc-and-a-lambda-in-ruby)) or even define a separate ```class``` with an instance or class method (maybe even a ```module```) to return the currency code:
+
+```ruby
+class DeliveryFee
+  def call(product)
+    # some logic here that will return a currency code
+  end
+end
+
+module OptionalPrice
+  def self.call(product)
+    # some logic here that will return a currency code
+  end
+end
+
+# app/models/product.rb
+class Product < ActiveRecord::Base
+
+  monetize :price_cents, with_currency: ->(_product) { :gbp }
+  monetize :delivery_fee_cents, with_currency: DeliveryFee.new
+  monetize :optional_price_cents, with_currency: OptionalPrice
+end
+```
+
 #### Instance Currencies
 
 All the previous options do not require any extra model fields to hold

data/lib/money-rails/active_model/validator.rb

@@ -33,10 +33,10 @@ module MoneyRails
         normalize_raw_value!
         super(@record, @attr, @raw_value)
 
-        if stringy and record_does_not_have_error?
+        if stringy && record_does_not_have_error?
           add_error if
-            value_has_too_many_decimal_points or
-            thousand_separator_after_decimal_mark or
+            value_has_too_many_decimal_points ||
+            thousand_separator_after_decimal_mark ||
             invalid_thousands_separation
         end
       end

data/lib/money-rails/version.rb

@@ -1,3 +1,3 @@
 module MoneyRails
-  VERSION = '1.11.0'
+  VERSION = '1.12.0'
 end

data/money-rails.gemspec

@@ -26,8 +26,8 @@ Gem::Specification.new do |s|
 
   s.require_path = "lib"
 
-  s.add_dependency "money",         "~> 6.11.0"
-  s.add_dependency "monetize",      "~> 1.7.0"
+  s.add_dependency "money",         "~> 6.12.0"
+  s.add_dependency "monetize",      "~> 1.9.0"
   s.add_dependency "activesupport", ">= 3.0"
   s.add_dependency "railties",      ">= 3.0"
   s.add_dependency "mime-types",    "< 3" if RUBY_VERSION < '2.0' # mime-types > 3 depends on mime-types-data, which doesn't support ruby 1.9

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: money-rails
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.0
 platform: ruby
 authors:
 - Andreas Loupasakis
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-10 00:00:00.000000000 Z
+date: 2018-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.11.0
+        version: 6.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.11.0
+        version: 6.12.0
 - !ruby/object:Gem::Dependency
   name: monetize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement