dothash 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9370d6174074e9e2dd6eb90097dc555664fa58c
-  data.tar.gz: 744f5ce43630e70f08456cf8c75e5a11818dee3c
+  metadata.gz: 590537e3612fab0548b995256f5d5643bb389623
+  data.tar.gz: f2cf1b402a47d35de414b3a9924cfbc4f1937ea4
 SHA512:
-  metadata.gz: ff629422c02c99ebf91b4ad719d83200f710e4df5bf65d701cc3e6b6a7e201f8bbcd8a0549ed7dfd5afbe6b0caecb74da06c6e8bdea33e4394331470b255b021
-  data.tar.gz: b1552126c0ab4a38e5f7b30fd4039a06730f22155b7d600787e0fd47334594414b416996774ad4f3a381f182fcd6f461197fdcdf2d14d6446169b99774d7a564
+  metadata.gz: 1b3492e36e382a228405b3a633b6c2324db71d01c7bfbb200671f743e6784b2d8a9f54781510c34a8652ba36b59448e3d1a1d4810273c5b8618f4ca241f36b3b
+  data.tar.gz: 2a4f3fd31dd6959c2e90dee1724eee0dc78f3b4c9f8a1ceba52deaf2be12b40c43008673faec6fe911de8ae6e09861d804b27fbe4ffcfea137fef55e4fbb7f97

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+=== 2.0.0 (2016.10.05)
+
+* add conversion from opposite direction
+
 === 1.0.0 (2016.10.04)
 
 * publication of the code

data/README.md

@@ -24,13 +24,18 @@ Or install it yourself as:
 ```ruby
 require "dothash"
 hash = { x: { y: 1, z: { a1: 8, a2: 10 } }, v: [1, { y: 2, z: 3 }] }
-dhash = Dothash::Hash.convert hash
+dhash = Dothash::Hash.with_dots hash
 
 puts dhash
 # {"x.y"=>1, "x.z.a1"=>8, "x.z.a2"=>10, "v.0"=>1, "v.1.y"=>2, "v.1.z"=>3}
 
 puts dh.class
 # Hash
+
+hash2 = Dothash::Hash.without_dots(dhash)
+
+puts hash2
+# {:x=>{:y=>1, :z=>{:a1=>8, :a2=>10}}, :v=>{:"0"=>1, :"1"=>{:y=>2, :z=>3}}}
 ```
 
 ## Versioning

data/lib/dothash/hash.rb

@@ -19,24 +19,49 @@
 
 module Dothash
   class Hash
-    def self.convert(hash, prefix = nil)
+    def self.with_dots(hash, prefix = nil)
       raise ArgumentError, "You should pass only Hash here" unless hash.is_a? ::Hash
       hash.each_with_object({}) do |(key, value), memo|
         new_key = [prefix, key].compact.join(".")
-        memo.merge! go_deep(value, new_key)
+        memo.merge! with_dots_deeper(value, new_key)
       end
     end
 
-    private_class_method def self.go_deep(value, new_key)
+    private_class_method def self.with_dots_deeper(value, new_key)
       if value.is_a?(::Hash)
-        convert(value, new_key)
+        with_dots(value, new_key)
       elsif value.is_a? ::Array
         value.each_with_object({}).with_index do |(avalue, memo), index|
-          memo.merge! convert({ index => avalue }, new_key)
+          memo.merge! with_dots({ index => avalue }, new_key)
         end
       else
         { new_key => value }
       end
     end
+
+    def self.without_dots(hash)
+      hash.each_with_object({}) do |(key, value), memo|
+        key_parts = key.to_s.split(".")
+        new_key = key_parts.shift.to_sym
+        if key_parts.empty?
+          memo[new_key] = value
+        else
+          deep_merge!(memo, new_key => without_dots(key_parts.join(".") => value))
+        end
+      end
+    end
+
+    private_class_method def self.deep_merge!(first, second)
+      merger = proc do |_key, v1, v2|
+        if v1.is_a?(::Hash) && v2.is_a?(::Hash)
+          v1.merge(v2, &merger)
+        elsif v1.is_a?(::Array) && v2.is_a?(::Array)
+          v1 | v2
+        else
+          [:undefined, nil, :nil].include?(v2) ? v1 : v2
+        end
+      end
+      first.merge!(second.to_h, &merger)
+    end
   end
 end

data/lib/dothash/version.rb

@@ -18,5 +18,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Dothash
-  VERSION = "1.0.0".freeze
+  VERSION = "2.0.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dothash
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Szymon Kopciewski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-04 00:00:00.000000000 Z
+date: 2016-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake