sk_calc 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTI4YjFhYzNhNjI2NzVmZmU5Njc0NTQ1OWJlMGQ2NTM3ZmQ5YzE5MA==
+    OWQ1Njk0NmNiZjk0NjM0OWUzMDA1NDMxMWIwMjZmZGQ0OGFiYjEyNg==
   data.tar.gz: !binary |-
-    YmRmYjU3OWM2YjI3OGVmNjMzODBjZmY2ODBjNmU1YWRjYmZjMjI0Yw==
+    YTNjOWU4YTViMmZiYjkwYTU0YWFiOWFhMGQ0OGUzMmI2ODM1ZDM0OA==
 SHA512:
   metadata.gz: !binary |-
-    YWM0YTFhZTcxNjk5NjI1YzFiN2Q1NzdjZjk2ZDg3NjA2NGJlNmRjZDI3MmE1
-    OTBjNDFlMTVhODM2NThmMzkxMmQ3MWNmNjJhYzQxODBjMjE1YzFmMjczOTI5
-    MThkZDJhMzQ1YjEyNTMyYzAyOGNhMzUzYjRjOTdmMDA1OGJmYWM=
+    MDk2NWU1ZjVmYjg4NjgzYTk3MTVmMTUxOWJmZTNiYzZjZjg1ZWY5YmIwZTQ4
+    NGIyMjU4Y2Q0ZmUyYmFkZjc3MzExYmE2MTBmNWNjNDcyNTFkMzA1NGFkN2Vj
+    YTk2YTk5Yzk3NjEzODMxZDljNzQxMDBiZDUxZjQ2MTgxMWFiYzQ=
   data.tar.gz: !binary |-
-    YzUwZjc2NDcwM2NjYTkxZGJmOGUyNjg0YzdhMTEyZDJkMGM2ZjNjMDY5ODEw
-    MjhmMmZiMTYyZDAyOTk3ZTcwZjcxOGE4NDk4OWRkMzhkODQ0OWE4MGM3MjA0
-    YmZiOWNjNmJjMDNlY2ExMDA4NjNjMWMyMDhlNmQwN2RmOGU2Y2M=
+    ZTYzODNiZTI5ZWQ0NjdhYzA0ZjY3ZjEwZTRiZTA1ZDlhMWZiMjEzMTFhYjQ0
+    ODBhMDRjZjg4MmEwMjZmZjMyYjI4MTY2NWNlNjM5ZjY3MDc4YzA3NmRlYzQ0
+    NjY3N2E5NzU4ZWY3NzdhZjUyYjU4MGRiMjY1YTcwNjgxN2FiNDM=

data/.gitignore

@@ -1,4 +1,6 @@
 .rvmrc
+.ruby-gemset
+.ruby-version
 coverage/*
 rdoc/*
 pkg/*

data/lib/sk_calc/helper.rb

@@ -15,7 +15,7 @@ module SK::Calc::Helper
   # == Return
   # <BigDecimal>
   def conv_tax
-    to_bd(tax || 0)
+    to_bd( (self.respond_to?(:tax) && tax) || 0)
   end
 
   # Cast a val to BigDecimal

data/lib/sk_calc/item.rb

@@ -51,7 +51,7 @@ module SK::Calc::Item
   # used to output the rounded & formatted values
   # @return [BigDecimal]
   def net_total_base
-    (100 - (discount||0)) * total / 100
+    (100 - conv_discount) * total / 100
   end
 
   # @return [BigDecimal] total amount of tax
@@ -64,7 +64,7 @@ module SK::Calc::Item
   # or gross_total instead
   # @return [BigDecimal] rounded 2 decimals
   def net_single_base
-    conv_price_single * ( 1 - ((discount||0) / 100 ) )
+    conv_price_single * ( 1 - (conv_discount / 100 ) )
   end
 
   def gross_single_base
@@ -80,7 +80,7 @@ module SK::Calc::Item
   # The discount amount unrounded
   # @return [BigDecimal] rounded
   def discount_total_base
-    total * ((discount||0) / 100)
+    total * (conv_discount / 100)
   end
 
   # Unrounded item total price * quantity, excl discount
@@ -192,4 +192,11 @@ module SK::Calc::Item
     to_bd(price_single || 0)
   end
 
+  # Init discount with 0 gracefully ignores if it is not defined.
+  # If nil and cast to BigDecimal
+  # @return [BigDecimal]
+  def conv_discount
+    to_bd( (self.respond_to?(:discount) && discount) || 0)
+  end
+
 end

data/lib/sk_calc/items.rb

@@ -1,12 +1,12 @@
 # Calculate totals for a multiple items eg in an invoice
 # Including class MUST respond to:
-# - price_total
-# - price_tax
+# - price_total: the sum of all items net totals, you must call #sum_items yourself to fill this and price tax
+# - price_tax: the tax total for all items
 # - line_items
 module SK::Calc::Items
   include SK::Calc::Helper
 
-  # Unrounded net total the taxation base
+  # Unrounded net total which is the sum of all items net_total, the taxation base
   # @return [BigDecimal]
   def net_total_base
     conv_price_total
@@ -94,7 +94,7 @@ module SK::Calc::Items
 
   private
 
-  # Init price single with 0 if nil and cast to BigDecimal
+  # Init total with 0 if nil and cast to BigDecimal
   # @return [BigDecimal]
   def conv_price_total
     to_bd(price_total || 0)

data/lib/sk_calc/version.rb

@@ -1,5 +1,5 @@
 module SK
   module Calc
-    VERSION = '0.0.5'
+    VERSION = '0.0.6'
   end
 end

data/spec/sk_calc/item_spec.rb

@@ -6,8 +6,24 @@ class LineItem
   calculates :item
 end
 
+class ItemWithoutFields
+  include SK::Calc
+  attr_accessor :price_single, :quantity
+  calculates :item
+end
+
 describe SK::Calc do
 
+ describe 'optional fields' do
+   it 'should have conv_tax' do
+     i = ItemWithoutFields.new
+     i.conv_tax.should == 0
+   end
+   it 'should have conv_discount' do
+     i = ItemWithoutFields.new
+     i.conv_discount.should == 0
+   end
+ end
  describe 'item calculations' do
 
     before :each do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sk_calc
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Georg Leciejewski