sie 1.0.5 → 1.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDlhZjFkZmQwYmY5YjFhMDQ5ODljYTU1ZGM1ODFkMzMxMmIxMTRhOA==
+    ZTJmMTM2NDcyNGI2ODIzZmZhZjdiMmUzMTNmOWM5ZjU5NDNjNWUyYw==
   data.tar.gz: !binary |-
-    OWIzMjZlMTE5YjAxZjg0MDE0YmNiOWE4MTljMDYzMGY4ZTE0NDc5Ng==
+    MDI2MDliNGM4NWZlMjYyMWU1ODliOGQ5YTA4NzMyMGFmMzVmMTgyNQ==
 SHA512:
   metadata.gz: !binary |-
-    MDA2OWNhMjU2OWFmNzBkNjZlOTgzODQyODBjNGZhNzFkYThkZTU1Y2UxNTlk
-    YjhkNTNhNDUwOTcxMGQ3OGU3ZTFlYzkwNDIzMTgyZWYyMDIwYmY4NWEzNDU2
-    ZjEwNDYxZTg4ZTk4NTE4MGMzZTE0NGRkMjYwNzdlOTMxZGQ3ZDY=
+    YzA1OTJjYzcyNTA3YWMxYmY5MTE0ZjY5ODk5ZDJkMjA2NDJiZGJhYTcyMGY5
+    ODEwYzQ3ZDY4NjdkYjI5YzdlOTJmYzE0ZDJjZDkxNDIwODdiNDdkNzY0Yjcy
+    MWYwODVmNjk4OWFjNGIxNzQ4MmExNGMyMTAyMTQ3ODFlZjcyNWI=
   data.tar.gz: !binary |-
-    MWFlMzY5ZmI4YjljZGQwMzY5Y2U3ZmIyZWE0ZDE5ZGMxYWE1YjY1ODJhNjk2
-    NmE3MjE1OThlZTAxN2VkNzU0NzgyNWFhZjgyODhiNDUzMmEyMzBiYmQwZDM5
-    Yjg2ODMxYjQ3NGIzZmE2MzI5M2Q0OGQ1MjNiMjlkMDNiYjg0N2M=
+    OGY2NTM1ZjgyZjU2ODMwYTc4YmNhOTFiZjNlMDJjYjhmMTgwMmQ3ZWFmZWQ4
+    MGM3ZDI5MjgzN2Q5MDFiYjVkNmIzZGIyYmQwOTRjNzRlZTgyZDRhNGE4MTc4
+    OWRhNTU1MGNiMTBlYzljZWZjNWNmNmM0M2QwNzM4ZjVkNjk0NTY=

data/lib/sie/document/financial_years.rb

@@ -7,21 +7,14 @@ class Sie::Document
 
     def between
       from_date.year.upto(to_date.year).map { |year|
-        financial_year = FinancialYear.new(year, start_month)
-        financial_year_date_range = financial_year.date_range
-        financial_year_date_range unless out_of_year_range(financial_year_date_range)
-      }.compact
-    end
-
-    private
-
-    def out_of_year_range(range)
-      range.last.year > to_date.year
+        FinancialYear.date_range(year, start_month)
+      }
     end
   end
 
   class FinancialYear
-    pattr_initialize :year, :start_month
+    method_object :date_range,
+      :year, :start_month
 
     def date_range
       (start_of_year.beginning_of_month..end_of_year.end_of_month)
@@ -30,7 +23,7 @@ class Sie::Document
     private
 
     def start_of_year
-      start_of_year = Date.new(year, start_month, 1)
+      Date.new(year, start_month, 1)
     end
 
     def end_of_year

data/lib/sie/document.rb

@@ -6,7 +6,8 @@ require "active_support/core_ext/module/delegation"
 
 class Sie::Document
   pattr_initialize :data_source
-  FORTNOX_DESCRIPTION_LENGTH_MAX = 30
+  # Because fortnox imposes these limits
+  DESCRIPTION_LENGTH_MAX = 30
 
   def render
     add_header
@@ -43,7 +44,7 @@ class Sie::Document
   def add_accounts
     accounts.each do |account|
       number      = account.fetch(:number)
-      description = account.fetch(:description).slice(0, FORTNOX_DESCRIPTION_LENGTH_MAX)
+      description = account.fetch(:description).slice(0, DESCRIPTION_LENGTH_MAX)
 
       add_line("KONTO", number, description)
     end
@@ -76,7 +77,7 @@ class Sie::Document
     type          = opts.fetch(:type)
     number        = opts.fetch(:number)
     booked_on     = opts.fetch(:booked_on)
-    description   = opts.fetch(:description).slice(0, FORTNOX_DESCRIPTION_LENGTH_MAX)
+    description   = opts.fetch(:description).slice(0, DESCRIPTION_LENGTH_MAX)
     voucher_lines = opts.fetch(:voucher_lines)
 
     add_line("VER", voucher_series(creditor, type), number, booked_on, description)
@@ -88,14 +89,14 @@ class Sie::Document
         booked_on      = line.fetch(:booked_on)
         # Some SIE-importers (fortnox) cannot handle descriptions longer than 30 characters,
         # but the specification has no limit.
-        description    = line.fetch(:description).slice(0, FORTNOX_DESCRIPTION_LENGTH_MAX)
+        description    = line.fetch(:description).slice(0, DESCRIPTION_LENGTH_MAX)
 
         add_line("TRANS", account_number, Renderer::EMPTY_ARRAY, amount, booked_on, description)
 
         # Some consumers of SIE cannot handle single voucher lines (fortnox), so add another empty one to make
         # it balance. The spec just requires the sum of lines to be 0, so single lines with zero amount would conform,
         # but break for these implementations.
-        if voucher_lines.size < 2 && amount == 0
+        if voucher_lines.size < 2 && amount.zero?
           add_line("TRANS", account_number, Renderer::EMPTY_ARRAY, amount, booked_on, description)
         end
       end

data/lib/sie/version.rb

@@ -1,3 +1,3 @@
 module Sie
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

data/spec/unit/document/financial_years_spec.rb

@@ -4,15 +4,14 @@ describe Sie::Document::FinancialYears, ".between" do
   it "gives us the financial years between from_date and to_date" do
     Sie::Document::FinancialYears.between(
       1,
-      Date.new(2011, 9, 1),
-      Date.new(2012, 12, 31)
+      Date.new(2011, 1, 1),
+      Date.new(2011, 12, 31)
     ).should == [
-      Date.new(2011, 1, 1)..Date.new(2011, 12, 31),
-      Date.new(2012, 1, 1)..Date.new(2012, 12, 31),
+      Date.new(2011, 1, 1)..Date.new(2011, 12, 31)
     ]
   end
 
-  it "gives us the financial years between from_date and to_date" do
+  it "gives us the financial years over multiple years" do
     Sie::Document::FinancialYears.between(
       1,
       Date.new(2011, 9, 1),
@@ -24,18 +23,6 @@ describe Sie::Document::FinancialYears, ".between" do
     ]
   end
 
-  it "gives us the financial years between from_date and to_date with a different financial year start month" do
-    Sie::Document::FinancialYears.between(
-      5,
-      Date.new(2011, 9, 1),
-      Date.new(2014, 1, 31)
-    ).should == [
-      Date.new(2011, 5, 1)..Date.new(2012, 4, 30),
-      Date.new(2012, 5, 1)..Date.new(2013, 4, 30),
-      Date.new(2013, 5, 1)..Date.new(2014, 4, 30),
-    ]
-  end
-
   it "normalizes start and end date for compatibility with other systems" do
     Sie::Document::FinancialYears.between(
       1,
@@ -46,13 +33,16 @@ describe Sie::Document::FinancialYears, ".between" do
     ]
   end
 
-  it "gives us the financial years between from_date and to_date" do
+  it "uses the start month" do
     Sie::Document::FinancialYears.between(
-      1,
-      Date.new(2011, 1, 1),
-      Date.new(2011, 12, 31)
+      5,
+      Date.new(2011, 9, 1),
+      Date.new(2014, 1, 31)
     ).should == [
-      Date.new(2011, 1, 1)..Date.new(2011, 12, 31)
+      Date.new(2011, 5, 1)..Date.new(2012, 4, 30),
+      Date.new(2012, 5, 1)..Date.new(2013, 4, 30),
+      Date.new(2013, 5, 1)..Date.new(2014, 4, 30),
+      Date.new(2014, 5, 1)..Date.new(2015, 4, 30),
     ]
   end
 end

data/spec/unit/document_spec.rb

@@ -163,13 +163,13 @@ describe Sie::Document, "#render" do
     }
     let(:vouchers) {
       [
-        {
-          creditor: true, type: :payment, number: 3, booked_on: from_date + 365, description: "Payout 1 with really really long description blablabla",
+        build_voucher(
+          description: "Payout 1 with really really long description blablabla",
           voucher_lines: [
-            { account_number: 2400, amount: 256.0, booked_on: from_date + 365, description: "Payout line 1 with really really long description blablabla" },
-            { account_number: 1970, amount: -256.0, booked_on: from_date + 365, description: "Payout line 2" },
+            build_voucher_line(description: "Payout line 1 with really really long description blablabla"),
+            build_voucher_line(description: "Payout line 2"),
           ]
-        }
+        )
       ]
     }
 
@@ -183,22 +183,37 @@ describe Sie::Document, "#render" do
   context "with a zeroed single voucher line" do
     let(:vouchers) {
       [
-        {
-          creditor: false, type: :invoice, number: 1, booked_on: from_date + 2, description: "Invoice 1",
-          voucher_lines: [
-            { account_number: 1500, amount: 0, booked_on: from_date + 2, description: "Item 1" },
-          ]
-        },
+        build_voucher(voucher_lines: [ build_voucher_line(amount: 0) ])
       ]
     }
 
-    it "makes sure there is always a matching zeroed line" do
+    it "ensures there are at least two lines" do
       expect(indexed_voucher_entries(0).size).to eq(2)
     end
   end
 
   private
 
+  def build_voucher(attributes)
+    defaults = {
+      creditor: true,
+      type: :payment,
+      number: 1,
+      booked_on: Date.today,
+      description: "A voucher",
+      voucher_lines: [
+        build_voucher_line,
+        build_voucher_line,
+      ],
+    }
+    defaults.merge(attributes)
+  end
+
+  def build_voucher_line(attributes = {})
+    defaults = { account_number: 1234, amount: 1, booked_on: Date.today, description: "A voucher line" }
+    defaults.merge(attributes)
+  end
+
   def entry_attribute(label, attribute)
     indexed_entry_attribute(label, 0, attribute)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sie
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Barsoom AB
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attr_extras