gnucash 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f91912ae36d38bc2c602c735564159fd14114e43
-  data.tar.gz: c95bc53e838d5595872d3edcb16945ba84e9d0d6
+  metadata.gz: f48cb558de94a0cc405d31710c076c1b0d58de28
+  data.tar.gz: 5196aee0a2081291d4515c1830115d1a74cd3610
 SHA512:
-  metadata.gz: 129f20266029b1d5e2529d3c23084b0d75f13988b87dceb8aad9b58e236ef5001a3014a857d584716aa1914543ee96d7cf449fc51226e896fd713788afe56a49
-  data.tar.gz: 479734374bb70a35026880996ef489923d18544c8b85fe82c2c8bdd4dbb1dba8590c6a60f72cc0edbf44b678ca3eb7593572f4a0303445901a5784314108a442
+  metadata.gz: 284f0728714930290f64939f6ca4f112394e5c4edd0b9c805c53876f59a93198c84881e7fbd74e8c70bed5dff051b014d26122ed32d53af0ec3b059d811f1032
+  data.tar.gz: 6e3f0ecbe2419c4ac2a774cffabd844c2f59463fd9a3af77e9ff0febad969d83a3ee931e6aeaf74f87922aab7be9f95e5a41b5cc827d1c24624ffd1f367b922b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gnucash (1.2.1)
+    gnucash (1.2.2)
       nokogiri
 
 GEM

data/lib/gnucash/value.rb

@@ -4,9 +4,12 @@ module Gnucash
   class Value
     include Comparable
 
-    # @return [Fixnum] The raw, undivided integer value.
+    # @return [Integer] The raw, undivided integer value.
     attr_reader :val
 
+    # @return [Integer] Divisor value.
+    attr_reader :div
+
     # Create a new Value object with value 0.
     #
     # @return [Value] Zero value.
@@ -16,11 +19,11 @@ module Gnucash
 
     # Construct a Value object.
     #
-    # @param val [String, Fixnum]
+    # @param val [String, Integer]
     #   Either a String in the form "1234/100" or an integer containing the
     #   raw value.
-    # @param div [Fixnum]
-    #   The divisor value to use (when +val+ is given as a Fixnum).
+    # @param div [Integer]
+    #   The divisor value to use (when +val+ is given as a Integer).
     def initialize(val, div = 100)
       if val.is_a?(String)
         if val =~ /^(-?\d+)\/(\d+)$/
@@ -29,7 +32,7 @@ module Gnucash
         else
           raise "Unexpected value string: #{val.inspect}"
         end
-      elsif val.is_a?(Fixnum)
+      elsif val.is_a?(Integer)
         @val = val
         @div = div
       else
@@ -44,7 +47,8 @@ module Gnucash
     # @return [Value] Result of addition.
     def +(other)
       if other.is_a?(Value)
-        Value.new(@val + other.val)
+        lcm_div = @div.lcm(other.div)
+        Value.new((@val * (lcm_div / @div)) + (other.val * (lcm_div / other.div)), lcm_div)
       elsif other.is_a?(Numeric)
         (to_f + other).round(2)
       else
@@ -59,7 +63,8 @@ module Gnucash
     # @return [Value] Result of subtraction.
     def -(other)
       if other.is_a?(Value)
-        Value.new(@val - other.val)
+        lcm_div = @div.lcm(other.div)
+        Value.new((@val * (lcm_div / @div)) - (other.val * (lcm_div / other.div)), lcm_div)
       elsif other.is_a?(Numeric)
         (to_f - other).round(2)
       else
@@ -78,7 +83,7 @@ module Gnucash
     #
     # @param other [Numeric] Multiplier.
     #
-    # @return [Value] Result of multiplication.
+    # @return [Numeric] Result of multiplication.
     def *(other)
       if other.is_a?(Numeric)
         (to_f * other).round(2)
@@ -91,7 +96,7 @@ module Gnucash
     #
     # @param other [Numeric] Divisor.
     #
-    # @return [Value] Result of division.
+    # @return [Numeric] Result of division.
     def /(other)
       if other.is_a?(Numeric)
         (to_f / other).round(2)
@@ -118,7 +123,17 @@ module Gnucash
     #
     # @return [Integer] Comparison result.
     def <=>(other)
-      @val <=> other.val
+      lcm_div = @div.lcm(other.div)
+      (@val * (lcm_div / @div)) <=> (other.val * (lcm_div / other.div))
+    end
+
+    # Test two Value objects for equality.
+    #
+    # @return [Boolean]
+    #   Whether the two Value objects hold the same value.
+    def ==(other)
+      lcm_div = @div.lcm(other.div)
+      (@val * (lcm_div / @div)) == (other.val * (lcm_div / other.div))
     end
   end
 end

data/lib/gnucash/version.rb

@@ -1,4 +1,4 @@
 module Gnucash
   # gem version
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/spec/gnucash/value_spec.rb

@@ -81,6 +81,12 @@ module Gnucash
       expect((Value.new("1234/100") > Value.new("222/100"))).to be_truthy
     end
 
+    it "converts between values with different divisors" do
+      expect(Value.new("1234/10000") < Value.new("100/100")).to be_truthy
+      expect(Value.new(7, 100) + Value.new(17, 1000)).to eq Value.new(87, 1000)
+      expect(Value.new(80, 100) - Value.new(5, 50)).to eq Value.new(70, 100)
+    end
+
     context "errors" do
       it "raises an error when attempting to add an unknown object type" do
         expect { Value.new(33) + nil }.to raise_error /Unexpected argument/i

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gnucash
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Josh Holtrop
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-25 00:00:00.000000000 Z
+date: 2017-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri