my_age 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 492f7c70dfd61156d3f1a550c5b0bf06f2361f8a
-  data.tar.gz: 760dc167e872eb052b582c92c1b42d67769ad53b
+  metadata.gz: 94e8609fc1e040a51451599b8c1991d2c1d92ac2
+  data.tar.gz: e2136277e36b0a95e274be82e95ff25049325680
 SHA512:
-  metadata.gz: d6bd761b63baaef480ca4a017615cf7c98aab548edc216ee2a0623366e89ad62e41c4b0d07b60945d96bc91580314fb6c4dbb4221ecab624a5e043ca94bdd006
-  data.tar.gz: 84d4494a3e8f76b4abce25017be4650ebbe6202b5323d766feb45c8af13c6d6fb88ac9ef4f0c013bb36898e275fa4f80e16a32d49a48e5757ccedf67e0dc9977
+  metadata.gz: c142d271f738bd587b15ca62b5b8b2ff31c7633d95b8c6b38f74aa51e0f158464cb381615f021e041234f7230a1491e28d9205754e3ddc64ac99c8059d1bfd40
+  data.tar.gz: cf940465c100a3c566bc1a85900a80e7ad1282de4c0211887913e9b622fc1452e2801bd1bdd5424568311db624c20c19ef1f0a8c774b365056d331354b9e9f2e

data/README.md

@@ -18,34 +18,47 @@ Or install it yourself as:
 
 ## Usage
 
-Mixin the calculator module
+Mixin the `Age` module and call `age` method. 
 
 ```
 class User
   attr_accessor :dob
-  include MyAge::Calculator
+  include MyAge
 end
 
 user = User.new
+## by default, age is calculated as of today
 user.age
-## age as of today
+## but you can supply a specific date
 user.age(date)
-## age as of date
+## there are a host of helpers starting with 'age_as_of_' to specify the date too 
 user.age_as_of_tomorrow
-## age as of tomorrow
 ```
 
-Use you own dob attribute
+If your date-of-birth attribute is not called `dob`, you can assign it with `my_dob` so the gem knows where to look for it.
 
 ``` 
 class User
   attr_accessor :date_of_birth
-  include MyAge::Calculator
-  my_dob :date_of_birth
+  include MyAge
+  my_dob :date_of_birthi  #my attribute name
 end
 
 ##everything else is the same
 ```
+## Use ActiveSupport Helpers
+You can use the helpers in `DateAndTime::Calculations`. Methods will look like `age_as_of_helper`:
+
+```
+## with #end_of_month, you can all
+user.age_as_of_end_of_month
+
+## or with #months_since
+user.age_as_of_months_since(9)
+
+## to be explicit, you can call
+user.age_as_of_today  ## same as user.age
+```
 
 ## CLI
 
@@ -56,8 +69,9 @@ $ #=> 4
 $ my_age is -d 1981-01-08
 $ #=> age as of today
 
+##ActiveSupport helpers work here too
 $ my_age is -d 1981-01-03 -a tomorrow
-$ #=> age as of tomorrow
+$ my_age is -d 'years_ago(5)' -a tomorrow  ##=> 5
 
 ```
 

data/lib/my_age/calculator.rb

@@ -2,7 +2,6 @@ require "my_age/helper"
 
 module MyAge
 	module Calculator
-		include MyAge::Helper
 
 		unless respond_to?(:dob)
 			def self.included(base)

data/lib/my_age/cli.rb

@@ -1,6 +1,6 @@
 require 'thor'
 require 'my_age'
-
+require 'pry'
 module MyAge
 	class CLI < Thor
     attr_accessor :dob
@@ -10,10 +10,29 @@ module MyAge
 		method_option :dob, aliases: "d", desc: "date of birth in yyyy-mm-dd", required: true
 		method_option :as_of, aliases: "a", desc: "as of date in yyyy-mm-dd", required: false 
 		def is
-			self.dob = DateTime.strptime(options[:dob], "%Y-%m-%d")
-			date = options[:as_of].present? ? DateTime.strptime(options[:as_of], "%Y-%m-%d") : Date.today
+			self.dob = get_date(options[:dob]) 
+			date = options[:as_of].present? ? get_date(options[:as_of]) : Date.today
 			puts self.age(date)
 		end
 
+
+		private
+		def get_date(date)
+			begin
+      if date =~ /^\d{4}-\d{2}-\d{2}$/
+				 DateTime.strptime(date, "%Y-%m-%d")
+			else
+				dates = date.gsub(")", "").split("(")
+				if dates.length == 2
+				  Date.today.send(dates[0].to_sym, dates[1].to_i)
+				else
+				  Date.today.send(dates[0].to_sym)
+				end
+			end
+		rescue NoMethodError
+			Date.send(date)
+		end
+		end
+
 	end
 end

data/lib/my_age/version.rb

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

data/lib/my_age.rb

@@ -5,5 +5,9 @@ require "my_age/calculator"
 require "my_age/helper"
 
 module MyAge
+	def self.included(base)
+		base.include MyAge::Calculator
+		base.include MyAge::Helper
+	end
 
 end

data/my_age.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["zorro.ej@gmail.com"]
 
   spec.summary       = %q{Calculate my age.}
-	spec.description   = %q{a simple module to be mixed in to provide an age method. Also provide a CLI. Default calendr: Gregorian. Though would like to expand to other calendars too}
+	spec.description   = %q{a simple module to be mixed in to provide an age method. Also provide a CLI. Default calender: Gregorian, though would like to expand to other calendars too}
   spec.homepage      = "https://github.com/ej2015/my_age.git"
   spec.license       = "MIT"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: my_age
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Edgar
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.14.0
 description: 'a simple module to be mixed in to provide an age method. Also provide
-  a CLI. Default calendr: Gregorian. Though would like to expand to other calendars
+  a CLI. Default calender: Gregorian, though would like to expand to other calendars
   too'
 email:
 - zorro.ej@gmail.com