ruby-duration 2.1.0 → 2.1.3

data/.gitignore

@@ -1,3 +1,4 @@
+Gemfile.lock
 .DS_Store
 .idea
 .bundle

data/lib/duration/mongoid.rb

@@ -1,35 +1,34 @@
 require "#{File.dirname(__FILE__)}/../duration"
+require "mongoid/fields"
 
 # Mongoid serialization support for Duration type.
 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
+    class Duration
+      include Mongoid::Fields::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 serialize(value)
+      # 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?
-          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
+          ::Duration.new(value).to_i
+        elsif value.respond_to?(:to_i)
+          value.to_i
         end
       end
     end

data/lib/duration/version.rb

@@ -1,3 +1,3 @@
 class Duration
-  VERSION = "2.1.0"
+  VERSION = "2.1.3"
 end

data/ruby-duration.gemspec

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

data/test/test_mongoid.rb

@@ -1,49 +1,70 @@
 # -*- encoding:  utf-8 -*-
 require 'helper'
 require 'duration/mongoid'
+require 'mongoid'
 
 describe "mongoid support" do
   before do
-    @mongoid_field = Mongoid::Fields::Serializable::Duration.new
+    class MyModel
+      include Mongoid::Document
+      field :duration, type: Duration
+    end
+    @model = MyModel.new
   end
   
-  describe "#get - Mongoid's deserialization" do
+  describe "assigning an integer value" do
     it "should return the duration given the total in seconds" do
-      assert_equal Duration.new(90), @mongoid_field.deserialize(90)
+      @model.duration = 90
+      assert_equal @model.duration, Duration.new(90)
     end
 
-    it "should return nil for nil serialized values" do
-      assert_nil @mongoid_field.deserialize(nil)
+    it "assigning a nil value" do
+      @model.duration = nil
+      assert_nil @model.duration
     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 => ""})
+  
+  describe "assigning an array" do
+    it "should return nil" do
+      @model.duration = [1,2,3]
+      assert_nil @model.duration
     end
-
-    it "should return total seconds given a duration" do
-      assert_equal 90, @mongoid_field.serialize(Duration.new(:minutes => 1, :seconds => 30))
+  end
+  
+  describe "assigning a valid hash" do
+    it "should return total seconds given a duration in hash" do
+      @model.duration = { :minutes => 1, :seconds => 30 }
+      assert_equal Duration.new({ :minutes => 1, :seconds => 30 }), @model.duration
     end
+  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
+  describe "assigning invalid hashes" do
+    it "should return nil" do
+      [{}, {:seconds => "", :hours => ""}, {:x => 100, :seconds => ""}].each do |value|
+        @model.duration = value
+        assert_nil @model.duration
+      end
     end
+  end
 
-    it "should return total seconds given a duration in hash" do
-      assert_equal 90, @mongoid_field.serialize(:minutes => 1, :seconds => 30)
+  describe "assigning a Duration object" do
+    it "should return the duration value" do
+      duration = Duration.new(:minutes => 1, :seconds => 30)
+      @model.duration = duration
+      assert_equal duration, @model.duration
     end
   end
 
+  describe "assigning a string" do
+    it "should return total seconds given a duration in string" do
+      @model.duration = "10"
+      assert_equal Duration.new(10), @model.duration
+   
+      @model.duration = "10string"
+      assert_equal Duration.new(10), @model.duration
+         
+      @model.duration = "string"
+      assert_equal Duration.new(0), @model.duration
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-duration
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-10 00:00:00.000000000 Z
+date: 2012-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2152565600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,15 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
+  version_requirements: *2152565600
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2152565040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,15 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2152565040
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2152564560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,15 +44,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+  version_requirements: *2152564560
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2152564080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -70,15 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2152564080
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2152563560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -86,15 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2152563560
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2152563040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -102,15 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2152563040
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2152562400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -118,15 +88,10 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.3.5
+  version_requirements: *2152562400
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2152561640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -134,12 +99,18 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *2152561640
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  requirement: &2152559660 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 2.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *2152559660
 description: Duration type
 email:
 - jose@peleteiro.net
@@ -151,7 +122,6 @@ files:
 - .gitignore
 - .rvmrc
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -186,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: ruby-duration
-rubygems_version: 1.8.18
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Duration type

data/Gemfile.lock

@@ -1,35 +0,0 @@
-PATH
-  remote: .
-  specs:
-    ruby-duration (2.1.0)
-      activesupport (>= 3.0.0)
-      i18n
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (3.2.3)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    bluecloth (2.2.0)
-    i18n (0.6.0)
-    minitest (2.12.0)
-    multi_json (1.2.0)
-    rake (0.9.2.2)
-    simplecov (0.6.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
-    yard (0.7.5)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bluecloth (>= 0.3.5)
-  bundler (>= 1.0.0)
-  minitest
-  rake
-  ruby-duration!
-  simplecov (>= 0.3.5)
-  yard