seniority 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '085ade7265703b057b94f048291359b1c59eaa168ac8f084746be646b1105438'
-  data.tar.gz: 19bbd0b0cc4d01207eeed6c38dc97ecfbba3dc32108bd1e52fec80f805eb26fa
+  metadata.gz: 53e90b2c5ce21986bfa8163bc9ef4b25c395e7e660d0190c8c2837751a5675e7
+  data.tar.gz: 213e74de54db6544485ff8de26f0d64cf7613d9ef8848c75f18bd808db2927c6
 SHA512:
-  metadata.gz: 42be515f9777f413eb68a818b6e768c80f9317fcc2db92c5414acc1b8b583594a945f0911b7b7a87fdd29a394271028d0e8d589cda87fcf733c3db5ee52d6fb1
-  data.tar.gz: cc506d0666d05795159a465baca53e484d2619f054ce5b6208c62205b05d3b3d449ae86ac278ce613871c0f2677a709cb47e69e203d42f7cf73add8b23c8b267
+  metadata.gz: 692afe79f5f300adda47c7982802d1e723d980ad8947c9d4f75b8f9bd0ce25d54c1760bed3e0a4e77f022902ba7fcd2d80580a95bfe4b20d27f2f2bdd44fc741
+  data.tar.gz: 331452a557cd6da8534e7a6419f0e11c2549de61d6a7d05070cac3996f36c7beec862a94356fece56fdaeb30b559a96827425d8452cbb7468f5d5d11e2c54a0c

data/README.md

@@ -7,23 +7,25 @@
 * Versions
     * 0.0.1.pre
     * 0.0.1
+    * 0.0.2
+    * 0.0.3
+    * 0.0.4
+    
     
 Note: Expected Input(DOB) Format: yyyy-mm-dd     
 
 Available Methods:  
 `Seniority.get_age('1989-08-30')`                 
-=> 28-07-01 (in yyyy-mm-dd)  
+=> "28 year(s), 11 month(s), 2 day(s)"  
 `Seniority.get_age_day('1989-08-30')`           
-=> 01  
+=> 2  
 `Seniority.get_age_month('1989-08-30')`         
-=> 07  
+=> 11  
 `Seniority.get_age_year('1989-08-30')`          
 => 28   
 
 **Getting Started:**   
-`gem install seniority -v 0.0.2`<br/>
-Or 
-`gem 'seniority'`<br/>
+`gem install seniority`<br/> 
 `Seniority.get_age('1989-08-30')`<br/>
 
 

data/lib/seniority.rb

@@ -1,50 +1,62 @@
+require 'date'
+# Age Calculator
 class Seniority
-#method that return result(in yyyy-mm-dd) as: 28-07-01
+  # method that return calculated age like: "28 year(s), 7 month(s), 1 day(s)"
   def self.get_age(dob)
     Seniority.age_finder dob
-    @err_mess.any? ? @err_mess.join(', ') : "#{@year}-#{@month}-#{@date}"
+    @error.empty? ? "#{@year} year(s), #{@month} month(s), #{@date} day(s)" : @error
   end
-#method that return result as: "28 year(s), 7 month(s), 1 day(s)"
-  # have to fix errors
-  # def self.get_textual_age(dob)
-  #   Seniority.age_finder dob
-  #   @err_mess.any? ? @err_mess.join(', ') : "#{@year} year(s), #{@month} month(s), #{@date} day(s)"
-  # end
-#method that return result as: "1"
+
+  # method that return calculated day like: 1
   def self.get_age_day(dob)
     Seniority.age_finder dob
-    @err_mess.any? ? @err_mess.join(', ') : "#{@date}"
+    @error.empty? ? @date.to_i : @error
   end
-#method that return result as: "7"
+
+  # method that return calculated month like: 7
   def self.get_age_month(dob)
     Seniority.age_finder dob
-    @err_mess.any? ? @err_mess.join(', ') : "#{@month}"
+    @error.empty? ? @month.to_i : @error
   end
-#method that return result as: "28"
+
+  # method that return calculated year like: 28
   def self.get_age_year(dob)
     Seniority.age_finder dob
-    @err_mess.any? ? @err_mess.join(', ') : "#{@year}"
+    @error.empty? ? @year.to_i : @error
   end
 
-  def self.age_finder dob
-    @err_mess = []
-    # expected input dob as: '1987-21-05' i.e. yyyy-mm-dd
-    @dob_year, @dob_month, @dob_date = dob.split('-')
-    @current_year, @current_month, @current_date = Time.now.strftime("%Y-%m-%d").split('-')
-    @current_year, @current_month, @current_date = @current_year.to_i, @current_month.to_i, @current_date.to_i
-    Seniority.get_error
-    if !@err_mess.any?
-      @dob_year, @dob_month, @dob_date = @dob_year.to_i, @dob_month.to_i, @dob_date.to_i
-      Seniority.calculate_date; Seniority.calculate_month; Seniority.calculate_year
-    else
-      @err_mess.join(', ')
+  def self.age_finder(dob)
+    # d1 = Date.parse('2018-07-31') -- Date
+    # d2 = '31-07-2018'             -- String   -- Date.parse(d2)
+    # d3 = Time.now                 -- Time     -- d3.to_date
+    @error = ''
+    begin
+      if dob.class == Date
+        dob
+      elsif dob.class == String
+        dob = Date.parse(dob)
+      elsif dob.class == Time
+        dob = dob.to_date
+      else
+        @error = 'Invalid Input!'
+      end
+    rescue
+      @error = 'Invalid Input!'
+    end
+    if @error != 'Invalid Input!'
+      @dob_year, @dob_month, @dob_date = dob.year, dob.month, dob.day
+      current_date = Time.now.to_date
+      @current_year, @current_month, @current_date = current_date.year, current_date.month, current_date.day
+      Seniority.calculate_date
+      Seniority.calculate_month
+      Seniority.calculate_year
     end
   end
 
   def self.calculate_date
     if @dob_date > @current_date
       @date = (Seniority.borrow_days + @current_date) - @dob_date
-      @current_month = @current_month - 1
+      @current_month -= 1
     else
       @date = @current_date - @dob_date
     end
@@ -53,7 +65,8 @@ class Seniority
   def self.calculate_month
     if @dob_month > @current_month
       @month = (@current_month + 12) - @dob_month # here 12 is borrowed month
-      @current_year = @current_year - 1 # after taking 12 months borrow we have to reduce 1 year from current year since 1 year = 12 months
+      @current_year -= 1 # after taking 12 months borrow we have to
+      # reduce 1 year from current year since 1 year = 12 months
     else
       @month = @current_month - @dob_month
     end
@@ -63,36 +76,13 @@ class Seniority
     @year = @current_year - @dob_year
   end
 
-  def self.get_error
-    # check any non-digit in year, month and day
-    # check day, month and year should not be zero
-    # check month and day should be within range i.e. for month: 12 and for day: 31
-    if !(@dob_year.scan(/\D/).empty?) or @dob_year.to_i == 0
-      @err_mess << 'DOB year is not valid'
-    end
-    if !(@dob_month.scan(/\D/).empty?) or @dob_month.to_i == 0 or @dob_month.to_i > 12
-      @err_mess << 'DOB month is not valid'
-    end
-    if !(@dob_date.scan(/\D/).empty?) or @dob_date.to_i == 0 or @dob_date.to_i > 31
-      @err_mess << 'DOB date is not valid'
-    end
-    # check dob should be less than current_year
-    if @dob_year.to_i > @current_year
-      @err_mess << 'DOB year is greater than current year'
-    end
-  end
-
   def self.borrow_days
     if [1, 3, 5, 7, 8, 10, 12].include?(@current_month)
       31
     elsif [4, 6, 9, 11].include?(@current_month)
       30
     elsif [2].include?(@current_month)
-      if ((@current_year+1) % 4) == 0
-        29
-      elsif 28
-      end
+      29 if ((@current_year + 1) % 4).zero?
     end
   end
-
-end  
+end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: seniority
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Raj Kumar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-31 00:00:00.000000000 Z
-dependencies: []
+date: 2018-08-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
 description: A simple gem to calculate current age from input DOB(Date of Birth)
 email: raj4057kumar@gmail.com
 executables: []
@@ -18,7 +32,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - lib/seniority.rb
-homepage: http://rubygems.org/gems/seniority
+homepage: https://github.com/championrajkumar/seniority
 licenses:
 - MIT
 metadata: {}
@@ -30,7 +44,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -41,5 +55,5 @@ rubyforge_project:
 rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
-summary: Seniority!
+summary: Age Calculator
 test_files: []