time_difference 0.6.0.pre.activesupport42 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d41c2f733312fe79731e39b1b814bba3ba12f8d
-  data.tar.gz: ee732324a2be9b25e187150683bd5b97975fd4b6
+  metadata.gz: ddbbd2776fa610f2b462a3bd34cfa053764de7c7
+  data.tar.gz: 60ba68aecef657121b45132068e2a196fba8ba35
 SHA512:
-  metadata.gz: 85e019c7f393dc05b523b10cc5ec71ce1f0c8278d9944e6bb7c486a1cf86a1eb018e7e4f633911ec6e2db894ba3c1e9ecd8aced1c29cdff22acb8f6193a4d761
-  data.tar.gz: 5c0b619fd768f1b7fb1cc22de691500cb2c1b857389efdd6c786b1d30e2b79baad642abdf44e235f9ea586e8c0ca037584efe3503e52655daecb8122442ed690
+  metadata.gz: 44f5a247d2c2deb2221872ec3c1406ebb78e0c82f264fc19fc079ef64a3ae7a1bbc3793790828139b3c067dfda8571c6b5d5dacc6b078eb22215413027855a90
+  data.tar.gz: 530f80604b653f162b6a6a170006d6bbb49e392205ca712e27a78b7761e5b54eb4368e0c0246db987490de69e9aa444a06d52dfd0862ed184c1150f2e0e48b1f

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - "1.9.3"
   - 2.2
   - 2.3
   - 2.4
@@ -8,13 +7,7 @@ rvm:
 # uncomment this line if your project needs to run something other than `rake`:
 script: bundle exec rspec spec
 gemfile:
-  - Gemfile.activesupport32
-  - Gemfile.activesupport42
-
-matrix:
-  exclude:
-  - rvm: 2.4
-    gemfile: Gemfile.activesupport32
+  - Gemfile.activesupport51
 
 before_install:
   - gem install bundler

data/{Gemfile.activesupport32 → Gemfile.activesupport51}

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

data/README.md

@@ -1,5 +1,7 @@
 [![Build Status](https://travis-ci.org/tmlee/time_difference.png)](https://travis-ci.org/tmlee/time_difference)
 
+This latest version of the gem works with ActiveSupport 5.1. For prior version, check out [v0.6.x-activesupport42](https://github.com/tmlee/time_difference/tree/0.6.0-activesupport42)
+
 # TimeDifference
 
 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.

data/lib/time_difference.rb

@@ -47,12 +47,14 @@ class TimeDifference
 
   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]
+      if remaining > 0
+        rounded_time_component = (remaining / 1.send(time_component).seconds).round(2).floor
+        remaining -= rounded_time_component.send(time_component)
+        [time_component, rounded_time_component]
+      else
+        [time_component, 0]
+      end
     end]
   end
 
@@ -78,7 +80,7 @@ class TimeDifference
   end
 
   private
-  
+
   def initialize(start_time, end_time)
     start_time = time_in_seconds(start_time)
     end_time = time_in_seconds(end_time)

data/spec/spec_helper.rb

@@ -2,7 +2,6 @@ require 'rspec'
 require 'time_difference'
 
 RSpec.configure do |config|
-  config.color_enabled = true
   config.formatter     = 'documentation'
 
   # Configure Timezone for proper tests

data/spec/time_difference_spec.rb

@@ -40,7 +40,7 @@ describe TimeDifference 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})
+        expect(TimeDifference.between(start_time, end_time).in_general).to eql({years: 1, months: 2, weeks: 0, days: 0, hours: 0, minutes: 0, seconds: 0})
       end
     end
   end
@@ -51,7 +51,7 @@ describe TimeDifference do
         start_time = clazz.new(2009, 11)
         end_time = clazz.new(2011, 1)
 
-        expect(TimeDifference.between(start_time, end_time).humanize).to eql("1 Year, 2 Months and 18 Hours")
+        expect(TimeDifference.between(start_time, end_time).humanize).to eql("1 Year and 2 Months")
       end
     end
   end

data/time_difference.gemspec

@@ -11,11 +11,11 @@ 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.6.0-activesupport42"
+  gem.version       = "0.7.0"
   gem.license = 'MIT'
 
-  gem.add_runtime_dependency('activesupport')
-  gem.add_development_dependency('rspec', '~> 2.13.0')
+  gem.add_runtime_dependency('activesupport', '~> 5.1')
+  gem.add_development_dependency('rspec', '~> 3.7.0')
   gem.add_development_dependency('rake')
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: time_difference
 version: !ruby/object:Gem::Version
-  version: 0.6.0.pre.activesupport42
+  version: 0.7.0
 platform: ruby
 authors:
 - TM Lee
@@ -14,30 +14,30 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 3.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -65,8 +65,7 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.activesupport32
-- Gemfile.activesupport42
+- Gemfile.activesupport51
 - LICENSE
 - README.md
 - Rakefile
@@ -89,12 +88,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: TimeDifference is the missing Ruby method to calculate difference between

data/Gemfile.activesupport42

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