amountable 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0856ee3834afef77888546b862d8cb200ccf6d38
-  data.tar.gz: 35153d7985332e50a55f1183cd7afbf578e182ff
+  metadata.gz: f3bf558f623bcacd7344a073a79c0c3df320e68e
+  data.tar.gz: f8b78e8dd441a0d9535072a0d271e80251a5ac96
 SHA512:
-  metadata.gz: 2e7c8be8ae3df1bbbefe8b1805ed0c78ae1e90eb26c1af053c29411e05774f1f3fc538ee29d1d8a25c608b658e35699551bb21b79aef37a47c9d55355b68d50a
-  data.tar.gz: b36bc482f7df0a01767174f08ba3ec0eaf68bf7e3889ff50dcb61f944c37dc1e27a7c8ccb3b6b8c944270badd9c5704400baef728d6d20551651bf9d4e5a0e17
+  metadata.gz: 95227423a46d60a54c75c4ca5c4b130295ba8f4641c548c6e1864730133c44e3f52f7a2d678e1fbe01dce4c3ec1bd5876c886ab9ce35f785169acbbb8c7f4034
+  data.tar.gz: 0547e0fdf70ffcdd1c3751622fa77e390fa7ab70b7b9b89c749e92ad0704ebab1debe393135b1c8861f16e667b871257b35cf35f15405e83bbd08f32669ad11c

data/lib/amountable/jsonb_methods.rb

@@ -12,11 +12,14 @@ module Amountable
 
     def set_amount(name, value)
       value = value.to_money
-      return value if value.zero?
       initialize_column
       amounts_json = attribute(amounts_column_name)
       amounts_json['amounts'] ||= {}
-      amounts_json['amounts'][name.to_s] = {'cents' => value.fractional, 'currency' => value.currency.iso_code}
+      if value.zero?
+        amounts_json['amounts'].delete(name.to_s)
+      else
+        amounts_json['amounts'][name.to_s] = {'cents' => value.fractional, 'currency' => value.currency.iso_code}
+      end
       set_json(amounts_json)
       @_amounts = nil
       @amounts_by_name = nil
@@ -30,6 +33,7 @@ module Amountable
       amounts_json['sets'] = {}
       amount_sets.each do |name, amount_names|
         sum = find_amounts(amount_names).sum(Money.zero, &:value)
+        next if sum.zero?
         amounts_json['sets'][name.to_s] = {'cents' => sum.fractional, 'currency' => sum.currency.iso_code}
       end
       set_json(amounts_json)

data/lib/amountable/version.rb

@@ -1,5 +1,5 @@
 # Copyright 2015-2016, Instacart
 
 module Amountable
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/spec/amountable/amountable_spec.rb

@@ -82,6 +82,10 @@ describe Amountable do
       subscription.update_attributes(sub_total: Money.new(200))
       expect(subscription.sub_total).to eq(Money.new(200))
       expect(subscription.total).to eq(Money.new(200))
+      subscription.sub_total = Money.zero
+      expect(subscription.sub_total).to eq(Money.zero)
+      expect(subscription.total).to eq(Money.zero)
+      expect(subscription.attributes['amounts']).to eq({'amounts' => {}, 'sets' => {}})
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amountable
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Emmanuel Turlay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-24 00:00:00.000000000 Z
+date: 2016-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord