what_date 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 79d947d42c8a1beb11fcbc8327ac2933f7c0cd4a19dfb4cb07adaf48ce6402e7
-  data.tar.gz: eab41983ec577e1aabb9d3abace7a74197c0d56409bb51427ff2d77c0cba98cc
+SHA1:
+  metadata.gz: 7f4e7f5299beb9358ddb950978a85d43345a1ba2
+  data.tar.gz: 4f1014d45467de87328c5daed2c4b3a021db2fca
 SHA512:
-  metadata.gz: d3a8e5c833ba814f98a8ca0c08e8768f7b2edd3caed7ce311d2ae04b78664b96ac962394138eb672f419c3f29dfa0fd18cce5f63d7a7e9d8e13419e0487d1dc5
-  data.tar.gz: 4c83b1bede76efe2eafe93c58094a86f86a1af451a1c9a16a5ea26c4044f85551792677ed019383c39cd5f38c93af266a6c33a7808c2f0845871407db6ba0e61
+  metadata.gz: c89b1f0e607cba9b25fe4247169f4e6290dbece02bd43654e93f653620c1949b56a51afa7330ea5171a91f744553458833f0a79a9730fbe98d23e7483059f5fb
+  data.tar.gz: b2c1e9b149a29d4717b30ae8c0739de66e19dd09e47687eb38c467677d3bac1822554339fa3575f83f857f13892b388f67c5af040a5cab8ad820c423912d8a77

data/README.md

@@ -1,5 +1,5 @@
 # WhatDate
-
+Simple solution to such questions as "What date is next Monday?"
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -23,19 +23,23 @@ You can query the date of any day in the current week, the previous week or the
 $client = WhatDate.client
 
 ## get dates
-$client.friday
-$client.tuesday(Date.new(2018,2,3))  ##date of tuesday in the week of the given date
-$client.prev_tuesday
-$client.next_tuesday
+client.friday
+client.tuesday(Date.new(2018,2,3))  ##date of tuesday in the week of the given date
+client.prev_tuesday
+client.next_tuesday
 
 ```
-You can also ask for the date of a particular day of a given month. Use ordinals such as first, second and up to fifth. But'last' does not work yet.
+You can also ask for the date of a particular day of a given month. Use ordinals such as first, second and up to fifth. You can enquire the last date too.
 
 ```
-$client.first_monday_of_june_2018
-$##4 June 2018
-$client.third_tuesday_of_may_2018
-$##19 June 2018
+client.first_monday_of_june_2018
+##4 June 2018
+
+client.third_tuesday_of_may_2018
+##19 June 2018
+
+client.last_monday_of_may_2018
+##28 May 2018
 
 ```
 

data/lib/what_date/client.rb

@@ -1,5 +1,6 @@
 require 'active_support'
 require 'active_support/core_ext/date/calculations'
+require 'active_support/core_ext/time/calculations'
 require 'what_date/date_of_month'
 
 module WhatDate

data/lib/what_date/date_of_month.rb

@@ -1,6 +1,12 @@
 module WhatDate
 	module DateOfMonth
 
+		ORDINALS ={ "first" => 1, "second" => 2, "third" => 3, "fourth" => 4, "fifth" => 5, "last" => nil }.freeze
+		ORDERS = '(first||second||third||fourth||fifth||last)'.freeze
+		WEEKDAYS = '(monday||tuesday||wednesday||thursday||friday||saturday||sunday)'.freeze
+		MONTHS = '(jan||feb||mar||apr||may||jun||jul||aug||sep||oct||nov||dec||january||february||march||april||may||june||july||august||september||october||november||december||sept)'.freeze
+
+
 		def date_of_month(order:1, day:, month:, year: Date.today.year)
 			month_int = Date::MONTHNAMES.index(month)
 			first_date = Date.new(year, month_int, 1)
@@ -11,23 +17,49 @@ module WhatDate
 			else
 				inc = (order - 1) * 7 + (lookup - first_day +  1)
 			end
-			Date.new(year, month_int, inc)
+			begin
+				Date.new(year, month_int, inc)
+			rescue ArgumentError
+				nil
+			end
 		end	
 
-
-		def method_missing(meth, *args)
-      if meth.to_s =~ /^(first||second||third||fourth||fifth)_(monday||tuesday||wednesday||thursday||friday||saturday||sunday)_of_[A-Za-z]+_\d+$/
-				methods = meth.to_s.split("_")
-				order = { "first" => 1, "second" => 2, "third" => 3, "fourth" => 4, "fifth" => 5 }[methods[0]]
-				day = methods[1].titleize
-				month = methods[3].titleize
+		def method_missing(name, *args, &block)
+			if name.to_s =~ Regexp.new("^#{ORDERS}_#{WEEKDAYS}_of_#{MONTHS}_\\d+$", true)
+				methods = name.to_s.split("_")
+				order = ORDINALS[methods[0].downcase]
+				day = format_date_string methods[1]
+				month = format_date_string methods[3]
 				year = methods[4].to_i
-				date_of_month(order: order, day: day, month: month, year: year)
+				order == nil ? date_of_last_week_day_in_month(day, month, year) :
+				               date_of_month(order: order, day: day, month: month, year: year)
 			else
 				super
 			end
 		end
 
+		def last_date_of_month(month:, year:)
+			begin
+				Date.parse("#{year}-#{month}-1").end_of_month
+			rescue ArgumentError
+				nil
+			end
+		end
+
+		private
+
+		def format_date_string(str)
+			str.downcase.capitalize
+		end
+
+		def date_of_last_week_day_in_month(lookup_day, month, year)
+			last_date = last_date_of_month(month: month, year: year) 
+			last_day = last_date.wday
+			lookup = Date::DAYNAMES.index(lookup_day)
+			diff = last_day - lookup
+			diff += 7 if lookup > last_day
+			last_date.days_ago(diff)
+		end
 
 	end
 end

data/lib/what_date/version.rb

@@ -1,3 +1,3 @@
 module WhatDate
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/what_date.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["zorro.ej@gmail.com"]
 
   spec.summary       = %q{A simple tool to return the dates given a day}
-  spec.description   = %q{You may ask for the date of next Tuesday, this Monday, last Saturyda, or the first Saturyda of Nov 2011}
+  spec.description   = %q{You may ask for the date of next Tuesday, this Monday, last Saturday, or the first Saturday of Nov 2011}
   spec.homepage      = "https://github.com/ej2015/what_date.git"
   spec.license       = "MIT"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: what_date
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Edgar
@@ -80,8 +80,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
-description: You may ask for the date of next Tuesday, this Monday, last Saturyda,
-  or the first Saturyda of Nov 2011
+description: You may ask for the date of next Tuesday, this Monday, last Saturday,
+  or the first Saturday of Nov 2011
 email:
 - zorro.ej@gmail.com
 executables: []
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A simple tool to return the dates given a day