numeric_with_unit 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f33f4241debd10d0f422dffd58afaa2ea4ff81bb
-  data.tar.gz: d75d05e2524f9f840a9019ed7cb17b2f0acd7071
+  metadata.gz: 5a9e3bf253a2b7b59618f970d6c3dbdd22ff33b7
+  data.tar.gz: 13adf31a8364d7ffa4e88c283ba0b67738c114e9
 SHA512:
-  metadata.gz: 7edf5db65fff4bcd7dffbc9e035da919f60a079ca2583a95fd6acb47019ec3f7b11738ad728ff6117d33ca451b9d97971f2e246ba6772625bcc89274bb66d97e
-  data.tar.gz: f23d463f342e2d2ed4b1d0dc8b674b3e71030041e3500ff7740299ea0458856d6baec99a9a9d3fa5a2cee44549eed882f14a56aa862baa24e69220748b3e1a85
+  metadata.gz: 5938fcabeb8013050901f66e98888a78a02ab65fb175b3341747e91913044b570efe5c3d18a36683a388ab341b05877759200824e269b26bbe78e744e932434f
+  data.tar.gz: 1154f4a257116d39df130e411e9c3021bbb4519ec851d76d345f43405cf3a5345d1ad7680e4d0d4b9d9e4123a2e9f4f06e1c36e5e1a04c7fa1cc1fd2e4be1f04

data/lib/numeric_with_unit/unit.rb

@@ -1,20 +1,17 @@
 # coding: utf-8
 
-
 class NumericWithUnit
   class Unit
     class Config
-      attr_reader :symbol, :dimension, :derivation
+      attr_reader :symbol, :dimension
       attr_reader :si
       
-      def initialize(parent=nil)
+      def initialize()
         @symbol = nil
         @dimension = Hash.new(0)
         @from_si = nil
         @to_si = nil
         @si = false
-        
-        @parent = parent
       end
       
       def compile
@@ -23,9 +20,6 @@ class NumericWithUnit
         @from_si ||= ->(x){x}
         @to_si ||= ->(x){x}
 
-        @derivation = Hash.new(0)
-        @derivation[@parent] += 1 unless @parent.nil?
-        
         self
       end
       
@@ -122,9 +116,10 @@ class NumericWithUnit
 
       h = derivation.sort_by{|u,v| u.symbol}.sort_by{|u,v| v} # ←どうしよう
       
-      s1 = h.select{|u,v| v > 0}.map{|u,v| u.symbol + ((v.abs>1) ? v.abs.to_s : '')}.join('.')
-      s2 = h.select{|u,v| v < 0}.map{|u,v| u.symbol + ((v.abs>1) ? v.abs.to_s : '')}.join('.')
-      symbol = s1 + (s2.empty? ? '' : "/(#{s2})")
+      syms_pos = h.select{|u,v| v > 0}.map{|u,v| u.symbol + ((v.abs>1) ? v.abs.to_s : '')}
+      syms_neg = h.select{|u,v| v < 0}.map{|u,v| u.symbol + ((v.abs>1) ? v.abs.to_s : '')}
+      symbol = syms_pos.join('.')
+      symbol += '/' + (syms_neg.size==1 ? "#{syms_neg.first}" : "(#{syms_neg.join('.')})") unless syms_neg.empty?
       
       derivation.each do |u,v|
         u.dimension.each do |d,i|
@@ -158,11 +153,11 @@ class NumericWithUnit
         ->(x){memo[prc[x]]}
       }
 
-      self.new{|conf|
-        conf.symbol = symbol
-        conf.dimension = dimension
-        conf.from_si = from_si
-        conf.to_si = to_si
+      self.new(derivation){|config|
+        config.symbol = symbol
+        config.dimension = dimension
+        config.from_si = from_si
+        config.to_si = to_si
       }
     end
     
@@ -327,9 +322,9 @@ class NumericWithUnit
     attr_reader :symbol
     attr_reader :dimension, :derivation
     
-    def initialize
+    def initialize(derivation=nil)
       # Unit::Configとinitializeの役割が分離できていないので見なおせ
-      config = Config.new(self)
+      config = Config.new
       yield(config) if block_given?
       config.compile
       
@@ -338,17 +333,21 @@ class NumericWithUnit
       @from_si = config.from_si
       @to_si = config.to_si
       
-      @derivation = config.derivation
+      unless derivation
+        derivation = Hash.new(0)
+        derivation[self] += 1
+      end
+      @derivation = derivation
     end
     
     # create new unit with new symbol and factor from self.
     # use for converting [in] = 25.4[mm] .
     def cast(new_symbol, factor = 1)
-      self.class.new do |conf|
-        conf.symbol = new_symbol
-        conf.dimension = @dimension
-        conf.from_si = ->(x){from_si(x.quo(factor))}
-        conf.to_si = ->(x){to_si(x * factor)}
+      self.class.new do |config|
+        config.symbol = new_symbol
+        config.dimension = @dimension
+        config.from_si = ->(x){from_si(x.quo(factor))}
+        config.to_si = ->(x){to_si(x * factor)}
       end
     end
     
@@ -409,6 +408,7 @@ class NumericWithUnit
         end
       end
     end
+    
   end
 
   class Unit

data/lib/numeric_with_unit.rb

@@ -187,8 +187,11 @@ end
 
 class String
   def to_nwu(mthd=:to_r)
-    m = self.match /(?<value>.+) (?<unit>.+)/ # 適当
-    NumericWithUnit.new(m[:value].__send__(mthd), m[:unit])
+    # 適当
+    m = self.match /.*?(?=[\s\(\[])/
+    value = m.to_s
+    unit = m.post_match.strip.gsub(/^\[|\]$/, '')
+    NumericWithUnit.new(value.__send__(mthd), unit)
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: numeric_with_unit
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - diaphragm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-31 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies: []
 description: This gem provide NumericWithUnit class to calculate numeric with unit
   of measurement.