what_date 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f4e7f5299beb9358ddb950978a85d43345a1ba2
-  data.tar.gz: 4f1014d45467de87328c5daed2c4b3a021db2fca
+  metadata.gz: 589b27a457943401b0029d5896071f4fd44678ca
+  data.tar.gz: c51e60d504a9e233eb9ebb506d5668b5a72b49c0
 SHA512:
-  metadata.gz: c89b1f0e607cba9b25fe4247169f4e6290dbece02bd43654e93f653620c1949b56a51afa7330ea5171a91f744553458833f0a79a9730fbe98d23e7483059f5fb
-  data.tar.gz: b2c1e9b149a29d4717b30ae8c0739de66e19dd09e47687eb38c467677d3bac1822554339fa3575f83f857f13892b388f67c5af040a5cab8ad820c423912d8a77
+  metadata.gz: 1357c088824ba1e953f5d5ae676a13c04a0df97f7305e476421baccab89c78f6526a53fc0eb87e8728bd801f745b59ef876c37b34a0271c6fd097e87285181b4
+  data.tar.gz: aa9827cbac19ebbd6042fcb82f9d7a3d04700ac7b06a163a3a2865105df5d82871227aa5d6bd7e55a873d6f467c1eba7fb856baffec60346bd1ab1008d4f1ee9

data/README.md

@@ -25,8 +25,9 @@ $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.prev_tuesday  ## same as client.last_tuesday
 client.next_tuesday
+client.next_tuesday Date.new(2018,2,3)  ## the following tuesday after the week of the given date
 
 ```
 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.
@@ -41,6 +42,11 @@ client.third_tuesday_of_may_2018
 client.last_monday_of_may_2018
 ##28 May 2018
 
+## default to current year
+## Date.today.year == 2018
+client.last_monday_of_may
+##28 May 2018
+
 ```
 
 ## Development

data/lib/what_date/client.rb

@@ -20,6 +20,12 @@ module WhatDate
 			end
 		end	
 
+		Date::DAYS_INTO_WEEK.each do |day, inc|
+			define_method("last_#{day.to_s}".to_sym) do |ref_date = nil|
+			  send("prev_#{day.to_s}".to_sym, ref_date)
+			end
+		end	
+
 		Date::DAYS_INTO_WEEK.each do |day, inc|
 			define_method("next_#{day.to_s}".to_sym) do |ref_date = nil|
 		     send(day, ref_date).days_since(7)

data/lib/what_date/date_of_month.rb

@@ -2,9 +2,9 @@ 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
+		ORDERS = 'first||second||third||fourth||fifth||last'.freeze
+		WEEKDAYS = 'monday||tuesday||wednesday||thursday||friday||saturday||sunday'.freeze
+		MONTHS = 'january||february||march||april||may||june||july||august||september||october||november||december'.freeze
 
 
 		def date_of_month(order:1, day:, month:, year: Date.today.year)
@@ -25,12 +25,12 @@ module WhatDate
 		end	
 
 		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]
+			methods = missing_method_reg.match(name)
+			if methods 
+				order = ORDINALS[methods[1].downcase]
+				day = format_date_string methods[2]
 				month = format_date_string methods[3]
-				year = methods[4].to_i
+				year = methods[4] ? methods[4][/\d+/].to_i : Date.today.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
@@ -48,6 +48,10 @@ module WhatDate
 
 		private
 
+		def missing_method_reg
+      Regexp.new("^(#{ORDERS})_(#{WEEKDAYS})_of_(#{MONTHS})(_\\d+)?$", true)
+		end
+
 		def format_date_string(str)
 			str.downcase.capitalize
 		end

data/lib/what_date/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: what_date
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Edgar
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-30 00:00:00.000000000 Z
+date: 2018-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport