fyuk 0.1.1 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/fyuk.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "fyuk"
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nigel Lowry"]

data/lib/uk_financial_year.rb

@@ -13,6 +13,14 @@ class UkFinancialYear
     @range = start_date...start_date.next_year
   end
 
+  # returns string representation of the financial year in the form '2000/01'.
+  # This is the form HMRC use.
+  # @return [String] representation in the form of the first year as four
+  # digits, a '/', then the last year as two digits
+  def to_s
+    "#{self.first_day.year}/#{self.last_day.year.to_s[-2..-1]}"
+  end
+
   # creates a new UkFinancialYear from a string in the form '2000/01'
   # @param [String] s the two years of the financial year in the form
   # of the first year as four digits, a '/', then the last year as
@@ -63,11 +71,8 @@ class UkFinancialYear
     UkFinancialYear.new self.first_day.prev_year
   end
 
-  # returns string representation of the financial year in the form '2000/01'
-  # @return [String] representation in the form of the first year as four
-  # digits, a '/', then the last year as two digits
-  def to_s
-    "#{self.first_day.year}/#{self.last_day.year.to_s[-2..-1]}"
+  def adjacent? other_financial_year
+    self.first_day.next_year == other_financial_year.first_day || self.first_day.prev_year == other_financial_year.first_day
   end
 
   # equality method

data/spec/uk_financial_year_spec.rb

@@ -134,6 +134,32 @@ describe UkFinancialYear do
     end
   end 
 
+  describe "#adjacent" do
+    it "is true for two consecutive financial years in date order" do
+      fy1 = UkFinancialYear.from_s '2011/12'
+      fy2 = UkFinancialYear.from_s '2012/13'
+
+      fy1.should be_adjacent fy2
+      fy2.should be_adjacent fy1
+    end
+
+    it "is false for financial years which do not run together" do
+      fy1 = UkFinancialYear.from_s '2011/12'
+      fy2 = UkFinancialYear.from_s '2013/14'
+
+      fy1.should_not be_adjacent fy2
+      fy2.should_not be_adjacent fy1
+    end
+
+    it "is false for the same financial year" do
+      fy1 = UkFinancialYear.from_s '2011/12'
+      fy2 = UkFinancialYear.from_s '2011/12'
+
+      fy1.should_not be_adjacent fy2
+      fy2.should_not be_adjacent fy1
+    end
+  end
+
   describe "object comparison" do
     it "is less than for earlier FYs" do
       UkFinancialYear.new(Date.parse '5 Apr 2011').should be < UkFinancialYear.new(Date.parse '6 Apr 2011')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fyuk
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70299305466680 !ruby/object:Gem::Requirement
+  requirement: &70272143533980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *70299305466680
+  version_requirements: *70272143533980
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70299305466200 !ruby/object:Gem::Requirement
+  requirement: &70272143533320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70299305466200
+  version_requirements: *70272143533320
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70299305465700 !ruby/object:Gem::Requirement
+  requirement: &70272143523480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70299305465700
+  version_requirements: *70272143523480
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70299305465180 !ruby/object:Gem::Requirement
+  requirement: &70272143522880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70299305465180
+  version_requirements: *70272143522880
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70299305464660 !ruby/object:Gem::Requirement
+  requirement: &70272143522280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70299305464660
+  version_requirements: *70272143522280
 description: Small library with methods for finding the financial or fiscal year for
   a particular date and suchlike
 email: nigel-lowry@ultra.eclipse.co.uk
@@ -102,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4011342982725739789
+      hash: 2899375031864654896
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: