fyuk 0.6.3 → 0.6.4

data/Gemfile

@@ -20,3 +20,6 @@ end
 group :development, :test do
   gem 'debugger'
 end
+
+gem 'activesupport'
+gem 'i18n'

data/Gemfile.lock

@@ -1,6 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    activesupport (3.0.0)
     columnize (0.3.6)
     debugger (1.1.3)
       columnize (>= 0.3.1)
@@ -11,6 +12,7 @@ GEM
     debugger-ruby_core_source (1.1.2)
     diff-lcs (1.1.3)
     git (1.2.5)
+    i18n (0.6.1)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -32,8 +34,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport
   bundler (~> 1.0.0)
   debugger
+  i18n
   jeweler (~> 1.6.4)
   rcov
   rspec (~> 2.9.0)

data/VERSION

@@ -1 +1 @@
-0.6.3
+0.6.4

data/fyuk.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fyuk"
-  s.version = "0.6.3"
+  s.version = "0.6.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nigel Lowry"]
-  s.date = "2012-07-06"
+  s.date = "2012-11-05"
   s.description = "Small library with methods for finding the financial or fiscal year for a particular date and suchlike. Used by Hubo https://hubo.herokuapp.com/"
   s.email = "nigel-lowry@ultra.eclipse.co.uk"
   s.extra_rdoc_files = [
@@ -41,6 +41,8 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+      s.add_runtime_dependency(%q<i18n>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.9.0"])
       s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -48,6 +50,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<debugger>, [">= 0"])
     else
+      s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<i18n>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.9.0"])
       s.add_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -56,6 +60,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<debugger>, [">= 0"])
     end
   else
+    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<i18n>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.9.0"])
     s.add_dependency(%q<yard>, ["~> 0.6.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])

data/lib/uk_financial_year.rb

@@ -1,4 +1,4 @@
-require 'date'
+require 'active_support/all'
 
 # Makes working with the UK financial or fiscal year easier.
 class UkFinancialYear
@@ -19,7 +19,7 @@ class UkFinancialYear
   # @return [String] representation in the form of the first year as four
   # digits, a '/', then the last year as two digits
   def to_s
-    "#{first_day.year}/#{last_day.year.to_s[-2..-1]}"
+    "#{first_day.year}/#{last_day.year.to_s.from 2}"
   end
 
   # creates a new UkFinancialYear from a string in the form '2000/01'
@@ -29,16 +29,20 @@ class UkFinancialYear
   # @raise [RuntimeError] if the string cannot be parsed to a financial year
   # @return [UkFinancialYear] the financial year specified by the string
   def UkFinancialYear.from_s s
+    check_format s
+    new(Date.new s.to(3).to_i, 4, 6)
+  end
+
+  def self.check_format s
     if /^(?<year1>\d{4})\/(?<year2>\d{2})$/ =~ s
       year1 = year1.to_i
       year1_century = year1 / 100
       year2_century = year1 % 100 == 99 ? year1_century + 1 : year1_century
       year2 = year2_century * 100 + year2.to_i
-      raise %{"#{year1}" and "#{year2}" are not consecutive years} unless year2 == year1 + 1
-      return new(Date.new year1, 4, 6)
+      raise %{"#{year1}" and "#{year2}" are not consecutive years} unless year1 + 1 == year2
+    else
+      raise %{"#{s}" does not match FY string format}
     end
-
-    raise %{"#{s}" does not match FY string format}
   end
 
   # returns the date of the first day of the financial year
@@ -73,21 +77,21 @@ class UkFinancialYear
   end
 
   def adjacent? other_financial_year
-    self.first_day.next_year == other_financial_year.first_day or self.first_day.prev_year == other_financial_year.first_day
+    other_financial_year.last_day.tomorrow == self.first_day or other_financial_year.first_day.yesterday == self.last_day
   end
 
   # tells if the given date or financial year is before this one
   # @param [Date] date_or_fy date or financial year to check
   # @return [Boolean] to indicate if this financial year is before
   def before? date_or_fy
-    self.first_day.before?(date_to_compare date_or_fy)
+    self.first_day < date_to_compare(date_or_fy)
   end
 
   # tells if the given date or financial year is after this one
-  # @param (see FixedOdds#before?)
+  # @param (see UkFinancialYear#before?)
   # @return [Boolean] to indicate if this financial year is after
   def after? date_or_fy
-    self.first_day.after?(date_to_compare date_or_fy)
+    self.first_day > date_to_compare(date_or_fy)
   end
 
   # returns the period before this date in the financial year
@@ -95,8 +99,8 @@ class UkFinancialYear
   # @return [Range<Date>] the period before this date in the the
   # financial year 
   def period_before date
-    raise "#{date} is before FY #{to_s}" if date < first_day
-    raise "#{date} is after FY #{to_s}" if date > last_day
+    raise "#{date} is before FY #{to_s} which starts on #{first_day}" if date < first_day
+    raise "#{date} is after FY #{to_s} which ends on #{last_day}" if date > last_day
 
     first_day...date
   end
@@ -112,22 +116,14 @@ class UkFinancialYear
   end
 
   private
-    def date_to_compare other
-      if other.is_a?(Date) then other else other.first_day end
-    end
 
     def start_date date
-      swap_date_that_year = Date.new date.year, 4, 6
-      (date.after?(swap_date_that_year) or date == swap_date_that_year) ? swap_date_that_year : swap_date_that_year.prev_year
+      swap_date_that_year = date.change day: 6, month: 4
+      date < swap_date_that_year ? swap_date_that_year.prev_year : swap_date_that_year
     end
-end
 
-class Date
-  def before? other
-    self < other
-  end
+    def date_to_compare other
+      other.is_a?(Date) ? other : other.first_day
+    end
 
-  def after? other
-    self > other
-  end
 end

data/spec/uk_financial_year_spec.rb

@@ -50,6 +50,7 @@ describe UkFinancialYear do
   end
 
   describe "#from_s" do
+    specify { UkFinancialYear.from_s('1997/98').to_s.should == '1997/98' }
     specify { UkFinancialYear.from_s('1998/99').to_s.should == '1998/99' }
     specify { UkFinancialYear.from_s('1999/00').to_s.should == '1999/00' }
     specify { UkFinancialYear.from_s('2000/01').to_s.should == '2000/01' }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fyuk
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-06 00:00:00.000000000 Z
+date: 2012-11-05 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -144,7 +176,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 807708259231471718
+      hash: -695263215771451728
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: