ruby-measurement 1.2.0 → 1.2.1

data/.travis.yml

@@ -1,4 +1,10 @@
 language: ruby
+
 rvm:
   - 1.9.3
+  - 2.0.0
   - ruby-head
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head

data/README.md

@@ -162,6 +162,12 @@ that will be used when displaying a measurement.
     Measurement.parse('3 year')                # => 3.0 yr
     Measurement.parse('3 years')               # => 3.0 yr
 
+### List all units names defined
+
+List all keys you can use as unit
+
+    Measurement.names                           # => ['count','doz','dozen',...]
+
 ## Contributing
 
 1. Fork it

data/lib/ruby-measurement/measurement.rb

@@ -82,24 +82,11 @@ class Measurement
   def self.parse(str = '0')
     str = str.strip
     
-    if str =~ COMPLEX_REGEX
-      real, imaginary, unit_name = str.scan(COMPLEX_REGEX).first
-      quantity = Complex(real.to_f, imaginary.to_f).to_f
-    elsif str =~ SCIENTIFIC_REGEX
-      whole, unit_name = str.scan(SCIENTIFIC_REGEX).first
-      quantity = whole.to_f
-    elsif str =~ RATIONAL_REGEX
-      whole, _, numerator, denominator, unit_name = str.scan(RATIONAL_REGEX).first
-      
-      if numerator && denominator
-        numerator = numerator.to_f + (denominator.to_f * whole.to_f)
-        denominator = denominator.to_f
-        quantity = Rational(numerator, denominator).to_f
-      else
-        quantity = whole.to_f
-      end
-    else
-      raise ArgumentError, "Unable to parse: '#{str}'"
+    case str
+      when COMPLEX_REGEX then unit_name, quantity = parse_complex(str)
+      when SCIENTIFIC_REGEX then unit_name, quantity = parse_scientific(str)
+      when RATIONAL_REGEX then unit_name, quantity = parse_rational(str)
+      else raise ArgumentError, "Unable to parse: '#{str}'"
     end
     
     unit_name ||= 'count'
@@ -115,6 +102,32 @@ class Measurement
   
   private
   
+  def self.parse_complex(str)
+    real, imaginary, unit_name = str.scan(COMPLEX_REGEX).first
+    quantity = Complex(real.to_f, imaginary.to_f).to_f
+    return unit_name, quantity
+  end
+  
+  def self.parse_scientific(str)
+    whole, unit_name = str.scan(SCIENTIFIC_REGEX).first
+    quantity = whole.to_f
+    return unit_name, quantity
+  end
+  
+  def self.parse_rational(str)
+    whole, _, numerator, denominator, unit_name = str.scan(RATIONAL_REGEX).first
+    
+    if numerator && denominator
+      numerator = numerator.to_f + (denominator.to_f * whole.to_f)
+      denominator = denominator.to_f
+      quantity = Rational(numerator, denominator).to_f
+    else
+      quantity = whole.to_f
+    end
+    
+    return unit_name, quantity
+  end
+  
   define(:count) do |unit|
     unit.convert_to(:dozen) { |value| value / 12.0 }
   end

data/lib/ruby-measurement/unit.rb

@@ -56,6 +56,10 @@ class Measurement
       @definitions[unit_name.to_s.downcase]
     end
     
+    def self.names
+      @definitions.keys
+    end
+    
     private
     
     def self.[]=(unit_name, unit)

data/lib/ruby-measurement/version.rb

@@ -1,3 +1,3 @@
 class Measurement
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/spec/ruby-measurement/unit_spec.rb

@@ -117,4 +117,47 @@ describe Measurement::Unit do
       end
     end
   end
+  
+  describe '.names' do
+    subject { Measurement::Unit }
+    
+    it 'returns all defined unit names' do
+      unit_names = subject.names
+      unit_names.should be_kind_of Array
+      unit_names.should include 'count'
+    end
+  end
+  
+  describe '.define' do
+    subject { Measurement::Unit }
+    
+    it 'returns a unit builder' do
+      builder = subject.define(:count)
+      builder.should be_a Measurement::Unit::Builder
+    end
+    
+    it 'accepts a block' do
+      builder = subject.define(:count) { |b| b.alias :ct }
+      builder.should be_a Measurement::Unit::Builder
+    end
+  end
+  
+  describe '.[]' do
+    subject { Measurement::Unit }
+    
+    describe 'for a unit name that is defined' do
+      it 'returns the unit' do
+        unit = subject[:dozen]
+        unit.should be_a Measurement::Unit
+        unit.name.should eq 'doz'
+        unit.aliases.should eq %w(doz dozen).to_set
+      end
+    end
+    
+    describe 'for a unit name that is not defined' do
+      it 'returns nil' do
+        subject[:potato].should be_nil
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-measurement
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-16 00:00:00.000000000 Z
+date: 2013-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2160834380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160834380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2160833960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160833960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple gem for calculating and converting measurements
 email: matt.huggins@gmail.com
 executables: []
@@ -99,15 +109,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4225981439654296545
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4225981439654296545
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Simple gem for calculating and converting measurements