quantify 3.1.4 → 3.2.0

data/Gemfile

@@ -6,9 +6,9 @@ gem "i18n"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "bundler", "~> 1.0.0"
+  gem "bundler"
   gem "jeweler", "~> 1.6.4"
   gem 'rspec', '~> 2.6.0'
-  gem 'rcov'
+  gem 'simplecov'
   gem 'rdoc'
 end

data/README.md

@@ -32,6 +32,11 @@ _.to_s                              #=> "0.68 kg"
 
 Unit.ratio(:kg, :ton)               #=> <Quantify::Quantity:0xb7332bbc ... >
 _.to_s                              #=> "1016.047 kilograms per long ton"
+
+Quantity.new(nil, nil)              #=> <Quantify::Quantity:0xb7332bbc ... >
+_.value                             #=> nil
+_.unit                              #=> <Quantify::Unit::Base:0x007ff622bd9320 ...>
+_.unit.name                         #=> "unity" #== 'unitless' unit
 ```
     
 General introduction
@@ -219,4 +224,4 @@ License
 
 © Copyright 2012 Andrew Berkeley.
 
-Licensed under the MIT license (See COPYING file for details)
+Licensed under the MIT license (See COPYING file for details)

data/Rakefile

@@ -35,13 +35,6 @@ Jeweler::Tasks.new do |gem|
 end
 Jeweler::RubygemsDotOrgTasks.new
 
-require 'rcov/rcovtask'
-desc "Generate code coverage"
-RSpec::Core::RakeTask.new(:coverage) do |t|
-  t.rcov = true
-  t.rcov_opts = ['--exclude', 'spec']
-end
-
 require 'rdoc/task'
 RDoc::Task.new do |rd|
   rd.title = "Quantify"

data/VERSION

@@ -1 +1 @@
-3.1.4
+3.2.0

data/lib/quantify/quantity.rb

@@ -45,7 +45,9 @@ module Quantify
     # subseqent unit name, symbol or JScience label. Returns an array containing
     # quantity objects for each quantity recognised.
     def self.parse(string,options={})
-      
+
+      return [Quantity.new(nil, nil)] unless string != nil && string.strip.length > 0
+
       quantities   = []
       remainder    = []
       words        = string.words
@@ -121,8 +123,16 @@ module Quantify
     # JScience label of a known (or derivable through know units and prefixes)
     # unit
     def initialize(value, unit)
-      @value = value.to_f
-      @unit = Unit.for(unit)
+      if value
+        @value = value.to_f
+      else
+        @value = nil
+      end
+      if unit
+        @unit = Unit.for(unit)
+      else
+        @unit = Unit.for('unity')
+      end
     end
 
     # Returns a description of what the quantity describes, based upon the physica

data/quantify.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "quantify"
-  s.version = "3.1.4"
+  s.name = %q{quantify}
+  s.version = "3.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Berkeley"]
-  s.date = "2012-10-30"
-  s.description = "A gem to support physical quantities and unit conversions"
-  s.email = "andrew.berkeley.is@googlemail.com"
+  s.date = %q{2012-10-30}
+  s.description = %q{A gem to support physical quantities and unit conversions}
+  s.email = %q{andrew.berkeley.is@googlemail.com}
   s.extra_rdoc_files = [
     "README.md"
   ]
@@ -50,39 +50,40 @@ Gem::Specification.new do |s|
     "spec/string_spec.rb",
     "spec/unit_spec.rb"
   ]
-  s.homepage = "https://github.com/spatchcock/quantify"
+  s.homepage = %q{https://github.com/spatchcock/quantify}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
-  s.summary = "Support for handling physical quantities, unit conversions, etc"
+  s.rubygems_version = %q{1.3.7.1}
+  s.summary = %q{Support for handling physical quantities, unit conversions, etc}
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, ["~> 3.0"])
       s.add_runtime_dependency(%q<i18n>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rspec>, ["~> 2.6.0"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
     else
       s.add_dependency(%q<activesupport>, ["~> 3.0"])
       s.add_dependency(%q<i18n>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rspec>, ["~> 2.6.0"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
     end
   else
     s.add_dependency(%q<activesupport>, ["~> 3.0"])
     s.add_dependency(%q<i18n>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rspec>, ["~> 2.6.0"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<rdoc>, [">= 0"])
   end
 end

data/spec/quantity_spec.rb

@@ -4,6 +4,12 @@ include Quantify
 
 describe Quantity do
 
+  it "should create a valid instance with nil values" do
+    quantity = Quantity.new nil, nil
+    quantity.value.should be_nil
+    quantity.unit.should eq(Unit.for('unity'))
+  end
+
   it "should create a valid instance with standard create and unit name" do
     quantity = Quantity.new 10.0, 'metre'
     quantity.value.should == 10
@@ -116,6 +122,13 @@ describe Quantity do
     quantities.first.unit.name.should == 'kilometre'
   end
 
+
+  it "should create a valid instance with unity unit from an empty string" do
+    quantities = Quantity.parse " "
+    quantities.first.value.should == nil
+    quantities.first.unit.name.should == 'unity'
+  end
+
   it "should create valid instances from complex string, no space and two-digit symbol" do
     quantities = Quantity.parse "100km driving cars"
     quantities.first.value.should == 100
@@ -329,6 +342,10 @@ describe Quantity do
     lambda{1.metre + 5.kg}.should raise_error
   end
 
+  it "should throw error when adding nil quantities" do
+    lambda{Quantity.new(nil,nil) + 5.kg}.should raise_error
+  end
+
   it "should subtract quantities correctly with different units of same dimension" do
     result = (125.4.kelvin - -211.85.degree_celsius)
     result.value.should be_within(0.00000001).of(64.1)
@@ -347,6 +364,10 @@ describe Quantity do
     lambda{1.metre - 5.kg}.should raise_error
   end
 
+  it "should throw error when subtracting nil quantities" do
+    lambda{Quantity.new(nil,nil) - 5.kg}.should raise_error
+  end
+
   it "should successfully multiply a quantity by a scalar" do
     (20.metre * 3).to_s.should == "60.0 m"
   end
@@ -359,7 +380,12 @@ describe Quantity do
     lambda{20.metre * '3'}.should raise_error
   end
 
-  it "should two quantities" do
+  it "should raise error when multiplying by nil quantity" do
+    lambda{Quantity.new(nil,nil) * 5.kg}.should raise_error
+    lambda{5.kg * Quantity.new(nil,nil)}.should raise_error
+  end
+
+  it "should multiply two quantities" do
     quantity = (20.metre * 1.metre)
     quantity.value.should == 20
     quantity.unit.measures.should == 'area'
@@ -385,6 +411,11 @@ describe Quantity do
     (2.kg / 0.5).round.to_s.should == "4 kg"
   end
 
+  it "should throw error when dividing nil quantities" do
+    lambda{Quantity.new(nil,nil) / 5.kg}.should raise_error
+    lambda{5.kg / Quantity.new(nil,nil)}.should raise_error
+  end
+
   it "should calculate speed from distance and time quantities" do
     distance_in_km = 12.km
     time_in_min = 16.5.min
@@ -429,6 +460,14 @@ describe Quantity do
     quantity.unit.pluralized_name.should eql "kilograms"
   end
 
+  specify "converting a nil quantity to another unit yields nil" do
+    Quantity.new(nil,nil).to_kg.should be_nil
+  end
+
+  it "should raise error when trying to round a nil quantity" do
+    lambda{Quantity.new(nil,nil).round(2)}.should raise_error
+  end
+
   it "should convert compound units correctly" do
     speed = Quantity.new 100, (Unit.km/Unit.h)
     speed.to_mi.round(2).to_s.should == "62.14 mi/h"
@@ -468,6 +507,11 @@ describe Quantity do
     (80.kg/2.m/4.s/5.s).to_s(:name).should == '2.0 pascals'
   end
 
+  it "should raise error when trying to raise a nil quantity to a power" do
+    lambda{Quantity.new(nil,nil) ** 2}.should raise_error
+    lambda{Quantity.new(nil,nil).pow(2)}.should raise_error
+  end
+
   it "should raise a quantity to a power correctly" do
     unit = 50.ft ** 2
     unit.to_s.should == "2500.0 ft²"
@@ -516,6 +560,32 @@ describe Quantity do
     quantity.unit.symbol.should eql  "yd²"
   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
+
+    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 "between" do
+      lambda{Quantity.new(nil,nil).between? 1.ft,10.m}.should raise_error
+    end
+  end
+
   it "should be greater than" do
     (20.ft > 1.m).should be_true
   end
@@ -580,6 +650,15 @@ 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
+  end
+
+  specify "cover? with nil quantities raises an error" do
+    lambda{(2.ft..20.ft).cover?(Quantity.new(nil,nil))}.should raise_error
+  end
+
   it "should return unit consolidation setting" do
     Quantity.auto_consolidate_units?.should be_false
   end

metadata

@@ -1,136 +1,124 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: quantify
-version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: 
-  segments: 
+version: !ruby/object:Gem::Version
+  version: 3.2.0
+  segments:
   - 3
-  - 1
-  - 4
-  version: 3.1.4
+  - 2
+  - 0
+  prerelease: false
 platform: ruby
-authors: 
+authors:
 - Andrew Berkeley
-autorequire: 
+autorequire: !!null 
 bindir: bin
 cert_chain: []
-
-date: 2012-10-30 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-10-30 00:00:00.000000000 +00:00
+default_executable: !!null 
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &24562920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
+      - !ruby/object:Gem::Version
+        version: '3.0'
+        segments:
         - 3
         - 0
-        version: "3.0"
   type: :runtime
-  name: activesupport
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *24562920
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &24561840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+        segments:
         - 0
-        version: "0"
   type: :runtime
-  name: i18n
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *24561840
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &24557200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+        segments:
         - 0
-        - 0
-        version: 1.0.0
   type: :development
-  name: bundler
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *24557200
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &24555280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
+      - !ruby/object:Gem::Version
+        version: 1.6.4
+        segments:
         - 1
         - 6
         - 4
-        version: 1.6.4
   type: :development
-  name: jeweler
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *24555280
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &24554180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+        segments:
         - 2
         - 6
         - 0
-        version: 2.6.0
   type: :development
-  name: rspec
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *24554180
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &24553080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+        segments:
         - 0
-        version: "0"
   type: :development
-  name: rcov
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *24553080
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &24552260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+        segments:
         - 0
-        version: "0"
   type: :development
-  name: rdoc
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: *24552260
 description: A gem to support physical quantities and unit conversions
 email: andrew.berkeley.is@googlemail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - COPYING
 - Gemfile
 - README.md
@@ -164,38 +152,35 @@ files:
 - spec/quantity_spec.rb
 - spec/string_spec.rb
 - spec/unit_spec.rb
+has_rdoc: true
 homepage: https://github.com/spatchcock/quantify
-licenses: 
+licenses:
 - MIT
-post_install_message: 
+post_install_message: !!null 
 rdoc_options: []
-
-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 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 4343267713667360298
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.8.24
-signing_key: 
+rubyforge_project: !!null 
+rubygems_version: 1.3.7.1
+signing_key: !!null 
 specification_version: 3
 summary: Support for handling physical quantities, unit conversions, etc
 test_files: []
-