span 0.0.1 → 0.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzVhYjA4MDBjNmExMDRmODlkNzU4MjAwMjRiMmYyMzZlZWVkODkxYQ==
+    NWM2ZmU3YzBkZTdmMjI2MGYyYzkyMTBkOGE1N2MwMGJiZmEzMmZmNg==
   data.tar.gz: !binary |-
-    YmEyMDhhNjk2YTMyYjlmMTNjMDI1MmU5MDIyYmU2OGUxYWQyMDU3NQ==
+    OWI3ZWFiYjY1ZTU0YTI0YTE5YmUzNWEzM2QyNjU3MDZhYzI2ZjI0Ng==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    M2NkZTgyZjM2NTg1Y2U5NjI5Mzc5ZGIzOWEyN2UyMDY0YzczY2IzMzMzYWZi
-    NWYxMDM2ODczZWVjZGQ5MGI1MWY3NDUwN2Y4ODcxYzhkZGQxY2E4NmQ3MjI5
-    MDBkNTgwMGExNTdjZWM0MDZmZmQwMGRkMTRiYWZjNGY2YmE0MjY=
+    OGExM2M5ZWQ3YWQ1ODg5ZGU5ZTkwMGEwZGM4ZTY1Y2MxOThhNTM4NTA2YzBh
+    ZGViOGFiOWE1ODQ3ZmU5N2IyZTRjMzNjNjBkY2JlMDVhOGI5ODRlOGJhMmMw
+    MTlkNzFiYTYxZTk4ZTk5YzY2ODM0MWI0NGFiODBkYzU2YWI0OTY=
   data.tar.gz: !binary |-
-    MjdmMTYwZTBjMzQ4ZmZjNmNhMGU1YzUyYzgzYjY3ODU5MzMwNmEyYTFjOTE0
-    ZjIzY2EyOWQ5MmU5ZGU2YmYzNDFmNzllMjdjNmUyYjZiODJmNDY2ZWU1ZjNj
-    YmI5MzkyYWEwMDU1ZDViODEyYzliODQwOTU3YzJkNGU1Yjg3YjM=
+    MmYyYjZiZmFkNWUwY2Y5MjBmM2ZmMDFmN2FjZDRmOWJjMjUxMmE0MTQ0NzYy
+    YjczOGRlZGM2ZjFmOTQ0ZDg0ZDAzYzA4ZDY0ZmE0OGJjZTE3MTFlZDViY2Zi
+    M2I5NzhiNzc1MGRhNTM0ZTk5ZTU1OGNmNzkxZjFjNzIzMDE3YmM=

data/lib/span/date_diff.rb

@@ -0,0 +1,121 @@
+require 'date'
+
+module Span
+  class DateDiff
+    attr_reader \
+      :end_date,
+      :start_date
+
+    def self.compute( *args , &block )
+      new( *args , &block ).to_hash
+    end
+
+    def initialize( end_date_input , start_date_input )
+      @end_date   = end_date_input.to_date
+      @start_date = start_date_input.to_date
+    end
+
+    def build_diff_hash
+      check_from = start_date
+
+      [ :years , :months , :weeks , :days ].reduce Hash.new do | memo , part |
+        check_from , num_of_part , part_singular =
+          send \
+            :"diff_#{ part }",
+            check_from,
+            part
+
+        memo[ part_singular ] = num_of_part
+        memo
+      end
+    end
+
+    def default_diff( check_from , part , part_singular )
+      num_of_part      = 0
+      part_next_method = :"next_#{ part_singular }"
+
+      loop do
+        check = check_from.send part_next_method
+
+        break if check > end_date
+
+        check_from = check
+        num_of_part += 1
+      end
+
+      [ check_from , num_of_part , part_singular ]
+    end
+
+    def diff_days( *args )
+      default_diff *args , :day
+    end
+
+    def diff_months( check_from , * )
+      num_of_part = 0
+      part_singular = :month
+      part_next_method = :"next_#{ part_singular }"
+
+      loop do
+        check = check_from.send part_next_method
+
+        if check > end_date
+          if start_date.day != check_from.day
+            day   = start_date.strftime '%d'
+            month = check_from.strftime '%m'
+            year  = check_from.strftime '%Y'
+
+            date_to_try =
+              begin
+                Date.parse "#{ day }/#{ month }/#{ year }"
+              rescue ArgumentError
+                false
+              end
+
+            check_from =
+              if date_to_try
+                date_to_try
+              else
+                next_month = check_from.next_month.strftime '%m'
+                Date.parse( "01/#{ next_month }/#{ year }" ).prev_day
+              end
+          end
+
+          break
+        end
+
+        check_from = check
+        num_of_part += 1
+      end
+
+      [ check_from , num_of_part , part_singular ]
+    end
+
+    def diff_weeks( check_from , * )
+      num_of_part = 0
+      part_singular = :week
+      part_next_method = :next_day
+      check_from = check_from.prev_day
+
+      loop do
+        check = check_from.send part_next_method
+        6.times { check = check.send part_next_method }
+
+        break if check > end_date
+
+        check_from = check
+        num_of_part += 1
+      end
+
+      [ check_from , num_of_part , part_singular ]
+    end
+
+    def diff_years( *args )
+      default_diff *args , :year
+    end
+
+    def to_hash
+      @_hash ||= build_diff_hash
+    end
+  end
+end
+

data/lib/span/version.rb

@@ -1,3 +1,3 @@
 module Span
-  VERSION = "0.0.1"
+  VERSION = '0.1.0'
 end

data/lib/span.rb

@@ -1,126 +1,8 @@
-require 'date'
-
+require 'span/date_diff'
 require 'span/version'
 
 module Span
   def self.compute( *args , &block )
-    TimeDiff.compute *args , &block
-  end
-
-  class TimeDiff
-    attr_reader \
-      :end_date,
-      :start_date
-
-    def self.compute( *args , &block )
-      new( *args , &block ).to_hash
-    end
-
-    def initialize( end_date_input , start_date_input )
-      @end_date   = end_date_input.to_date
-      @start_date = start_date_input.to_date
-    end
-
-    def build_diff_hash
-      check_from = start_date
-
-      [ :years , :months , :weeks , :days ].reduce Hash.new do | memo , part |
-        check_from , num_of_part , part_singular =
-          send \
-            :"diff_#{ part }",
-            check_from,
-            part
-
-        memo[ part_singular ] = num_of_part
-        memo
-      end
-    end
-
-    def default_diff( check_from , part , part_singular )
-      num_of_part      = 0
-      part_next_method = :"next_#{ part_singular }"
-
-      loop do
-        check = check_from.send part_next_method
-
-        break if check > end_date
-
-        check_from = check
-        num_of_part += 1
-      end
-
-      [ check_from , num_of_part , part_singular ]
-    end
-
-    def diff_days( *args )
-      default_diff *args , :day
-    end
-
-    def diff_months( check_from , * )
-      num_of_part = 0
-      part_singular = :month
-      part_next_method = :"next_#{ part_singular }"
-
-      loop do
-        check = check_from.send part_next_method
-
-        if check > end_date
-          if start_date.day != check_from.day
-            day   = start_date.strftime '%d'
-            month = check_from.strftime '%m'
-            year  = check_from.strftime '%Y'
-
-            date_to_try =
-              begin
-                Date.parse "#{ day }/#{ month }/#{ year }"
-              rescue ArgumentError
-                false
-              end
-
-            check_from =
-              if date_to_try
-                date_to_try
-              else
-                next_month = check_from.next_month.strftime '%m'
-                Date.parse( "01/#{ next_month }/#{ year }" ).prev_day
-              end
-          end
-
-          break
-        end
-
-        check_from = check
-        num_of_part += 1
-      end
-
-      [ check_from , num_of_part , part_singular ]
-    end
-
-    def diff_weeks( check_from , * )
-      num_of_part = 0
-      part_singular = :week
-      part_next_method = :next_day
-      check_from = check_from.prev_day
-
-      loop do
-        check = check_from.send part_next_method
-        6.times { check = check.send part_next_method }
-
-        break if check > end_date
-
-        check_from = check
-        num_of_part += 1
-      end
-
-      [ check_from , num_of_part , part_singular ]
-    end
-
-    def diff_years( *args )
-      default_diff *args , :year
-    end
-
-    def to_hash
-      @_hash ||= build_diff_hash
-    end
+    DateDiff.compute *args , &block
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: span
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Ryan Cook
@@ -65,6 +65,7 @@ files:
 - README.md
 - Rakefile
 - lib/span.rb
+- lib/span/date_diff.rb
 - lib/span/version.rb
 - span.gemspec
 - test/span_test.rb