week_of_month 1.2.3.2 → 1.2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb763a374f81af6d9930c901028abc73b85fdc17
-  data.tar.gz: 006949252e68ebb482b07254d031e5366671b264
+  metadata.gz: 38c961369c785e86656fd70ba102c26d4b58fc19
+  data.tar.gz: c64a4dfd1818b1dfd347975d146275efaa4c10b1
 SHA512:
-  metadata.gz: 695d2c55e137bc75e04f343cedf771569dc57ceda2112e7b20e48b7c399f3adf2bfea0d0949bcbe05d52d1d3c51e2951a6776f9c84f6f97c3084c8cf8691f0c9
-  data.tar.gz: a6a127b55d61f32cf2ccb83e7d6e12720479de5ece65e460a1ca8fba9545bab36183be2fac724d76ab61cc8499988401b5fabceae59f85a4795cbb93994c1a09
+  metadata.gz: 9dc85ac5f08fc0d86f741930357a00afdb29929977d70709e29d5ebe8def9bd44d98821b4c3ee90d78d9e2c60c64b13493463608e4b3889454a84f8ee3466651
+  data.tar.gz: 18d86c5d5b0177350db060207e69f9caa7daadd585031e20935ab04cbabc9829915197d7d2abd5319c196b6387e0d2d7fbfe68fc5083f4377f689b1cf42caccc

data/Gemfile

@@ -2,3 +2,13 @@ source 'https://rubygems.org'
 
 gemspec
 
+
+group :development do
+  # Debugging
+  gem 'byebug'
+
+  # Documentation
+  gem 'yard'               # Documentation generator
+  gem 'redcarpet'          # Markdown implementation (for yard)
+end
+

data/Gemfile.lock

@@ -1,17 +1,29 @@
 PATH
   remote: .
   specs:
-    week_of_month (1.2.3.2)
+    week_of_month (1.2.3.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    rake (10.1.0)
+    byebug (4.0.5)
+      columnize (= 0.9.0)
+    columnize (0.9.0)
+    power_assert (0.2.2)
+    rake (10.4.2)
+    redcarpet (3.2.3)
+    test-unit (3.0.8)
+      power_assert
+    yard (0.8.7.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (>= 1.0)
+  byebug
   rake (>= 10.1.0)
+  redcarpet
+  test-unit
   week_of_month!
+  yard

data/README.md

@@ -6,29 +6,34 @@
 
 [gem]: http://badge.fury.io/rb/week_of_month
 [climate]: https://codeclimate.com/github/sachin87/week-of-month
-[license]: http://opensource.org/licenses/MIT 
+[license]: http://opensource.org/licenses/MIT
 
-Week of month is a gem which gives you access to methods for the Date and Time class objects. Among accurately displaying the days of a week in the form of a calendar arrangement, this gem will also provide you with tools for identifying which week of the month a particular date lies.
+Week of month is a gem which extends Date and Time class with useful methods. Among accurately displaying the days of a week in the form of a calendar arrangement, this gem will also provide you with tools for identifying which week of the month a particular date lies.
 
 ## Getting Started
 
 Week of month is released as a Ruby Gem. The gem is to be installed within a Ruby
-or Rails application. To install, simply add the following to your Gemfile:
+on Rails application. To install, simply add the following to your Gemfile:
 
 ```ruby
 gem 'week_of_month'
 ```
 
-Run bundle install and don't forget to restart your server after you install a new gem. 
+Run bundle install and don't forget to restart your server after it.
 
-You can also install this gem from the command line as: 
+You can also install this gem from the command line as:
 
 ```ruby
 gem install 'week_of_month'
 ```
-## Assumption
+## New! Configure week start day!
 
-Sunday is the first day of the week.
+include this line inside your application.rb:
+
+```ruby
+WeekOfMonth.configuration.monday_active = true
+```
+This will do all manipulations considering monday as first day of week.
 
 ## Usage
 
@@ -39,39 +44,39 @@ Date.new(2012,1,1).week_split
 
 =begin
     [[1, 2, 3, 4, 5, 6, 7],
-	[8, 9, 10, 11, 12, 13, 14], 
-	[15, 16, 17, 18, 19, 20, 21], 
-	[22, 23, 24, 25, 26, 27, 28], 
-	[29, 30, 31]]
+    [8, 9, 10, 11, 12, 13, 14],
+    [15, 16, 17, 18, 19, 20, 21],
+    [22, 23, 24, 25, 26, 27, 28],
+    [29, 30, 31]]
 =end
 ```
 **Return the total number of weeks in a month.**
 
 ```ruby
 Date.new(2012,1,31).total_weeks
-# => 5 
+# => 5
 ```
 
 **Return what number week in the month a specific date lies. Can also return the number in english.**
 
 ```ruby
-Date.new(2012,1,31).week_of_month 
+Date.new(2012,1,31).week_of_month
 # => 5
 
 Date.new(2012,1,31).week_of_month_in_eng
-# => "Fifth" 
+# => "Fifth"
 ```
 
 **Return true if date lies in first week of month, otherwise false will be returned. Also works with second week and last week.**
 
 ```ruby
 Date.new(2012,1,1).first_week?
-# => true 
+# => true
 
 Date.new(2012,1,9).second_week?
-# => true 
+# => true
 
-Date.new(2012,1,31).last_week? 
+Date.new(2012,1,31).last_week?
 # => true
 ```
 
@@ -86,12 +91,12 @@ Date.new(2012,1,1).name_of_month
 
 ```ruby
 Date.new(2012,1,1).january?
-# => true 
+# => true
 
 Date.new(2012,1,9).august?
-# => false 
+# => false
 
-Date.new(2012,12,25).december? 
+Date.new(2012,12,25).december?
 # => true
 ```
 
@@ -99,17 +104,17 @@ Date.new(2012,12,25).december?
 
 ```ruby
 Date.new(2012,1,1).last_day_of_month
-# => 31 
+# => 31
 
 Date.new(2012,2,9).last_day_of_month
-# => 29 
+# => 29
 ```
 
 **Return the dates for which the day of the method falls (works for all days).**
 
 ```ruby
 Date.new(2012,1,1).all_mondays_in_month
-# => [2, 9, 16, 23, 30] 
+# => [2, 9, 16, 23, 30]
 ```
 
 **Return the day of the week for the specified date.**
@@ -175,7 +180,8 @@ august?, september?, october?, november?, december?, last_day_of_month
 
 ## Contributing to Week of month
 
-Fork, fix, then send me a pull request.
+Fork, fix, then send me a pull request,
+and most important add yourself to list of authors in gemspec file.
 
 ## License
 

data/Rakefile

@@ -1,11 +1,13 @@
+# @author Sachin Singh
+
 require 'rake/testtask'
 require 'bundler/gem_tasks'
 
 Rake::TestTask.new do |t|
-  t.libs << "test"
+  t.libs << 'test'
   t.test_files = FileList['lib/test/modules/test*.rb']
   t.verbose = true
 end
 
-desc "Run tests"
+desc 'Run tests'
 task :default => :test

data/lib/modules/configuration.rb

@@ -0,0 +1,26 @@
+module WeekOfMonth
+  class Configuration
+    attr_accessor \
+      :monday_active
+
+    def initialize
+      @monday_active = false
+    end
+
+    def monday_active?
+      @monday_active
+    end
+  end
+
+  def self.configuration
+    @configuration ||= Configuration.new
+  end
+
+  def self.configuration=(config)
+    @configuration = config
+  end
+
+  def self.configure
+    yield configuration
+  end
+end

data/lib/modules/constant.rb

@@ -5,37 +5,39 @@
 
 module WeekOfMonth
   module Constant
-    
+
     # hash containing english words from one to seven
     WEEK_OF_MONTH_IN_ENG = { 1 => 'First', 2 => 'Second', 3 => 'Third',
                     4 => 'Fourth', 5 => 'Fifth', 6 => 'Sixth', 7 => 'Seventh'}
 
     # hash containing french words from one to seven
-    WEEK_OF_MONTH_IN_FR  = { 1 => 'First', 2 => 'Second', 3 => 'Third',
-                    4 => 'Quatrième', 5 => 'Cinquième', 6 => 'sixième', 7 => 'septième'}
+    WEEK_OF_MONTH_IN_FR  = { 1 => 'Premier', 2 => 'Deuxième', 3 => 'Troisième',
+                    4 => 'Quatrième', 5 => 'Cinquième', 6 => 'Sixième', 7 => 'Septième'}
 
     # hash containing german words from one to seven
     WEEK_OF_MONTH_IN_GER = { 1 => 'First', 2 => 'Second', 3 => 'Dritten',
                     4 => 'Vierte', 5 => 'Fünfte', 6 => 'Sechste', 7 => 'siebte'}
 
-    # hash containing japneese words from one to seven
+    # hash containing japanese words from one to seven
     WEEK_OF_MONTH_IN_JAP = { 1 => '最初', 2 => '秒', 3 => 'サード',
                     4 => '第4回', 5 => '第五', 6=> 'シックス', 7 =>  '第7' }
-    
-    # hash containing month name with days in that month(in non leap yaer)
+
+    # hash containing month name with days in that month(in non leap year)
     MONTH_WITH_DAY = { :january => 31, :february => 28, :march => 31,
                        :april => 30, :may => 31, :june => 30, :july => 31,
                        :august => 31, :september => 30, :october => 31,
                        :november => 30, :december => 31 }
 
-    # hash containing month names with their sequence 
+    # hash containing month names with their sequence
     MONTH_WITH_SEQUENCE = { :january => 1, :february => 2, :march => 3,
                             :april => 4, :may => 5, :june => 6, :july => 7,
                             :august => 8, :september => 9, :october => 10,
                             :november => 11, :december => 12 }
-   
-    # array of days names ordered starting with sunday and ending with saturday.
-    DAYS_IN_SEQUENCE = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday",
-                         "Saturday"]
+
+    # array of ordered days names starting from sunday and ending with saturday.
+    DAYS_IN_SEQUENCE = %w(Sunday Monday Tuesday Wednesday Thursday Friday Saturday)
+
+    # array of ordered days names starting from sunday and ending with saturday.
+    WEEKS_IN_SEQUENCE = %w(Last First Second Third Fourth Fifth)
   end
 end

data/lib/modules/day.rb

@@ -4,8 +4,14 @@
 # @author Sachin Singh
 
 module WeekOfMonth
-  module Day
 
+  attr_accessor :config
+
+  def initialize(config = Configuration.new)
+    @config = config
+  end
+
+  module Day
     # gives array of days in month
     # Date.new(2012,1,1).days_array
     #   => [ 1, 2, 3, 4, 5, 6, 7, 8, 9,
@@ -16,6 +22,9 @@ module WeekOfMonth
     # @return [Array]
     def days_array
       day = self.beginning_of_month.to_date.wday
+      if WeekOfMonth.configuration.monday_active == true
+        day = day.zero? ? 6 : day - 1
+      end
       array = []
       array[day] = 1
       (2..self.end_of_month.mday).each {|i| array << i }
@@ -28,8 +37,8 @@ module WeekOfMonth
     def name_of_week_day
       self.class.new(year,month,day).strftime('%A')
     end
-      
-    # this code generates method names like 'upcoming_monday' and 'previous_monday'
+
+    # this code generates methods with names like 'upcoming_monday' and 'previous_monday'
     # Date.new(2013,1,1).upcoming_monday
     # => #<Date: 2013-01-07 ((2456300j,0s,0n),+0s,2299161j)>
     # Date.new(2013,1,1).previous_monday
@@ -42,14 +51,14 @@ module WeekOfMonth
           date = eval "self"
           if date.send(check)
             if date.class == Date
-              date = date.send(value,7) 
+              date = date.send(value,7)
             elsif date.class == Time
               date = date.send(value,(60 * 60 * 24 * 7))
             end
            else
              until date.send(check)
                if date.class == Date
-                 date = date.send(value,1) 
+                 date = date.send(value,1)
                elsif date.class == Time
                  date = date.send(value,(60 * 60 * 24))
                end
@@ -59,6 +68,48 @@ module WeekOfMonth
         end
       end
     end
-   
+
+    # gives last working/business day of the month
+    # Date.new(2014,12,1).last_business_day_of_month
+    # => #<Date: 2014-12-31 ((2457023j,0s,0n),+0s,2299161j)>
+    def last_business_day_of_month
+      all_working_days_of_month.first
+    end
+
+    # returns array of all working days of the month
+    # Date.new(2014,12,1).all_working_days_of_month
+    # => [#<Date: 2014-12-31 ((2457023j,0s,0n),+0s,2299161j)>, #<Date: 2014-12-30 ((2457022j,0s,0n),+0s,2299161j)>,
+      # #<Date: 2014-12-29 ((2457021j,0s,0n),+0s,2299161j)>, #<Date: 2014-12-26 ((2457018j,0s,0n),+0s,2299161j)>,
+      # #<Date: 2014-12-25 ((2457017j,0s,0n),+0s,2299161j)>, #<Date: 2014-12-24 ((2457016j,0s,0n),+0s,2299161j)>,
+      # #<Date: 2014-12-23 ((2457015j,0s,0n),+0s,2299161j)>, #<Date: 2014-12-22 ((2457014j,0s,0n),+0s,2299161j)>,
+      # #<Date: 2014-12-19 ((2457011j,0s,0n),+0s,2299161j)>, #<Date: 2014-12-18 ((2457010j,0s,0n),+0s,2299161j)>,
+      # #<Date: 2014-12-17 ((2457009j,0s,0n),+0s,2299161j)>, #<Date: 2014-12-16 ((2457008j,0s,0n),+0s,2299161j)>,
+      # #<Date: 2014-12-15 ((2457007j,0s,0n),+0s,2299161j)>, #<Date: 2014-12-12 ((2457004j,0s,0n),+0s,2299161j)>,
+      # #<Date: 2014-12-11 ((2457003j,0s,0n),+0s,2299161j)>, #<Date: 2014-12-10 ((2457002j,0s,0n),+0s,2299161j)>,
+      # #<Date: 2014-12-09 ((2457001j,0s,0n),+0s,2299161j)>, #<Date: 2014-12-08 ((2457000j,0s,0n),+0s,2299161j)>,
+      # #<Date: 2014-12-05 ((2456997j,0s,0n),+0s,2299161j)>, #<Date: 2014-12-04 ((2456996j,0s,0n),+0s,2299161j)>,
+      # #<Date: 2014-12-03 ((2456995j,0s,0n),+0s,2299161j)>, #<Date: 2014-12-02 ((2456994j,0s,0n),+0s,2299161j)>,
+      # #<Date: 2014-12-01 ((2456993j,0s,0n),+0s,2299161j)>]
+    def all_working_days_of_month
+      self.end_of_month.downto(beginning_of_month).select{|day| day.working_day? }
+    end
+
+    # returns array of all non working days of the month
+    # Date.new(2014,12,1).all_non_week_days_of_month
+    # => [#<Date: 2014-12-28 ((2457020j,0s,0n),+0s,2299161j)>, #<Date: 2014-12-27 ((2457019j,0s,0n),+0s,2299161j)>,
+      # #<Date: 2014-12-21 ((2457013j,0s,0n),+0s,2299161j)>, #<Date: 2014-12-20 ((2457012j,0s,0n),+0s,2299161j)>,
+      # #<Date: 2014-12-14 ((2457006j,0s,0n),+0s,2299161j)>, #<Date: 2014-12-13 ((2457005j,0s,0n),+0s,2299161j)>,
+      # #<Date: 2014-12-07 ((2456999j,0s,0n),+0s,2299161j)>, #<Date: 2014-12-06 ((2456998j,0s,0n),+0s,2299161j)>]
+    def all_non_week_days_of_month
+      self.end_of_month.downto(beginning_of_month).select{|day| day.week_end? }
+    end
+
+    # gives first working/business day of the month
+    # Date.new(2014,12,1).first_working_day_of_the_month
+    # => #<Date: 2014-12-01 ((2456993j,0s,0n),+0s,2299161j)>
+    def first_working_day_of_the_month
+      self.beginning_of_month.upto(end_of_month).find{|day| day.working_day? }
+    end
+
   end
 end

data/lib/modules/month.rb

@@ -64,5 +64,19 @@ module WeekOfMonth
       end
     end
     
+    # this code generates method named like 'first_monday_in_month',
+    # 'second_tuesday_in_month', 'last_friday_in_month' etc. for 
+    # first, second, third, fourth and last seven days of week
+    # Date.new(2014,11).third_saturday_in_month
+    #   => #<Date: 2014-11-15>
+    # @return [Date]
+    DAYS_IN_SEQUENCE.each_with_index do |day_name, i|
+      WEEKS_IN_SEQUENCE.each.with_index(-1) do |week_number, j|
+        method_name = "#{week_number.downcase}_#{day_name.downcase}_in_month".to_sym
+        define_method(method_name) do
+          self.class.new(year, month, week_split.map{|d| d[i] }.compact[j])
+        end
+      end
+    end
   end
 end

data/lib/modules/version.rb

@@ -1,5 +1,5 @@
 # @author Sachin Singh
 
 module WeekOfMonth
-  VERSION = '1.2.3.2'
+  VERSION = '1.2.3.4'
 end

data/lib/modules/week.rb

@@ -1,4 +1,4 @@
-# @author Sachion Singh 
+# @author Sachion Singh
 
 RUBY_VERSION < '1.9' ? require('modules/constant') : require_relative('constant')
 
@@ -40,7 +40,7 @@ module WeekOfMonth
         week_of_month
       end
     end
-    
+
     # checks whether the given day lies in first week of month
     # Date.new(2012,11,1).first_week?
     #   => true
@@ -48,7 +48,7 @@ module WeekOfMonth
     def first_week?
       week_split[0].include?((self.day))
     end
-    
+
     # checks whether the given day lies in second week of month
     # Date.new(2012,11,8).second_week?
     #   => true
@@ -91,13 +91,21 @@ module WeekOfMonth
 
     # returns week split of the month for the given date
     # example-
-    # Date.new(2012,1,1).week_split
+    # Optional argument to change first week day to Monday
+    # Date.new(2012,1,1).week_split       -> Sunday is first week day
     #   => [[1, 2, 3, 4, 5, 6, 7],
-    #       [8, 9, 10, 11, 12, 13, 14], 
-    #       [15, 16, 17, 18, 19, 20, 21], 
-    #       [22, 23, 24, 25, 26, 27, 28], 
+    #       [8, 9, 10, 11, 12, 13, 14],
+    #       [15, 16, 17, 18, 19, 20, 21],
+    #       [22, 23, 24, 25, 26, 27, 28],
     #       [29, 30, 31]
-    # @return [Array] 
+    # Date.new(2012,1,1).week_split(true) -> Monday is first week day
+    #   => [[nil,nil,nil,nil,nil,nil,1],
+    #       [2, 3, 4, 5, 6, 7, 8],
+    #       [9, 10, 11, 12, 13, 14, 15],
+    #       [16, 17, 18, 19, 20, 21, 22],
+    #       [23, 24, 25, 26, 27, 28, 29],
+    #       [30, 31]
+    # @return [Array]
     def week_split
       days_array.each_slice(7).to_a
     end
@@ -107,23 +115,23 @@ module WeekOfMonth
     #   => 'Third'
     # Date.new(2012,11,30).week_of_month_in_fr
     #   => "Cinquième"
-    # @return [String] 
+    # @return [String]
     constants.select{|x| x.to_s.match("WEEK_OF_MONTH_IN_")}.each do |const|
       define_method(const.to_s.downcase) do
         eval "#{const.to_s}[week_of_month]"
       end
     end
-    
+
     # it returns days past in the week
     # Date.new(2012,11,15).days_past_in_week
     #   => 4
     # Time.new(2012,11,30).days_past_in_week
     #   => 5
-    # @return [Fixnum] 
+    # @return [Fixnum]
     def days_past_in_week
       self.to_date.cwday
     end
-    
+
     # it returns days left in the week
     # Date.new(2012,11,15).days_left_in_week
     #   => 3
@@ -133,23 +141,23 @@ module WeekOfMonth
     def days_left_in_week
       7 - days_past_in_week
     end
-    
+
     # it returns date of the first day(sunday) of the week
     # Date.new(2012,11,15).beginning_of_week
     #   => #<Date: 2012-11-12 ((2456244j,0s,0n),+0s,2299161j)>
     # Time.new(2012,11,30).beginning_of_week
     #   => 2012-11-29 23:59:55 +0530
-    # @return [Date || Time] 
+    # @return [Date || Time]
     def beginning_of_week
       self.class.new(year,month,current_week.detect {|i| !i.nil?})
     end
-    
+
     # it returns date of the last day(saturday) of the week
     # Date.new(2012,11,15).end_of_week
     #   => #<Date: 2012-11-19 ((2456251j,0s,0n),+0s,2299161j)>
     # Time.new(2012,11,30).end_of_week
     #   => 2012-11-30 00:00:02 +0530
-    # @return [Date || Time] 
+    # @return [Date || Time]
     def end_of_week
       if current_week.index(self.day) == 6
         self.class.new(year,month,current_week.last)
@@ -161,42 +169,42 @@ module WeekOfMonth
         end
       end
     end
-    
+
     # it returns date of the next week day.
     # Date.new(2012,11,15).next_week
     #   => #<Date: 2012-11-22 ((2456254j,0s,0n),+0s,2299161j)>
     # Time.new(2012,11,30).next_week
     #   => 2012-11-30 00:00:07 +0530
-    # @return [Date || Time] 
+    # @return [Date || Time]
     def next_week
       if self.class == Date
-        self + 7 
+        self + 7
       elsif self.class == Time
         self + (60 * 60 * 24 * 7)
       end
     end
-    
+
     # it returns date of the previous week day.
     # Date.new(2012,11,15).previous_week
     #   => #<Date: 2012-11-08 ((2456240j,0s,0n),+0s,2299161j)>
     # Time.new(2012,11,30).previous_week
     #   => 2012-11-29 23:59:53 +0530
-    # @return [Date || Time] 
+    # @return [Date || Time]
     def previous_week
       if self.class == Date
-        self - 7 
+        self - 7
       elsif self.class == Time
         self - (60 * 60 * 24 * 7)
       end
     end
-    
+
     # it returns array of days in current week.
     # Date.new(2013,1,13).current_week
     # => [7, 8, 9, 10, 11, 12, 13]
-    # @return [Array]    
+    # @return [Array]
     def current_week
       week_split.select{|c| c.include?((self.day))}.flatten
     end
-    
+
   end
 end

data/lib/test/modules/test_constant.rb

@@ -6,61 +6,60 @@ RUBY_VERSION < '1.9' ? require('lib/week_of_month') : require_relative('../../we
 
 
 class TestConstant < Test::Unit::TestCase
-  
+
   def test_constants_present?
     [Date,Time].each do |klass|
       assert klass::WEEK_OF_MONTH_IN_ENG
-    
+
       assert klass::WEEK_OF_MONTH_IN_GER
-    
+
       assert klass::WEEK_OF_MONTH_IN_FR
-    
+
       assert klass::WEEK_OF_MONTH_IN_JAP
-    
+
       assert klass::MONTH_WITH_DAY
-    
+
       assert klass::MONTH_WITH_SEQUENCE
 
       assert klass::DAYS_IN_SEQUENCE
     end
   end
-  
+
   def test_constants_value
     [Date,Time].each do |klass|
       assert_equal({ 1 => 'First', 2 => 'Second',
                      3 => 'Third', 4 => 'Fourth',
                      5 => 'Fifth', 6 => 'Sixth',
                      7 =>"Seventh" }, klass::WEEK_OF_MONTH_IN_ENG)
-                   
-      assert_equal({ 1 => 'First', 2 => 'Second',
-                     3 => 'Third', 4 => 'Quatrième',
-                     5 => 'Cinquième', 6 => 'sixième',
-                     7 => "septième" }, klass::WEEK_OF_MONTH_IN_FR)
-                   
+
+      assert_equal({ 1 => 'Premier', 2 => 'Deuxième',
+                     3 => 'Troisième', 4 => 'Quatrième',
+                     5 => 'Cinquième', 6 => 'Sixième',
+                     7 => "Septième" }, klass::WEEK_OF_MONTH_IN_FR)
+
       assert_equal({ 1 => 'First', 2 => 'Second',
                      3 => 'Dritten', 4 => 'Vierte',
                      5 => 'Fünfte', 6 => 'Sechste',
                      7 => "siebte" }, klass::WEEK_OF_MONTH_IN_GER)
-                   
+
       assert_equal({ 1=>'最初', 2 =>'秒',
                                           3 =>'サード', 4=> '第4回',
                      5 =>'第五', 6=> 'シックス' ,
                      7 => "第7" } ,  klass::WEEK_OF_MONTH_IN_JAP)
-                   
-      assert_equal({ :january => 1, :february => 2, :march => 3, 
-                     :april => 4, :may => 5, :june => 6, :july => 7, 
-                     :august => 8, :september => 9, :october => 10, 
+
+      assert_equal({ :january => 1, :february => 2, :march => 3,
+                     :april => 4, :may => 5, :june => 6, :july => 7,
+                     :august => 8, :september => 9, :october => 10,
                      :november => 11, :december => 12 }, klass::MONTH_WITH_SEQUENCE)
-    
-      assert_equal({ :january => 31, :february => 28, :march => 31, 
-                     :april => 30, :may => 31, :june => 30, :july => 31, 
-                     :august => 31, :september => 30, :october => 31, 
+
+      assert_equal({ :january => 31, :february => 28, :march => 31,
+                     :april => 30, :may => 31, :june => 30, :july => 31,
+                     :august => 31, :september => 30, :october => 31,
                      :november => 30, :december => 31 }, klass::MONTH_WITH_DAY)
-                     
-      assert_equal(["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday",
-                     "Friday", "Saturday"], klass::DAYS_IN_SEQUENCE)
+
+      assert_equal(%w(Sunday Monday Tuesday Wednesday Thursday Friday Saturday), klass::DAYS_IN_SEQUENCE)
     end
   end
-    
+
 end
-  
+

data/lib/test/modules/test_day.rb

@@ -28,7 +28,32 @@ class TestDay < Test::Unit::TestCase
     end
   end
 
+  def test_days_array_monday
+    WeekOfMonth.configuration.monday_active = true
+    [Date,Time].each do |klass|
+      object = klass.new(2014,11,3)
+
+      days_array_for_november =  [nil, nil, nil, nil, nil, 1, 2,
+                                  3, 4, 5, 6, 7, 8, 9, 10, 11,
+                                  12, 13, 14, 15, 16, 17, 18,
+                                  19, 20, 21, 22, 23, 24, 25, 26,
+                                  27, 28, 29, 30]
+      assert_kind_of Array,object.days_array
+      assert_equal days_array_for_november, object.days_array
+
+      object = klass.new(2014,12,1)
+      days_array_for_december = [ 1, 2, 3, 4, 5, 6, 7,
+                             8, 9, 10, 11, 12, 13,
+                             14, 15, 16, 17, 18, 19,
+                             20, 21, 22, 23, 24, 25,
+                             26, 27, 28, 29, 30, 31]
+      assert_kind_of Array,object.days_array
+      assert_equal days_array_for_december, object.days_array
+    end
+  end
+
   def test_name_of_week_day
+    WeekOfMonth.configuration.monday_active = false
     [Date,Time].each do |klass|
       assert_equal "Saturday",  klass.new(2012,12,1).name_of_week_day
       assert_equal "Sunday",  klass.new(2012,12,2).name_of_week_day
@@ -126,5 +151,34 @@ class TestDay < Test::Unit::TestCase
       assert_equal klass.new(2012,12,30), klass.new(2013,1,1).previous_sunday
     end
   end
+    
+  def test_all_working_days_of_month
+    [Date].each do |klass|
+      assert_equal [
+        klass.new(2013,4,30), klass.new(2013,4,29),
+        klass.new(2013,4,26), klass.new(2013,4,25), klass.new(2013,4,24), klass.new(2013,4,23), klass.new(2013,4,22),
+        klass.new(2013,4,19), klass.new(2013,4,18), klass.new(2013,4,17), klass.new(2013,4,16), klass.new(2013,4,15),
+        klass.new(2013,4,12), klass.new(2013,4,11), klass.new(2013,4,10), klass.new(2013,4,9), klass.new(2013,4,8),
+        klass.new(2013,4,5), klass.new(2013,4,4), klass.new(2013,4,3), klass.new(2013,4,2), klass.new(2013,4,1),
+      ], klass.new(2013,4,1).all_working_days_of_month
+    end
+  end
+
+  def test_all_non_week_days_of_month
+    [Date].each do |klass|
+      assert_equal [
+        klass.new(2013,4,28), klass.new(2013,4,27),
+        klass.new(2013,4,21), klass.new(2013,4,20),
+        klass.new(2013,4,14), klass.new(2013,4,13),
+        klass.new(2013,4,7), klass.new(2013,4,6),
+      ], klass.new(2013,4,1).all_non_week_days_of_month
+    end
+  end
+
+  def test_first_working_day_of_the_month
+    [Date].each do |klass|
+      assert_equal klass.new(2013,1,1), klass.new(2013,1,1).first_working_day_of_the_month
+    end
+  end
 
-end
+end

data/lib/test/modules/test_week.rb

@@ -6,31 +6,31 @@ RUBY_VERSION < '1.9' ? require('lib/week_of_month') : require_relative('../../we
 
 
 class TestWeek < Test::Unit::TestCase
-  
+
    def test_week_of_month
-    [Date,Time].each do |klass| 
+    [Date,Time].each do |klass|
       assert_equal 5, klass.new(2013,1,31).week_of_month
-       
+
       assert_equal 5, klass.new(2013,2,28).week_of_month
-       
+
       assert_equal 6, klass.new(2013,3,31).week_of_month
-       
+
       assert_equal 5, klass.new(2013,4,30).week_of_month
-       
+
       assert_equal 5, klass.new(2013,5,31).week_of_month
-       
+
       assert_equal 6, klass.new(2013,6,30).week_of_month
-       
+
       assert_equal 5, klass.new(2013,7,31).week_of_month
-      
+
       assert_equal 5, klass.new(2013,8,31).week_of_month
-       
+
       assert_equal 5, klass.new(2013,9,30).week_of_month
-       
+
       assert_equal 5, klass.new(2013,10,31).week_of_month
-       
+
       assert_equal 5, klass.new(2013,11,30).week_of_month
-  
+
       assert_equal 5, klass.new(2013,12,31).week_of_month
     end
   end
@@ -73,7 +73,7 @@ class TestWeek < Test::Unit::TestCase
                              [27, 28, 29, 30, 31]]
       assert_kind_of Array,object.week_split
       assert_equal split_for_january, object.week_split
-    
+
       object = Date.new(2013,2,15)
       split_for_october = [[nil, nil, nil, nil, nil, 1, 2],
                            [3, 4, 5, 6, 7, 8, 9],
@@ -84,7 +84,7 @@ class TestWeek < Test::Unit::TestCase
       assert_equal split_for_october, object.week_split
     end
   end
-  
+
   def test_first_week?
     [Date,Time].each do |klass|
       assert klass.new(2012,1,1).first_week?
@@ -103,14 +103,14 @@ class TestWeek < Test::Unit::TestCase
     [Date,Time].each do |klass|
       assert klass.new(2012,10,31).last_week?
       assert !klass.new(2012,10,20).last_week?
-    end  
+    end
   end
 
   def test_total_weeks
     [Date,Time].each do |klass|
       assert_equal 5, klass.new(2012,10,31).total_weeks
       assert_equal 6, klass.new(2012,12,20).total_weeks
-    end  
+    end
   end
 
   def test_week_of_month_in_eng
@@ -123,18 +123,18 @@ class TestWeek < Test::Unit::TestCase
       assert_equal 'Sixth', klass.new(2012,12,31).week_of_month_in_eng
     end
   end
-  
+
   def test_week_of_month_in_fr
     [Date,Time].each do |klass|
-      assert_equal 'First', klass.new(2012,12,1).week_of_month_in_fr
-      assert_equal 'Second', klass.new(2012,12,4).week_of_month_in_fr
-      assert_equal 'Third', klass.new(2012,12,9).week_of_month_in_fr
+      assert_equal 'Premier', klass.new(2012,12,1).week_of_month_in_fr
+      assert_equal 'Deuxième', klass.new(2012,12,4).week_of_month_in_fr
+      assert_equal 'Troisième', klass.new(2012,12,9).week_of_month_in_fr
       assert_equal 'Quatrième', klass.new(2012,12,16).week_of_month_in_fr
       assert_equal 'Cinquième', klass.new(2012,12,24).week_of_month_in_fr
-      assert_equal 'sixième', klass.new(2012,12,31).week_of_month_in_fr
+      assert_equal 'Sixième', klass.new(2012,12,31).week_of_month_in_fr
     end
   end
-  
+
   def test_week_of_month_in_ger
     [Date,Time].each do |klass|
       assert_equal 'First', klass.new(2012,12,1).week_of_month_in_ger
@@ -145,7 +145,7 @@ class TestWeek < Test::Unit::TestCase
       assert_equal 'Sechste', klass.new(2012,12,31).week_of_month_in_ger
     end
   end
-  
+
   def test_week_of_month_in_jap
     [Date,Time].each do |klass|
       assert_equal '最初', klass.new(2012,12,1).week_of_month_in_jap
@@ -156,7 +156,7 @@ class TestWeek < Test::Unit::TestCase
       assert_equal 'シックス',  klass.new(2012,12,31).week_of_month_in_jap
     end
   end
-  
+
   def test_week_end?
     [Date,Time].each do |klass|
       assert !klass.new(2012,10,1).week_end?
@@ -165,7 +165,7 @@ class TestWeek < Test::Unit::TestCase
       assert klass.new(2012,10,7).week_end?
     end
   end
-  
+
   def test_working_day?
     [Date,Time].each do |klass|
       assert klass.new(2012,10,1).working_day?
@@ -175,51 +175,71 @@ class TestWeek < Test::Unit::TestCase
     end
   end
 
-   def test_days_past_in_week
-     [Date,Time].each do |klass|
-       assert_equal 2, klass.new(2013,1,1).days_past_in_week
-     end
-   end
-
-   def test_days_left_in_week
-      [Date,Time].each do |klass|
-        assert_equal 5, klass.new(2013,1,1).days_left_in_week
-      end
-    end
-    
-    def test_beginning_of_week
-      [Date,Time].each do |klass|
-        assert_equal klass.new(2012,11,25), klass.new(2012,11,26).beginning_of_week
-        assert_equal klass.new(2012,11,25), klass.new(2012,11,25).beginning_of_week
-        assert_equal klass.new(2012,11,25), klass.new(2012,11,30).beginning_of_week
-      end
-    end
-    
-    def test_end_of_week
-      [Date,Time].each do |klass|
-        assert_equal klass.new(2012,12,1), klass.new(2012,12,1).end_of_week
-        assert_equal klass.new(2012,12,8), klass.new(2012,12,2).end_of_week
-        assert_equal klass.new(2012,12,8), klass.new(2012,12,3).end_of_week
-        assert_equal klass.new(2012,12,8), klass.new(2012,12,7).end_of_week
-      end
-    end
-    
-    def test_next_week
-      [Date,Time].each do |klass|
-        assert_equal klass.new(2012,12,8), klass.new(2012,12,1).next_week
-        assert_equal klass.new(2012,12,22), klass.new(2012,12,15).next_week
-        assert_equal klass.new(2013,1,5), klass.new(2012,12,29).next_week
-        assert_equal klass.new(2012,12,26), klass.new(2012,12,19).next_week
-      end
-    end
-    
-    def test_previous_week
-      [Date,Time].each do |klass|
-        assert_equal klass.new(2012,12,1), klass.new(2012,12,8).previous_week
-        assert_equal klass.new(2012,12,15), klass.new(2012,12,22).previous_week
-        assert_equal klass.new(2012,12,29), klass.new(2013,1,5).previous_week
-        assert_equal klass.new(2012,12,19), klass.new(2012,12,26).previous_week
-      end
-    end
-  
-end
+  def test_days_past_in_week
+    [Date,Time].each do |klass|
+      assert_equal 2, klass.new(2013,1,1).days_past_in_week
+    end
+  end
+
+  def test_days_left_in_week
+    [Date,Time].each do |klass|
+      assert_equal 5, klass.new(2013,1,1).days_left_in_week
+    end
+  end
+
+  def test_beginning_of_week
+    [Date,Time].each do |klass|
+      assert_equal klass.new(2012,11,25), klass.new(2012,11,25).beginning_of_week
+      assert_equal klass.new(2012,11,25), klass.new(2012,11,26).beginning_of_week
+      assert_equal klass.new(2012,11,25), klass.new(2012,11,30).beginning_of_week
+    end
+  end
+
+  def test_end_of_week
+    [Date,Time].each do |klass|
+      assert_equal klass.new(2012,12,1), klass.new(2012,12,1).end_of_week
+      assert_equal klass.new(2012,12,8), klass.new(2012,12,2).end_of_week
+      assert_equal klass.new(2012,12,8), klass.new(2012,12,3).end_of_week
+      assert_equal klass.new(2012,12,8), klass.new(2012,12,7).end_of_week
+    end
+  end
+
+  def test_next_week
+    [Date,Time].each do |klass|
+      assert_equal klass.new(2012,12,8), klass.new(2012,12,1).next_week
+      assert_equal klass.new(2012,12,22), klass.new(2012,12,15).next_week
+      assert_equal klass.new(2013,1,5), klass.new(2012,12,29).next_week
+      assert_equal klass.new(2012,12,26), klass.new(2012,12,19).next_week
+    end
+  end
+
+  def test_previous_week
+    [Date,Time].each do |klass|
+      assert_equal klass.new(2012,12,1), klass.new(2012,12,8).previous_week
+      assert_equal klass.new(2012,12,15), klass.new(2012,12,22).previous_week
+      assert_equal klass.new(2012,12,29), klass.new(2013,1,5).previous_week
+      assert_equal klass.new(2012,12,19), klass.new(2012,12,26).previous_week
+    end
+  end
+
+  def test_monday_configured_beginning_of_week
+    WeekOfMonth.configuration.monday_active = true
+    [Date,Time].each do |klass|
+      assert_equal klass.new(2012,11,19), klass.new(2012,11,25).beginning_of_week
+      assert_equal klass.new(2012,11,26), klass.new(2012,11,26).beginning_of_week
+      assert_equal klass.new(2012,11,26), klass.new(2012,11,30).beginning_of_week
+    end
+    WeekOfMonth.configuration.monday_active = false
+  end
+
+  def test_monday_configured_end_of_week
+    WeekOfMonth.configuration.monday_active = true
+    [Date,Time].each do |klass|
+      assert_equal klass.new(2012,12,2), klass.new(2012,12,1).end_of_week
+      assert_equal klass.new(2012,12,2), klass.new(2012,12,2).end_of_week
+      assert_equal klass.new(2012,12,9), klass.new(2012,12,3).end_of_week
+      assert_equal klass.new(2012,12,9), klass.new(2012,12,7).end_of_week
+    end
+    WeekOfMonth.configuration.monday_active = false
+  end
+end

data/lib/week_of_month.rb

@@ -1,10 +1,12 @@
 require 'date'
 require 'time'
 
-def require_file file_name
+# supports both version of ruby 1.8 and 1.9 for loading a file.
+def require_file(file_name)
   RUBY_VERSION < '1.9' ? require(file_name) : require_relative(file_name)
 end
 
+require_file 'modules/configuration'
 require_file 'modules/day'
 require_file 'modules/month'
 require_file 'modules/week'
@@ -27,6 +29,7 @@ end
       end
     end
 
+    # these methods are already defined in ruby 1.9 and above
     unless method_defined?(:sunday?)
       def sunday?    ; self.wday == 0; end
       def monday?    ; self.wday == 1; end
@@ -46,7 +49,7 @@ class Time
   include WeekOfMonth::Month
   include WeekOfMonth::Week
   include WeekOfMonth::Year
-  
+
   def leap?
     self.to_date.leap?
   end
@@ -69,8 +72,13 @@ class Hash
 end
 
 module WeekOfMonth
+  class << self
+    # A WeekOfMonth configuration object. Must act like a hash
+    # See WeekOfMonth::Configuration.
+    attr_writer :configuration
+  end
 
-  def self.first_day=val
+  def self.first_day=(val)
     @first_day = DAYS_IN_SEQUENCE[val]
   end
 
@@ -78,9 +86,16 @@ module WeekOfMonth
     @first_day ||= 0
   end
 
-  def self.configure
-     yield
+  def self.configuration
+    @configuration ||= Configuration.new
   end
 
+  def self.configuration=(config)
+    @configuration = config
+  end
+
+  def self.configure
+    yield configuration
+  end
 end
 

data/license

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2012-2014 Sachin Singh
+Copyright (c) 2012-2016 Sachin Singh
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/week_of_month.gemspec

@@ -1,13 +1,14 @@
+# @author Sachin Singh
+
 require File.expand_path('../lib/modules/version', __FILE__)
 
 Gem::Specification.new do |s|
   s.name          = 'week_of_month'
   s.version       = WeekOfMonth::VERSION
-  s.date          = '2014-07-28'
-  s.summary       = 'Week Of Month!'
+  s.summary       = 'Week of month!'
   s.description   = 'Its gives you week_of_month method on date and time objects, that returns week of the month.'
-  s.authors       = ['Sachin Singh', 'Tommy']
-  s.email         = ['sachin@railsdeveloper.in', 'sachin.y87@gmail.com', 'singhsachin87@yahoo.com']
+  s.authors       =  %w(Sachin87 Tommyixi Matt-- berikin pablorusso AstonJ swapnilchincholkar hitendrasingh ilake)
+  s.email         = %w(sachin@railsdeveloper.in sachin.y87@gmail.com singhsachin87@yahoo.com)
   s.homepage      = 'https://github.com/sachin87/week-of-month'
   s.files         = `git ls-files`.split("\n").sort
   s.require_paths = ['lib']
@@ -15,4 +16,5 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'rake', '>= 10.1.0'
   s.add_development_dependency 'bundler', '>= 1.0'
+  s.add_development_dependency 'test-unit'
 end

metadata

@@ -1,15 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: week_of_month
 version: !ruby/object:Gem::Version
-  version: 1.2.3.2
+  version: 1.2.3.4
 platform: ruby
 authors:
-- Sachin Singh
-- Tommy
+- Sachin87
+- Tommyixi
+- Matt--
+- berikin
+- pablorusso
+- AstonJ
+- swapnilchincholkar
+- hitendrasingh
+- ilake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-28 00:00:00.000000000 Z
+date: 2016-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -39,6 +46,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Its gives you week_of_month method on date and time objects, that returns
   week of the month.
 email:
@@ -55,6 +76,7 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
+- lib/modules/configuration.rb
 - lib/modules/constant.rb
 - lib/modules/day.rb
 - lib/modules/month.rb
@@ -89,8 +111,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
-summary: Week Of Month!
+summary: Week of month!
 test_files: []
+has_rdoc: