ruby-duration 0.5.4 → 2.0.2

data/.rvmrc

@@ -0,0 +1 @@
+rvm 1.9.2@ruby-duration

data/Gemfile.lock

@@ -1,15 +1,16 @@
 PATH
   remote: .
   specs:
-    ruby-duration (0.5.0)
+    ruby-duration (2.0.1)
+      activesupport (>= 3.0.0)
       i18n
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.1)
+    activesupport (3.0.9)
     bluecloth (2.0.9)
-    i18n (0.4.1)
+    i18n (0.5.0)
     minitest (1.7.2)
     rake (0.8.7)
     simplecov (0.3.6)
@@ -21,10 +22,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (>= 3.0.0)
   bluecloth (>= 0.3.5)
   bundler (>= 1.0.0)
-  i18n
   minitest
   rake
   ruby-duration!

data/README.md

@@ -37,6 +37,7 @@ Show me the code
     Duration.new(:weeks => 1, :days => 20).iso8601 => "P3W6DT0H0M0S"
 
 ### Mongoid support
+The current version of this gem supports Mongoid >= [2.1.0](https://github.com/mongoid/mongoid). For lower Mongoid versions try the tag [v1.0.0](https://github.com/peleteiro/ruby-duration/tree/v1.0.0)
 
     require 'duration/mongoid'
 

data/lib/duration.rb

@@ -1,5 +1,6 @@
 # -*- encoding:  utf-8 -*-
 require 'i18n'
+require 'active_support/core_ext'
 
 # 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
@@ -11,7 +12,7 @@ class Duration
   include Comparable
 
   UNITS = [:seconds, :minutes, :hours, :days, :weeks]
-                 
+
   MULTIPLES = {:seconds => 1,
                :minutes => 60,
                :hours   => 3600,
@@ -92,7 +93,7 @@ class Duration
   def blank?
     @total == 0
   end
-  
+
   # @return true if total different than 0
   def present?
     !blank?
@@ -161,7 +162,7 @@ class Duration
 
   alias_method :to_i, :total
   alias_method :strftime, :format
-
+  
 private
 
   # Calculates the duration from seconds and figures out what the actual
@@ -180,11 +181,11 @@ private
     # Gather the divided units
     @weeks, @days, @hours, @minutes, @seconds = units
   end
-  
+
   def i18n_for(singular)
     plural = "#{singular}s"
     label = send(plural) == 1 ? singular : plural
-    
+
     I18n.t(label, :scope => :ruby_duration, :default => label.to_s)
   end
-end
+end

data/lib/duration/mongoid.rb

@@ -1,34 +1,37 @@
-# -*- encoding:  utf-8 -*-
-require 'duration'
-require 'active_support/core_ext'
+require "#{File.dirname(__FILE__)}/../duration"
 
 # Mongoid serialization support for Duration type.
-module Duration::Mongoid
-  
-  # Deserialize a Duration given the amount of seconds stored by Mongodb
-  #
-  # @param [Integer, nil] duration in seconds
-  # @return [Duration] deserialized Duration
-  def get(seconds)
-    return if !seconds
-    Duration.new(seconds)
-  end
+module Mongoid
+  module Fields
+    module Serializable
+      class Duration
+        include Serializable
+        
+        # Deserialize a Duration given the amount of seconds stored by Mongodb
+        #
+        # @param [Integer, nil] duration in seconds
+        # @return [Duration] deserialized Duration
+        def deserialize(seconds)
+          return if !seconds
+          ::Duration.new(seconds)
+        end
 
-  # Serialize a Duration or a Hash (with duration units) or a amount of seconds to
-  # a BSON serializable type.
-  #
-  # @param [Duration, Hash, Integer] value
-  # @return [Integer] duration in seconds
-  def set(value)
-    return if value.blank?
-    if value.is_a?(Hash)
-      value.delete_if{|k, v| v.blank? || !Duration::UNITS.include?(k.to_sym)}
-      return if value.blank?
-      Duration.new(value).to_i
-    elsif value.respond_to?(:to_i)
-      value.to_i
+        # Serialize a Duration or a Hash (with duration units) or a amount of seconds to
+        # a BSON serializable type.
+        #
+        # @param [Duration, Hash, Integer] value
+        # @return [Integer] duration in seconds
+        def serialize(value)
+          return if value.blank?
+          if value.is_a?(Hash)
+            value.delete_if{|k, v| v.blank? || !::Duration::UNITS.include?(k.to_sym)}
+            return if value.blank?
+            ::Duration.new(value).to_i
+          elsif value.respond_to?(:to_i)
+            value.to_i
+          end
+        end
+      end
     end
   end
-end
-
-Duration.send(:extend, Duration::Mongoid)
+end

data/lib/duration/version.rb

@@ -1,3 +1,3 @@
 class Duration
-  VERSION = "0.5.4"
-end
+  VERSION = "2.0.2"
+end

data/lib/ruby-duration.rb

@@ -1,2 +1,2 @@
 # -*- encoding:  utf-8 -*-
-require 'duration'
+require "#{File.dirname(__FILE__)}/duration"

data/ruby-duration.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.version     = Duration::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Jose Peleteiro", "Bruno Azisaka Maciel"]
-  s.email       = ["jose@peleteiro.net", "bruno@bubble.com.br"]
+  s.email       = ["jose@peleteiro.net", "bruno@azisaka.com.br"]
   s.homepage    = "http://github.com/peleteiro/ruby-duration"
   s.summary     = "Duration type"
   s.description = "Duration type"
@@ -14,13 +14,13 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "ruby-duration"
 
+  s.add_dependency "activesupport", ">= 3.0.0"
   s.add_dependency "i18n", ">= 0"
 
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "minitest", ">= 0"
   s.add_development_dependency "yard", ">= 0"
   s.add_development_dependency "rake", ">= 0"
-  s.add_development_dependency "activesupport", ">= 3.0.0"
   s.add_development_dependency "simplecov", ">= 0.3.5"
   s.add_development_dependency "bluecloth", ">= 0.3.5"
 

data/test/helper.rb

@@ -10,7 +10,6 @@ end
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'duration'
-require 'duration/mongoid'
+require 'ruby-duration'
 
 MiniTest::Unit.autorun

data/test/test_duration.rb

@@ -2,7 +2,6 @@
 require 'helper'
 
 describe "Duration" do
-
   it "should initialize given duration in seconds" do
     d = Duration.new(90)
     assert_equal 0, d.weeks
@@ -117,4 +116,4 @@ describe "Duration" do
     end
   end
 
-end
+end

data/test/{duration/test_i18n.rb → test_i18n.rb}

@@ -1,9 +1,9 @@
 # -*- encoding:  utf-8 -*-
 require 'helper'
 
-I18n.load_path << File.join(File.dirname(__FILE__), '..', 'fixtures', 'locales', 'pt.yml')
+I18n.load_path << File.join(File.dirname(__FILE__), 'fixtures', 'locales', 'pt.yml')
 
-describe "I18n" do
+describe "I18n" do  
   describe "when the locale is pt" do
     before do
       I18n.locale = :pt

data/test/test_mongoid.rb

@@ -0,0 +1,49 @@
+# -*- encoding:  utf-8 -*-
+require 'helper'
+require 'duration/mongoid'
+
+describe "mongoid support" do
+  before do
+    @mongoid_field = Mongoid::Fields::Serializable::Duration.new
+  end
+  
+  describe "#get - Mongoid's deserialization" do
+    it "should return the duration given the total in seconds" do
+      assert_equal Duration.new(90), @mongoid_field.deserialize(90)
+    end
+
+    it "should return nil for nil serialized values" do
+      assert_nil @mongoid_field.deserialize(nil)
+    end
+  end
+
+  describe "#set - Mongoid's serialization" do
+    it "should serialize to nil given an invalid serialized value or nil" do
+      assert_nil @mongoid_field.serialize([1,2,3])
+      assert_nil @mongoid_field.serialize(nil)
+      assert_nil @mongoid_field.serialize("")
+      assert_nil @mongoid_field.serialize({})
+      assert_nil @mongoid_field.serialize({:seconds => "", :hours => ""})
+      assert_nil @mongoid_field.serialize({:x => 100, :seconds => ""})
+    end
+
+    it "should return total seconds given a duration" do
+      assert_equal 90, @mongoid_field.serialize(Duration.new(:minutes => 1, :seconds => 30))
+    end
+
+    it "should return total seconds given a duration in seconds" do
+      assert_equal 10, @mongoid_field.serialize(10)
+    end
+  
+    it "should return total seconds given a duration in string" do
+      assert_equal 10, @mongoid_field.serialize("10")
+      assert_equal 10, @mongoid_field.serialize("10string")
+      assert_equal 0, @mongoid_field.serialize("string") # not blank
+    end
+
+    it "should return total seconds given a duration in hash" do
+      assert_equal 90, @mongoid_field.serialize(:minutes => 1, :seconds => 30)
+    end
+  end
+
+end

metadata

@@ -1,147 +1,115 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby-duration
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 5
-  - 4
-  version: 0.5.4
+version: !ruby/object:Gem::Version
+  version: 2.0.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Jose Peleteiro
 - Bruno Azisaka Maciel
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-11-15 00:00:00 -02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: i18n
+date: 2011-08-04 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &2153695180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *2153695180
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &2153694720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153694720
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &2153694260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2153694260
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &2153693800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2153693800
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &2153693340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2153693340
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2153692880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
-  type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2153692880
+- !ruby/object:Gem::Dependency
   name: simplecov
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &2153692420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.5
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: bluecloth
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *2153692420
+- !ruby/object:Gem::Dependency
+  name: bluecloth
+  requirement: &2153691960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.5
   type: :development
-  version_requirements: *id008
+  prerelease: false
+  version_requirements: *2153691960
 description: Duration type
-email: 
+email:
 - jose@peleteiro.net
-- bruno@bubble.com.br
+- bruno@azisaka.com.br
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .rvmrc
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -152,44 +120,34 @@ files:
 - lib/duration/version.rb
 - lib/ruby-duration.rb
 - ruby-duration.gemspec
-- test/duration/test_i18n.rb
-- test/duration/test_mongoid.rb
 - test/fixtures/locales/pt.yml
 - test/helper.rb
 - test/test_duration.rb
-has_rdoc: true
+- test/test_i18n.rb
+- test/test_mongoid.rb
 homepage: http://github.com/peleteiro/ruby-duration
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: ruby-duration
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Duration type
 test_files: []
-

data/test/duration/test_mongoid.rb

@@ -1,45 +0,0 @@
-# -*- encoding:  utf-8 -*-
-require 'helper'
-
-describe "mongoid support" do
-
-  describe "#get - Mongoid's deserialization" do
-    it "should return the duration given the total in seconds" do
-      assert_equal Duration.new(90), Duration.get(90)
-    end
-
-    it "should return nil for nil serialized values" do
-      assert_nil Duration.get(nil)
-    end
-  end
-
-  describe "#set - Mongoid's serialization" do
-    it "should serialize to nil given an invalid serialized value or nil" do
-      assert_nil Duration.set([1,2,3])
-      assert_nil Duration.set(nil)
-      assert_nil Duration.set("")
-      assert_nil Duration.set({})
-      assert_nil Duration.set({:seconds => "", :hours => ""})
-      assert_nil Duration.set({:x => 100, :seconds => ""})
-    end
-
-    it "should return total seconds given a duration" do
-      assert_equal 90, Duration.set(Duration.new(:minutes => 1, :seconds => 30))
-    end
-
-    it "should return total seconds given a duration in seconds" do
-      assert_equal 10, Duration.set(10)
-    end
-  
-    it "should return total seconds given a duration in string" do
-      assert_equal 10, Duration.set("10")
-      assert_equal 10, Duration.set("10string")
-      assert_equal 0, Duration.set("string") # not blank
-    end
-
-    it "should return total seconds given a duration in hash" do
-      assert_equal 90, Duration.set(:minutes => 1, :seconds => 30)
-    end
-  end
-
-end