what_date 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfdc633523771b3eb74c5c7aae7c454d2e312f715b3d5322a4e094af0f6502bd
-  data.tar.gz: b14e6c35441f9b2b0b387dc095575f5e489a40938239d7e0f32122a1a7425070
+  metadata.gz: 79d947d42c8a1beb11fcbc8327ac2933f7c0cd4a19dfb4cb07adaf48ce6402e7
+  data.tar.gz: eab41983ec577e1aabb9d3abace7a74197c0d56409bb51427ff2d77c0cba98cc
 SHA512:
-  metadata.gz: 24298eb526c237523332c74012f7521b884923df15702e60a72e9a2a32d7698551784158b5a9fd664ab097d77a55e375e9b4020344492a4d0975572981602518
-  data.tar.gz: 7c23a014673de2137aa861f69100ae9a905475df98daaa70593f4eaefb877d70ab311d2abfefa9a52c6c3b2a5427bb7f657909f2d3dd77e70ff8bb390f455fdd
+  metadata.gz: d3a8e5c833ba814f98a8ca0c08e8768f7b2edd3caed7ce311d2ae04b78664b96ac962394138eb672f419c3f29dfa0fd18cce5f63d7a7e9d8e13419e0487d1dc5
+  data.tar.gz: 4c83b1bede76efe2eafe93c58094a86f86a1af451a1c9a16a5ea26c4044f85551792677ed019383c39cd5f38c93af266a6c33a7808c2f0845871407db6ba0e61

data/README.md

@@ -17,11 +17,26 @@ Or install it yourself as:
     $ gem install what_date
 
 ## Usage
-
+You can query the date of any day in the current week, the previous week or the following week. You can supply a date so the query is relative to the week of the given date
 ```
+## initialize client
 $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
+
+```
+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.
+
+```
+$client.first_monday_of_june_2018
+$##4 June 2018
+$client.third_tuesday_of_may_2018
+$##19 June 2018
+
 ```
 
 ## Development

data/lib/what_date/client.rb

@@ -1,7 +1,10 @@
 require 'active_support'
 require 'active_support/core_ext/date/calculations'
+require 'what_date/date_of_month'
+
 module WhatDate
 	class Client 
+		include WhatDate::DateOfMonth
 
 		Date::DAYS_INTO_WEEK.each do |day, inc|
 			define_method(day) do |ref_date=nil|
@@ -9,5 +12,18 @@ module WhatDate
 				ref_date.monday.days_since(inc)
 			end
 		end
+
+		Date::DAYS_INTO_WEEK.each do |day, inc|
+			define_method("prev_#{day.to_s}".to_sym) do |ref_date = nil|
+		     send(day, ref_date).days_ago(7)
+			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)
+			end
+		end			
+
 	end
 end

data/lib/what_date/date_of_month.rb

@@ -0,0 +1,33 @@
+module WhatDate
+	module DateOfMonth
+
+		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)
+			first_day = first_date.wday
+			lookup = Date::DAYNAMES.index(day.titleize)
+			if lookup < first_day
+				inc = (order - 1) * 7 + (lookup - first_day + 8)
+			else
+				inc = (order - 1) * 7 + (lookup - first_day +  1)
+			end
+			Date.new(year, month_int, inc)
+		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
+				year = methods[4].to_i
+				date_of_month(order: order, day: day, month: month, year: year)
+			else
+				super
+			end
+		end
+
+
+	end
+end

data/lib/what_date/version.rb

@@ -1,3 +1,3 @@
 module WhatDate
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 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{This gem tells you the date of next Tuesday}
+  spec.description   = %q{You may ask for the date of next Tuesday, this Monday, last Saturyda, or the first Saturyda 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.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Edgar
@@ -80,7 +80,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
-description: This gem tells you the date of next Tuesday
+description: You may ask for the date of next Tuesday, this Monday, last Saturyda,
+  or the first Saturyda of Nov 2011
 email:
 - zorro.ej@gmail.com
 executables: []
@@ -98,6 +99,7 @@ files:
 - bin/setup
 - lib/what_date.rb
 - lib/what_date/client.rb
+- lib/what_date/date_of_month.rb
 - lib/what_date/version.rb
 - what_date.gemspec
 homepage: https://github.com/ej2015/what_date.git