ruby-duration 3.0.0 → 3.1.0

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
   - 1.9.3
+  - 2.0.0
   - jruby-19mode
-  - ruby-head
   - jruby-head

data/lib/duration.rb

@@ -1,6 +1,7 @@
 # -*- encoding:  utf-8 -*-
 require 'i18n'
 require 'active_support/core_ext'
+require 'iso8601'
 
 # Duration objects are simple mechanisms that allow you to operate on durations
 # of time.  They allow you to know how much time has passed since a certain
@@ -39,6 +40,8 @@ class Duration
         unit = unit.to_sym
         @seconds += args[unit].to_i * multiple if args.key?(unit)
       end
+    elsif args.kind_of?(String) and args[0] == 'P'
+      @seconds = ISO8601::Duration.new(args).to_seconds
     else
       @seconds = args.to_i
     end
@@ -46,6 +49,14 @@ class Duration
     calculate!
   end
 
+  def self.load string
+    self.new(string)
+  end
+
+  def self.dump duration
+    duration.iso8601
+  end
+
   # Compare this duration to another (or objects that respond to #to_i)
   def <=>(other)
     return false unless other.is_a?(Duration)
@@ -81,8 +92,8 @@ class Duration
   def iso8601
     output = 'P'
 
-    output << "#{weeks}W" if weeks > 0
-    output << "#{days}D" if days > 0
+    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
@@ -115,6 +126,10 @@ class Duration
   #   %tm  => total minutes
   #   %ts  => total seconds
   #   %t   => total seconds
+  #   %MP  => minutes with UTF-8 prime
+  #   %SP  => seconds with UTF-8 double-prime
+  #   %MH  => minutes with HTML prime
+  #   %SH  => seconds with HTML double-prime
   #   %H   => zero-padded hours
   #   %M   => zero-padded minutes
   #   %S   => zero-padded seconds
@@ -161,6 +176,10 @@ class Duration
       'tm' => Proc.new { total_minutes },
       'ts' => @total,
       't'  => @total,
+      'MP' =>  Proc.new { "#{@minutes}′"},
+      'SP' =>  Proc.new { "#{@seconds}″"},
+      'MH' =>  Proc.new { "#{@minutes}&#8242;"},
+      'SH' =>  Proc.new { "#{@seconds}&#8243;"},
       'H'  => @hours.to_s.rjust(2, '0'),
       'M'  => @minutes.to_s.rjust(2, '0'),
       'S'  => @seconds.to_s.rjust(2, '0'),
@@ -172,10 +191,10 @@ class Duration
       'tdu'=> Proc.new { "#{total_days} #{i18n_for(:total_day)}"},
       'thu'=> Proc.new { "#{total_hours} #{i18n_for(:total_hour)}"},
       'tmu'=> Proc.new { "#{total_minutes} #{i18n_for(:total_minute)}"},
-      'tsu'=> Proc.new { "#{total} #{i18n_for(:total)}"}
+      'tsu'=> Proc.new { "#{total} #{i18n_for(:total)}"},
     }
 
-    format_str.gsub(/%?%(w|d|h|m|s|t([dhms]u?)?|H|M|S|~(?:s|m|h|d|w))/) do |match|
+    format_str.gsub(/%?%(w|d|h|m|s|t([dhms]u?)?|MP|SP|MH|SH|H|M|S|~(?:s|m|h|d|w))/) do |match|
       match['%%'] ? match : (identifiers[match[1..-1]].class == Proc ? identifiers[match[1..-1]].call : identifiers[match[1..-1]])
     end.gsub('%%', '%')
   end

data/lib/duration/version.rb

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

data/ruby-duration.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "activesupport", ">= 3.0.0"
   s.add_dependency "i18n", ">= 0"
+  s.add_dependency "iso8601", ">= 0"
 
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "minitest", ">= 0"

data/test/helper.rb

@@ -1,6 +1,6 @@
 # -*- encoding:  utf-8 -*-
 require 'rubygems'
-require 'minitest/spec'
+require 'minitest/autorun'
 begin
   require 'simplecov'
   SimpleCov.start do
@@ -12,4 +12,4 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'ruby-duration'
 
-MiniTest::Unit.autorun
+MiniTest.autorun

data/test/test_duration.rb

@@ -28,6 +28,12 @@ describe "Duration" do
     assert_equal      9, d.total_days
   end
 
+  it 'should load and dump' do
+    duration = Duration.new(:seconds => 3)
+    assert_equal 'PT3S', Duration.dump(duration)
+    assert_equal Duration.load('PT3S'), duration
+  end
+
   describe "mathematical operations" do
 
     it "should +" do
@@ -123,6 +129,38 @@ describe "Duration" do
     end
   end
 
+  describe "output typographic marks for minutes and seconds" do
+    it "uses a UTF-8 double prime for seconds" do
+      d = Duration.new(:seconds => 14)
+      assert_equal "14″", d.format("%SP")
+    end
+
+    it "uses a UTF-8 prime for seconds" do
+      d = Duration.new(:minutes => 21)
+      assert_equal "21′", d.format("%MP")
+    end
+
+    it "uses a HTML double prime for seconds" do
+      d = Duration.new(:seconds => 14)
+      assert_equal "14″", d.format("%SH")
+    end
+
+    it "uses a HTML prime for seconds" do
+      d = Duration.new(:minutes => 21)
+      assert_equal "21′", d.format("%MH")
+    end
+  end
+
+  describe "creation from iso_8601" do
+    it "should work" do
+      assert_equal 60, Duration.new("PT1M").to_i
+      assert_equal 3630, Duration.new("PT1H30S").to_i
+
+      duration = Duration.new(:weeks => 1, :days => 1, :hours => 2, :minutes => 1, :seconds => 2)
+      assert_equal duration, Duration.new(duration.iso8601)
+    end
+  end
+
   describe "#iso_6801" do
     it "should format seconds" do
       d = Duration.new(:seconds => 1)
@@ -144,20 +182,20 @@ describe "Duration" do
       assert_equal "P1D", d.iso8601
     end
 
-    it "should format weeks" do
+    it "should format weeks as ndays" do
       d = Duration.new(:weeks => 1)
-      assert_equal "P1W", d.iso8601
+      assert_equal "P7D", d.iso8601
     end
 
     it "should format only with given values" do
       d = Duration.new(:weeks => 1, :days => 2, :hours => 3, :minutes => 4, :seconds => 5)
-      assert_equal "P1W2DT3H4M5S", d.iso8601
+      assert_equal "P9DT3H4M5S", d.iso8601
 
       d = Duration.new(:weeks => 1, :hours => 2, :seconds => 3)
-      assert_equal "P1WT2H3S", d.iso8601
+      assert_equal "P7DT2H3S", d.iso8601
 
       d = Duration.new(:weeks => 1, :days => 2)
-      assert_equal "P1W2D", d.iso8601
+      assert_equal "P9D", d.iso8601
 
       d = Duration.new(:hours => 1, :seconds => 30)
       assert_equal "PT1H30S", d.iso8601

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-duration
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-22 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,6 +44,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: iso8601
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +196,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 370806958351175358
+      hash: 1867546005898660473
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: