us_bank_holidays 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 421d85478436ebcc1574e2ccc9639b887029e46e
-  data.tar.gz: 3a0cd71dd007bfddc392a016739eabcae93af9c4
+  metadata.gz: 55df8b485e62ef28d7d1872ff78e21a807e241e0
+  data.tar.gz: 0c36413d6b45bb274e3c70a1929c6a517ab3af0e
 SHA512:
-  metadata.gz: c1a919b687012cc56dea4f7afa1259715b83e037ac275e236dda25f1ebfd9fd9de6e642d3f8ad89f03e5cfc46846b46a84f95c16e84f96d78489daf0cd4a48cd
-  data.tar.gz: 18552331c1658fdc6a1eda5db1bdfe61485c6736a5ae318064fadeb48a45fc6304ca625c6c5c810ec2e612cb46b21a6043160d5b0012fa72e72ffce041748e82
+  metadata.gz: 2153d108279fd2296d312274210153bf10ee38c50d1239baf4dc9e5ae3c1303d01fed80801ea77268419bcd6ee0f8ab3e5eb2703f5fab3b8bf9c22e15039ec40
+  data.tar.gz: 8ab9877ee8d665d75ba9385fde4aaa05ed186db5bdaa900cb5f24ba5c8258722d884dcd9e815515b9a1d6fd6698682bf614a189d147c029def5a3f632b9c2956

data/README.md

@@ -3,6 +3,7 @@
 https://github.com/albertosaurus/us_bank_holidays
 
 [![Build Status](https://travis-ci.org/albertosaurus/us_bank_holidays.png?branch=master)](https://travis-ci.org/albertosaurus/us_bank_holidays)
+[![Code Climate](https://codeclimate.com/github/albertosaurus/us_bank_holidays.png)](https://codeclimate.com/github/albertosaurus/us_bank_holidays)
 
 Patches `Date` to make working with US bank holidays easier
 

data/lib/us_bank_holidays/month.rb

@@ -1,16 +1,20 @@
 module UsBankHolidays
 
-  # Utility class to make it easier to work with a particular month
+  # Utility class to make it easier to work with a particular month. It represents
+  # a month of a specific year.
   class Month
 
     attr_reader :year, :month
 
+    # Initializes an instance from a year and a month. Raises an error if the
+    # month is not in the allowed range, i.e. it must be between 1 and 12 inclusive.
     def initialize(year, month)
       if month < 1 || month > 12
         raise ArgumentError, "Month is out of range, must be between 1 and 12, got #{month}"
       end
       @month = month
-      @year = year
+      @year  = year
+      @weeks = []
       init_month
     end
 
@@ -41,6 +45,9 @@ module UsBankHolidays
       :saturdays  => 6
     }.each do |day, index|
 
+      # For each day of the week, define a method that will return the set of
+      # all the matching dates in the month. For example, this lets me determine
+      # all the Mondays of the month, or all the Fridays.
       define_method(day) do
         @weeks.map { |w|
           w[index]
@@ -49,10 +56,14 @@ module UsBankHolidays
 
     end
 
+    # Returns true if the given month contains the given date, false otherwise.
+    def contains?(date)
+      year == date.year && month == date.month
+    end
+
     private
 
       def init_month
-        @weeks = []
         current_date = Date.new(year, month, 1)
         week = init_first_week(current_date)
         while current_date.month == month
@@ -60,31 +71,16 @@ module UsBankHolidays
           current_date += 1
           if week.size == 7 || current_date.month != month
             @weeks << week.freeze
-            unless current_date.month > month
-              week = []
-            end
+            week = [] if contains?(current_date)
           end
         end
         @weeks.freeze
       end
 
       def init_first_week(start_date)
-        case start_date.wday
-        when 0
-          []
-        when 1
-          [nil]
-        when 2
-          [nil, nil]
-        when 3
-          [nil, nil, nil]
-        when 4
-          [nil, nil, nil, nil]
-        when 5
-          [nil, nil, nil, nil, nil]
-        when 6
-          [nil, nil, nil, nil, nil, nil]
-        end
+        offset = []
+        start_date.wday.times { offset << nil }
+        offset
       end
 
   end

data/lib/us_bank_holidays/version.rb

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

data/spec/functional/month_spec.rb

@@ -19,6 +19,27 @@ describe UsBankHolidays::Month do
     }
   end
 
+  describe '.contains?' do
+
+    it 'should return true if the month contains the given date' do
+      (1..31).each do |mday|
+        january.contains?(Date.new(january.year, january.month, mday)).should be_true
+      end
+    end
+
+    it 'should return false if the month is not the same' do
+      (1..31).each do |mday|
+        january.contains?(Date.new(2014, 8, mday)).should be_false
+      end
+    end
+
+    it 'should return false if the year is not the same' do
+      (1..31).each do |mday|
+        january.contains?(Date.new(2015, 1, mday)).should be_false
+      end
+    end
+  end
+
   describe '.to_s' do
 
     let(:january_str) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: us_bank_holidays
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Arthur Shagall
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-02-08 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler