saturday 1.0.2 → 1.1.0

data/lib/saturday.rb

@@ -1,14 +1,20 @@
-class Saturday
 
- @@by = ['by_year','by_year_and_month']
-	class << self
-		@@by.each do |method|
+require 'saturday/dates'
+include Dates
+class Saturday
+ 	class << self
+		BY.each do |method|
 			define_method(method) do |year=nil,month=nil|
-				date=Dates.new(year,month)
+				date=Dates::Saturday.new(year,month)
 				date.find_saturdays
 			end
 		end	
-end
-end
 
-require 'saturday/dates'
+		MONTHS_MAP.each_with_index do |(key,value),index|
+			define_method("in_#{key.to_s}") do |year=nil,month=nil|
+				date=Dates::Saturday.new(year,month = index)
+				date.find_saturdays	
+			end
+		end
+	end
+end

data/lib/saturday/dates.rb

@@ -1,34 +1,36 @@
 require 'date'
-class Saturday::Dates
+module Dates
+  BY  = ['by_year','by_year_and_month']
+  MONTHS_MAP = {:nil => :nil,
+                :jan => 31,
+                :feb => 28,
+                :mar => 31,
+                :apr => 30,
+                :may => 31,
+                :jun => 30,
+                :jul => 31,
+                :aug => 31,
+                :sep => 30,
+                :oct => 31,
+                :nov => 30,
+                :dec => 31}
+  class Saturday
   attr_accessor :date ,:year ,:month
   
-  MONTHS_MAP = [{:january => 31},
-                  {:february => 28},
-                  {:march => 31},
-                  {:april => 30},
-                  {:may => 31},
-                  {:june => 30},
-                  {:july => 31},
-                  {:august => 31},
-                  {:september => 30},
-                  {:october => 31},
-                  {:november => 30},
-                  {:december => 31}]
-
-  def initialize(year=nil,month=nil)
-    @year = year
-    @month = month
-    @date = @year && @month.nil? ? Date.new(year) : Date.new(year,month)
-  end
+    def initialize(year=nil,month=nil)
+      @year = year
+      @month = month
+      @date = @year && @month.nil? ? Date.new(year) : Date.new(year,month)
+    end
 
     def find_saturdays
-      @date.leap? ? MONTHS_MAP[1][:february] = 29 : MONTHS_MAP
+      @date.leap? ? MONTHS_MAP[:feb] = 29 : MONTHS_MAP
       dates = []
       year ,month = @date.year ,@date.month
       if @year && @month
-        MONTHS_MAP[@month - 1].each_pair { |key,value|  dates << find_dates(year,month,value)} 
-    else
-        MONTHS_MAP.each {|k| k.each_pair { |key,value|  dates << find_dates(year,MONTHS_MAP.index(k) + 1,value)} }
+        MONTHS_MAP.each_with_index { |(key,value),index|  dates << find_dates(year,month,value) if month == index} 
+     else
+        MONTHS_MAP.each_with_index { |(key,value),index|  dates << find_dates(year,month = index,value) unless index==0}  
       end  
       dates
     end
@@ -36,8 +38,9 @@ class Saturday::Dates
     private
 
     def find_dates(year,month,value)
-      saturdays = []
+      saturdays = Array.new
       1.upto(value) {|o| saturdays << Date.new(year,month,o) if Date.new(year,month,o).saturday? }
       saturdays
     end
+end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saturday
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors: