time_crisis 0.1.7 → 0.1.8

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 1
+:patch: 8
 :build: 
-:patch: 7

data/lib/time_crisis/holiday.rb

@@ -14,7 +14,7 @@ module TimeCrisis::Holiday
       last_monday_of_may = TimeCrisis::Date.nth_weekday({
               :month => 5,
               :weekday => :monday,
-              :nth => 4
+              :nth => :last
       })
 
       [last_monday_of_may.month, last_monday_of_may.day]

data/lib/time_crisis/nth_weekday.rb

@@ -13,17 +13,25 @@ module TimeCrisis
 
       def nth_weekday(h={})
         raise ArgumentError unless h[:nth]
+        nth = h[:nth].to_s == 'last' ? 5 : h[:nth]
 
         today = TimeCrisis::Date.today
         h[:year] ||= today.year
         h[:month] ||= today.month
         h[:weekday] ||= today.wday
 
+        target_month = TimeCrisis::Date.new(h[:year], h[:month], 1)
+        days_in_month = target_month.days_in_month
         target_weekday = h[:weekday].is_a?(Numeric) ? h[:weekday] : @@days_of_the_week[h[:weekday]]
-        first_weekday = TimeCrisis::Date.new(h[:year], h[:month], 1).wday
+        first_weekday = target_month.wday
 
         offset = target_weekday > 0 ? target_weekday - first_weekday + 1 : 7 - (first_weekday - 1)
-        day = h[:nth] == 1 ? 7 + offset : (7 * (h[:nth] - 1)) + offset
+        day = calculate_day_with_offset(nth, offset)
+
+        while day > days_in_month
+          nth = nth - 1
+          day = calculate_day_with_offset(nth, offset)
+        end
 
         if $DEBUG
           STDERR.puts "Arguments: #{h.inspect}"
@@ -35,6 +43,12 @@ module TimeCrisis
 
         TimeCrisis::Date.civil(h[:year], h[:month], day)
       end
+
+      private
+
+      def calculate_day_with_offset(nth, offset)
+        nth == 1 ? (offset > 0 ? offset : 7 + offset) : (7 * (nth - 1)) + offset
+      end
     end
 
     module InstanceMethods

data/time_crisis.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{time_crisis}
-  s.version = "0.1.7"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Travis Tilley"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: time_crisis
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors: 
 - Travis Tilley