libruby 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17a5f042f8929c5816f4a0e01732fd8410e28208
-  data.tar.gz: 64a19edf86ea197ca358d7b890f12e661a80ee17
+  metadata.gz: 7c1daa187c1b53ef63fa34a45816afa499a2bd0e
+  data.tar.gz: f94a884d86d515e7549c91d76152ca017b989c1b
 SHA512:
-  metadata.gz: 4e437160671901ccf31792158d7b6d94e27df784c53bcce8a75773aa5701190a04af9af3aeb673bc9d2a0140afa902cfad2eae85e2251b1620a6835bc3abf015
-  data.tar.gz: 351e197a215c9a8ad39e9bda4288f3398d89b370a591655c2915d8d733968135cb18bd45c4c18efc10c0b876edfa1662bfe427793d0eca95c1fecc354285da4b
+  metadata.gz: e1271bb93422f0e2ec53f68bbd2b0343008cd142e5e98043a74e1fa2f419bed61bfc9f2f36dd0c9e740bf71ee627ad0f5d068df93c1c78624a1d5dc9e84e6d50
+  data.tar.gz: 9470fd7be9e5f3092b2caf67fe585a8c27dd2a64747818aaa65ce212ecd5854115f0d2377d6962fb514f5897660c5573b687894aa48400613c7dbf93fdc50883

data/lib/libruby/unit_converter.rb

@@ -47,9 +47,9 @@ module Libruby
     def self.to_ja_s(num)
       s = to_s(num)      
       if s =~ /(\d+)(\.\d+)/
-        result = comma($1) + $2
+        result = ja($1) + $2
       else
-        result = comma(s)
+        result = ja(s)
       end
       result
     end
@@ -59,23 +59,31 @@ module Libruby
   class UnitConverterResult
     TYPE_ORIGINAL = 1
     TYPE_NUMBER = 2
-    TYPE_JA = 3
+    TYPE_EN = 3    
+    TYPE_JA = 4
 
-    TYPE_LABELS = [
+    TYPE_LABELS = {
       TYPE_ORIGINAL => 'オリジナル',
       TYPE_NUMBER => '数値表現',
       TYPE_JA => '日本語表現'
-    ]
+    }
+
+    def self.find(results, type)
+      results.find{|result| result.type == type}
+    end
 
     def self.create_original(value)
       UnitConverterResult.new(TYPE_ORIGINAL, value)
     end
 
     def self.create_number(value)
-      # ほんとはカンマ区切りにしたい整数部と小数部にわけて三桁区切りにする必要あり？
       UnitConverterResult.new(TYPE_NUMBER, UnitConverterUtils.to_comma_s(value))
     end
 
+    def self.create_ja(value)
+      UnitConverterResult.new(TYPE_JA, UnitConverterUtils.to_ja_s(value))
+    end    
+
     def initialize(type, value)
       @type = type
       @value = value
@@ -83,7 +91,11 @@ module Libruby
     attr_reader :type, :value
 
     def type_label
-      TYPE_LABELS[type]
+      TYPE_LABELS[@type]
+    end
+
+    def to_s
+      "#{@type}:#{type_label}:#{value}"
     end
   end
 
@@ -123,7 +135,8 @@ module Libruby
         original_num = get_num(value)
         unit = get_unit(value)
         num = calc_num(original_num, unit)
-        result << UnitConverterResult.create_number(value)
+        results << UnitConverterResult.create_number(num)
+        results << UnitConverterResult.create_ja(num)
       rescue ArgumentError => e
         puts e.to_s
       end

data/lib/libruby/version.rb

@@ -1,3 +1,3 @@
 module Libruby
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libruby
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - src