taxedo 0.0.4 → 0.0.5

data/data/regions.yml

@@ -25,6 +25,10 @@ taxedo:
       currency: cad
       included: false
 
+      equation_types:
+        19910101: compiled
+        20130101: separated
+
       rules:
         standard: ['gst', 'qst']
         non_taxable: ['gst_zero', 'qst_zero']
@@ -42,5 +46,6 @@ taxedo:
           19980101: 750
           20110101: 850
           20120101: 950
+          20130101: 997.5
         qst_zero:
           19910101: 0

data/lib/taxedo/receipt.rb

@@ -1,5 +1,6 @@
 class Taxedo::Receipt
   attr_accessor :currency
+  attr_accessor :equation_type
 
   def initialize(region_id, amount)
     @region_id = region_id
@@ -13,11 +14,19 @@ class Taxedo::Receipt
     tax = Taxedo::Tax.new(id)
     tax.name = tax_name(id)
     tax.rate = rate
-    tax.source_amount = (@taxes.empty? ? @amount : @taxes.last.subtotal)
+    tax.source_amount = get_source_amount
 
     @taxes << tax
   end
 
+  def get_source_amount
+    if @taxes.empty? or self.equation_type == 'separated'
+      @amount
+    else
+      @taxes.last.subtotal
+    end
+  end
+
   def language
     defined?(I18n) ? I18n.locale.to_s : 'fr'
   end

data/lib/taxedo/region.rb

@@ -1,3 +1,4 @@
+require 'yaml'
 require 'time'
 
 class Taxedo::Region
@@ -7,10 +8,11 @@ class Taxedo::Region
   end
 
   def calculate(amount, options={})
-    options = { :on => Time.now, :rule => 'standard' }.merge(options)
+    options = { :on => Time.now, :rule => 'standard', :equations => 'compiled'}.merge(options)
 
     receipt = Taxedo::Receipt.new(@id, amount)
     receipt.currency = @data['currency']
+    receipt.equation_type = equation_type_from_date(options[:on]).nil? ? options[:equations] : equation_type_from_date(options[:on])
 
     taxes(options[:rule], options[:on]).each do |tax|
       receipt.add_tax tax[0], tax[1]
@@ -21,6 +23,15 @@ class Taxedo::Region
 
   private
 
+  def equation_type_from_date(start_at)
+    selection = Time.at(0)
+    @data['equation_types'].each do |equation_start_at, equation|
+      equation_start_at = Time.parse(equation_start_at.to_s)
+      selection = equation_start_at if equation_start_at <= start_at and equation_start_at > selection
+    end
+    @data['equation_types'][selection.strftime('%Y%m%d').to_i]
+  end
+
   def tax_from_start_date(tax_id, start_at)
     selection = Time.at(0)
 

metadata

@@ -1,49 +1,64 @@
 --- !ruby/object:Gem::Specification
 name: taxedo
 version: !ruby/object:Gem::Version
-  version: 0.0.4
   prerelease: 
+  version: 0.0.5
 platform: ruby
 authors:
 - Sebastien Rosa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-28 00:00:00.000000000 Z
+date: 2013-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &2153049320 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
+    none: false
+  name: rake
   type: :development
   prerelease: false
-  version_requirements: *2153049320
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &2153048540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.0'
+    none: false
+  name: rspec
   type: :development
   prerelease: false
-  version_requirements: *2153048540
-- !ruby/object:Gem::Dependency
-  name: rspec-aspic
-  requirement: &2153047200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.0'
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
+    none: false
+  name: rspec-aspic
   type: :development
   prerelease: false
-  version_requirements: *2153047200
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+    none: false
 description: ''
 email:
 - sebastien@demarque.com
@@ -53,34 +68,34 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- data/README.md
 - data/regions.yml
-- languages/en.yml
+- data/README.md
 - languages/fr.yml
-- lib/taxedo/builder/base.rb
-- lib/taxedo/builder/hash.rb
-- lib/taxedo/builder/html.rb
-- lib/taxedo/builder/json.rb
-- lib/taxedo/builder/price.rb
-- lib/taxedo/builder/text.rb
+- languages/en.yml
+- lib/taxedo/tax.rb
+- lib/taxedo/receipt.rb
+- lib/taxedo/implants.rb
 - lib/taxedo/builder.rb
-- lib/taxedo/implants/action_controller.rb
 - lib/taxedo/implants/railtie.rb
-- lib/taxedo/implants.rb
-- lib/taxedo/receipt.rb
+- lib/taxedo/implants/action_controller.rb
 - lib/taxedo/region.rb
-- lib/taxedo/tax.rb
+- lib/taxedo/builder/html.rb
+- lib/taxedo/builder/hash.rb
+- lib/taxedo/builder/base.rb
+- lib/taxedo/builder/json.rb
+- lib/taxedo/builder/text.rb
+- lib/taxedo/builder/price.rb
 - lib/taxedo.rb
+- spec/taxedo_spec.rb
 - spec/spec_helper.rb
-- spec/taxedo/builder/hash_spec.rb
-- spec/taxedo/builder/html_spec.rb
-- spec/taxedo/builder/json_spec.rb
-- spec/taxedo/builder/price_spec.rb
-- spec/taxedo/builder/text_spec.rb
 - spec/taxedo/receipt_spec.rb
 - spec/taxedo/region_spec.rb
 - spec/taxedo/tax_spec.rb
-- spec/taxedo_spec.rb
+- spec/taxedo/builder/html_spec.rb
+- spec/taxedo/builder/price_spec.rb
+- spec/taxedo/builder/hash_spec.rb
+- spec/taxedo/builder/text_spec.rb
+- spec/taxedo/builder/json_spec.rb
 - LICENSE
 - README.md
 - Rakefile
@@ -93,20 +108,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: taxedo
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ''