hash_util 1.2 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42e9d259e17d9b4e348851b3d543542f26e21782
-  data.tar.gz: 71d7179641b864666b483b04501421a988a4a79e
+  metadata.gz: ab549485511ee94e51e5f7c31244c41fc8cc832c
+  data.tar.gz: 8b4e7a4bf9a56a5df26ba3d70c06585abfd1bbae
 SHA512:
-  metadata.gz: aedbe6dad81938ffaaf61e065bc82fa309228fb3f8591d90a2424c4957c5299b9c6bb5d6b55bcddc658a346d54d325dda562fe4104853be3526773269c49f697
-  data.tar.gz: c806c1f383a78901e685ea305d0e7ef2ed27f079634c399dfaff3c68309bcc84f3e15c6f1838dbc89d8d4e0f2367525e7cd8e63dee9842f777bbfe1cf962cc9e
+  metadata.gz: dab8bdaf0d4c2f5fa8abd9b5588dcb6da870901d5bcfb564d7269ebbf972470708d449733e43e3f9c5c6e1d8074db216572d7c32dd2516eeb656f897c0515d34
+  data.tar.gz: 7985b1064ccaf3f848367893ff32108e8863c466a2c3ca33c71f7616c5f3e7e7aa0edf3e1bb43359a16d187e8763aece87bbdeda51684320f629163de1e03e3e

data/README.md

@@ -13,6 +13,9 @@ should be of same structure
 
 5) extract_numbers_hash => extracts numbers from a hash             
 
+* works with new hash syntax
+
+* Works with hashes that have numbers as values
 
 ## Installation
 
@@ -46,13 +49,13 @@ HashUtil.zero(hash1) #{a:0,b:0,c:[0,0],d:{a:0}}
 (3) merge
 ```ruby
    str1 = %{
-        { "OccExp": [ -0.0004, 0.09600, 0.0000, -0.0204, 0.09 ,"abc":{"a":1,"b":0,"c":[0,1,2]} ], 
+        { "OccExp": [ -0.0004, 0.09600, 0.0000, -0.0204, 0.09 ,"abc":{"a":1,"b":0,"c":[0,1,2]} ],
           "PremRV": [ 8.500, 4.19999981, 5.0, 7.80 ]}
         }    
-       
+
     str2 = %{
         { "OccExp": [ 0.0250000004, 0.0, 0.023, 0.0250000004, 0.0280000009,
-          "abc":{"a":1,"b":0,"c":[0,1,2]}  ], "PremRV": [ 8.5, 4.19999981, 5.5, 
+          "abc":{"a":1,"b":0,"c":[0,1,2]}  ], "PremRV": [ 8.5, 4.19999981, 5.5,
           7.80000019 ]}
       }
     str1 =  HashUtil.merge(str1,str2) # values in str1 == str2
@@ -61,16 +64,16 @@ HashUtil.zero(hash1) #{a:0,b:0,c:[0,0],d:{a:0}}
 ```ruby
  str2 = %{
           { "OccExp": [ 0.0250000004, 0.0199999996, "abc":{"a":1,"b":0,"c":[0,1,2]}]}
-        } 
+        }
  HashUtil.extract_numbers_hash(str2) #[ 0.0250000004, 0.0199999996,1,0,0,1,2]
 ```
-(5) extract_numbers_hash 
+(5) extract_numbers_hash
 ```ruby
     str2 = %{
         { "OccExp": [ 0.0250000004, 0.0199999996, "abc":{"a":1,"b":0,"c":[0,1,2]}]}
-      } 
+      }
     HashUtil.extract_numbers_hash(str2) #[ 0.0250000004, 0.0199999996,1,0,0,1,2]  
- 
+
 ```
 
 

data/lib/hash_util/version.rb

@@ -1,3 +1,3 @@
 module HashUtil
-  VERSION = "1.2"
+  VERSION = "1.3"
 end

data/lib/hash_util.rb

@@ -52,11 +52,14 @@ module HashUtil
   def self.merge(hash_str1, hash_str2)
     token1 = hash_str1.scan(/[[+-]?([0-9]*[.])?[0-9e-]+]+|\w+|[{}\[\]:,"\040]/)
     token2 = extract_numbers_hash(hash_str2)
+    # byebug
     j = 0
     token1.each_index do |i|
-      if /[0-9.]/.match token1[i]
+      begin
+        Float token1[i]
         token1[i] = token2[j]
         j += 1
+      rescue
       end
     end
     token1.join.gsub(/\s+/, ' ')
@@ -69,9 +72,9 @@ module HashUtil
   # extracts all numbers in a hash string
   def self.extract_numbers_hash(str)
     str = tokenize str
-    str.select! { |m| /[0-9.]/.match m }
+    str.select! { |m| /^[0-9.e-]+$/.match m }
     str.collect do |m|
-      m.to_s.include?('.') ? m.to_f : m.to_i
+      Float m
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hash_util
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: '1.3'
 platform: ruby
 authors:
 - dinesh.theetla@gmail.com
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-29 00:00:00.000000000 Z
+date: 2017-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler