shopify-money 0.11.9 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a0dc4bc7a3ff75c76fecbfcfe16bf3c5700288856da1922fc4f67ca804bc198
-  data.tar.gz: 51a21ae0e6a752e7c829af5c51902c0a5c4c1b4fb5e87623cf5d6d891c8324b3
+  metadata.gz: 5e95441c6aa9e01d7ac17c8e76f8008cf94dba8d4af2bd75f101d743a333311e
+  data.tar.gz: 07d99a0656016292183ef0a782879f018d4a8fdb814ab6e97470675003280805
 SHA512:
-  metadata.gz: 2ca89a5c68d872b9eed4e48db92d7ac99b970120d647e8fbeb8898e699b74746c13c6802b855a5450acdb2979fa18f0348f12d8e6ea07f6c05f1fb6ce66c95b8
-  data.tar.gz: 8a0fae4c2704ec9064976e8d2b3636c49496d32f1adec8ea60c8429a110b3e98a0a0eca30397efeb04d7d6bb2847376ae3fe4f5a4fd6487d850e8a74287ad097
+  metadata.gz: e18f193d30427adb99f4ebb28e1125a5819ec489801c25698069f1c48448edb492ea3effbd9117bac45d77a613f59688a5ff5ed3327d4b20d03b6dd0a51231d7
+  data.tar.gz: b5cc2766b02db02ebf0df626cc531d0996444f78e7939c7fee7e3caa050cb2fb06c767e88e7256ad12131f225436c68b7ebf776c6e8ea1995e18525004f34896

data/README.md

@@ -114,8 +114,8 @@ generate methods for use with ActiveRecord:
 
 ```ruby
 create_table :orders do |t|
-  t.decimal :sub_total, precision: 20, scale: 3
-  t.decimal :tax, precision: 20, scale: 3
+  t.decimal :sub_total, precision: 21, scale: 3
+  t.decimal :tax, precision: 21, scale: 3
   t.string :currency, limit: 3
 end
 

data/lib/money/money.rb

@@ -114,6 +114,7 @@ class Money
   end
 
   def <=>(other)
+    return unless other.respond_to?(:to_money)
     arithmetic(other) do |money|
       value <=> money.value
     end
@@ -150,6 +151,7 @@ class Money
     eql?(other)
   end
 
+  # TODO: Remove once cross-currency mathematical operations are no longer allowed
   def eql?(other)
     return false unless other.is_a?(Money)
     return false unless currency.compatible?(other.currency)

data/lib/money/version.rb

@@ -1,3 +1,3 @@
 class Money
-  VERSION = "0.11.9"
+  VERSION = "0.12.0"
 end

data/spec/money_spec.rb

@@ -3,7 +3,7 @@ require 'yaml'
 
 RSpec.describe "Money" do
 
-  let (:money) {Money.new(1)}
+  let (:money) { Money.new(1) }
   let (:amount_money) { Money.new(1.23, 'USD') }
   let (:non_fractional_money) { Money.new(1, 'JPY') }
   let (:zero_money) { Money.new(0) }
@@ -374,17 +374,23 @@ RSpec.describe "Money" do
       expect((0.5 <=> money)).to eq(-1)
     end
 
-    it "raises error if compared other is not compatible" do
-      expect{ Money.new(5.00) <=> nil }.to raise_error(TypeError)
-    end
-
     it "have the same hash value as $1" do
       expect(money.hash).to eq(Money.new(1.00).hash)
     end
 
     it "does not have the same hash value as $2" do
-      expect(money.hash).to eq(Money.new(1.00).hash)
+      expect(money.hash).to_not eq(Money.new(2.00).hash)
     end
+  end
+
+  describe('Comparable') do
+    let (:cad_05) { Money.new(5.00, 'CAD') }
+    let (:cad_10) { Money.new(10.00, 'CAD') }
+    let (:cad_20) { Money.new(20.00, 'CAD') }
+    let (:nil_05) { Money.new(5.00, Money::NULL_CURRENCY) }
+    let (:nil_10) { Money.new(10.00, Money::NULL_CURRENCY) }
+    let (:nil_20) { Money.new(20.00, Money::NULL_CURRENCY) }
+    let (:usd_10) { Money.new(10.00, 'USD') }
 
     it "<=> can compare with and without currency" do
       expect(Money.new(1000, Money::NULL_CURRENCY) <=> Money.new(2000, 'JPY')).to eq(-1)
@@ -396,6 +402,111 @@ RSpec.describe "Money" do
       expect(Money.new(1000, 'USD') <=> Money.new(2000, 'JPY')).to eq(-1)
       expect(Money.new(2000, 'JPY') <=> Money.new(1000, 'USD')).to eq(1)
     end
+
+    describe('same values') do
+      describe('same currencies') do
+        it { expect(cad_10 <=> cad_10).to(eq(0)) }
+        it { expect(cad_10 >  cad_10).to(eq(false)) }
+        it { expect(cad_10 >= cad_10).to(eq(true)) }
+        it { expect(cad_10 == cad_10).to(eq(true)) }
+        it { expect(cad_10 <= cad_10).to(eq(true)) }
+        it { expect(cad_10 <  cad_10).to(eq(false)) }
+      end
+
+      describe('null currency') do
+        it { expect(cad_10 <=> nil_10).to(eq(0)) }
+        it { expect(cad_10 >  nil_10).to(eq(false)) }
+        it { expect(cad_10 >= nil_10).to(eq(true)) }
+        it { expect(cad_10 == nil_10).to(eq(true)) }
+        it { expect(cad_10 <= nil_10).to(eq(true)) }
+        it { expect(cad_10 <  nil_10).to(eq(false)) }
+      end
+
+      describe('different currencies') do
+        it { expect(Money).to(receive(:deprecate).once); expect(cad_10 <=> usd_10).to(eq(0)) }
+        it { expect(Money).to(receive(:deprecate).once); expect(cad_10 >  usd_10).to(eq(false)) }
+        it { expect(Money).to(receive(:deprecate).once); expect(cad_10 >= usd_10).to(eq(true)) }
+        it { expect(cad_10 == usd_10).to(eq(false)) }
+        it { expect(Money).to(receive(:deprecate).once); expect(cad_10 <= usd_10).to(eq(true)) }
+        it { expect(Money).to(receive(:deprecate).once); expect(cad_10 <  usd_10).to(eq(false)) }
+      end
+
+      describe('to_money types') do
+        it { expect(cad_10 <=> 10.00).to(eq(0)) }
+        it { expect(cad_10 >   10.00).to(eq(false)) }
+        it { expect(cad_10 >=  10.00).to(eq(true)) }
+        it { expect(cad_10 ==  10.00).to(eq(false)) }
+        it { expect(cad_10 <=  10.00).to(eq(true)) }
+        it { expect(cad_10 <   10.00).to(eq(false)) }
+      end
+    end
+
+    describe('left lower than right') do
+      describe('same currencies') do
+        it { expect(cad_10 <=> cad_20).to(eq(-1)) }
+        it { expect(cad_10 >   cad_20).to(eq(false)) }
+        it { expect(cad_10 >=  cad_20).to(eq(false)) }
+        it { expect(cad_10 ==  cad_20).to(eq(false)) }
+        it { expect(cad_10 <=  cad_20).to(eq(true)) }
+        it { expect(cad_10 <   cad_20).to(eq(true)) }
+      end
+
+      describe('null currency') do
+        it { expect(cad_10 <=> nil_20).to(eq(-1)) }
+        it { expect(cad_10 >   nil_20).to(eq(false)) }
+        it { expect(cad_10 >=  nil_20).to(eq(false)) }
+        it { expect(cad_10 ==  nil_20).to(eq(false)) }
+        it { expect(cad_10 <=  nil_20).to(eq(true)) }
+        it { expect(cad_10 <   nil_20).to(eq(true)) }
+      end
+
+      describe('to_money types') do
+        it { expect(cad_10 <=> 20.00).to(eq(-1)) }
+        it { expect(cad_10 >   20.00).to(eq(false)) }
+        it { expect(cad_10 >=  20.00).to(eq(false)) }
+        it { expect(cad_10 ==  20.00).to(eq(false)) }
+        it { expect(cad_10 <=  20.00).to(eq(true)) }
+        it { expect(cad_10 <   20.00).to(eq(true)) }
+      end
+    end
+
+    describe('left greater than right') do
+      describe('same currencies') do
+        it { expect(cad_10 <=> cad_05).to(eq(1)) }
+        it { expect(cad_10 >   cad_05).to(eq(true)) }
+        it { expect(cad_10 >=  cad_05).to(eq(true)) }
+        it { expect(cad_10 ==  cad_05).to(eq(false)) }
+        it { expect(cad_10 <=  cad_05).to(eq(false)) }
+        it { expect(cad_10 <   cad_05).to(eq(false)) }
+      end
+
+      describe('null currency') do
+        it { expect(cad_10 <=> nil_05).to(eq(1)) }
+        it { expect(cad_10 >   nil_05).to(eq(true)) }
+        it { expect(cad_10 >=  nil_05).to(eq(true)) }
+        it { expect(cad_10 ==  nil_05).to(eq(false)) }
+        it { expect(cad_10 <=  nil_05).to(eq(false)) }
+        it { expect(cad_10 <   nil_05).to(eq(false)) }
+      end
+
+      describe('to_money types') do
+        it { expect(cad_10 <=> 5.00).to(eq(1)) }
+        it { expect(cad_10 >   5.00).to(eq(true)) }
+        it { expect(cad_10 >=  5.00).to(eq(true)) }
+        it { expect(cad_10 ==  5.00).to(eq(false)) }
+        it { expect(cad_10 <=  5.00).to(eq(false)) }
+        it { expect(cad_10 <   5.00).to(eq(false)) }
+      end
+    end
+
+    describe('any values, non-to_money types') do
+      it { expect(cad_10 <=> nil).to(eq(nil)) }
+      it { expect { cad_10 >  nil }.to(raise_error(ArgumentError)) }
+      it { expect { cad_10 >= nil }.to(raise_error(ArgumentError)) }
+      it { expect(cad_10 == nil).to(eq(false)) }
+      it { expect { cad_10 <= nil }.to(raise_error(ArgumentError)) }
+      it { expect { cad_10 <  nil }.to(raise_error(ArgumentError)) }
+    end
   end
 
   describe "#subunits" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-money
 version: !ruby/object:Gem::Version
-  version: 0.11.9
+  version: 0.12.0
 platform: ruby
 authors:
 - Shopify Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-11 00:00:00.000000000 Z
+date: 2019-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler