quantify 3.1.0 → 3.1.1

data/VERSION

@@ -1 +1 @@
-3.1.0
+3.1.1

data/lib/quantify/unit/unit.rb

@@ -191,9 +191,7 @@ module Quantify
     end
 
     def self.dimensionless
-      Unit::Base.new(:dimensions => 'dimensionless') do |unit|
-        unit.acts_as_alternative_unit = false
-      end
+      Unit::Base.new(:dimensions => 'dimensionless')
     end
 
     # Retrieve an object representing the specified unit.
@@ -329,8 +327,8 @@ module Quantify
       while term = string.starts_with_valid_unit_term? do  
         if term =~ /^#{UNIT_PREFIX_TERMS_REGEX}$/
           current_exponent = Unit.exponent_term_to_number(term)
-        elsif term =~ /^#{UNIT_SUFFIX_TERMS_REGEX}$/
-          units.last.index *= Unit.exponent_term_to_number(term)
+        elsif term =~ /^#{UNIT_SUFFIX_TERMS_REGEX}$/ 
+          units.last.index *= Unit.exponent_term_to_number(term) unless units.empty?
         elsif term =~ /^#{UNIT_DENOMINATOR_REGEX}/
           is_denominator = true
         else
@@ -424,7 +422,6 @@ module Quantify
     def self.terms_for_regex(klass,method,attribute)
       list = klass.send(method).map { |item| item.send(attribute).gsub("/","\\/").gsub("^","\\^")  }
       list.map! { |item| item.downcase } if attribute == :name
-      list.reject! { |item| item == "" }
       list.sort {|x, y| y.size <=> x.size }.join("|")
     end
     

data/quantify.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "quantify"
-  s.version = "3.1.0"
+  s.version = "3.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Berkeley"]
-  s.date = "2011-12-21"
+  s.date = "2011-12-22"
   s.description = "A gem to support physical quantities and unit conversions"
   s.email = "andrew.berkeley.is@googlemail.com"
   s.extra_rdoc_files = [

data/spec/quantity_spec.rb

@@ -185,6 +185,48 @@ describe Quantity do
     quantities.first.unit.symbol.should == 'ft²'
   end
   
+  it "should return dimensionless quantity when 'squared' suffix used without a unit" do
+    quantities = Quantity.parse "25 squared"
+    quantities.first.value.should == 25
+    quantities.first.unit.name.should == ''
+    quantities.first.unit.symbol.should == ''
+  end
+  
+  it "should return unsquared quantity when 'squared' suffix used unrelated to unit" do
+    quantities = Quantity.parse "25 grams some more text and then squared"
+    quantities.first.value.should == 25
+    quantities.first.unit.name.should == 'gram'
+    quantities.first.unit.symbol.should == 'g'
+  end
+  
+  it "should return unsquared quantity when 'square' suffix used" do
+    quantities = Quantity.parse "25 grams square"
+    quantities.first.value.should == 25
+    quantities.first.unit.name.should == 'gram'
+    quantities.first.unit.symbol.should == 'g'
+  end
+  
+  it "should return dimensionless quantity when 'square' prefix used without a unit" do
+    quantities = Quantity.parse "25 square"
+    quantities.first.value.should == 25
+    quantities.first.unit.name.should == ''
+    quantities.first.unit.symbol.should == ''
+  end
+  
+  it "should return dimensionless quantity when 'cubed' suffix used without a unit" do
+    quantities = Quantity.parse "25 cubed"
+    quantities.first.value.should == 25
+    quantities.first.unit.name.should == ''
+    quantities.first.unit.symbol.should == ''
+  end
+  
+  it "should return dimensionless quantity when 'cubic' prefix used without a unit" do
+    quantities = Quantity.parse "25 cubic"
+    quantities.first.value.should == 25
+    quantities.first.unit.name.should == ''
+    quantities.first.unit.symbol.should == ''
+  end
+  
   it "should create valid instance from string with 'cubed' suffix descriptor" do
     quantities = Quantity.parse "25 feet cubed"
     quantities.first.value.should == 25

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: quantify
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 3
   - 1
-  - 0
-  version: 3.1.0
+  - 1
+  version: 3.1.1
 platform: ruby
 authors: 
 - Andrew Berkeley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-21 00:00:00 Z
+date: 2011-12-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement