week_of_month 1.2.2.1 → 1.2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cc308a8f81dbd9579c4aa6fbef97b4001fbd17f
-  data.tar.gz: bb5dc79f8c80fc31608ecce03cddbdc24fd390dc
+  metadata.gz: eb8e17155b66f00d79619774220611769249f90d
+  data.tar.gz: de433fd66043692ee66d04705ec26beec126d91f
 SHA512:
-  metadata.gz: 014a5ad79f2aa49d60d8b91b012dec5e29d5b714dacd73866db4b94e317dc275a61c8f1efe178549315ab600a6e5694ac1a8f27ce06e846c3bc71e960f6d96bc
-  data.tar.gz: 4b3c698b9a98ddab51a6dbcdded707c89dbfcab19ebd241e23dcc4d339432638cb3ab071476924064d04e899ba66a8f8f5d2cc47748a4abe5014f6dcdd8b1369
+  metadata.gz: 481f139413ab807b87057c916aa09f4f19eea12745cd42058c2395fadc1b28d83fbf7c73de48de71bb18b20eb4ead9111c9ebd8fa7c051dead44c1390d44c26a
+  data.tar.gz: e487771ab29e5c6cb351e70a634e83e6f20c37d2e76f0c4f0bbf18107814c6ad534d63cabbba9dc2aa4a282fc258a7291c9bbec66f647899854ac11b882c9bd5

data/Gemfile

@@ -1,2 +1,4 @@
 source 'https://rubygems.org'
 
+gem "rake"
+

data/Gemfile.lock

@@ -1,8 +1,10 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    rake (10.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  rake

data/README.rdoc

@@ -11,6 +11,8 @@ or Rails application. To install, simply add the following to your Gemfile:
 
   gem 'week_of_month'
   
+Run bundle install and don't forget to restart your server after you install a new gem.
+  
 == Usage
              
  It returns week split of that date's month
@@ -25,33 +27,27 @@ or Rails application. To install, simply add the following to your Gemfile:
   
  It returns month's week in which the date lies
     
- Date.new(2012,1,1).week_of_month
- => 1
+ Date.new(2012,1,1).week_of_month => 1
 
  It return true if date lies in first week of month, else false.
        
- Date.new(2012,1,1).first_week?
- => true
+ Date.new(2012,1,1).first_week? => true
    
  It returns true if date lies in second week of month, else false.
    
- Date.new(2012,1,9).second_week?
- => true
+ Date.new(2012,1,9).second_week? => true
     
  It returns true if date lies in last week of month, else false.
   
- Date.new(2012,1,31).last_week?
-  => true
+ Date.new(2012,1,31).last_week? => true
   
  It returns total number of weeks in month.
   
- Date.new(2012,1,31).total_weeks
-  => 5
+ Date.new(2012,1,31).total_weeks => 5
   
  It returns month's week in which the date lies
    
- Date.new(2012,1,31).week_of_month_in_eng
- => "Fifth"
+ Date.new(2012,1,31).week_of_month_in_eng => "Fifth"
    
 == Tools Being Used
 
@@ -87,25 +83,6 @@ august?, september?, october?, november?, december?, last_day_of_month
 
   Fork, fix, then send me a pull request.
   
-== Copyright
-
-(The MIT License)
-
-Copyright (c) 2012-2013 Sachin Singh. See LICENSE for details.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy 
-of this software and associated documentation files (the ‘Software’), to deal 
-in the Software without restriction, including without limitation the rights 
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all 
-copies or substantial portions of the Software.
+## License
 
-THE SOFTWARE IS PROVIDED ‘AS IS’, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A 
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION 
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+use MIT license.

data/lib/modules/constant.rb

@@ -7,19 +7,19 @@ module WeekOfMonth
   module Constant
     
     # hash containg english words from one to seventh
-    WEEK_IN_ENG = { 1 => 'First', 2 => 'Second', 3 => 'Third',
+    WEEK_OF_MONTH_IN_ENG = { 1 => 'First', 2 => 'Second', 3 => 'Third',
                     4 => 'Fourth', 5 => 'Fifth', 6 => 'Sixth', 7 => 'Seventh'}
 
     # hash containg french words from one to seventh
-    WEEK_IN_FR  = { 1 => 'First', 2 => 'Second', 3 => 'Third',
+    WEEK_OF_MONTH_IN_FR  = { 1 => 'First', 2 => 'Second', 3 => 'Third',
                     4 => 'Quatrième', 5 => 'Cinquième', 6 => 'sixième', 7 => 'septième'}
 
     # hash containg german words from one to seventh
-    WEEK_IN_GER = { 1 => 'First', 2 => 'Second', 3 => 'Dritten',
+    WEEK_OF_MONTH_IN_GER = { 1 => 'First', 2 => 'Second', 3 => 'Dritten',
                     4 => 'Vierte', 5 => 'Fünfte', 6 => 'Sechste', 7 => 'siebte'}
 
     # hash containg japneese words from one to seventh
-    WEEK_IN_JAP = { 1 => '最初', 2 => '秒', 3 => 'サード',
+    WEEK_OF_MONTH_IN_JAP = { 1 => '最初', 2 => '秒', 3 => 'サード',
                     4 => '第4回', 5 => '第五', 6=> 'シックス', 7 =>  '第7' }
     
     # hash containg month name with days in that month(in non leap yaer)
@@ -38,4 +38,4 @@ module WeekOfMonth
     DAYS_IN_SEQUENCE = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday",
                          "Saturday"]
   end
-end
+end

data/lib/modules/month.rb

@@ -1,6 +1,6 @@
 # @author Sachion Singh 
 
-require_relative 'constant'
+RUBY_VERSION < '1.9' ? require('modules/constant') : require_relative('constant')
 
 module WeekOfMonth
   module Month

data/lib/modules/week.rb

@@ -1,6 +1,6 @@
 # @author Sachion Singh 
 
-require_relative 'constant'
+RUBY_VERSION < '1.9' ? require('modules/constant') : require_relative('constant')
 
 module WeekOfMonth
   module Week
@@ -16,6 +16,30 @@ module WeekOfMonth
         return (i + 1) if o.include?(self.day)
       end
     end
+
+    # November week_split would like this
+    # [[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]]
+    #
+    # The First Day of week decide its month of week.
+    # The W1 Nov should be Nov 3 - Nov 9
+    #
+    # Date.new(2012,11,15).general_week_of_month
+    #   => 2
+    #
+    # Date.new(2013,11,3).general_week_of_month
+    #   => 1
+    # @return [Fixnum]
+    def general_week_of_month
+      if week_split.first.first.nil?
+        week_of_month - 1
+      else
+        week_of_month
+      end
+    end
     
     # checks whether the given day lies in first week of month
     # Date.new(2012,11,1).first_week?
@@ -84,10 +108,9 @@ module WeekOfMonth
     # Date.new(2012,11,30).week_of_month_in_fr
     #   => "Cinquième"
     # @return [String] 
-    ['eng', 'fr', 'ger', 'jap'].each do |lang|
-      method_name = "week_of_month_in_#{lang}"
-      define_method(method_name) do
-        eval "WEEK_IN_#{lang.upcase}[week_of_month]"
+    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
     
@@ -176,4 +199,4 @@ module WeekOfMonth
     end
     
   end
-end
+end

data/lib/test/modules/test_constant.rb

@@ -2,23 +2,26 @@
 # encoding: utf-8
 
 require 'test/unit'
-require_relative '../../week_of_month'
+RUBY_VERSION < '1.9' ? require('lib/week_of_month') : require_relative('../../week_of_month')
+
 
 class TestConstant < Test::Unit::TestCase
   
   def test_constants_present?
     [Date,Time].each do |klass|
-      assert klass::WEEK_IN_ENG
+      assert klass::WEEK_OF_MONTH_IN_ENG
     
-      assert klass::WEEK_IN_GER
+      assert klass::WEEK_OF_MONTH_IN_GER
     
-      assert klass::WEEK_IN_FR
+      assert klass::WEEK_OF_MONTH_IN_FR
     
-      assert klass::WEEK_IN_JAP
+      assert klass::WEEK_OF_MONTH_IN_JAP
     
       assert klass::MONTH_WITH_DAY
     
       assert klass::MONTH_WITH_SEQUENCE
+
+      assert klass::DAYS_IN_SEQUENCE
     end
   end
   
@@ -27,22 +30,22 @@ class TestConstant < Test::Unit::TestCase
       assert_equal({ 1 => 'First', 2 => 'Second',
                      3 => 'Third', 4 => 'Fourth',
                      5 => 'Fifth', 6 => 'Sixth',
-                     7 =>"Seventh" }, klass::WEEK_IN_ENG)
+                     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_IN_FR)
+                     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_IN_GER)
+                     7 => "siebte" }, klass::WEEK_OF_MONTH_IN_GER)
                    
       assert_equal({ 1=>'最初', 2 =>'秒',
                                           3 =>'サード', 4=> '第4回',
                      5 =>'第五', 6=> 'シックス' ,
-                     7 => "第7" } ,  klass::WEEK_IN_JAP)
+                     7 => "第7" } ,  klass::WEEK_OF_MONTH_IN_JAP)
                    
       assert_equal({ :january => 1, :february => 2, :march => 3, 
                      :april => 4, :may => 5, :june => 6, :july => 7, 
@@ -60,4 +63,4 @@ class TestConstant < Test::Unit::TestCase
   end
     
 end
-  
+  

data/lib/test/modules/test_day.rb

@@ -3,12 +3,13 @@
 
 require 'test/unit'
 
-require_relative '../../week_of_month'
+RUBY_VERSION < '1.9' ? require('lib/week_of_month') : require_relative('../../week_of_month')
 class TestDay < Test::Unit::TestCase
-  
+
   def test_days_array
     [Date,Time].each do |klass|
       object = klass.new(2012,2,8)
+
       days_array_for_february =  [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,

data/lib/test/modules/test_month.rb

@@ -2,7 +2,7 @@
 # encoding: utf-8
 
 require 'test/unit'
-require_relative '../../week_of_month'
+RUBY_VERSION < '1.9' ? require('lib/week_of_month') : require_relative('../../week_of_month')
 
 class TestMonth < Test::Unit::TestCase
   
@@ -24,7 +24,7 @@ class TestMonth < Test::Unit::TestCase
     
       assert klass.new(2012,8,1).august?
      
-      assert klass.new(2012,9,1).september? 
+      assert klass.new(2012,9,1).september?
      
       assert klass.new(2012,10,1).october?
      

data/lib/test/modules/test_week.rb

@@ -2,7 +2,8 @@
 # encoding: utf-8
 
 require 'test/unit'
-require_relative '../../week_of_month'
+RUBY_VERSION < '1.9' ? require('lib/week_of_month') : require_relative('../../week_of_month')
+
 
 class TestWeek < Test::Unit::TestCase
   
@@ -33,7 +34,35 @@ class TestWeek < Test::Unit::TestCase
       assert_equal 5, klass.new(2013,12,31).week_of_month
     end
   end
-    
+
+   def test_general_week_of_month
+    [Date,Time].each do |klass|
+      assert_equal 4, klass.new(2013,1,31).general_week_of_month
+
+      assert_equal 4, klass.new(2013,2,28).general_week_of_month
+
+      assert_equal 5, klass.new(2013,3,31).general_week_of_month
+
+      assert_equal 4, klass.new(2013,4,30).general_week_of_month
+
+      assert_equal 4, klass.new(2013,5,31).general_week_of_month
+
+      assert_equal 5, klass.new(2013,6,30).general_week_of_month
+
+      assert_equal 4, klass.new(2013,7,31).general_week_of_month
+
+      assert_equal 4, klass.new(2013,8,31).general_week_of_month
+
+      assert_equal 5, klass.new(2013,9,30).general_week_of_month
+
+      assert_equal 4, klass.new(2013,10,31).general_week_of_month
+
+      assert_equal 4, klass.new(2013,11,30).general_week_of_month
+
+      assert_equal 5, klass.new(2013,12,31).general_week_of_month
+    end
+  end
+
   def test_week_split
     [Date,Time].each do |klass|
       object = klass.new(2013,1,10)

data/lib/test/modules/test_year.rb

@@ -4,7 +4,7 @@
 # @author Sachin Singh
 
 require 'test/unit'
-require_relative '../../week_of_month'
+RUBY_VERSION < '1.9' ? require('lib/week_of_month') : require_relative('../../week_of_month')
 
 class TestYear < Test::Unit::TestCase
   

data/lib/week_of_month.rb

@@ -1,15 +1,32 @@
 require 'date'
 require 'time'
-require_relative 'modules/day'
-require_relative 'modules/month'
-require_relative 'modules/week'
-require_relative 'modules/year'
+
+RUBY_VERSION < '1.9' ? require('modules/day')   : require_relative('modules/day')
+RUBY_VERSION < '1.9' ? require('modules/month') : require_relative('modules/month')
+RUBY_VERSION < '1.9' ? require('modules/week')  : require_relative('modules/week')
+RUBY_VERSION < '1.9' ? require('modules/year')  : require_relative('modules/year')
 
 class Date
   include WeekOfMonth::Day
   include WeekOfMonth::Month
   include WeekOfMonth::Week
   include WeekOfMonth::Year
+
+  unless method_defined?(:to_date)
+    def to_date
+      ::Date.new(year, month, day)
+    end
+  end
+
+  unless method_defined?(:sunday?)
+    def sunday?    ; self.wday == 0; end
+    def monday?    ; self.wday == 1; end
+    def tuesday?   ; self.wday == 2; end
+    def wednesday? ; self.wday == 3; end
+    def thursday?  ; self.wday == 4; end
+    def friday?    ; self.wday == 5; end
+    def saturday?  ; self.wday == 6; end
+  end
 end
 
 class Time
@@ -21,4 +38,36 @@ class Time
   def leap?
     self.to_date.leap?
   end
+
+  if RUBY_VERSION < '1.9'
+    def self.new(year=Time.now.year, month=Time.now.month, day=Time.now.day, hour=Time.now.hour, min=Time.now.min, sec=Time.now.sec, millisecond=(Time.now.to_f * 1000.0).to_i)
+      Time.local(year, month, day, hour, min, sec, millisecond)
+    end
+  end
+
+  unless method_defined?(:to_date)
+    def to_date
+      ::Date.new(year, month, day)
+    end
+  end
+  unless method_defined?(:sunday?)
+    def sunday?    ; self.wday == 0; end
+    def monday?    ; self.wday == 1; end
+    def tuesday?   ; self.wday == 2; end
+    def wednesday? ; self.wday == 3; end
+    def thursday?  ; self.wday == 4; end
+    def friday?    ; self.wday == 5; end
+    def saturday?  ; self.wday == 6; end
+  end
 end
+
+class Hash
+  unless method_defined?(:key)
+    def key(value)
+      result = nil
+      self.each do |k,v| result = k if v == value && result == nil; end if self.values.include?(value)
+      result
+    end
+  end
+end
+

data/license

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2012-2013 Sachin Singh
+Copyright (c) 2012-2014 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,12 @@
 Gem::Specification.new do |s|
   s.name        = 'week_of_month'
-  s.version     = '1.2.2.1'
-  s.date        = '2013-08-12'
+  s.version     = '1.2.3.1'
+  s.date        = '2014-04-27'
   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"]
   s.email       = 'sachin@railsdeveloper.in'
   s.homepage    = 'https://github.com/sachin87/week-of-month'
-  s.summary     = %q{}
   s.files         = `git ls-files`.split("\n").sort
   s.require_paths = ["lib"]
   s.license = 'MIT'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: week_of_month
 version: !ruby/object:Gem::Version
-  version: 1.2.2.1
+  version: 1.2.3.1
 platform: ruby
 authors:
 - Sachin Singh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-12 00:00:00.000000000 Z
+date: 2014-04-27 00:00:00.000000000 Z
 dependencies: []
 description: Its gives you week_of_month method on date and time objects, that returns
   week of the month.
@@ -58,5 +58,5 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: ''
+summary: Week Of Month!
 test_files: []