quantify 3.2.0 → 3.2.1

data/VERSION

@@ -1 +1 @@
-3.2.0
+3.2.1

data/lib/quantify/quantity.rb

@@ -122,7 +122,7 @@ module Quantify
     # a unit. The unit can be a an instance of Unit::Base or the name, symbol or
     # JScience label of a known (or derivable through know units and prefixes)
     # unit
-    def initialize(value, unit)
+    def initialize(value, unit = 'unity')
       if value
         @value = value.to_f
       else
@@ -291,6 +291,8 @@ module Quantify
     def <=>(other)
       raise Exceptions::InvalidArgumentError unless other.is_a? Quantity
       raise Exceptions::InvalidArgumentError unless other.unit.is_alternative_for?(unit)
+      return 0 if @value.nil? && (other.nil? || other.value.nil?)
+
       other = other.to @unit
       @value.to_f <=> other.value.to_f
     end
@@ -300,6 +302,11 @@ module Quantify
       range.cover? self
     end
 
+    def between?(min, max)
+      raise NoMethodError if @value.nil?
+      super(min,max)
+    end
+
     protected
     
     # Quantities must be of the same dimension in order to operate. If they are

data/quantify.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{quantify}
-  s.version = "3.2.0"
+  s.version = "3.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Berkeley"]

data/spec/quantity_spec.rb

@@ -4,6 +4,14 @@ include Quantify
 
 describe Quantity do
 
+  describe "#initialize" do
+    specify { Quantity.new(1).should eq(Quantity.new(1,'unity')) }
+    specify { Quantity.new(nil,nil).should eq(Quantity.new(nil,'unity')) }
+    specify { Quantity.new(nil,nil).should eq(Quantity.new(nil,'unity')) }
+    specify { Quantity.new(nil,'unity').should eq(Quantity.new(nil,'unity')) }
+    specify { Quantity.new(nil).should eq(Quantity.new(nil,'unity')) }
+  end
+
   it "should create a valid instance with nil values" do
     quantity = Quantity.new nil, nil
     quantity.value.should be_nil
@@ -561,29 +569,65 @@ describe Quantity do
   end
 
   context "comparing nil quantities" do
-    specify "greater than" do
-      lambda{Quantity.new(nil,nil) > 1.m}.should raise_error
-    end
 
-    specify "greater than or equals" do
-      lambda{Quantity.new(nil,nil) >= 1.m}.should raise_error
-    end
+    context "when comparing with non-nil quantities" do
+      specify "greater than" do
+        lambda{Quantity.new(nil,nil) > 1.m}.should raise_error
+      end
 
-    specify "less than" do
-      lambda{Quantity.new(nil,nil) < 1.m}.should raise_error
-    end
+      specify "greater than or equals" do
+        lambda{Quantity.new(nil,nil) >= 1.m}.should raise_error
+      end
 
-    specify "less than or equals" do
-      lambda{Quantity.new(nil,nil) <= 1.m}.should raise_error
-    end
+      specify "less than" do
+        lambda{Quantity.new(nil,nil) < 1.m}.should raise_error
+      end
+
+      specify "less than or equals" do
+        lambda{Quantity.new(nil,nil) <= 1.m}.should raise_error
+      end
+
+      specify "equals" do
+        lambda{Quantity.new(nil,nil) == 1.m}.should raise_error
+      end
 
-    specify "equals" do
-      lambda{Quantity.new(nil,nil) == 1.m}.should raise_error
+      specify "between" do
+        lambda{Quantity.new(nil,nil).between? 1.ft,10.m}.should raise_error NoMethodError
+        lambda{Quantity.new(nil,nil).between? Quantity.new(nil,nil),Quantity.new(nil,nil)}.should raise_error NoMethodError
+      end
+
+      specify "range" do
+        expect{(Quantity.new(nil)..1.kg)}.to raise_error
+        expect{(1.kg..Quantity.new(nil))}.to raise_error
+      end
     end
 
-    specify "between" do
-      lambda{Quantity.new(nil,nil).between? 1.ft,10.m}.should raise_error
+    context "when comparing with another nil quantity" do
+      specify "greater than" do
+        (Quantity.new(nil) > Quantity.new(nil)).should be_false
+      end
+
+      specify "greater than or equals" do
+        (Quantity.new(nil) >= Quantity.new(nil)).should be_true
+      end
+
+      specify "less than" do
+        (Quantity.new(nil) < Quantity.new(nil)).should be_false
+      end
+
+      specify "less than or equals" do
+        (Quantity.new(nil) <= Quantity.new(nil)).should be_true
+      end
+
+      specify "equals" do
+        (Quantity.new(nil) == Quantity.new(nil)).should be_true
+      end
+
+      specify "range" do
+        (Quantity.new(nil)..Quantity.new(nil)).should eq(Quantity.new(nil,'unity')..Quantity.new(nil, 'unity'))
+      end
     end
+
   end
 
   it "should be greater than" do
@@ -650,13 +694,12 @@ describe Quantity do
     lambda{20.ft === (1.ft..3)}.should raise_error
   end
 
-  specify "a range with nil quantities raises an error" do
-    lambda{Quantity.new(nil,nil)..Quantity.new(nil,nil)}.should raise_error
-    lambda{Quantity.new(nil,nil)..20.ft}.should raise_error
+  specify "a range with one nil quantity raises an error" do
+    lambda{Quantity.new(nil)..20.ft}.should raise_error
   end
 
   specify "cover? with nil quantities raises an error" do
-    lambda{(2.ft..20.ft).cover?(Quantity.new(nil,nil))}.should raise_error
+    lambda{(2.ft..20.ft).cover?(Quantity.new(nil))}.should raise_error
   end
 
   it "should return unit consolidation setting" do

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: quantify
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
   segments:
   - 3
   - 2
-  - 0
+  - 1
   prerelease: false
 platform: ruby
 authors:
@@ -18,7 +18,7 @@ default_executable: !!null
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &24562920 !ruby/object:Gem::Requirement
+  requirement: &18752180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -29,10 +29,10 @@ dependencies:
         - 0
   type: :runtime
   prerelease: false
-  version_requirements: *24562920
+  version_requirements: *18752180
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &24561840 !ruby/object:Gem::Requirement
+  requirement: &18751100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -42,10 +42,10 @@ dependencies:
         - 0
   type: :runtime
   prerelease: false
-  version_requirements: *24561840
+  version_requirements: *18751100
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &24557200 !ruby/object:Gem::Requirement
+  requirement: &18745940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         - 0
   type: :development
   prerelease: false
-  version_requirements: *24557200
+  version_requirements: *18745940
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &24555280 !ruby/object:Gem::Requirement
+  requirement: &18744180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -70,10 +70,10 @@ dependencies:
         - 4
   type: :development
   prerelease: false
-  version_requirements: *24555280
+  version_requirements: *18744180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &24554180 !ruby/object:Gem::Requirement
+  requirement: &18743160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -85,10 +85,10 @@ dependencies:
         - 0
   type: :development
   prerelease: false
-  version_requirements: *24554180
+  version_requirements: *18743160
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &24553080 !ruby/object:Gem::Requirement
+  requirement: &18742040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         - 0
   type: :development
   prerelease: false
-  version_requirements: *24553080
+  version_requirements: *18742040
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &24552260 !ruby/object:Gem::Requirement
+  requirement: &18741200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,7 +111,7 @@ dependencies:
         - 0
   type: :development
   prerelease: false
-  version_requirements: *24552260
+  version_requirements: *18741200
 description: A gem to support physical quantities and unit conversions
 email: andrew.berkeley.is@googlemail.com
 executables: []
@@ -168,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4343267713667360298
+      hash: -2814138011086079233
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: