week_of_month 1.2.3.4 → 1.2.4

data/lib/test/modules/time/test_week.rb

@@ -0,0 +1,201 @@
+#!/bin/env ruby
+# encoding: utf-8
+
+require 'test/unit'
+RUBY_VERSION < '1.9' ? require('lib/week_of_month') : require_relative('../../../week_of_month')
+
+class TestWeekForTime < Test::Unit::TestCase
+  def test_week_of_month
+    assert_equal 5, Time.new(2013, 1, 31).week_of_month
+
+    assert_equal 5, Time.new(2013, 2, 28).week_of_month
+
+    assert_equal 6, Time.new(2013, 3, 31).week_of_month
+
+    assert_equal 5, Time.new(2013, 4, 30).week_of_month
+
+    assert_equal 5, Time.new(2013, 5, 31).week_of_month
+
+    assert_equal 6, Time.new(2013, 6, 30).week_of_month
+
+    assert_equal 5, Time.new(2013, 7, 31).week_of_month
+
+    assert_equal 5, Time.new(2013, 8, 31).week_of_month
+
+    assert_equal 5, Time.new(2013, 9, 30).week_of_month
+
+    assert_equal 5, Time.new(2013, 10, 31).week_of_month
+
+    assert_equal 5, Time.new(2013, 11, 30).week_of_month
+
+    assert_equal 5, Time.new(2013, 12, 31).week_of_month
+  end
+
+  def test_general_week_of_month
+    assert_equal 4, Time.new(2013, 1, 31).general_week_of_month
+
+    assert_equal 4, Time.new(2013, 2, 28).general_week_of_month
+
+    assert_equal 5, Time.new(2013, 3, 31).general_week_of_month
+
+    assert_equal 4, Time.new(2013, 4, 30).general_week_of_month
+
+    assert_equal 4, Time.new(2013, 5, 31).general_week_of_month
+
+    assert_equal 5, Time.new(2013, 6, 30).general_week_of_month
+
+    assert_equal 4, Time.new(2013, 7, 31).general_week_of_month
+
+    assert_equal 4, Time.new(2013, 8, 31).general_week_of_month
+
+    assert_equal 5, Time.new(2013, 9, 30).general_week_of_month
+
+    assert_equal 4, Time.new(2013, 10, 31).general_week_of_month
+
+    assert_equal 4, Time.new(2013, 11, 30).general_week_of_month
+
+    assert_equal 5, Time.new(2013, 12, 31).general_week_of_month
+  end
+
+  def test_week_split
+    object = Time.new(2013, 1, 10)
+    split_for_january = [[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]]
+    assert_kind_of Array, object.week_split
+    assert_equal split_for_january, object.week_split
+
+    object = Time.new(2013, 2, 15)
+    split_for_october = [[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]]
+    assert_kind_of Array, object.week_split
+    assert_equal split_for_october, object.week_split
+  end
+
+  def test_first_week?
+    assert Time.new(2012, 1, 1).first_week?
+    assert !Time.new(2012, 1, 31).first_week?
+  end
+
+  def test_second_week?
+    assert Time.new(2013, 1, 6).second_week?
+    assert !Time.new(2013, 1, 2).second_week?
+  end
+
+  def test_last_week?
+    assert Time.new(2012, 10, 31).last_week?
+    assert !Time.new(2012, 10, 20).last_week?
+  end
+
+  def test_total_weeks
+    assert_equal 5, Time.new(2012, 10, 31).total_weeks
+    assert_equal 6, Time.new(2012, 12, 20).total_weeks
+  end
+
+  def test_week_of_month_in_eng
+    assert_equal 'First', Time.new(2012, 12, 1).week_of_month_in_eng
+    assert_equal 'Second', Time.new(2012, 12, 4).week_of_month_in_eng
+    assert_equal 'Third', Time.new(2012, 12, 9).week_of_month_in_eng
+    assert_equal 'Fourth', Time.new(2012, 12, 16).week_of_month_in_eng
+    assert_equal 'Fifth', Time.new(2012, 12, 24).week_of_month_in_eng
+    assert_equal 'Sixth', Time.new(2012, 12, 31).week_of_month_in_eng
+  end
+
+  def test_week_of_month_in_fr
+    assert_equal 'Premier', Time.new(2012, 12, 1).week_of_month_in_fr
+    assert_equal 'Deuxième', Time.new(2012, 12, 4).week_of_month_in_fr
+    assert_equal 'Troisième', Time.new(2012, 12, 9).week_of_month_in_fr
+    assert_equal 'Quatrième', Time.new(2012, 12, 16).week_of_month_in_fr
+    assert_equal 'Cinquième', Time.new(2012, 12, 24).week_of_month_in_fr
+    assert_equal 'Sixième', Time.new(2012, 12, 31).week_of_month_in_fr
+  end
+
+  def test_week_of_month_in_ger
+    assert_equal 'First', Time.new(2012, 12, 1).week_of_month_in_ger
+    assert_equal 'Second', Time.new(2012, 12, 4).week_of_month_in_ger
+    assert_equal 'Dritten', Time.new(2012, 12, 9).week_of_month_in_ger
+    assert_equal 'Vierte', Time.new(2012, 12, 16).week_of_month_in_ger
+    assert_equal 'Fünfte', Time.new(2012, 12, 24).week_of_month_in_ger
+    assert_equal 'Sechste', Time.new(2012, 12, 31).week_of_month_in_ger
+  end
+
+  def test_week_of_month_in_ja
+    assert_equal '第一', Time.new(2012, 12, 1).week_of_month_in_ja
+    assert_equal '第二', Time.new(2012, 12, 4).week_of_month_in_ja
+    assert_equal '第三', Time.new(2012, 12, 9).week_of_month_in_ja
+    assert_equal '第四', Time.new(2012, 12, 16).week_of_month_in_ja
+    assert_equal '第五', Time.new(2012, 12, 24).week_of_month_in_ja
+    assert_equal '第六', Time.new(2012, 12, 31).week_of_month_in_ja
+  end
+
+  def test_week_end?
+    assert !Time.new(2012, 10, 1).week_end?
+    assert !Time.new(2012, 10, 31).week_end?
+    assert Time.new(2012, 10, 6).week_end?
+    assert Time.new(2012, 10, 7).week_end?
+  end
+
+  def test_working_day?
+    assert Time.new(2012, 10, 1).working_day?
+    assert Time.new(2012, 10, 31).working_day?
+    assert !Time.new(2012, 10, 6).working_day?
+    assert !Time.new(2012, 10, 7).working_day?
+  end
+
+  def test_days_past_in_week
+    assert_equal 2, Time.new(2013, 1, 1).days_past_in_week
+  end
+
+  def test_days_left_in_week
+    assert_equal 5, Time.new(2013, 1, 1).days_left_in_week
+  end
+
+  def test_beginning_of_week
+    assert_equal Time.new(2012, 11, 25), Time.new(2012, 11, 25).beginning_of_week
+    assert_equal Time.new(2012, 11, 25), Time.new(2012, 11, 26).beginning_of_week
+    assert_equal Time.new(2012, 11, 25), Time.new(2012, 11, 30).beginning_of_week
+  end
+
+  def test_end_of_week
+    assert_equal Time.new(2012, 12, 1), Time.new(2012, 12, 1).end_of_week
+    assert_equal Time.new(2012, 12, 8), Time.new(2012, 12, 2).end_of_week
+    assert_equal Time.new(2012, 12, 8), Time.new(2012, 12, 3).end_of_week
+    assert_equal Time.new(2012, 12, 8), Time.new(2012, 12, 7).end_of_week
+  end
+
+  def test_next_week
+    assert_equal Time.new(2012, 12, 8), Time.new(2012, 12, 1).next_week
+    assert_equal Time.new(2012, 12, 22), Time.new(2012, 12, 15).next_week
+    assert_equal Time.new(2013, 1, 5), Time.new(2012, 12, 29).next_week
+    assert_equal Time.new(2012, 12, 26), Time.new(2012, 12, 19).next_week
+  end
+
+  def test_previous_week
+    assert_equal Time.new(2012, 12, 1), Time.new(2012, 12, 8).previous_week
+    assert_equal Time.new(2012, 12, 15), Time.new(2012, 12, 22).previous_week
+    assert_equal Time.new(2012, 12, 29), Time.new(2013, 1, 5).previous_week
+    assert_equal Time.new(2012, 12, 19), Time.new(2012, 12, 26).previous_week
+  end
+
+  def test_monday_configured_beginning_of_week
+    WeekOfMonth.configuration.monday_active = true
+    assert_equal Time.new(2012, 11, 19), Time.new(2012, 11, 25).beginning_of_week
+    assert_equal Time.new(2012, 11, 26), Time.new(2012, 11, 26).beginning_of_week
+    assert_equal Time.new(2012, 11, 26), Time.new(2012, 11, 30).beginning_of_week
+    WeekOfMonth.configuration.monday_active = false
+  end
+
+  def test_monday_configured_end_of_week
+    WeekOfMonth.configuration.monday_active = true
+    assert_equal Time.new(2012, 12, 2), Time.new(2012, 12, 1).end_of_week
+    assert_equal Time.new(2012, 12, 2), Time.new(2012, 12, 2).end_of_week
+    assert_equal Time.new(2012, 12, 9), Time.new(2012, 12, 3).end_of_week
+    assert_equal Time.new(2012, 12, 9), Time.new(2012, 12, 7).end_of_week
+    WeekOfMonth.configuration.monday_active = false
+  end
+end

data/lib/test/modules/time/test_year.rb

@@ -0,0 +1,13 @@
+#!/bin/env ruby
+# encoding: utf-8
+
+# @author Sachin Singh
+
+require 'test/unit'
+RUBY_VERSION < '1.9' ? require('lib/week_of_month') : require_relative('../../../week_of_month')
+
+class TestYearForTime < Test::Unit::TestCase
+  def test_years_between_dates
+    assert_equal 3, Time.years_between_dates(Time.new(2015, 11, 1), Time.new(2012, 11, 15))
+  end
+end

data/lib/week_of_month.rb

@@ -1,7 +1,7 @@
 require 'date'
 require 'time'
 
-# supports both version of ruby 1.8 and 1.9 for loading a file.
+# 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
@@ -20,9 +20,7 @@ class Date
 end
 
 [Time, Date].each do |klass|
-
   klass.class_eval do
-
     unless method_defined?(:to_date)
       def to_date
         ::Date.new(year, month, day)
@@ -31,17 +29,35 @@ 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
-      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
+      def sunday?
+        wday == 0
+      end
 
-  end
+      def monday?
+        wday == 1
+      end
+
+      def tuesday?
+        wday == 2
+      end
+
+      def wednesday?
+        wday == 3
+      end
+
+      def thursday?
+        wday == 4
+      end
+
+      def friday?
+        wday == 5
+      end
 
+      def saturday?
+        wday == 6
+      end
+    end
+  end
 end
 
 class Time
@@ -51,11 +67,11 @@ class Time
   include WeekOfMonth::Year
 
   def leap?
-    self.to_date.leap?
+    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)
+    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
@@ -65,19 +81,13 @@ 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)
+      each { |k, v| result = k if v == value && result.nil?; } if values.include?(value)
       result
     end
   end
 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)
     @first_day = DAYS_IN_SEQUENCE[val]
   end
@@ -85,17 +95,4 @@ module WeekOfMonth
   def self.first_day
     @first_day ||= 0
   end
-
-  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-2016 Sachin Singh
+Copyright (c) 2012-2017 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

@@ -7,14 +7,14 @@ Gem::Specification.new do |s|
   s.version       = WeekOfMonth::VERSION
   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       =  %w(Sachin87 Tommyixi Matt-- berikin pablorusso AstonJ swapnilchincholkar hitendrasingh ilake)
-  s.email         = %w(sachin@railsdeveloper.in sachin.y87@gmail.com singhsachin87@yahoo.com)
+  s.authors = %w[Sachin87 Tommyixi Matt-- berikin pablorusso AstonJ swapnilchincholkar hitendrasingh ilake fursich]
+  s.email         = %w[sachin.y87@gmail.com]
   s.homepage      = 'https://github.com/sachin87/week-of-month'
   s.files         = `git ls-files`.split("\n").sort
   s.require_paths = ['lib']
   s.license       = 'MIT'
 
-  s.add_development_dependency 'rake', '>= 10.1.0'
-  s.add_development_dependency 'bundler', '>= 1.0'
-  s.add_development_dependency 'test-unit'
+  s.add_development_dependency 'rake', '>= 12.0.0'
+  s.add_development_dependency 'bundler', '>= 1.15.0'
+  s.add_development_dependency 'test-unit', '>= 3.2.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: week_of_month
 version: !ruby/object:Gem::Version
-  version: 1.2.3.4
+  version: 1.2.4
 platform: ruby
 authors:
 - Sachin87
@@ -13,10 +13,11 @@ authors:
 - swapnilchincholkar
 - hitendrasingh
 - ilake
+- fursich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-02 00:00:00.000000000 Z
+date: 2017-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -24,54 +25,53 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: 12.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: 12.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.15.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.15.0
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.3
 description: Its gives you week_of_month method on date and time objects, that returns
   week of the month.
 email:
-- sachin@railsdeveloper.in
 - sachin.y87@gmail.com
-- singhsachin87@yahoo.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".bundle/install.log"
 - ".gitignore"
+- ".rvmrc"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -83,11 +83,16 @@ files:
 - lib/modules/version.rb
 - lib/modules/week.rb
 - lib/modules/year.rb
-- lib/test/modules/test_constant.rb
-- lib/test/modules/test_day.rb
-- lib/test/modules/test_month.rb
-- lib/test/modules/test_week.rb
-- lib/test/modules/test_year.rb
+- lib/test/modules/date/test_constant.rb
+- lib/test/modules/date/test_day.rb
+- lib/test/modules/date/test_month.rb
+- lib/test/modules/date/test_week.rb
+- lib/test/modules/date/test_year.rb
+- lib/test/modules/time/test_constant.rb
+- lib/test/modules/time/test_day.rb
+- lib/test/modules/time/test_month.rb
+- lib/test/modules/time/test_week.rb
+- lib/test/modules/time/test_year.rb
 - lib/week_of_month.rb
 - license
 - week_of_month.gemspec
@@ -111,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Week of month!