hash_util 1.3 → 1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab549485511ee94e51e5f7c31244c41fc8cc832c
-  data.tar.gz: 8b4e7a4bf9a56a5df26ba3d70c06585abfd1bbae
+  metadata.gz: 0230c0efbf88089171c6e9a2235e91f2acaa9071
+  data.tar.gz: '08c22b3fd5ea8a65d8592b15b4d31d01ae9568ad'
 SHA512:
-  metadata.gz: dab8bdaf0d4c2f5fa8abd9b5588dcb6da870901d5bcfb564d7269ebbf972470708d449733e43e3f9c5c6e1d8074db216572d7c32dd2516eeb656f897c0515d34
-  data.tar.gz: 7985b1064ccaf3f848367893ff32108e8863c466a2c3ca33c71f7616c5f3e7e7aa0edf3e1bb43359a16d187e8763aece87bbdeda51684320f629163de1e03e3e
+  metadata.gz: ba88670cdb68c6b3f437248dfa6a0606d61315a03b4c97b82d724e3e0c3209ec60b00f8d20682316e4b8f003841799e83123fa865d78a4fba67d36a70e5cf8a1
+  data.tar.gz: 9b10d7350fb58bbe2c43f5973a322320ef1e4b9854f1e415b065d2f1d5136652cd276f43155b6180af7d615507c68cc88cf3629158921fd051e110daab6e29ab

data/README.md

@@ -37,6 +37,7 @@ Or install it yourself as:
 
 (1)add_hash2_to_hash1
 ```ruby
+require 'hash_util'
 hash1 = {a:1,b:2,c:[1,2],d:{a:1}}
 hash2 = {a:3,b:3,c:[3,2],d:{a:10}}
 hash3 =  HashUtil.add_hash2_to_hash1(hash1,hash2) # hash1 = hash3 = {a:4,b:5,c:[4,4],d:{a:11}}

data/lib/hash_helper.rb

@@ -0,0 +1,65 @@
+require 'hash_util/version'
+require 'byebug'
+
+# Ruby Hash utility module
+module HashHelper
+
+  def tokenize(str)
+    # extract words + nums
+    str.scan(/[0-9.e-]+|\w+/)
+  end
+
+  # extracts all numbers in a hash string
+  def extract_numbers_hash(str)
+    str = tokenize str
+    # extract all nums including those using e notation
+    str.select! { |m| /^[0-9.e-]+$/.match m }
+    # used Float instead of to_f as to_f converts string to '0'
+    str.collect do |m|
+      Float m
+    end
+  end
+
+  # submethod used by add_hash2_to_hash1 if type Array
+  def add_hash_if_array(a1, b1)
+    a1 = a1.enum_for(:each_with_index).collect do |m, index|
+      if %w[Array Hash].include?(m.class.name)
+        add_hash2_to_hash1(a1[index], b1[index])
+      else
+        m + b1[index]
+      end
+    end
+    a1
+  end
+
+  # submethod used by add_hash2_to_hash1 if type Hash
+  def add_hash_if_hash(a1, b1)
+    a1.each do |k, _v|
+      if %w[Array Hash].include?(a1[k].class.name)
+        a1[k] = add_hash2_to_hash1(a1[k], b1[k])
+      else
+        a1[k] += b1[k]
+      end
+    end
+  end
+
+  # adds up hash2 values in to hash1
+  # alternate implementation using string instead of hash
+
+  # def self.add_hash2_to_hash1(hash1, hash2)
+  #   token1 = hash1.to_s.scan(/[[+-]?([0-9]*[.])?[0-9e-]+]+|\w+|[{}\[\]:,"\040]/)
+  #   token2 = extract_numbers_hash(hash2.to_s)
+  #   j = 0
+  #   token1.each_index do |i|
+  #     begin
+  #       Float token1[i]
+  #       b = Float token2[j]
+  #       token1[i] = token1[i].to_f + b
+  #       j += 1
+  #     rescue => e
+  #       e.backtrace
+  #     end
+  #   end
+  #   token1.join.gsub(/\s+/, ' ').gsub(/[.0]/, '')
+  # end
+end

data/lib/hash_util/version.rb

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

data/lib/hash_util.rb

@@ -1,33 +1,30 @@
 require 'hash_util/version'
 require 'byebug'
+require 'hash_helper'
 
 # Ruby Hash utility module
 module HashUtil
-  # adds up hash2 values in to hash1
+  extend HashHelper
+
+  # adds hash2 value to hash1 value recursively
+  # alternate implementation using a string instead of hash
+  # can be found in hash helper module
   def self.add_hash2_to_hash1(a1, b1)
     if a1.class.name == 'Array'
-      a1 = a1.enum_for(:each_with_index).collect do |m, index|
-        if %w[Array Hash].include?(m.class.name)
-          add_hash2_to_hash1(a1[index], b1[index])
-        else
-          m + b1[index]
-        end
-      end
-      a1
+      add_hash_if_array(a1, b1)
     elsif a1.class.name == 'Hash'
-      a1.each do |k, _v|
-        if %w[Array Hash].include?(a1[k].class.name)
-          a1[k] = add_hash2_to_hash1(a1[k], b1[k])
-        else
-          a1[k] += b1[k]
-        end
-      end
+      add_hash_if_hash(a1, b1)
     else
       a1[k] += b1[k]
     end
   end
 
   #  set all values in the hash to 0
+  #  This method should be moved to helper module and
+  #  another genericmethod called set_Values to be added
+  #  that can set all values including zero
+  #  TODO optimize
+  #  FIXME rubocop
   def self.zero(obj)
     if obj.class.name == 'Array'
       obj = obj.collect do |m|
@@ -49,13 +46,15 @@ module HashUtil
   # copies values from a hash string in to another
   # The 2 hashes should be of same structure but keys
   # can be different
+  # FIXME rubocop
   def self.merge(hash_str1, hash_str2)
+    # extract nums, words
     token1 = hash_str1.scan(/[[+-]?([0-9]*[.])?[0-9e-]+]+|\w+|[{}\[\]:,"\040]/)
     token2 = extract_numbers_hash(hash_str2)
-    # byebug
     j = 0
     token1.each_index do |i|
       begin
+        # used Float instead of to_f as to_f converts string to '0'
         Float token1[i]
         token1[i] = token2[j]
         j += 1
@@ -64,17 +63,4 @@ module HashUtil
     end
     token1.join.gsub(/\s+/, ' ')
   end
-
-  def self.tokenize(str)
-    str.scan(/[0-9.e-]+|\w+/)
-  end
-
-  # extracts all numbers in a hash string
-  def self.extract_numbers_hash(str)
-    str = tokenize str
-    str.select! { |m| /^[0-9.e-]+$/.match m }
-    str.collect do |m|
-      Float m
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hash_util
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: '1.4'
 platform: ruby
 authors:
 - dinesh.theetla@gmail.com
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-02 00:00:00.000000000 Z
+date: 2017-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -69,6 +69,7 @@ files:
 - bin/console
 - bin/setup
 - hash_util.gemspec
+- lib/hash_helper.rb
 - lib/hash_util.rb
 - lib/hash_util/version.rb
 homepage: https://github.com/dtheetla/hash_util