us_bank_holidays 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55df8b485e62ef28d7d1872ff78e21a807e241e0
-  data.tar.gz: 0c36413d6b45bb274e3c70a1929c6a517ab3af0e
+  metadata.gz: a4921197ea42b26e8e08bf2f4059f034c805e214
+  data.tar.gz: d40a2bbb91cce5c533a7f0056e833ba9bf09ebfd
 SHA512:
-  metadata.gz: 2153d108279fd2296d312274210153bf10ee38c50d1239baf4dc9e5ae3c1303d01fed80801ea77268419bcd6ee0f8ab3e5eb2703f5fab3b8bf9c22e15039ec40
-  data.tar.gz: 8ab9877ee8d665d75ba9385fde4aaa05ed186db5bdaa900cb5f24ba5c8258722d884dcd9e815515b9a1d6fd6698682bf614a189d147c029def5a3f632b9c2956
+  metadata.gz: b90aab66fb070972ce928c186233c2ca82066b371691b728cec75b8e4c94a7f9c6c5b09dd4e7bdad9dd37ff4c907f223b789c58acfb299801786801ba92945b7
+  data.tar.gz: 4a944a80069321f13677993dc3a3ff4b386b8dc93c740d657f0b6aa012ae98c8679a5dbed74094b8e6e1f6a2689692cb7e832f60019ee86e1547b40db5759569

data/lib/us_bank_holidays/holiday_year.rb

@@ -19,35 +19,8 @@ module UsBankHolidays
     def initialize(year)
       @year                 = year
 
-      # First of the year, rolls either forward or back.
-      @new_years_day        = roll_nominal(Date.new(year, 1, 1))
-
-      # Third Monday of January
-      @mlk_day              = ::UsBankHolidays::Month.new(year, 1).mondays[2]
-
-      # Third Monday of February
-      @washingtons_birthday = ::UsBankHolidays::Month.new(year, 2).mondays[2]
-
-      # Last Monday of May
-      @memorial_day         = ::UsBankHolidays::Month.new(year, 5).mondays.last
-
-      # 4'th of July
-      @independence_day     = roll_nominal(Date.new(year, 7, 4))
-
-      # First Monday of September
-      @labor_day            = ::UsBankHolidays::Month.new(year, 9).mondays.first
-
-      # Second Monday of October
-      @columbus_day         = ::UsBankHolidays::Month.new(year, 10).mondays[1]
-
-      # November 11
-      @veterans_day         = roll_nominal(Date.new(year, 11, 11))
-
-      # Fourth Thursday of November
-      @thanksgiving         = ::UsBankHolidays::Month.new(year, 11).thursdays[3]
-
-      # December 25
-      @christmas            = roll_nominal(Date.new(year, 12, 25))
+      init_fixed_holidays
+      init_rolled_holidays
 
     end
 
@@ -74,20 +47,78 @@ module UsBankHolidays
       end
     end
 
-    # Figures out where to roll the given nominal date. If it's a Saturday, assumes
-    # it's the day before (Friday), if Sunday it's the date after (Monday), otherwise
-    # just returns self.
-    def roll_nominal(nominal)
-      if nominal.saturday?
-        nominal - 1
-      elsif nominal.sunday?
-        nominal + 1
-      else
-        nominal
+    {
+      :january   => 1,
+      :february  => 2,
+      :march     => 3,
+      :april     => 4,
+      :may       => 5,
+      :june      => 6,
+      :july      => 7,
+      :august    => 8,
+      :september => 9,
+      :october   => 10,
+      :november  => 11,
+      :december  => 12
+    }.each do |month_name, month_index|
+      # Create a method that returns an instance of UsBankHolidays::Month for
+      # the needed month
+      define_method(month_name) do
+        ::UsBankHolidays::Month.new(year, month_index)
       end
     end
-    private :roll_nominal
+
+    private
+
+      # These holidays are always fixed
+      def init_fixed_holidays
+        # Third Monday of January
+        @mlk_day              = january.mondays[2]
+
+        # Third Monday of February
+        @washingtons_birthday = february.mondays[2]
+
+        # Last Monday of May
+        @memorial_day         = may.mondays.last
+
+        # First Monday of September
+        @labor_day            = september.mondays.first
+
+        # Second Monday of October
+        @columbus_day         = october.mondays[1]
+
+        # Fourth Thursday of November
+        @thanksgiving         = november.thursdays[3]
+      end
+
+      # These holidays are potentially rolled if they come on a weekend.
+      def init_rolled_holidays
+        # First of the year, rolls either forward or back.
+        @new_years_day    = roll_nominal(Date.new(year, 1, 1))
+
+        # 4'th of July
+        @independence_day = roll_nominal(Date.new(year, 7, 4))
+
+        # November 11
+        @veterans_day     = roll_nominal(Date.new(year, 11, 11))
+
+        # December 25
+        @christmas        = roll_nominal(Date.new(year, 12, 25))
+      end
+
+      # Figures out where to roll the given nominal date. If it's a Saturday, assumes
+      # it's the day before (Friday), if Sunday it's the date after (Monday), otherwise
+      # just returns self.
+      def roll_nominal(nominal)
+        if nominal.saturday?
+          nominal - 1
+        elsif nominal.sunday?
+          nominal + 1
+        else
+          nominal
+        end
+      end
 
   end
 
-end
+end

data/lib/us_bank_holidays/version.rb

@@ -1,3 +1,3 @@
 module UsBankHolidays
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/functional/holiday_year_spec.rb

@@ -20,4 +20,30 @@ describe UsBankHolidays::HolidayYear do
   it 'should declare Dec. 31 a bank holiday if it falls on a Friday' do
     UsBankHolidays::HolidayYear.new(2021).bank_holidays.last.should == Date.new(2021, 12, 31)
   end
-end
+
+  context 'Months' do
+    let(:year) { UsBankHolidays::HolidayYear.new(2014) }
+
+    {
+      :january   => 1,
+      :february  => 2,
+      :march     => 3,
+      :april     => 4,
+      :may       => 5,
+      :june      => 6,
+      :july      => 7,
+      :august    => 8,
+      :september => 9,
+      :october   => 10,
+      :november  => 11,
+      :december  => 12
+    }.each do |month_name, month_index|
+      it "should respond to '#{month_name}' and return the right month" do
+        year.respond_to?(month_name).should be_true
+        month = year.send(month_name)
+        month.year.should  == 2014
+        month.month.should == month_index
+      end
+    end
+  end
+end

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: us_bank_holidays
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Arthur Shagall
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rspec
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: simplecov
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simplify working with US bank holidays.
 email:
 - arthur.shagall@gmail.com
@@ -91,7 +91,7 @@ homepage: https://github.com/albertosaurus/us_bank_holidays
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -106,9 +106,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.2.1
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.2.2
+signing_key: 
 specification_version: 4
 summary: Patches Date to add methods to make dealing with US bank holidays simpler.
 test_files: