week_of_month 1.2.3.4 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38c961369c785e86656fd70ba102c26d4b58fc19
-  data.tar.gz: c64a4dfd1818b1dfd347975d146275efaa4c10b1
+  metadata.gz: 0d40697431c1fc812225cb4a515a10ead0d8067d
+  data.tar.gz: c8db492be402a3e49f56be44243469c53bc8a809
 SHA512:
-  metadata.gz: 9dc85ac5f08fc0d86f741930357a00afdb29929977d70709e29d5ebe8def9bd44d98821b4c3ee90d78d9e2c60c64b13493463608e4b3889454a84f8ee3466651
-  data.tar.gz: 18d86c5d5b0177350db060207e69f9caa7daadd585031e20935ab04cbabc9829915197d7d2abd5319c196b6387e0d2d7fbfe68fc5083f4377f689b1cf42caccc
+  metadata.gz: 697711cda4ebd22d70ab622fe2b60d0e586d3bb1f7adce50f2f0b9dbaef8f34f04174a6171f04fbf1ceaaecb46763b944c29bb5459d8d3ec0e4073476174f9b1
+  data.tar.gz: be1cc754c4a01803ae4f83fc6fb707f8c8f059156ab9fe194bc0e35d1b36c49bc946ff7920c6aeb38e43ec2f9d729eb77cad10927b3d0d1ec8ee6631cd58fb6a

data/.rvmrc

@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+
+# This is an RVM Project .rvmrc file, used to automatically load the ruby
+# development environment upon cd'ing into the directory
+
+# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
+# Only full ruby name is supported here, for short names use:
+#     echo "rvm use 2.4.1@wom" > .rvmrc
+environment_id="ruby-2.4.1@wom"
+
+# Uncomment the following lines if you want to verify rvm version per project
+# rvmrc_rvm_version="1.27.0 (latest)" # 1.10.1 seems like a safe start
+# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | __rvm_awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
+#   echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
+#   return 1
+# }
+
+# First we attempt to load the desired environment directly from the environment
+# file. This is very fast and efficient compared to running through the entire
+# CLI and selector. If you want feedback on which environment was used then
+# insert the word 'use' after --create as this triggers verbose mode.
+if [[ -d "${rvm_path:-$HOME/.rvm}/environments"
+  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
+then
+  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
+  for __hook in "${rvm_path:-$HOME/.rvm}/hooks/after_use"*
+  do
+    if [[ -f "${__hook}" && -x "${__hook}" && -s "${__hook}" ]]
+    then \. "${__hook}" || true
+    fi
+  done
+  unset __hook
+  if (( ${rvm_use_flag:=1} >= 1 )) # display automatically
+  then
+    if [[ $- == *i* ]] # check for interactive shells
+    then printf "%b" "Using: $(tput setaf 2 2>/dev/null)$GEM_HOME$(tput sgr0 2>/dev/null)\n" # show the user the ruby and gemset they are using in green
+    else printf "%b" "Using: $GEM_HOME\n" # don't use colors in non-interactive shells
+    fi
+  fi
+else
+  # If the environment file has not yet been created, use the RVM CLI to select.
+  rvm --create use  "$environment_id" || {
+    echo "Failed to create RVM environment '${environment_id}'."
+    return 1
+  }
+fi
+
+# If you use bundler, this might be useful to you:
+# if [[ -s Gemfile ]] && {
+#   ! builtin command -v bundle >/dev/null ||
+#   builtin command -v bundle | GREP_OPTIONS="" \command \grep $rvm_path/bin/bundle >/dev/null
+# }
+# then
+#   printf "%b" "The rubygem 'bundler' is not installed. Installing it now.\n"
+#   gem install bundler
+# fi
+# if [[ -s Gemfile ]] && builtin command -v bundle >/dev/null
+# then
+#   bundle install | GREP_OPTIONS="" \command \grep -vE '^Using|Your bundle is complete'
+# fi

data/Gemfile

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

data/Gemfile.lock

@@ -6,24 +6,44 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    ast (2.3.0)
     byebug (4.0.5)
       columnize (= 0.9.0)
     columnize (0.9.0)
-    power_assert (0.2.2)
-    rake (10.4.2)
+    parallel (1.11.2)
+    parser (2.4.0.0)
+      ast (~> 2.2)
+    power_assert (0.4.1)
+    powerpack (0.1.1)
+    rainbow (2.2.2)
+      rake
+    rake (12.0.0)
     redcarpet (3.2.3)
-    test-unit (3.0.8)
+    rubocop (0.49.1)
+      parallel (~> 1.10)
+      parser (>= 2.3.3.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.8.1)
+    test-unit (3.2.3)
       power_assert
+    unicode-display_width (1.2.1)
     yard (0.8.7.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 1.0)
+  bundler (>= 1.15.0)
   byebug
-  rake (>= 10.1.0)
+  rake (>= 12.0.0)
   redcarpet
-  test-unit
+  rubocop
+  test-unit (>= 3.2.3)
   week_of_month!
   yard
+
+BUNDLED WITH
+   1.15.0

data/README.md

@@ -33,8 +33,7 @@ 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.
-
+This will do all manipulations considering Monday as the first day of a week.
 ## Usage
 
 **Return the days of the month as if they were displayed on a calendar. In this example, the first day of January starts on a Sunday. Note the format is always (year, month, day)**
@@ -67,7 +66,7 @@ Date.new(2012,1,31).week_of_month_in_eng
 # => "Fifth"
 ```
 
-**Return true if date lies in first week of month, otherwise false will be returned. Also works with second week and last week.**
+**Return true if date lies in the first week of a month, otherwise false will be returned. Also works with second week and last week.**
 
 ```ruby
 Date.new(2012,1,1).first_week?
@@ -181,7 +180,7 @@ august?, september?, october?, november?, december?, last_day_of_month
 ## Contributing to Week of month
 
 Fork, fix, then send me a pull request,
-and most important add yourself to list of authors in gemspec file.
+and most important add yourself to a list of authors in a gemspec file.
 
 ## License
 

data/Rakefile

@@ -5,9 +5,9 @@ require 'bundler/gem_tasks'
 
 Rake::TestTask.new do |t|
   t.libs << 'test'
-  t.test_files = FileList['lib/test/modules/test*.rb']
+  t.test_files = FileList['lib/test/modules/date/test*.rb', 'lib/test/modules/time/test*.rb']
   t.verbose = true
 end
 
 desc 'Run tests'
-task :default => :test
+task default: :test

data/lib/modules/constant.rb

@@ -5,39 +5,38 @@
 
 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'}
+                             4 => 'Fourth', 5 => 'Fifth', 6 => 'Sixth', 7 => 'Seventh' }.freeze
 
     # hash containing french words from one to seven
     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'}
+                             4 => 'Quatrième', 5 => 'Cinquième', 6 => 'Sixième', 7 => 'Septième' }.freeze
 
     # 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'}
+                             4 => 'Vierte', 5 => 'Fünfte', 6 => 'Sechste', 7 => 'siebte' }.freeze
 
     # hash containing japanese words from one to seven
-    WEEK_OF_MONTH_IN_JAP = { 1 => '最初', 2 => '秒', 3 => 'サード',
-                    4 => '第4回', 5 => '第五', 6=> 'シックス', 7 =>  '第7' }
+    WEEK_OF_MONTH_IN_JA = { 1 => '第一', 2 => '第二', 3 => '第三',
+                            4 => '第四', 5 => '第五', 6 => '第六', 7 =>  '第七' }.freeze
 
     # 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 }
+    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 }.freeze
 
     # 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 }
+    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 }.freeze
 
     # array of ordered days names starting from sunday and ending with saturday.
-    DAYS_IN_SEQUENCE = %w(Sunday Monday Tuesday Wednesday Thursday Friday Saturday)
+    DAYS_IN_SEQUENCE = %w[Sunday Monday Tuesday Wednesday Thursday Friday Saturday].freeze
 
     # array of ordered days names starting from sunday and ending with saturday.
-    WEEKS_IN_SEQUENCE = %w(Last First Second Third Fourth Fifth)
+    WEEKS_IN_SEQUENCE = %w[Last First Second Third Fourth Fifth].freeze
   end
 end

data/lib/modules/day.rb

@@ -4,7 +4,6 @@
 # @author Sachin Singh
 
 module WeekOfMonth
-
   attr_accessor :config
 
   def initialize(config = Configuration.new)
@@ -21,13 +20,13 @@ module WeekOfMonth
     #        31]
     # @return [Array]
     def days_array
-      day = self.beginning_of_month.to_date.wday
+      day = 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 }
+      (2..end_of_month.mday).each { |i| array << i }
       array
     end
 
@@ -35,7 +34,7 @@ module WeekOfMonth
     #   => 'Thursday'
     # @return [String]
     def name_of_week_day
-      self.class.new(year,month,day).strftime('%A')
+      self.class.new(year, month, day).strftime('%A')
     end
 
     # this code generates methods with names like 'upcoming_monday' and 'previous_monday'
@@ -43,28 +42,28 @@ module WeekOfMonth
     # => #<Date: 2013-01-07 ((2456300j,0s,0n),+0s,2299161j)>
     # Date.new(2013,1,1).previous_monday
     # => #<Date: 2012-12-31 ((2456293j,0s,0n),+0s,2299161j)>
-    { 'upcoming' => '+', 'previous' => '-' }.each_pair do |key,value|
+    { 'upcoming' => '+', 'previous' => '-' }.each_pair do |key, value|
       Date::DAYNAMES.each do |day_name|
         name = "#{key}_#{day_name.downcase}".to_sym
         check = "#{day_name.downcase}?".to_sym
         define_method(name) do
-          date = eval "self"
+          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))
+              date = date.send(value, (60 * 60 * 24 * 7))
+            end
+          else
+            until date.send(check)
+              if date.class == Date
+                date = date.send(value, 1)
+              elsif date.class == Time
+                date = date.send(value, (60 * 60 * 24))
+              end
             end
-           else
-             until date.send(check)
-               if date.class == Date
-                 date = date.send(value,1)
-               elsif date.class == Time
-                 date = date.send(value,(60 * 60 * 24))
-               end
-             end
-           end
-           date
+          end
+          date
         end
       end
     end
@@ -79,37 +78,36 @@ module WeekOfMonth
     # 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)>]
+    # #<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_of_month.downto(beginning_of_month).select(&: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)>]
+    # #<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_of_month.downto(beginning_of_month).select(&:week_end?)
     end
 
-    # gives first working/business day of the month
+    # returns 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? }
+      beginning_of_month.upto(end_of_month).find(&:working_day?)
     end
-
   end
 end

data/lib/modules/month.rb

@@ -1,10 +1,9 @@
-# @author Sachion Singh 
+# @author Sachion Singh
 
 RUBY_VERSION < '1.9' ? require('modules/constant') : require_relative('constant')
 
 module WeekOfMonth
   module Month
-
     include WeekOfMonth::Constant
 
     # this code generates method named like january?..december?
@@ -15,7 +14,7 @@ module WeekOfMonth
         MONTH_WITH_SEQUENCE[month_name] == month
       end
     end
-    
+
     # returns day of last day of month for a given date.
     # Date.new(2012,11,1).last_day_of_month
     #   => 30
@@ -33,23 +32,23 @@ module WeekOfMonth
     #   => #<Date: 2012-11-30 ((2456262j,0s,0n),+0s,2299161j)>
     # @return [Date]
     def end_of_month
-      self.class.new(year,month,last_day_of_month)
+      self.class.new(year, month, last_day_of_month)
     end
 
-    # returns date of first day of month for a given date.    
+    # returns date of first day of month for a given date.
     # Date.new(2012,11,1).beginning_of_month
     #   => #<Date: 2012-11-01 ((2456233j,0s,0n),+0s,2299161j)>
     # @return [Date]
     def beginning_of_month
-      self.class.new(year,month,1)
+      self.class.new(year, month, 1)
     end
 
-    # returns name of month for a given date.    
+    # returns name of month for a given date.
     # Date.new(2012,11,1).name_of_month
     #   => "November"
     # @return [String]
     def name_of_month
-      self.class.new(year,month,day).strftime('%B')
+      self.class.new(year, month, day).strftime('%B')
     end
 
     # this code generates method named like 'all_mondays_in_month',
@@ -60,12 +59,12 @@ module WeekOfMonth
     DAYS_IN_SEQUENCE.each_with_index do |day_name, i|
       method_name = "all_#{day_name.downcase}s_in_month".to_sym
       define_method(method_name) do
-        week_split.map{|d| d[i] }.compact
+        week_split.map { |d| d[i] }.compact
       end
     end
-    
+
     # this code generates method named like 'first_monday_in_month',
-    # 'second_tuesday_in_month', 'last_friday_in_month' etc. for 
+    # '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>
@@ -74,9 +73,9 @@ module WeekOfMonth
       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])
+          self.class.new(year, month, week_split.map { |d| d[i] }.compact[j])
         end
       end
     end
   end
-end
+end

data/lib/modules/version.rb

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