sie 1.0.1 → 1.0.2

data/README.md

@@ -61,11 +61,11 @@ class YourDataSource
   end
 
   def balance_account_numbers
-    [ "1500", "2400" ]
+    [ 1500, 2400 ]
   end
 
   def closing_account_numbers
-    [ "3100" ]
+    [ 3100 ]
   end
 
   # Used to calculate balance before (and on) the given date for an account.
@@ -86,11 +86,11 @@ class YourDataSource
         booked_on: Date.today, description: "Invoice 1",
         voucher_lines: [
           {
-            account_number: "1500", amount: 512.0,
+            account_number: 1500, amount: 512.0,
             booked_on: Date.today, description: "Item 1"
           },
           {
-            account_number: "3100", amount: -512.0,
+            account_number: 3100, amount: -512.0,
             booked_on: Date.today, description: "Item 1"
           },
         ]

data/lib/sie/document/financial_years.rb

@@ -1,24 +1,43 @@
+require "active_support/core_ext/time"
+require "active_support/core_ext/date"
+
 class Sie::Document
   class FinancialYears
-    def self.between(start_month, from_date, to_date)
-      result = []
+    method_object :between,
+      :start_month, :from_date, :to_date
+
+    def between
+      from_date.upto(to_date).map { |date|
+        financial_year = FinancialYear.new(date, start_month)
+        financial_year.date_range(from_date, to_date)
+      }.uniq
+    end
+  end
 
-      from_date.upto(to_date) do |date|
-        next if result.any? { |r| r.cover?(date) }
+  class FinancialYear
+    pattr_initialize :date, :start_month
 
-        start_of_year = Date.new(date.year, start_month, 1)
-        start_of_year = start_of_year <= date ? start_of_year : (start_of_year << 12)
+    def date_range(from_date, to_date)
+      first_date = [ start_of_year, from_date ].max
+      last_date = [ end_of_year, to_date ].min
+      (first_date.beginning_of_month..last_date.end_of_month)
+    end
 
-        a_year_later = start_of_year >> 11
-        end_of_year = Date.new(a_year_later.year, a_year_later.month, -1)
+    private
 
-        first_date = [start_of_year, from_date].max
-        last_date = [end_of_year, to_date].min
+    def start_of_year
+      start_of_year = Date.new(date.year, start_month, 1)
 
-        result << (first_date..last_date)
+      if start_of_year <= date
+        start_of_year
+      else
+        start_of_year << 12
       end
+    end
 
-      result
+    def end_of_year
+      a_year_later = start_of_year >> 11
+      Date.new(a_year_later.year, a_year_later.month, -1)
     end
   end
 end

data/lib/sie/version.rb

@@ -1,3 +1,3 @@
 module Sie
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/script/test

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+#
+# Command to run the specs the correct way when triggered from the turbux vim plugin.
+
+command = "rspec #{ARGV.first}"
+exit(1) unless system(command)

data/spec/unit/document/financial_years_spec.rb

@@ -28,11 +28,21 @@ describe Sie::Document::FinancialYears, ".between" do
     Sie::Document::FinancialYears.between(
       5,
       Date.new(2011, 9, 1),
-      Date.new(2014, 1, 10)
+      Date.new(2014, 1, 31)
     ).should == [
       Date.new(2011, 9, 1)..Date.new(2012, 4, 30),
       Date.new(2012, 5, 1)..Date.new(2013, 4, 30),
-      Date.new(2013, 5, 1)..Date.new(2014, 1, 10),
+      Date.new(2013, 5, 1)..Date.new(2014, 1, 31),
+    ]
+  end
+
+  it "normalizes start and end date for compatibility with other systems" do
+    Sie::Document::FinancialYears.between(
+      1,
+      Date.new(2011, 9, 15),
+      Date.new(2011, 10, 10)
+    ).should == [
+      Date.new(2011, 9, 1)..Date.new(2011, 10, 31),
     ]
   end
 end

data/spec/unit/document_spec.rb

@@ -17,15 +17,15 @@ describe Sie::Document, "#render" do
       {
         creditor: false, type: :invoice, number: 1, booked_on: from_date + 2, description: "Invoice 1",
         voucher_lines: [
-          { account_number: "1500", amount: 512.0, booked_on: from_date + 2, description: "Item 1" },
-          { account_number: "3100", amount: -512.0, booked_on: from_date + 2, description: "Item 1" },
+          { account_number: 1500, amount: 512.0, booked_on: from_date + 2, description: "Item 1" },
+          { account_number: 3100, amount: -512.0, booked_on: from_date + 2, description: "Item 1" },
         ]
       },
       {
         creditor: true, type: :payment, number: 2, booked_on: from_date + 365, description: "Payout 1",
         voucher_lines: [
-          { account_number: "2400", amount: 256.0, booked_on: from_date + 365, description: "Payout line 1" },
-          { account_number: "1970", amount: -256.0, booked_on: from_date + 365, description: "Payout line 2" },
+          { account_number: 2400, amount: 256.0, booked_on: from_date + 365, description: "Payout line 1" },
+          { account_number: 1970, amount: -256.0, booked_on: from_date + 365, description: "Payout line 2" },
         ]
       }
     ]
@@ -69,8 +69,8 @@ describe Sie::Document, "#render" do
       generated_on: generated_on,
       company_name: "Foocorp",
       financial_year_start_month: 1,
-      balance_account_numbers: [ "1500", "2400" ],
-      closing_account_numbers: [ "3100" ]
+      balance_account_numbers: [ 1500, 2400 ],
+      closing_account_numbers: [ 3100 ]
     )
     doc = Sie::Document.new(data_source)
   }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sie
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-27 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attr_extras
-  requirement: &70219540379320 !ruby/object:Gem::Requirement
+  requirement: &70247794044260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70219540379320
+  version_requirements: *70247794044260
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70219540378900 !ruby/object:Gem::Requirement
+  requirement: &70247794043840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70219540378900
+  version_requirements: *70247794043840
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70219540378400 !ruby/object:Gem::Requirement
+  requirement: &70247794043340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70219540378400
+  version_requirements: *70247794043340
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70219540377980 !ruby/object:Gem::Requirement
+  requirement: &70247794042920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70219540377980
+  version_requirements: *70247794042920
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70219540377520 !ruby/object:Gem::Requirement
+  requirement: &70247794042460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70219540377520
+  version_requirements: *70247794042460
 description: SIE parser and generator
 email:
 - all@barsoom.se
@@ -96,6 +96,7 @@ files:
 - lib/sie/version.rb
 - script/bootstrap
 - script/refresh
+- script/test
 - script/turbux_rspec
 - sie.gemspec
 - spec/fixtures/sie_file.se
@@ -122,7 +123,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4086731428764887794
+      hash: -3882600270749227957
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -131,10 +132,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4086731428764887794
+      hash: -3882600270749227957
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Parses and generates SIE files (http://sie.se/)