sk_calc 1.0.2 → 1.0.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OWMxYjkzZDAwNGY2ZDk3ZjIwZDkxZTllNTkzZDliOTc1ZThiNGJjYg==
-  data.tar.gz: !binary |-
-    NDk4YmZjYzRjZTc4OGEyMjI1OTc5YzJhZWFjNGQ5NTFkNWQ1OTYwNg==
+SHA1:
+  metadata.gz: 51ac1e01d1ba2a985d6b255cf9fd29ba85894154
+  data.tar.gz: e02b10b0129c7fa310aeeca46c131b0a7f60613d
 SHA512:
-  metadata.gz: !binary |-
-    MWYyMDU5NDkwMjYwMjJmNGI1YWVhNWI3YzA3ODM2YTJjMmYxMmRiNWY5M2Y4
-    YjRiYzQ0MTAzNmRlNzI1ZGE1MmQwMDBhMjhjZTM0NWMzZDBhMDNkM2FiM2Yw
-    YTYxNGFlNjUxNWZjYjM4MGU4ODk3MTJiYWRkMzQwNTlhMTk3MDQ=
-  data.tar.gz: !binary |-
-    ZTYzYTA1OTU4YjA3YzViZTQzODRhZTY3NmQ3MDc2MGU4ZTBlZWZjNjkyNmU3
-    N2NhNzYxZjg5ZmMxZjc2ZjE5M2EwZTI0MTlmNWIxNGFiYjVmM2U4MDJiNTc5
-    OTRkYjdjNTFmYzM3NTE3ZThjMzRmYzU5MjkwM2Y3ZjAyMmY3NjQ=
+  metadata.gz: ff9cd7c68678c4c64e061adc80cd995271d03f4b7aa2aaec58bc762c3b07b2660ce3b7364bc469c9087ef48ed02eb660c31fbdd06193a081652cd3eae6c61227
+  data.tar.gz: 24958ad3c941142f8b49ca42b3eb53cf61a2c44115e15961e60744b734a652a59b3024d314f99a47ad0e22f8da9e8dbda6fe5bcbf7cd14b91813a597491de9b3

data/.travis.yml

@@ -1,3 +1,3 @@
 rvm:
-  - 1.9.3
+  - 2.3
   - 2.2

data/README.md

@@ -16,6 +16,8 @@ mixing it into your local classes.
 
 == Install
 
+Ruby 2.2 tested, 1.9 should work to
+
   gem install sk_calc
 
 
@@ -34,4 +36,4 @@ read spec/sk_calc/*.rb to see examples
 
 == Tests
 
-Copyright (c) 2011-2016 Georg Leciejewski, released under the MIT license
+Copyright (c) 2011-2024 Georg Leciejewski, released under the MIT license

data/lib/sk_calc/items.rb

@@ -67,7 +67,7 @@ module SK::Calc::Items
   #       [1] => 57   #(items sum = 300)
   #
   #
-  # @return [Hash]
+  # @return [Array<Array>]
   def tax_grouped(items=nil)
     items ||= line_items
     result = {}
@@ -78,6 +78,27 @@ module SK::Calc::Items
     result.sort
   end
 
+  # @return [Array<Hash<Symbol,Mixed>>]
+  def tax_grouped_details(items=nil)
+    items ||= line_items
+    result = []
+    items.group_by(&:tax).each do |tax, item_group|
+      net_total_sum = item_group.to_a.sum(&:net_total_base)
+      tax_total = if tax && !tax.zero?
+                    (net_total_sum * tax.to_r / 100.0).round(SK::Calc.precision)
+                  else
+                    0.0
+                  end
+      result << {
+        tax: tax,
+        net_total: net_total_sum,
+        gross_total: net_total_sum+tax_total,
+        tax_total: tax_total,
+      }
+    end
+    result.sort{|a,b| a[:tax] <=> b[:tax]}
+  end
+
   private
 
   # Init total with 0 if nil and cast to Rational

data/lib/sk_calc/version.rb

@@ -1,5 +1,5 @@
 module SK
   module Calc
-    VERSION = '1.0.2'
+    VERSION = '1.0.3'
   end
 end

data/spec/sk_calc/item_spec.rb

@@ -17,28 +17,28 @@ describe SK::Calc do
  describe 'private convert methods' do
    it 'conv_tax' do
      i = ItemWithoutFields.new
-     i.send(:conv_tax).should == 0
+     expect(i.send(:conv_tax)).to eq 0
    end
    it 'conv_price_single' do
      i = ItemWithoutFields.new
-     i.send(:conv_price_single).should == 0
+     expect(i.send(:conv_price_single)).to eq 0
    end
 
    it 'rounds to max 6 conv_price_single' do
      i = ItemWithoutFields.new
      i.price_single = 1.12345678
-     i.send(:conv_price_single).to_f.should == 1.123457
+     expect(i.send(:conv_price_single).to_f).to eq 1.123457
    end
 
    it 'conv_discount' do
      i = ItemWithoutFields.new
-     i.send(:conv_discount).should == 0
+     expect(i.send(:conv_discount)).to eq 0
    end
 
    it 'conv_quantity' do
      i = ItemWithoutFields.new
-     i.send(:conv_quantity).should == 0
-     i.send(:conv_quantity).should be_a Rational
+     expect(i.send(:conv_quantity)).to eq 0
+     expect(i.send(:conv_quantity)).to be_a Rational
    end
  end
 
@@ -53,31 +53,31 @@ describe SK::Calc do
     end
 
     it "has net_single" do
-      @i.net_single.should == 10.00
+      expect(@i.net_single).to eq 10.00
     end
 
     it "has gross_single" do
-      @i.gross_single.should == 11.90
+      expect(@i.gross_single).to eq 11.90
     end
 
     it "has total" do
-      @i.total.should == 10.0
+      expect(@i.total).to eq 10.0
     end
 
     it "has net_total" do
-      @i.net_total.should == 10.0
+      expect(@i.net_total).to eq 10.0
     end
 
     it "has gross_total" do
-      @i.gross_total.should == 11.90
+      expect(@i.gross_total).to eq 11.90
     end
 
     it "has net_total_base" do
-      @i.net_total_base.should == 10.00
+      expect(@i.net_total_base).to eq 10.00
     end
 
     it "has tax_total" do
-      @i.tax_total.should == 1.90
+      expect(@i.tax_total).to eq 1.90
     end
   end
 
@@ -92,30 +92,30 @@ describe SK::Calc do
     end
 
     it "has total" do
-      @i.total.should == 12.605
+      expect(@i.total).to eq 12.605
     end
 
     it "has net_total" do
-      @i.net_total.to_f.should == 12.61
+      expect(@i.net_total.to_f).to eq 12.61
     end
 
     it "has gross_total" do
-      @i.gross_total.should == 15.0
+      expect(@i.gross_total).to eq 15.0
     end
 
     it "has net_total_base" do
-      @i.net_total_base.should == 12.605
+      expect(@i.net_total_base).to eq 12.605
     end
     it "has net_total" do
-      @i.net_total.should == 12.61
+      expect(@i.net_total).to eq 12.61
     end
 
     it "has tax_total_base" do
-      @i.tax_total_base.should == 2.39495
+      expect(@i.tax_total_base).to eq 2.39495
     end
 
     it "has tax_total" do
-      @i.tax_total.should == 2.39
+      expect(@i.tax_total).to eq 2.39
     end
   end
 
@@ -125,8 +125,8 @@ describe SK::Calc do
       i = LineItem.new
       i.price_single = 12345.123456
       i.quantity = BigDecimal.new("1.0")
-      i.total.should == 12345.123456
-      i.total.should be_a Rational
+      expect(i.total).to eq 12345.123456
+      expect(i.total).to be_a Rational
     end
   end
 

data/spec/sk_calc/items_spec.rb

@@ -27,26 +27,50 @@ describe SK::Calc, 'items calculations' do
 
   it "calc net_total" do
     @doc.sum_items
-    @doc.net_total.should == 10.0
+    expect(@doc.net_total).to eq 10.0
   end
 
   it "calc gross_total" do
     @doc.sum_items
-    @doc.gross_total.should == 11.90
+    expect(@doc.gross_total).to eq 11.90
   end
 
   it "sums totals" do
     @doc.sum_items
-    @doc.price_total.should == 10.0
-    @doc.price_tax.should == 1.90
+    expect(@doc.price_total).to eq 10.0
+    expect(@doc.price_tax).to eq 1.90
   end
 
   it "sums items with tax as rational" do
     @i.price_single = 7142.857143
     @i.tax = BigDecimal('19.0')
     @doc.sum_items
-    @doc.price_total.should == 7142.857143
-    @doc.price_tax.should == 1357.142857
-    @doc.gross_total.should == 8500.00
+    expect(@doc.price_total).to eq 7142.857143
+    expect(@doc.price_tax).to eq 1357.142857
+    expect(@doc.gross_total).to eq 8500.00
   end
+
+  it "tax_grouped" do
+    @i.price_single = 7142.857143
+    @i.tax = BigDecimal('19.0')
+    res = @doc.tax_grouped
+    expect(res).to eq [[19.0, 1357.142857]]
+  end
+
+
+  it "tax_grouped_details" do
+    b = LineItem.new
+    b.tax=7.0
+    b.quantity=10
+    b.price_single=10
+    b.discount=0
+
+    @doc.line_items << b
+
+    res = @doc.tax_grouped_details
+    expect(res[0]).to eq( {net_total: 100.0, tax: 7.0, tax_total: 7.0, gross_total:107.0})
+    expect(res[1]).to eq( {net_total:10, tax:19.0, tax_total:1.9, gross_total:11.9})
+  end
+
+
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: sk_calc
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Georg Leciejewski
 - Mike Połtyn
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2012-02-15 00:00:00.000000000 Z
@@ -15,56 +15,56 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
 description: Calculate document and line item totals. This moule is used inside SalesKIng
@@ -74,8 +74,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -91,24 +91,24 @@ files:
 homepage: http://github.com/salesking/sk_calc
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 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.2.2
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.4.5.5
+signing_key:
 specification_version: 4
 summary: SalesKing Calculation Module
 test_files: []