ruby-duration 0.1.6 → 0.1.7

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/lib/duration.rb

@@ -64,6 +64,7 @@ class Duration
 
   # Compare this duration to another (or objects that respond to #to_i)
   def <=>(other)
+    return false unless other.is_a?(Duration)
     @total <=> other.to_i
   end
   

data/lib/duration/mongoid.rb

@@ -1,18 +1,21 @@
 # -*- encoding:  utf-8 -*-
 require 'duration'
+require 'active_support/core_ext'
 
 class Duration
   def self.get(seconds)
+    return if !seconds
     Duration.new(seconds)
   end
 
   def self.set(args)
+    return if args.blank?
     if args.is_a?(Hash)
       Duration.new(args).to_i
     elsif args.respond_to?(:to_i)
       args.to_i
     else
-      0
+      nil
     end
   end
 end

data/ruby-duration.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby-duration}
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jose Peleteiro"]

data/test/duration/test_mongoid.rb

@@ -4,24 +4,36 @@ require 'helper'
 class Duration::TestMongoid < MiniTest::Unit::TestCase
 
   # Returns seconds to serialization
-  def test_get
+  def test_get_seconds
     assert_equal Duration.new(90), Duration.get(90)
   end
+  
+  def test_get_nil
+    assert_nil Duration.get(nil)
+  end
+
+  def test_set_nil
+    assert_nil Duration.set([1,2,3])
+    assert_nil Duration.set(nil)
+    assert_nil Duration.set("")
+  end
 
-  def test_set_default
-    zero = Duration.new(0)
-    assert_equal zero, Duration.set([1,2,3])
-    assert_equal zero, Duration.set("string")
-    assert_equal zero, Duration.set(nil)
+  def test_set_duration
+    assert_equal 90, Duration.set(Duration.new(:minutes => 1, :seconds => 30))
   end
 
   def test_set_seconds
-    assert_equal Duration.new(10), Duration.set("10")
-    assert_equal Duration.new(10), Duration.set(10)
+    assert_equal 10, Duration.set(10)
+  end
+  
+  def test_set_string
+    assert_equal 10, Duration.set("10")
+    assert_equal 10, Duration.set("10string")
+    assert_equal 0, Duration.set("string")
   end
 
   def test_set_hash
-    assert_equal Duration.new(:minutes => 1, :seconds => 30), Duration.set(:minutes => 1, :seconds => 30)
+    assert_equal 90, Duration.set(:minutes => 1, :seconds => 30)
   end
 
 end

data/test/test_duration.rb

@@ -39,13 +39,13 @@ class TestDuration < MiniTest::Unit::TestCase
   end
   
   def test_blank?
-    assert_true Duration.new.blank?
-    assert_false Duration.new(1).blank?
+    assert Duration.new.blank?
+    refute Duration.new(1).blank?
   end
   
   def test_present?
-    assert_false Duration.new.present?
-    assert_true Duration.new(1).present?
+    refute Duration.new.present?
+    assert Duration.new(1).present?
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-duration
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Jose Peleteiro