ruby-si-units 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efa72132c423b8eeebd9edfb7be550c997713b49
-  data.tar.gz: 7efa33641c700b3a2af0bc5d2665e30617e19274
+  metadata.gz: 4dd439cebc308b9ac78f93d5032f9b35451b04f5
+  data.tar.gz: 40936a1ce7817bb55c05103d17f533b568bc2d40
 SHA512:
-  metadata.gz: af000424f61537a2c24d6bb758ba2f7de023b4e59aa40ff16e95b4b642c377f9de52c94db2271a669e2235ad2e86eb3b929a44724313bfcef9d945f04d7d7ea6
-  data.tar.gz: e655905b2637defa6103898bbcc7c6773bc6ef09fd400274c03001559105c43e91674c1eb813cf6ca844f1c2ad6424ace13e82ea7013bd4a16983ade4cdabbaf
+  metadata.gz: b5872b30732861c26fc4f149256a64071d0a91ca4fee2eadfaf7a5b516c5b3e091aaecdf6dd863db1c59031662985910acf157213a401db0ccad384b71188047
+  data.tar.gz: b77c8c05ec713741d5ff8b55f4eae9d3366c7f35a4c7fb011707cc6b548c6f3e6ae9fda8de35f4af5629183d568224bdff4f3fbcbc079648a28c33cbb4e69d5d

data/lib/si_units/string.rb

@@ -2,12 +2,7 @@ class String
   # make a string into a unit
   # @return (see RubyUnits::Unit#initialize)
   def to_unit
-    unit_reduced, prefix = *split_value(self)
-    SIUnits::Unit.new(unit_reduced).convert_to(prefix)
-  end
-
-  def split_value(value)
-    value.scan(/(\d+\.?\d*)(\w+)/).flatten
+    SIUnits::Unit.new(self)
   end
 end
 

data/lib/si_units/unit.rb

@@ -8,7 +8,7 @@ module SIUnits
   class Unit
     include Comparable
 
-    attr_reader :unit_value, :unit_kind
+    attr_reader :value, :kind
 
     # Definition of SI Prefix Units, with name, aliases and scale
     UNITS_DEFINITION = {
@@ -44,7 +44,7 @@ module SIUnits
       'yocto'  => [%w{y Yocto yocto},     1e-24],
       'zero'   => [%w{zero},                0.0]
     }
-    UNIT_REGEX = /(\d+\.?\d*)(\w+)/
+    UNIT_REGEX = /\d+[\.?]\d+|\w+/
 
     # Create a new Unit object.
     # @return [Unit]
@@ -58,14 +58,14 @@ module SIUnits
       case options[0]
       when Numeric
         # Conversion use a scale
-        @unit_value = options.first
-        @unit_kind = parse_unit
+        @value = options.first
+        @kind = parse_unit
 
       when String
         value, prefix = *split_value(options[0])
-        @unit_kind = who_is_my_prefix?(prefix)
+        @kind = who_is_my_prefix?(prefix)
         # Value is absolute, needs convert to scale of prefix
-        @unit_value = value.to_f * unit_scale
+        @value = value.to_f * scale
 
       else
         raise ArgumentError, "Invalid Unit Format"
@@ -81,11 +81,11 @@ module SIUnits
     # Comparable units
     # => Compare with scale of kinds
     def <=>(comparison)
-      UNITS_DEFINITION[unit_kind].last <=> UNITS_DEFINITION[comparison.unit_kind].last
+      UNITS_DEFINITION[kind].last <=> UNITS_DEFINITION[comparison.kind].last
     end
 
     def ==(comparison)
-      unit_kind == comparison.unit_kind
+      kind == comparison.kind
     end
 
     # convert to a specified unit string or to the same unit as another Unit
@@ -106,7 +106,7 @@ module SIUnits
     alias :>> :convert_to
 
     def to_s
-      [best_scale, unit_kind].join(' ')
+      [best_scale, kind].join(' ')
     end
 
     private
@@ -114,7 +114,7 @@ module SIUnits
     # Logic to convert the current unit value to a best form of representation
     # == Just remove the "e base" from value
     def best_value_with_scale
-      (unit_value / unit_scale).round(4)
+      (value / scale).round(4)
     end
 
     # The parser
@@ -122,40 +122,65 @@ module SIUnits
     # @return String with the name of representation
     # @raise ArgumentError
     def parse_unit
-      case @unit_value
-      when 0 then return "zero"
-      when 1e-24..1e-21 then return "yocto"
-      when 1e-21..1e-18 then return "atto"
-      when 1e-18..1e-15 then return "femto"
-      when 1e-15..1e-12 then return "pico"
-      when 1e-12..1e-9 then return "nano"
-      when 1e-9..1e-6 then return "micro"
-      when 1e-6..1e-3 then return "milli"
-      when 1e-3..1e-2 then return "centi"
-      when 1e-2..1e-1 then return "deci"
-      when 1e-1..1e1 then return "1"
-      when 1e1..1e2 then return "deca"
-      when 1e2..1e3 then return "hecto"
-      when 1e3..1e6 then return "kilo"
-      when 1e6..1e9 then return "mega"
-      when 1e9..1e12 then return "giga"
-      when 1e12..1e15 then return "tera"
-      when 1e15..1e18 then return "peta"
-      when 1e18..1e21 then return "exa"
-      when 1e21..1e24 then return "zetta"
-      else raise ArgumentError, "Unit out of range"
+      case @value
+      when 0
+        return "zero"
+      when 1e-24..1e-21
+        return "yocto"
+      when 1e-21..1e-18
+        return "atto"
+      when 1e-18..1e-15
+        return "femto"
+      when 1e-15..1e-12
+        return "pico"
+      when 1e-12..1e-9
+        return "nano"
+      when 1e-9..1e-6
+        return "micro"
+      when 1e-6..1e-3
+        return "milli"
+      when 1e-3..1e-2
+        return "centi"
+      when 1e-2..1e-1
+        return "deci"
+      when 1e-1..1e1
+        return "1"
+      when 1e1..1e2
+        return "deca"
+      when 1e2..1e3
+        return "hecto"
+      when 1e3..1e6
+        return "kilo"
+      when 1e6..1e9
+        return "mega"
+      when 1e9..1e12
+        return "giga"
+      when 1e12..1e15
+        return "tera"
+      when 1e15..1e18
+        return "peta"
+      when 1e18..1e21
+        return "exa"
+      when 1e21..1e24
+        return "zetta"
+      else
+        raise ArgumentError, "Unit out of range"
       end
     end
 
     def who_is_my_prefix?(prefix)
-      UNITS_DEFINITION.each { |key, value|
+
+      prefix unless UNITS_DEFINITION.has_key?(prefix)
+
+      UNITS_DEFINITION.each do |key, value|
         return key if value[0].include?(prefix)
-      }
+      end
+
       raise ArgumentError, "Unknown prefix"
     end
 
-    def unit_scale
-      @unit_scale ||= UNITS_DEFINITION[unit_kind].last
+    def scale
+      @scale ||= UNITS_DEFINITION[kind].last
     end
 
     def split_value(value)

data/lib/si_units/version.rb

@@ -1,4 +1,4 @@
 module SIUnits
-  # Project Version
-  VERSION = "0.0.7"
+  #GEM version
+  VERSION = "0.0.8"
 end

data/lib/unit.rb

@@ -1,3 +1,3 @@
-require 'si_units/string'
-require 'si_units/unit'
-require 'si_units/version'
+require_relative 'si_units/string'
+require_relative 'si_units/unit'
+require_relative 'si_units/version'

data/spec/units/unit_spec.rb

@@ -4,47 +4,13 @@ require "unit"
 
 describe SIUnits::Unit do
 
-  context "it's a pico " do
-
-  end
-
-  context "it's a nano " do
-
-  end
-
-  context "it's a micro " do
-
-  end
-
-  context "it's a milli " do
-
-  end
-
-  context "it's a const " do
-
-  end
-
-  context "it's a kilo " do
-  end
-
-  context "it's a mega " do
-
-  end
-
-  context "it's a giga " do
-
-  end
-
-  context "Its comparable" do
-    it "Compare with"
-  end
+end
 
-  context "Convert to" do
-    it "Convert to"
-  end
 
-  context "Convert string to unit" do
-    it "string to unit"
-  end
+describe "Convert to" do
+  it "Convert to"
+end
 
+describe "Convert string to unit" do
+  it "string to unit"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-si-units
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Kenner Kliemann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
+date: 2013-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler