moments 0.0.1.alpha → 0.0.2.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5c9ac306fade5a3e30cf114c2d8d2c5bd6ddef7
-  data.tar.gz: 01ab04bf9129c934bbcd347a09e71d9681d8ee9d
+  metadata.gz: 50e1bdbcf9a083bb6213223ff6f9558bb8871c0f
+  data.tar.gz: b5657505ec91e49a9ca89de5a0e299a7c5fec436
 SHA512:
-  metadata.gz: d22dbd113c4e13f1efc0b45edc5ef8b1c961bc6400b2c109d659a0d37e8615a011072d42034d71c5dba59c95a9f512fb80aaeff8d6d85c1c4c76bbca0b062d50
-  data.tar.gz: be8882e85ce70577b6ba4cc8d53109e6d7c5e30e06ed345b9d2c2a48d9aadb7d627d0d217356b5254819e8f9ae207b8aca69cfee7aa3cc9b8ecc79c2023baa92
+  metadata.gz: e1c3176a225c6674a199dee03fe9d60912fb71f3eaa4adfa9d88f1c2e4a2215e7d3dfc9b5c76136de67a6945cf80fca4f4c96451de34379c347dac377ea10676
+  data.tar.gz: df0f0200d5bf1a5b8164751cbc4c242e79dc5de030302931de003fe88c14a5de3a95b511fd2898caabb1e147be8b592c0780052052ec49a11ab965543be1a48d

data/.travis.yml

@@ -1,7 +1,10 @@
 language: ruby
 script: "bundle exec rspec"
 rvm:
-  - 2.1.0
+  - 2.1.5
   - jruby-19mode
   - ruby-head
   - jruby-head
+addons:
+  code_climate:
+    repo_token: 83c2e090282b16d91251419d1258e47c82d725056835a1daef193077cbb2a0e6

data/README.md

@@ -1,7 +1,9 @@
-# Moments
+# Moments [![Gem Version](https://badge.fury.io/rb/moments.svg)](http://badge.fury.io/rb/moments)
 
 [![Build Status](https://travis-ci.org/excpt/moments.svg?branch=master)](https://travis-ci.org/excpt/moments)
 [![Code Climate](https://codeclimate.com/github/excpt/moments.png)](https://codeclimate.com/github/excpt/moments)
+[![Test Coverage](https://codeclimate.com/github/excpt/moments/badges/coverage.svg)](https://codeclimate.com/github/excpt/moments)
+[![Dependency Status](https://gemnasium.com/excpt/moments.svg)](https://gemnasium.com/excpt/moments)
 
 Handles time differences and calculations.
 
@@ -21,6 +23,19 @@ Or install it yourself as:
 
 ## Usage
 
+```ruby
+require 'moments'
+
+t1 = Time.now
+t2 = Time.new 2020, 1, 1
+
+# Important: For now t1 must be equal or less than t2
+diff = Moments.difference t1, t2
+
+puts diff.to_hash
+# Output {:years=>5, :months=>7, :days=>5, :hours=>19, :minutes=>29, :seconds=>6}
+```
+
 ## Contributing
 
 1. Fork it ( https://github.com/excpt/moments/fork )

data/lib/moments/difference.rb

@@ -29,55 +29,55 @@ module Moments
     end
 
     def precise_difference
-      seconds = @to.sec - @from.sec
-      minutes = @to.min - @from.min
-      hours   = @to.hour - @from.hour
-      days    = @to.day - @from.day
-      months  = @to.month - @from.month
-      years   = @to.year - @from.year
-
-      if seconds < 0
-        seconds += 60
-        minutes -= 1
-      end
+      @diff = {
+        seconds: @to.sec - @from.sec,
+        minutes: @to.min - @from.min,
+        hours: @to.hour - @from.hour,
+        days: @to.day - @from.day,
+        months: @to.month - @from.month,
+        years: @to.year - @from.year,
+      }
 
-      if minutes < 0
-        minutes += 60
-        hours   -= 1
-      end
+      calculate :seconds, :minutes
+      calculate :minutes, :hours
+      calculate :hours, :days, 24
+      calculate_days
+      calculate :months, :years, 12
 
-      if hours < 0
-        hours += 24
-        days  -= 1
-      end
+      @diff
+    end
 
-      if days < 0
-        previous_month_days = (Time.new(@to.year, @to.month, 1) - 1).day
+    private :precise_difference
 
-        if previous_month_days < @from.day
-          days = previous_month_days + days + (@from.day - previous_month_days)
-        else
-          days = previous_month_days + days
-        end
+    def calculate(attr, subtr, increment = 60)
+      if @diff[attr] < 0
+        @diff[attr] += increment
+        @diff[subtr] -= 1
+      end
+    end
+
+    private :calculate
 
-        months -= 1
+    def calculate_days
+      if @diff[:days] < 0
+        previous_month_days = (Time.new(@to.year, @to.month, 1) - 1).day
+        @diff[:days] = precise_previous_month_days(@diff[:days], previous_month_days, @from.day)
+        @diff[:months] -= 1
       end
+    end
 
-      if months < 0
-        months += 12
-        years -= 1
+    private :calculate_days
+
+    def precise_previous_month_days(days, previous, from)
+      if previous < from
+        days = previous + days + (from - previous)
+      else
+        days = previous + days
       end
 
-      @diff = {
-          years:   years,
-          months:  months,
-          days:    days,
-          hours:   hours,
-          minutes: minutes,
-          seconds: seconds
-      }
+      days
     end
 
-    private :precise_difference
+    private :precise_previous_month_days
   end
-end
+end

data/lib/moments/version.rb

@@ -6,7 +6,7 @@ module Moments
   module VERSION
     MAJOR = 0
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
     PRE   = 'alpha'
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/moments.gemspec

@@ -18,7 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "codeclimate-test-reporter"
 end

data/spec/lib/moments/difference_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require_relative '../../../lib/moments/difference'
 
 describe Moments::Difference do

data/spec/lib/moments_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require_relative '../../lib/moments.rb'
 
 describe Moments do
@@ -17,5 +18,11 @@ describe Moments do
 
       Moments.difference(from, to).should be_a Moments::Difference
     end
+
+    it '#difference should raise an error if :from is greater than :to' do
+      expect do
+        Moments.difference(to, from)
+      end.to raise_error
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,11 @@
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
+
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.expect_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
+
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: moments
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha
+  version: 0.0.2.alpha
 platform: ruby
 authors:
 - Tim Rudat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-26 00:00:00.000000000 Z
+date: 2014-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
 email:
 - timrudat@gmail.com
@@ -93,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Handles time differences and calculations.