shopify-money 0.11.3 → 0.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53109f360b32e2f8fe8c6ade1992ba9a50c4a27d
-  data.tar.gz: 63b5789d8f13897ddba4ce87e857d8d60092d026
+  metadata.gz: 83c2db01e42a2e8495d522c5e2d1e8f1f0503503
+  data.tar.gz: 57aee0d1d639f9564792794add56654d4adfd8ef
 SHA512:
-  metadata.gz: b602fb6b125c484290a44d6269b14f209c7699d58830bbcf50589b8588b02d4c15d2030dd9ef91890e770fb4e3ba205d2b974a529c120285ff62b673ac0c19e7
-  data.tar.gz: 3e6c25119ade6fa8a8e4236f5779e64baaaa6e771c1f7be10204334066de7b94a516eeafe98a144cf8467069fed0d3490823a78093fe0318381e09e6c137ba6e
+  metadata.gz: e994c9974a9c75e5a3307fb93babbfbff2adaa44606b5eff744586a94ffc5ee4e596894d01fdf03488fc3023090db19fdd5b6e032a33adbe4d9ca3276e795341
+  data.tar.gz: 0cb26b9374ff0c6dbf583d5415f2c2e2e1390d490b3ce02ac03f86c27ca31cc23aa69e835e66f1149a026b0475aa64164ab7f0787da7e8235f97e1e7a8681494

data/README.md

@@ -3,7 +3,7 @@
 [![Build Status](https://travis-ci.org/Shopify/money.svg?branch=master)](https://travis-ci.org/Shopify/money) [![codecov](https://codecov.io/gh/Shopify/money/branch/master/graph/badge.svg)](https://codecov.io/gh/Shopify/money)
 
 
-money_column expects a decimal 8,3 database field.
+money_column expects a DECIMAL(21,3) database field.
 
 ### Features
 

data/lib/money.rb

@@ -3,6 +3,7 @@ require_relative 'money/helpers'
 require_relative 'money/currency'
 require_relative 'money/null_currency'
 require_relative 'money/money'
+require_relative 'money/errors'
 require_relative 'money/deprecations'
 require_relative 'money/accounting_money_parser'
 require_relative 'money/core_extensions'

data/lib/money/core_extensions.rb

@@ -13,6 +13,6 @@ end
 #   '100.37'.to_money => #<Money @cents=10037>
 class String
   def to_money(currency = nil)
-    empty? ? Money.empty : Money.parse(self, currency)
+    Money.parse(self, currency)
   end
 end

data/lib/money/errors.rb

@@ -0,0 +1,7 @@
+class Money
+  class Error < StandardError
+  end
+
+  class IncompatibleCurrencyError < Error
+  end
+end

data/lib/money/helpers.rb

@@ -5,7 +5,7 @@ class Money
   module Helpers
     module_function
 
-    NUMERIC_REGEX = /\A\s*[\+\-]?\d*(\.\d+)?\s*\z/
+    NUMERIC_REGEX = /\A\s*[\+\-]?(\d+|\d*\.\d+)\s*\z/
     DECIMAL_ZERO = BigDecimal(0).freeze
     MAX_DECIMAL = 21
 

data/lib/money/money.rb

@@ -190,7 +190,8 @@ class Money
 
     curr = Helpers.value_to_currency(curr)
     unless currency.compatible?(curr)
-      Money.deprecate("mathematical operation not permitted for Money objects with different currencies #{curr} and #{currency}.")
+      Money.deprecate("mathematical operation not permitted for Money objects with different currencies #{curr} and #{currency}. " \
+        "A Money::IncompatibleCurrencyError will raise in the next major release")
     end
 
     self

data/lib/money/money_parser.rb

@@ -63,14 +63,18 @@ class MoneyParser
 
   def parse(input, currency = nil, strict: false)
     currency = Money::Helpers.value_to_currency(currency)
-    amount = extract_money(input.to_s, currency, strict)
+    amount = extract_amount_from_string(input, currency, strict)
     Money.new(amount, currency)
   end
 
   private
 
-  def extract_money(input, currency, strict)
-    if input.empty?
+  def extract_amount_from_string(input, currency, strict)
+    unless input.is_a?(String)
+      return input
+    end
+
+    if input.strip.empty?
       return '0'
     end
 

data/lib/money/version.rb

@@ -1,3 +1,3 @@
 class Money
-  VERSION = "0.11.3"
+  VERSION = "0.11.4"
 end

data/spec/core_extensions_spec.rb

@@ -14,6 +14,10 @@ RSpec.describe Integer do
   end
 
   it_should_behave_like "an object supporting to_money"
+
+  it "parses 0 to Money.zero" do
+    expect(0.to_money).to eq(Money.zero)
+  end
 end
 
 RSpec.describe Float do
@@ -23,6 +27,10 @@ RSpec.describe Float do
   end
 
   it_should_behave_like "an object supporting to_money"
+
+  it "parses 0.0 to Money.zero" do
+    expect(0.0.to_money).to eq(Money.zero)
+  end
 end
 
 RSpec.describe String do
@@ -32,6 +40,11 @@ RSpec.describe String do
   end
 
   it_should_behave_like "an object supporting to_money"
+
+  it "parses an empty string to Money.zero" do
+    expect(''.to_money).to eq(Money.zero)
+    expect(' '.to_money).to eq(Money.zero)
+  end
 end
 
 RSpec.describe BigDecimal do
@@ -41,4 +54,8 @@ RSpec.describe BigDecimal do
   end
 
   it_should_behave_like "an object supporting to_money"
+
+  it "parses a zero BigDecimal to Money.zero" do
+    expect(BigDecimal.new("-0.000").to_money).to eq(Money.zero)
+  end
 end

data/spec/money_column_spec.rb

@@ -291,7 +291,7 @@ RSpec.describe 'MoneyColumn' do
       expect(record.instance_variable_get(:@money_column_cache)["price"]).to eq(price)
     end
 
-    it 'reload will clear memoizes money values' do
+    it 'reload will clear memoized money values' do
       price = Money.new(1, 'USD')
       record = MoneyRecord.create(price: price)
       expect(record.price).to eq(price)
@@ -301,6 +301,23 @@ RSpec.describe 'MoneyColumn' do
       record.price
       expect(record.instance_variable_get(:@money_column_cache)["price"]).to eq(price)
     end
+
+    it 'reload will clear record cache' do
+      price = Money.new(1, 'USD')
+      price2 = Money.new(2, 'USD')
+
+      record = MoneyRecord.create(price: price)
+      expect(record.price).to eq(price)
+      expect(record[:price]).to eq(price)
+
+      ActiveRecord::Base.connection.execute("UPDATE money_records SET price=#{price2.value} WHERE id=#{record.id}")
+      expect(record[:price]).to_not eq(price2)
+      expect(record.price).to_not eq(price2)
+
+      record.reload
+      expect(record[:price]).to eq(price2)
+      expect(record.price).to eq(price2)
+    end
   end
 
   describe 'ActiveRecord querying' do

data/spec/money_parser_spec.rb

@@ -333,6 +333,10 @@ RSpec.describe MoneyParser do
     it "parses 1.32" do
       expect(@parser.parse(1.32)).to eq(Money.new(1.32))
     end
+
+    it "parses 1.234" do
+      expect(@parser.parse(1.234)).to eq(Money.new(1.234))
+    end
   end
 
   describe "parsing with thousands separators" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-money
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.11.4
 platform: ruby
 authors:
 - Shopify Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-23 00:00:00.000000000 Z
+date: 2018-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,6 +134,7 @@ files:
 - lib/money/currency.rb
 - lib/money/currency/loader.rb
 - lib/money/deprecations.rb
+- lib/money/errors.rb
 - lib/money/helpers.rb
 - lib/money/money.rb
 - lib/money/money_parser.rb