time_difference 0.3.2 → 0.4.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3f41189c3216e381c0b064cde1fd7de7bad4a7bf
+  data.tar.gz: 79c6dff109309e90f0b0303b927b47ba5521e286
+SHA512:
+  metadata.gz: 423c17b810279a3b072d423542ea31ea985a97644aa91096ffc1932bf05b6841599a6d8c81ee44901bed63fdd85a469debd573370f0cde6359574052804ad92c
+  data.tar.gz: d8b9992a80bf9b35fbda3d8d04ecccbd104aefa23f71c7457926ec9dad47f7967a45059904c3cfd5ffab5fd8d331d2deaa17820944f7fb1581773e52c5417162

data/.travis.yml

@@ -1,7 +1,11 @@
 language: ruby
 rvm:
   - "1.9.3"
+  - 2.2
   - jruby-19mode # JRuby in 1.9 mode
   - rbx-19mode
 # uncomment this line if your project needs to run something other than `rake`:
-script: bundle exec rspec spec
+script: bundle exec rspec spec
+gemfile:
+- Gemfile.activesupport32
+- Gemfile

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v0.4.2
+* Support Time, DateTime, and Date class as input
+
 ## v0.3.1
 * Support in_each_component as a shortcut for all time components
 

data/Gemfile.activesupport32

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+gemspec
+
+gem 'activesupport', '~> 3.2'

data/README.md

@@ -18,11 +18,22 @@ And then execute:
 
 ### Get the time difference in year
 
+	# Works for Time, DateTime, and Date
 	start_time = Time.new(2013,1)
 	end_time = Time.new(2014,1)
 	TimeDifference.between(start_time, end_time).in_years
 	=> 1.0
 
+	start_time = DateTime.new(2013,1)
+	end_time = DateTime.new(2014,1)
+	TimeDifference.between(start_time, end_time).in_years
+	=> 1.0
+
+	start_time = Date.new(2013,1)
+	end_time = Date.new(2014,1)
+	TimeDifference.between(start_time, end_time).in_years
+	=> 1.0
+
 ### Get the time difference in months
 
 	start_time = Time.new(2013,1)

data/lib/time_difference.rb

@@ -3,46 +3,74 @@ require "active_support/all"
 
 class TimeDifference
 
+  private_class_method :new
+
+  TIME_COMPONENTS = [:years, :months, :weeks, :days, :hours, :minutes, :seconds]
+
   def self.between(start_time, end_time)
-  	@time_diff = end_time - start_time
-  	self
-  end
-
-  class << self
-
-  	[:years, :months, :weeks, :days, :hours, :minutes, :seconds].each do |time_component|
-  		self.class.instance_eval do
-  			define_method("in_#{time_component}") do
-  				if time_component == :months
-  					((@time_diff/(1.days * 30.42)).round(2)).abs
-  				else
-  			 		((@time_diff/1.send(time_component)).round(2)).abs
-  			 	end
-  			end
-  		end
-  	end
-
-  end
-
-  def self.in_each_component
-    time_in_each_component = {}
-    [:years, :months, :weeks, :days, :hours, :minutes, :seconds].each do |time_component|
-      if time_component == :months
-        time_in_each_component[time_component] = ((@time_diff/(1.days * 30.42)).round(2)).abs
-      else
-        time_in_each_component[time_component] = ((@time_diff/1.send(time_component)).round(2)).abs
-      end
-    end
-    time_in_each_component
-  end
-
-  def self.in_general
-  	result = {}
-	  [:years, :months, :weeks, :days, :hours, :minutes, :seconds].each do |time_component|
-  		result[time_component] = (@time_diff/1.send(time_component)).floor
-  		@time_diff = (@time_diff - result[time_component].send(time_component))
-  	end
-  	result
+    new(start_time, end_time)
+  end
+
+  def in_years
+    in_component(:years)
+  end
+
+  def in_months
+    (@time_diff / (1.day * 30.42)).round(2)
+  end
+
+  def in_weeks
+    in_component(:weeks)
+  end
+
+  def in_days
+    in_component(:days)
+  end
+
+  def in_hours
+    in_component(:hours)
+  end
+
+  def in_minutes
+    in_component(:minutes)
+  end
+
+  def in_seconds
+    @time_diff
+  end
+
+  def in_each_component
+    Hash[TIME_COMPONENTS.map do |time_component|
+      [time_component, public_send("in_#{time_component}")]
+    end]
+  end
+
+  def in_general
+    remaining = @time_diff
+
+    Hash[TIME_COMPONENTS.map do |time_component|
+      rounded_time_component = (remaining / 1.send(time_component)).floor
+      remaining -= rounded_time_component.send(time_component)
+
+      [time_component, rounded_time_component]
+    end]
+  end
+
+  private
+  
+  def initialize(start_time, end_time)
+    start_time = time_in_seconds(start_time)
+    end_time = time_in_seconds(end_time)
+
+    @time_diff = (end_time - start_time).abs
+  end
+
+  def time_in_seconds(time)
+    time.to_time.to_f
+  end
+
+  def in_component(component)
+    (@time_diff / 1.send(component)).round(2)
   end
 
 end

data/spec/time_difference_spec.rb

@@ -2,38 +2,170 @@ require 'spec_helper'
 
 describe TimeDifference do
 
-	it "returns time difference in each component" do
-		start_time = Time.new(2011,1)
-		end_time = Time.new(2011,12)
-		expect(TimeDifference.between(start_time, end_time).in_each_component).to eql({:years=>0.91, :months=>10.98, :weeks=>47.71, :days=>334.0, :hours=>8016.0, :minutes=>480960.0, :seconds=>28857600.0})
-	end
-
-	it "returns time difference in general that matches the total seconds" do
-		start_time = Time.new(2009,9)
-		end_time = Time.new(2010,11)
-		expect(TimeDifference.between(start_time, end_time).in_general).to eql({:years=>1, :months=>2, :weeks=>0, :days=>0, :hours=>18, :minutes=>0, :seconds=>0})
-	end
-
-	it "returns time difference based on Wolfram Alpha" do
-		start_time = Time.new(2011,1)
-		end_time = Time.new(2011,12)
-		expect(TimeDifference.between(start_time, end_time).in_years).to eql 0.91
-		expect(TimeDifference.between(start_time, end_time).in_months).to eql 10.98
-		expect(TimeDifference.between(start_time, end_time).in_weeks).to eql 47.71
-		expect(TimeDifference.between(start_time, end_time).in_days).to eql 334.0
-		expect(TimeDifference.between(start_time, end_time).in_hours).to eql 8016.0
-		expect(TimeDifference.between(start_time, end_time).in_minutes).to eql 480960.0
-	end
-
-	it "returns time difference in absolute value regardless how it is minus-ed out" do
-		start_time = Time.new(2011,1)
-		end_time = Time.new(2011,12)
-		expect(TimeDifference.between(end_time, start_time).in_years).to eql 0.91
-		expect(TimeDifference.between(end_time, start_time).in_months).to eql 10.98
-		expect(TimeDifference.between(end_time, start_time).in_weeks).to eql 47.71
-		expect(TimeDifference.between(end_time, start_time).in_days).to eql 334.0
-		expect(TimeDifference.between(end_time, start_time).in_hours).to eql 8016.0
-		expect(TimeDifference.between(end_time, start_time).in_minutes).to eql 480960.0
-	end
-
-end
+  def self.with_each_class(&block)
+    classes = [Time, Date, DateTime]
+
+    classes.each do |clazz|
+      context "with a #{clazz.name} class" do
+        instance_exec clazz, &block
+      end
+    end
+  end
+
+  describe ".between" do
+    it "returns a new TimeDifference instance" do
+      start_time = Time.new(2011, 1)
+      end_time = Time.new(2011, 12)
+
+      expect(TimeDifference.between(start_time, end_time)).to be_a(TimeDifference)
+    end
+  end
+
+  describe "#in_each_component" do
+    with_each_class do |clazz|
+      it "returns time difference in each component" do
+        start_time = clazz.new(2011, 1)
+        end_time = clazz.new(2011, 12)
+
+        expect(TimeDifference.between(start_time, end_time).in_each_component).to eql({:years => 0.91, :months => 10.98, :weeks => 47.71, :days => 334.0, :hours => 8016.0, :minutes => 480960.0, :seconds => 28857600.0})
+      end
+    end
+  end
+
+  describe "#in_general" do
+    with_each_class do |clazz|
+      it "returns time difference in general that matches the total seconds" do
+        start_time = clazz.new(2009, 11)
+        end_time = clazz.new(2011, 1)
+
+        expect(TimeDifference.between(start_time, end_time).in_general).to eql({:years => 1, :months => 2, :weeks => 0, :days => 0, :hours => 18, :minutes => 0, :seconds => 0})
+      end
+    end
+  end
+
+  describe "#in_years" do
+    with_each_class do |clazz|
+      it "returns time difference in years based on Wolfram Alpha" do
+        start_time = clazz.new(2011, 1)
+        end_time = clazz.new(2011, 12)
+
+        expect(TimeDifference.between(start_time, end_time).in_years).to eql(0.91)
+      end
+
+      it "returns an absolute difference" do
+        start_time = clazz.new(2011, 12)
+        end_time = clazz.new(2011, 1)
+
+        expect(TimeDifference.between(start_time, end_time).in_years).to eql(0.91)
+      end
+    end
+  end
+
+  describe "#in_months" do
+    with_each_class do |clazz|
+      it "returns time difference in months based on Wolfram Alpha" do
+        start_time = clazz.new(2011, 1)
+        end_time = clazz.new(2011, 12)
+
+        expect(TimeDifference.between(start_time, end_time).in_months).to eql(10.98)
+      end
+
+      it "returns an absolute difference" do
+        start_time = clazz.new(2011, 12)
+        end_time = clazz.new(2011, 1)
+
+        expect(TimeDifference.between(start_time, end_time).in_months).to eql(10.98)
+      end
+    end
+  end
+
+  describe "#in_weeks" do
+    with_each_class do |clazz|
+      it "returns time difference in weeks based on Wolfram Alpha" do
+        start_time = clazz.new(2011, 1)
+        end_time = clazz.new(2011, 12)
+
+        expect(TimeDifference.between(start_time, end_time).in_weeks).to eql(47.71)
+      end
+
+      it "returns an absolute difference" do
+        start_time = clazz.new(2011, 12)
+        end_time = clazz.new(2011, 1)
+
+        expect(TimeDifference.between(start_time, end_time).in_weeks).to eql(47.71)
+      end
+    end
+  end
+
+  describe "#in_days" do
+    with_each_class do |clazz|
+      it "returns time difference in weeks based on Wolfram Alpha" do
+        start_time = clazz.new(2011, 1)
+        end_time = clazz.new(2011, 12)
+
+        expect(TimeDifference.between(start_time, end_time).in_days).to eql(334.0)
+      end
+
+      it "returns an absolute difference" do
+        start_time = clazz.new(2011, 12)
+        end_time = clazz.new(2011, 1)
+
+        expect(TimeDifference.between(start_time, end_time).in_days).to eql(334.0)
+      end
+    end
+  end
+
+  describe "#in_hours" do
+    with_each_class do |clazz|
+      it "returns time difference in hours based on Wolfram Alpha" do
+        start_time = clazz.new(2011, 1)
+        end_time = clazz.new(2011, 12)
+
+        expect(TimeDifference.between(start_time, end_time).in_hours).to eql(8016.0)
+      end
+
+      it "returns an absolute difference" do
+        start_time = clazz.new(2011, 12)
+        end_time = clazz.new(2011, 1)
+
+        expect(TimeDifference.between(start_time, end_time).in_hours).to eql(8016.0)
+      end
+    end
+  end
+
+  describe "#in_minutes" do
+    with_each_class do |clazz|
+      it "returns time difference in minutes based on Wolfram Alpha" do
+        start_time = clazz.new(2011, 1)
+        end_time = clazz.new(2011, 12)
+
+        expect(TimeDifference.between(start_time, end_time).in_minutes).to eql(480960.0)
+      end
+
+      it "returns an absolute difference" do
+        start_time = clazz.new(2011, 12)
+        end_time = clazz.new(2011, 1)
+
+        expect(TimeDifference.between(start_time, end_time).in_minutes).to eql(480960.0)
+      end
+    end
+  end
+
+  describe "#in_seconds" do
+    with_each_class do |clazz|
+      it "returns time difference in seconds based on Wolfram Alpha" do
+        start_time = clazz.new(2011, 1)
+        end_time = clazz.new(2011, 12)
+
+        expect(TimeDifference.between(start_time, end_time).in_seconds).to eql(28857600.0)
+      end
+
+      it "returns an absolute difference" do
+        start_time = clazz.new(2011, 12)
+        end_time = clazz.new(2011, 1)
+
+        expect(TimeDifference.between(start_time, end_time).in_seconds).to eql(28857600.0)
+      end
+    end
+  end
+end

data/time_difference.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "time_difference"
   gem.require_paths = ["lib"]
-  gem.version       = "0.3.2"
+  gem.version       = "0.4.2"
   gem.license = 'MIT'
 
   gem.add_runtime_dependency('activesupport')

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: time_difference
 version: !ruby/object:Gem::Version
-  version: 0.3.2
-  prerelease: 
+  version: 0.4.2
 platform: ruby
 authors:
 - TM Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-05 00:00:00.000000000 Z
+date: 2015-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: TimeDifference is the missing Ruby method to calculate difference between
@@ -68,10 +61,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.activesupport32
 - LICENSE
 - README.md
 - Rakefile
@@ -82,31 +76,29 @@ files:
 homepage: ''
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: TimeDifference is the missing Ruby method to calculate difference between
   two given time. You can do a Ruby time difference in year, month, week, day, hour,
   minute, and seconds.
 test_files:
 - spec/spec_helper.rb
 - spec/time_difference_spec.rb
-has_rdoc: