numeric_with_unit 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 757d20434e2556a232c44455278317111626a717
-  data.tar.gz: 29a86bf1e906c35b49104ede8013e07ff392aaba
+  metadata.gz: 6c3724d871029ad4d5d0ff5372e0d26bdcacc742
+  data.tar.gz: f074c81b267dc22d4c67c6eff47effa15622e69b
 SHA512:
-  metadata.gz: 4ef1f289645e9fea40ec7674bc64c514355bef6705502214339b162d68f64153c230c768d1198315c6b0ff409d79835d8bb4751b4a82ff611cac119228eeee90
-  data.tar.gz: 70ea80a9ff0b464a69a1e64367e9365e80d532b9e4ab2a81b2cbcc5e6104101abf2da4195278bc75db106fea890cf7ad0b372dca71606376af1bd079c270901d
+  metadata.gz: d0cacaf3263609abe26adc0acbcc6c48a7ee6ee951f655a5da79f0b5b1b6e37967c0ff31527fe3166b122da85616e5996943268ef8b949536a9701e361f10b95
+  data.tar.gz: '068641c0886fef82749be9458ad385a37932d617e485740984d1d33d20c477f61bf7dcf95cff78b0691ef9650ae650873e017bb0be29414b032b7513b3a22e59'

data/lib/numeric_with_unit/core_ext.rb

@@ -2,31 +2,27 @@
 
 require 'numeric_with_unit'
 
-class Fixnum
-  def to_nwu(unit)
-    NumericWithUnit.new(self, unit)
-  end
-end
+class NumericWithUnit
+  module CORE_EXT
+    module Numeric
+      def to_nwu(unit)
+        NumericWithUnit.new(self, unit)
+      end
+    end
 
-class Bignum
-  def to_nwu(unit)
-    NumericWithUnit.new(self, unit)
+    module String
+      def to_nwu(mthd=:to_r)
+        # TODO: 適当なのでもう少しいい感じに。いい感じに
+        m = self.match /.*?(?=[\s\(\[])/
+        value = m.to_s
+        unit = m.post_match.strip.gsub(/^\[|\]$/, '')
+        NumericWithUnit.new(value.__send__(mthd), unit)
+      end
+    end
   end
 end
 
-class Numeric
-  def to_nwu(unit)
-    NumericWithUnit.new(self, unit)
-  end
-end
 
-class String
-  def to_nwu(mthd=:to_r)
-    # TODO: 適当なのでもう少しいい感じに。いい感じに
-    m = self.match /.*?(?=[\s\(\[])/
-    value = m.to_s
-    unit = m.post_match.strip.gsub(/^\[|\]$/, '')
-    NumericWithUnit.new(value.__send__(mthd), unit)
-  end
-end
 
+Numeric.prepend NumericWithUnit::CORE_EXT::Numeric
+String.prepend NumericWithUnit::CORE_EXT::String

data/lib/numeric_with_unit/unit.rb

@@ -109,9 +109,10 @@ class NumericWithUnit
     def self.derive #(block)
       derivation = Hash.new(0)
       yield(derivation)
+      derivation.delete_if{|k,v| k.symbol.nil?}
+      
       return Unit.new if derivation.empty?
       
-      derivation.delete_if{|k,v| k.symbol.nil?}
       
       # constructing symbol
       h = derivation.reject{|k,v| k.symbol.empty?}.sort_by{|u,v| u.symbol}.sort_by{|u,v| v}

data/lib/numeric_with_unit/util.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 
 # 1234['m3/kg']のように書けるようにします。
-# Numeric#[]、Fixnum#[]、Bignum#[]をオーバーライドします。
+# Numeric#[]、Integer#[](ruby2.4以降)、Fixnum#[](ruby2.4未満)、Bignum#[](ruby2.4未満)をオーバーライドします。
 
 require 'numeric_with_unit'
 
@@ -13,15 +13,11 @@ class NumericWithUnit
   end
 end
 
-class Fixnum
-  prepend NumericWithUnit::NumUtil
-end
-
-class Bignum
-  prepend NumericWithUnit::NumUtil
-end
-
-class Numeric
-  prepend NumericWithUnit::NumUtil
+if RUBY_VERSION >= "2.4.0"
+  Integer.prepend NumericWithUnit::NumUtil
+else
+  Fixnum.prepend NumericWithUnit::NumUtil
+  Bignum.prepend NumericWithUnit::NumUtil
 end
 
+Numeric.prepend NumericWithUnit::NumUtil

data/lib/numeric_with_unit/util2.rb

@@ -44,7 +44,7 @@ class NumericWithUnit
     def method_missing(name, *args)
       if args.empty?
         unit_str = name.to_s.gsub('_', '/')
-        self.to_f.to_nwu(unit_str) # util2は利便性優先なのでto_fしてしまいます
+        self.to_nwu(unit_str)
       else
         raise Unit::NoUnitError
       end
@@ -54,15 +54,4 @@ class NumericWithUnit
   end
 end
 
-
-class Fixnum
-  prepend NumericWithUnit::NumUtil
-end
-
-class Bignum
-  prepend NumericWithUnit::NumUtil
-end
-
-class Numeric
-  prepend NumericWithUnit::NumUtil
-end
+Numeric.prepend NumericWithUnit::NumUtil

data/lib/numeric_with_unit.rb

@@ -55,7 +55,7 @@ class NumericWithUnit
   end
 
   # Convert to given unit
-  def convert(unit)
+  def convert!(unit)
     new_unit = unit.is_a?(Unit) ? unit : Unit[unit]
 
     unless @unit.dimension_equal? new_unit
@@ -63,10 +63,15 @@ class NumericWithUnit
     end
 
     new_value = new_unit.from_si(@unit.to_si(@value))
-    self.class.new(new_value, new_unit)
+    @value, @unit = new_value, new_unit
+    self
+  end
+  alias :[] :convert!
+  
+  def convert(unit)
+    clone.convert!(unit)
   end
   alias :to_nwu :convert
-  alias :[] :convert
 
   # Convert to simple unit
   def simplify

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: numeric_with_unit
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - diaphragm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-11 00:00:00.000000000 Z
+date: 2017-08-12 00:00:00.000000000 Z
 dependencies: []
 description: This gem provide NumericWithUnit class to calculate numeric with unit
   of measurement.
@@ -50,7 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Numerical calculation with unit of measurement