money-rails 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 248e9756e9e93e82ed71a92426635e8864412a66
-  data.tar.gz: b985a0e0926babc02c77bd3ece23927c261ccaab
+  metadata.gz: 73ee4855c001933ab0c12f74417f5696a856dbc9
+  data.tar.gz: a733be5b1554565d6142bcf2ab047ed8290c176f
 SHA512:
-  metadata.gz: ea054a49148d15a90b373c61df52d73e2598cd67d06e9ffc79dea67e515e6038a365d45f924b09133b90c804311cd9050432e39add9259354823f1f6e0950171
-  data.tar.gz: b53220b8d3e692f983f556a264a9045b5b09d5361a578fa12ce500df96853d58f71e01b927250528b7447a57b5d60be60fbc0d896eec4b3fc440efb2d839aee4
+  metadata.gz: 2478a1cab8317060f5ae05c8e3756a465b621e014e0156aa45a420fabfea85d2f8bbd7ea5d1deaaabbd7b33f4105bea382d7cf6759608b1634738f4b9467aa2c
+  data.tar.gz: 08e5e5e699fbd4e7ffd5a09a1565a5c92197369b5cbead24184f0899affcbf9138d57e7358def34d11be25b6b593edb6aad12641ac315fb8b4e3b8c84e094f26

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.8.0
+
+- Ruby 2.4 support
+- Upgrade Money dependency from 6.7 to 6.8.1
+- Upgrade Monetize dependency from 1.4.0 to 1.6.0
+- Raise `MoneyRails::Error` instead of exposing Money and Monetize errors
+
 ## 1.7.0
 
 - Rails 5 support

data/README.md

@@ -91,7 +91,8 @@ class MonetizeProduct < ActiveRecord::Migration
     # OR
 
     change_table :products do |t|
-      t.money :price
+      t.money :price    # Rails 3
+      t.monetize :price # Rails 4x and above
     end
   end
 end
@@ -141,6 +142,16 @@ product.optional_price # => nil
 product.optional_price_cents # => nil
 ```
 
+#### Allow large numbers
+
+If you foresee that you will be saving large values (range is -2147483648 to +2147483647 for Postgres), increase your integer column limit to bigint:
+
+```ruby
+def change
+  change_column :products, :price_cents, :integer, limit: 8
+end
+```
+
 #### Numericality validation options
 
 You can also pass along
@@ -244,6 +255,19 @@ MoneyRails.configure do |config|
 end
 ```
 
+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
+from a field in a configuration model called `Tenant` in this example:
+
+```ruby
+# config/initializers/money.rb
+MoneyRails.configure do |config|
+
+  # set the default currency based on client configuration
+  config.default_currency = -> { Tenant.current.default_currency }
+end
+```
+
 In many cases this is not enough, so there are some other options to
 meet your needs.
 

data/lib/money-rails.rb

@@ -5,6 +5,7 @@ require "money-rails/configuration"
 require "money-rails/money"
 require "money-rails/version"
 require 'money-rails/hooks'
+require 'money-rails/errors'
 
 module MoneyRails
   extend Configuration

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

@@ -5,7 +5,7 @@ require 'active_support/deprecation/reporting'
 module MoneyRails
   module ActiveRecord
     module Monetizable
-      class ReadOnlyCurrencyException < StandardError; end
+      class ReadOnlyCurrencyException < MoneyRails::Error; end
       extend ActiveSupport::Concern
 
       module ClassMethods
@@ -232,11 +232,8 @@ module MoneyRails
               money = value.to_money(public_send("currency_for_#{name}"))
             rescue NoMethodError
               return nil
-            rescue ArgumentError
-              raise if MoneyRails.raise_error_on_money_parsing
-              return nil
-            rescue Money::Currency::UnknownCurrency
-              raise if MoneyRails.raise_error_on_money_parsing
+            rescue Money::Currency::UnknownCurrency, Monetize::ParseError => e
+              raise MoneyRails::Error, e.message if MoneyRails.raise_error_on_money_parsing
               return nil
             end
           end

data/lib/money-rails/errors.rb

@@ -0,0 +1,3 @@
+module MoneyRails
+  class Error < StandardError; end
+end

data/lib/money-rails/mongoid/money.rb

@@ -41,8 +41,8 @@ class Money
       when object.respond_to?(:to_money) then
         begin
           object.to_money.mongoize
-        rescue ArgumentError, Money::Currency::UnknownCurrency
-          raise if MoneyRails.raise_error_on_money_parsing
+        rescue Money::Currency::UnknownCurrency, Monetize::ParseError => e
+          raise MoneyRails::Error, e.message if MoneyRails.raise_error_on_money_parsing
           nil
         end
       else object

data/lib/money-rails/mongoid/two.rb

@@ -25,8 +25,8 @@ class Money
     when object.respond_to?(:to_money)
       begin
         serialize(object.to_money)
-      rescue ArgumentError
-        raise if MoneyRails.raise_error_on_money_parsing
+      rescue Monetize::ParseError => e
+        raise MoneyRails::Error, e.message if MoneyRails.raise_error_on_money_parsing
         nil
       end
     else nil

data/lib/money-rails/version.rb

@@ -1,3 +1,3 @@
 module MoneyRails
-  VERSION = '1.7.0'
+  VERSION = '1.8.0'
 end

data/money-rails.gemspec

@@ -26,8 +26,8 @@ Gem::Specification.new do |s|
 
   s.require_path = "lib"
 
-  s.add_dependency "money",         "~> 6.7"
-  s.add_dependency "monetize",      "~> 1.4.0"
+  s.add_dependency "money",         "~> 6.8.1"
+  s.add_dependency "monetize",      "~> 1.6.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

data/spec/active_record/monetizable_spec.rb

@@ -154,7 +154,7 @@ if defined? ActiveRecord
         after { MoneyRails.raise_error_on_money_parsing = false }
 
         it "raises exception when a String value with hyphen is assigned" do
-          expect { product.accessor_price = "10-235" }.to raise_error ArgumentError
+          expect { product.accessor_price = "10-235" }.to raise_error MoneyRails::Error
         end
 
         it "raises an exception if it can't change currency" do
@@ -935,17 +935,17 @@ if defined? ActiveRecord
           before { MoneyRails.raise_error_on_money_parsing = true }
           after { MoneyRails.raise_error_on_money_parsing = false }
 
-          it "raises an ArgumentError when given an invalid value" do
+          it "raises a MoneyRails::Error when given an invalid value" do
             expect {
               product.write_monetized :price, :price_cents, '10-50', false, nil, {}
-            }.to raise_error(ArgumentError)
+            }.to raise_error(MoneyRails::Error)
           end
 
-          it "raises a Money::Currency::UnknownCurrency error when trying to set invalid currency" do
+          it "raises a MoneyRails::Error error when trying to set invalid currency" do
             allow(product).to receive(:currency_for_price).and_return('INVALID_CURRENCY')
             expect {
               product.write_monetized :price, :price_cents, 10, false, nil, {}
-            }.to raise_error(Money::Currency::UnknownCurrency)
+            }.to raise_error(MoneyRails::Error)
           end
         end
 
@@ -956,7 +956,7 @@ if defined? ActiveRecord
             expect(product.price).to eq(old_price_value)
           end
 
-          it "raises a Money::Currency::UnknownCurrency error when trying to set invalid currency" do
+          it "raises a MoneyRails::Error error when trying to set invalid currency" do
             allow(product).to receive(:currency_for_price).and_return('INVALID_CURRENCY')
             product.write_monetized :price, :price_cents, 10, false, nil, {}
 

data/spec/mongoid/five_spec.rb

@@ -41,11 +41,11 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^5(.*)/
         after { MoneyRails.raise_error_on_money_parsing = false }
 
         it "raises exception if the mongoized value is a String with a hyphen" do
-          expect { priceable_from_string_with_hyphen }.to raise_error ArgumentError
+          expect { priceable_from_string_with_hyphen }.to raise_error MoneyRails::Error
         end
 
         it "raises exception if the mongoized value is a String with an unknown currency" do
-          expect { priceable_from_string_with_unknown_currency }.to raise_error ArgumentError
+          expect { priceable_from_string_with_unknown_currency }.to raise_error MoneyRails::Error
         end
       end
 

data/spec/mongoid/four_spec.rb

@@ -46,11 +46,11 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^4(.*)/
         after { MoneyRails.raise_error_on_money_parsing = false }
 
         it "raises exception if the mongoized value is a String with a hyphen" do
-          expect { priceable_from_string_with_hyphen }.to raise_error ArgumentError
+          expect { priceable_from_string_with_hyphen }.to raise_error MoneyRails::Error
         end
 
         it "raises exception if the mongoized value is a String with an unknown currency" do
-          expect { priceable_from_string_with_unknown_currency }.to raise_error ArgumentError
+          expect { priceable_from_string_with_unknown_currency }.to raise_error MoneyRails::Error
         end
       end
 

data/spec/mongoid/three_spec.rb

@@ -46,11 +46,11 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^3(.*)/
         after { MoneyRails.raise_error_on_money_parsing = false }
 
         it "raises exception if the mongoized value is a String with a hyphen" do
-          expect { priceable_from_string_with_hyphen }.to raise_error ArgumentError
+          expect { priceable_from_string_with_hyphen }.to raise_error MoneyRails::Error
         end
 
         it "raises exception if the mongoized value is a String with an unknown currency" do
-          expect { priceable_from_string_with_unknown_currency }.to raise_error ArgumentError
+          expect { priceable_from_string_with_unknown_currency }.to raise_error MoneyRails::Error
         end
       end
 

data/spec/mongoid/two_spec.rb

@@ -50,7 +50,7 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^2(.*)/
         after { MoneyRails.raise_error_on_money_parsing = false }
 
         it "raises exception if the mongoized value is a String with a hyphen" do
-          expect { priceable_from_string_with_hyphen }.to raise_error ArgumentError
+          expect { priceable_from_string_with_hyphen }.to raise_error MoneyRails::Error
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: money-rails
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Andreas Loupasakis
@@ -10,126 +10,112 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-31 00:00:00.000000000 Z
+date: 2017-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '6.7'
+        version: 6.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '6.7'
+        version: 6.8.1
 - !ruby/object:Gem::Dependency
   name: monetize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   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
   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
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 description: This library provides integration of RubyMoney - Money gem with Rails
 email:
 - alup.rubymoney@gmail.com
@@ -137,14 +123,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG.md
-- LICENSE
-- README.md
-- Rakefile
-- config/locales/money.en.yml
 - lib/generators/money_rails/initializer_generator.rb
 - lib/generators/templates/money.rb
-- lib/money-rails.rb
 - lib/money-rails/active_model/validator.rb
 - lib/money-rails/active_record/migration_extensions/options_extractor.rb
 - lib/money-rails/active_record/migration_extensions/schema_statements.rb
@@ -154,6 +134,7 @@ files:
 - lib/money-rails/active_record/monetizable.rb
 - lib/money-rails/configuration.rb
 - lib/money-rails/engine.rb
+- lib/money-rails/errors.rb
 - lib/money-rails/helpers/action_view_extension.rb
 - lib/money-rails/hooks.rb
 - lib/money-rails/money.rb
@@ -163,13 +144,11 @@ files:
 - lib/money-rails/railtie.rb
 - lib/money-rails/test_helpers.rb
 - lib/money-rails/version.rb
-- money-rails.gemspec
+- lib/money-rails.rb
 - spec/active_record/migration_extensions/schema_statements_spec.rb
 - spec/active_record/migration_extensions/table_spec.rb
 - spec/active_record/monetizable_spec.rb
 - spec/configuration_spec.rb
-- spec/dummy/README.rdoc
-- spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
@@ -180,7 +159,6 @@ files:
 - spec/dummy/app/models/service.rb
 - spec/dummy/app/models/transaction.rb
 - spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml
@@ -201,6 +179,7 @@ files:
 - spec/dummy/config/locales/it.yml
 - spec/dummy/config/mongoid.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/config.ru
 - spec/dummy/db/migrate/20120331190108_create_products.rb
 - spec/dummy/db/migrate/20120402080348_add_bonus_cents_to_product.rb
 - spec/dummy/db/migrate/20120524052716_create_services.rb
@@ -223,6 +202,8 @@ files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/dummy/Rakefile
+- spec/dummy/README.rdoc
 - spec/dummy/script/rails
 - spec/helpers/action_view_extension_spec.rb
 - spec/helpers/form_helper_spec.rb
@@ -233,6 +214,12 @@ files:
 - spec/spec_helper.rb
 - spec/support/database_cleaner.rb
 - spec/test_helpers_spec.rb
+- config/locales/money.en.yml
+- CHANGELOG.md
+- LICENSE
+- README.md
+- Rakefile
+- money-rails.gemspec
 homepage: https://github.com/RubyMoney/money-rails
 licenses:
 - MIT
@@ -243,17 +230,17 @@ 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.5.1
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Money gem integration with Rails
@@ -262,8 +249,6 @@ test_files:
 - spec/active_record/migration_extensions/table_spec.rb
 - spec/active_record/monetizable_spec.rb
 - spec/configuration_spec.rb
-- spec/dummy/README.rdoc
-- spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
@@ -274,7 +259,6 @@ test_files:
 - spec/dummy/app/models/service.rb
 - spec/dummy/app/models/transaction.rb
 - spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml
@@ -295,6 +279,7 @@ test_files:
 - spec/dummy/config/locales/it.yml
 - spec/dummy/config/mongoid.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/config.ru
 - spec/dummy/db/migrate/20120331190108_create_products.rb
 - spec/dummy/db/migrate/20120402080348_add_bonus_cents_to_product.rb
 - spec/dummy/db/migrate/20120524052716_create_services.rb
@@ -317,6 +302,8 @@ test_files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/dummy/Rakefile
+- spec/dummy/README.rdoc
 - spec/dummy/script/rails
 - spec/helpers/action_view_extension_spec.rb
 - spec/helpers/form_helper_spec.rb