ruby-duration 3.1.0 → 3.2.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZTQzZmEyYTE0Y2IzNzQ0MjE1OTM2YmRjMjI1OThmMDBlZDIwM2RiMw==
+  data.tar.gz: !binary |-
+    ZjNjODE1MzJkZGQxOWFjZWFlOTgzZWM2ZWZlM2I2MTBmNjQ0NzQ2Zg==
+SHA512:
+  metadata.gz: !binary |-
+    NWQzYTRhZTViNzEyYzcxMTZjNzQxNWIzNDI1YThmM2E5MmYxZTk5YzE1ZTZi
+    YzQxY2RmZDA4NWRhOTE4MTk1Y2FjODY3OGNmYzgxMDgzNTQ2MjllY2VmMzZi
+    MGYzODY1OTU3ZjU3NzE0YmNiYjRlNjQ2NjI4NGNmOGRhMjFhYjI=
+  data.tar.gz: !binary |-
+    ZDFiMzI1MTg3MWY0MjJlMGY1MmVmYzQ3MGE2OTllYzE2ZTYzNDY2ODdlMjI4
+    M2NmOWM2MjkyYzMzMGQ5ODJkYjAzOWIxMzk5YzBkMmRhNjQ1YmMzMWMxYWVl
+    M2VlZTk5NTMxMzAyY2RlNWY1NmNhMmU5MjZiNTM5Y2JkNDlmYzQ=

data/lib/duration.rb

@@ -90,18 +90,22 @@ class Duration
   # Formats a duration in ISO8601.
   # @see http://en.wikipedia.org/wiki/ISO_8601#Durations
   def iso8601
-    output = 'P'
-
-    number_of_days = weeks * 7 + days
-    output << "#{number_of_days}D" if number_of_days > 0
-    if seconds > 0 || minutes > 0 || hours > 0
-      output << 'T'
-      output << "#{hours}H" if hours > 0
-      output << "#{minutes}M" if minutes > 0
-      output << "#{seconds}S" if seconds > 0
-    end
+    if present?
+      output = 'P'
+
+      number_of_days = weeks * 7 + days
+      output << "#{number_of_days}D" if number_of_days > 0
+      if seconds > 0 || minutes > 0 || hours > 0
+        output << 'T'
+        output << "#{hours}H" if hours > 0
+        output << "#{minutes}M" if minutes > 0
+        output << "#{seconds}S" if seconds > 0
+      end
 
-    output
+      negative? ? "-#{output}" : output
+    else
+      'PT0S'
+    end
   end
 
   # @return true if total is 0
@@ -114,6 +118,10 @@ class Duration
     !blank?
   end
 
+  def negative?
+    @negative
+  end
+
   # Format a duration into a human-readable string.
   #
   #   %w   => weeks
@@ -210,7 +218,8 @@ private
   def calculate!
     multiples = [MULTIPLES[:weeks], MULTIPLES[:days], MULTIPLES[:hours], MULTIPLES[:minutes], MULTIPLES[:seconds]]
     units     = []
-    @total    = @seconds.to_f.round
+    @negative = @seconds < 0
+    @total    = @seconds.abs.to_f.round
     multiples.inject(@total) do |total, multiple|
       # Divide into largest unit
       units << total / multiple

data/lib/duration/version.rb

@@ -1,3 +1,3 @@
 class Duration
-  VERSION = "3.1.0"
+  VERSION = "3.2.0"
 end

data/ruby-duration.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "yard", ">= 0"
   s.add_development_dependency "rake", ">= 0"
   s.add_development_dependency "simplecov", ">= 0.3.5"
-  s.add_development_dependency "mongoid", ">= 3.0.0"
+  s.add_development_dependency "mongoid", ">= 3.0.0", "< 4.0.0"
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

data/test/helper.rb

@@ -10,6 +10,8 @@ end
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'ruby-duration'
 
-MiniTest.autorun
+require 'i18n'
+I18n.enforce_available_locales = true
+
+require 'ruby-duration'

data/test/test_duration.rb

@@ -201,6 +201,18 @@ describe "Duration" do
       assert_equal "PT1H30S", d.iso8601
     end
 
+    it 'should format empty duration' do
+      d = Duration.new(0)
+      assert_equal 'PT0S', d.iso8601
+    end
+
+    it 'should format negative duration' do
+      d = Duration.new(-1)
+      assert_equal '-PT1S', d.iso8601
+
+      d = Duration.new(-100)
+      assert_equal '-PT1M40S', d.iso8601
+    end
   end
 
   describe "utilities methods" do

data/test/test_i18n.rb

@@ -9,6 +9,10 @@ describe "I18n" do
       I18n.locale = :pt
     end
 
+    after do
+      I18n.locale = :en
+    end
+
     it "should translate to segundo" do
       assert_equal "segundo", Duration.new(:second => 1).format("%~s")
     end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-duration
 version: !ruby/object:Gem::Version
-  version: 3.1.0
-  prerelease: 
+  version: 3.2.0
 platform: ruby
 authors:
 - Jose Peleteiro
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000 Z
+date: 2014-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -31,7 +28,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -39,7 +35,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -47,7 +42,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: iso8601
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,7 +49,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -63,7 +56,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -71,7 +63,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -79,7 +70,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -87,7 +77,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -95,7 +84,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -103,7 +91,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -111,7 +98,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -119,7 +105,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -127,7 +112,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -135,7 +119,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -143,19 +126,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 description: Duration type
 email:
 - jose@peleteiro.net
@@ -183,31 +170,27 @@ files:
 - test/test_mongoid.rb
 homepage: http://github.com/peleteiro/ruby-duration
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1867546005898660473
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: ruby-duration
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Duration type
 test_files: []
 has_rdoc: