quantify 2.0.0 → 2.0.1

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.0.1

data/lib/quantify/config.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 include Quantify
 
 # Configure known dimensions, prefixes and units.

data/lib/quantify/core_extensions/string.rb

@@ -1,4 +1,4 @@
-
+# encoding: UTF-8
 class String
 
   def with_superscript_characters

data/lib/quantify/dimensions.rb

@@ -265,7 +265,7 @@ module Quantify
     #   Dimensions.length.units :symbol     #=> [ 'm', 'ft', 'yd', ... ]
     #
     def units(by=nil)
-      Unit.units.select { |unit| unit.dimensions == self }.map(&by)
+      Unit.units.select { |unit| unit.dimensions == self }.map(&by).to_a
     end
 
     # Returns the SI unit for the physical quantity described by self.
@@ -319,7 +319,7 @@ module Quantify
         Unit.base_quantity_si_units.select do |unit|
           unit.measures == dimension.remove_underscores
         end.first.clone ** index
-      end.map(&by)
+      end.map(&by).to_a
     end
 
     # Compares the base quantities of two Dimensions objects and returns true if
@@ -454,7 +454,11 @@ module Quantify
     #
     def base_quantities
       quantities = self.instance_variables
-      quantities.delete("@physical_quantity")
+      if RUBY_VERSION < "1.9"
+        quantities.delete("@physical_quantity")
+      else
+        quantities.delete(:@physical_quantity)
+      end
       return quantities
     end
 
@@ -475,7 +479,7 @@ module Quantify
     def to_hash
       hash = {}
       base_quantities.each do |variable|
-        hash[variable.gsub("@","").to_sym] = self.instance_variable_get(variable)
+        hash[variable.to_s.gsub("@","").to_sym] = self.instance_variable_get(variable)
       end
       return hash
     end

data/lib/quantify/quantify.rb

@@ -25,7 +25,7 @@ module Quantify
           units = Unit.units
         end
         return_format = ( $8 ? $8.to_sym : nil )
-        units.map(&return_format)
+        units.map(&return_format).to_a
       elsif unit = Unit.for(method)
         return unit
       else

data/lib/quantify/quantity.rb

@@ -55,8 +55,8 @@ module Quantify
       raise Quantify::Exceptions::QuantityParseError, "Cannot parse string into value and unit"
     end
 
-    def self.configure &block
-      self.class_eval &block if block
+    def self.configure(&block)
+      self.class_eval(&block) if block
     end
 
     attr_accessor :value, :unit
@@ -96,6 +96,10 @@ module Quantify
         "#{@value} #{@unit.send format}"
       end
     end
+    
+    def inspect
+      to_s
+    end
 
     # Converts self into a quantity using the unit provided as an argument. The
     # new unit must represent the same physical quantity, i.e. have the same

data/lib/quantify/unit/base_unit.rb

@@ -1,4 +1,3 @@
-
 module Quantify
   module Unit
     class Base
@@ -60,8 +59,8 @@ module Quantify
       #
       #   end
       #
-      def self.configure &block
-        class_eval &block if block
+      def self.configure(&block)
+        class_eval(&block) if block
       end
       
       attr_reader :name, :symbol, :label, :factor, :dimensions
@@ -402,7 +401,7 @@ module Quantify
       def alternatives(by=nil)
         @dimensions.units(nil).reject do |unit|
           unit.is_equivalent_to?(self) || !unit.acts_as_alternative_unit
-        end.map(&by)
+        end.map(&by).to_a
       end
 
       # Returns the SI unit for the same physical quantity which is represented
@@ -449,8 +448,8 @@ module Quantify
       #
       def valid_prefixes(by=nil)
         return [] if is_compound_unit? && has_multiple_base_units?
-        return Unit::Prefix.si_prefixes.map(&by) if is_si_unit?
-        return Unit::Prefix.non_si_prefixes.map(&by) if is_non_si_unit?
+        return Unit::Prefix.si_prefixes.map(&by).to_a if is_si_unit?
+        return Unit::Prefix.non_si_prefixes.map(&by).to_a if is_non_si_unit?
       end
 
       # Multiply two units together. This results in the generation of a compound
@@ -537,7 +536,7 @@ module Quantify
       def to_hash
         hash = {}
         self.instance_variables.each do |var|
-          symbol = var.gsub("@","").to_sym
+          symbol = var.to_s.gsub("@","").to_sym
           hash[symbol] = send symbol
         end
         return hash

data/lib/quantify/unit/compound_base_unit_list.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 
 module Quantify
   module Unit

data/lib/quantify/unit/prefix/prefix.rb

@@ -60,7 +60,7 @@ module Quantify
             prefixes = Prefix.prefixes
           end
           return_format = ( $4 ? $4.to_sym : nil )
-          prefixes.map(&return_format)
+          prefixes.map(&return_format).to_a
         elsif prefix = self.for(method)
           return prefix
         else

data/lib/quantify/unit/unit.rb

@@ -1,4 +1,4 @@
-#! usr/bin/ruby
+# encoding: UTF-8
 
 module Quantify
   module Unit

data/quantify.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{quantify}
-  s.version = "2.0.0"
+  s.version = "2.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Berkeley"]
-  s.date = %q{2011-09-28}
+  s.date = %q{2011-10-18}
   s.description = %q{A gem to support physical quantities and unit conversions}
   s.email = %q{andrew.berkeley.is@googlemail.com}
   s.extra_rdoc_files = [

data/spec/compound_unit_spec.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'quantify'
 include Quantify
 

data/spec/dimension_spec.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'quantify'
 include Quantify
 

data/spec/quantity_spec.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'quantify'
 include Quantify
 
@@ -104,7 +105,9 @@ describe Quantity do
   end
 
   it "should subtract quantities correctly with different units of same dimension" do
-    (125.4.kelvin - -211.85.degree_celsius).to_s.should == "64.1 K"
+    result = (125.4.kelvin - -211.85.degree_celsius)
+    result.value.should be_within(0.00000001).of(64.1)
+    result.unit.symbol.should == "K"
   end
 
   it "should subtract quantities correctly with different units of same dimension" do
@@ -202,7 +205,8 @@ describe Quantity do
 
   it "should convert compound units to SI correctly" do
     speed = Quantity.new 100, (Unit.km/Unit.h)
-    speed.to_si.to_s(:name).should == "27.7777777777778 metres per second"
+    speed.to_si.value.should be_within(0.0000000000001).of(27.7777777777778)
+    speed.to_si.unit.name.should == "metre per second"
   end
 
   it "should convert compound units to SI correctly" do
@@ -257,14 +261,16 @@ describe Quantity do
     quantity.to_s.should eql "432.0 yd ft"
     new_quantity=quantity.rationalize_units
     quantity.to_s.should eql "432.0 yd ft"
-    new_quantity.to_s.should eql "144.0 yd²"
+    new_quantity.value.should be_within(0.0000001).of(144)
+    new_quantity.unit.symbol.should eql  "yd²"
   end
 
   it "should rationalize units and modify value in place" do
     quantity = 12.yards*36.feet
     quantity.to_s.should eql "432.0 yd ft"
     quantity.rationalize_units!
-    quantity.to_s.should eql  "144.0 yd²"
+    quantity.value.should be_within(0.0000001).of(144)
+    quantity.unit.symbol.should eql  "yd²"
   end
 
   it "should be greater than" do

data/spec/string_spec.rb

@@ -1,4 +1,6 @@
-$KCODE = 'UTF8'
+# encoding: UTF-8
+$KCODE = 'UTF8' if RUBY_VERSION < "1.9"
+
 require 'quantify'
 
 describe String do

data/spec/unit_spec.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'quantify'
 include Quantify
 
@@ -1027,7 +1028,8 @@ describe Unit do
     end
 
     it "should return correct unit ratio quantity with symbols" do
-      Unit.ratio(:lb,:kg).to_s(:name).should == "2.20462262184878 pounds per kilogram"
+      Unit.ratio(:lb,:kg).to_s(:name).split(" ").first.to_f.should be_within(0.00000000000001).of(2.20462262184878)
+      Unit.ratio(:lb,:kg).to_s(:name).split(" ")[1..3].join(" ").should == "pounds per kilogram"
     end
 
     it "should return correct unit ratio quantity with symbols and rounding" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: quantify
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 2
   - 0
-  - 0
-  version: 2.0.0
+  - 1
+  version: 2.0.1
 platform: ruby
 authors: 
 - Andrew Berkeley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-28 00:00:00 +01:00
+date: 2011-10-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency