sie 1.0.2 → 1.0.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NTMyNmZiYTNmZTkzZTg3OWM2ODkzNmI2N2FmNjdjMzc1Yjc0OGJiZg==
+  data.tar.gz: !binary |-
+    OTA3ODk3MjY5MThjOTE4ODU0MGNjNzM1YTQ5MjkxNGYzZmY1MzZhMQ==
+SHA512:
+  metadata.gz: !binary |-
+    YzE2ODEzZmYyNDMzZThlNTVjZWNjZmVkOTM4NjE3NWQ0Zjc0MDhkZTY5OGM4
+    M2IxNjBjZWNkMzlkZjMzMzMxMWExODNlY2MyYzU0OWI5NjFmOGJkMjEzMTJj
+    MGYzODQzZDkxMmY2ZDA4ZmY0ZGQ5M2U2NDY3OTQ3MGE2YWU2NjQ=
+  data.tar.gz: !binary |-
+    YjA4NDlkY2IxYjJmOGVkM2NmYWJmYTVmYmUxMGQ4ZTJkMTViZDg4ZGFiNjgz
+    NjM4NGQ4NTJlMGEyZWI4ZWFiOWUyMTE5ZTU2MGMzMWY0Nzk4ODk0YzBmZGI2
+    MTczYmQzYzhlNzM5NTAyYTJjYmU1MzQ2ZTZkMmVmMjk1YTYzNjM=

data/lib/sie/document/financial_years.rb

@@ -7,32 +7,31 @@ class Sie::Document
       :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
+      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
     end
   end
 
   class FinancialYear
-    pattr_initialize :date, :start_month
+    pattr_initialize :year, :start_month
 
-    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)
+    def date_range
+      (start_of_year.beginning_of_month..end_of_year.end_of_month)
     end
 
     private
 
     def start_of_year
-      start_of_year = Date.new(date.year, start_month, 1)
-
-      if start_of_year <= date
-        start_of_year
-      else
-        start_of_year << 12
-      end
+      start_of_year = Date.new(year, start_month, 1)
     end
 
     def end_of_year

data/lib/sie/version.rb

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

data/spec/unit/document/financial_years_spec.rb

@@ -7,7 +7,7 @@ describe Sie::Document::FinancialYears, ".between" do
       Date.new(2011, 9, 1),
       Date.new(2012, 12, 31)
     ).should == [
-      Date.new(2011, 9, 1)..Date.new(2011, 12, 31),
+      Date.new(2011, 1, 1)..Date.new(2011, 12, 31),
       Date.new(2012, 1, 1)..Date.new(2012, 12, 31),
     ]
   end
@@ -18,7 +18,7 @@ describe Sie::Document::FinancialYears, ".between" do
       Date.new(2011, 9, 1),
       Date.new(2013, 12, 31)
     ).should == [
-      Date.new(2011, 9, 1)..Date.new(2011, 12, 31),
+      Date.new(2011, 1, 1)..Date.new(2011, 12, 31),
       Date.new(2012, 1, 1)..Date.new(2012, 12, 31),
       Date.new(2013, 1, 1)..Date.new(2013, 12, 31),
     ]
@@ -30,9 +30,9 @@ describe Sie::Document::FinancialYears, ".between" do
       Date.new(2011, 9, 1),
       Date.new(2014, 1, 31)
     ).should == [
-      Date.new(2011, 9, 1)..Date.new(2012, 4, 30),
+      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, 1, 31),
+      Date.new(2013, 5, 1)..Date.new(2014, 4, 30),
     ]
   end
 
@@ -42,7 +42,17 @@ describe Sie::Document::FinancialYears, ".between" do
       Date.new(2011, 9, 15),
       Date.new(2011, 10, 10)
     ).should == [
-      Date.new(2011, 9, 1)..Date.new(2011, 10, 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
+    Sie::Document::FinancialYears.between(
+      1,
+      Date.new(2011, 1, 1),
+      Date.new(2011, 12, 31)
+    ).should == [
+      Date.new(2011, 1, 1)..Date.new(2011, 12, 31)
     ]
   end
 end

data/spec/unit/document_spec.rb

@@ -95,7 +95,7 @@ describe Sie::Document, "#render" do
     expect(indexed_entry_attribute("rar", 1, "start")).to eq("20120101")
     expect(indexed_entry_attribute("rar", 1, "slut")).to  eq("20121231")
     expect(indexed_entry_attribute("rar", 2, "arsnr")).to eq("-2")
-    expect(indexed_entry_attribute("rar", 2, "start")).to eq("20110901")
+    expect(indexed_entry_attribute("rar", 2, "start")).to eq("20110101")
     expect(indexed_entry_attribute("rar", 2, "slut")).to  eq("20111231")
   end
 

metadata

@@ -1,71 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: sie
 version: !ruby/object:Gem::Version
-  version: 1.0.2
-  prerelease: 
+  version: 1.0.3
 platform: ruby
 authors:
 - Barsoom AB
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attr_extras
-  requirement: &70247794044260 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70247794044260
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70247794043840 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70247794043840
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70247794043340 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70247794043340
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70247794042920 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70247794042920
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70247794042460 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70247794042460
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: SIE parser and generator
 email:
 - all@barsoom.se
@@ -111,33 +125,26 @@ files:
 homepage: ''
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3882600270749227957
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3882600270749227957
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Parses and generates SIE files (http://sie.se/)
 test_files:
 - spec/fixtures/sie_file.se