non_config 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37cc8679f6cd7583c945ddc2309df64abee9937a
-  data.tar.gz: 674ff8cd87c4f2ca24bd6acda16c43d3c0cb8cc9
+  metadata.gz: 40d5f3ba45beed6cd73c6f36907fa400db18567c
+  data.tar.gz: b2d4f6613b83402e2a4d0e973bcd690f3ff43789
 SHA512:
-  metadata.gz: 88c99337ae59f8ff20391ee4bfaf3e33c4a360e8bbf6a1a033733af624f2f3f6f53476c666cbcede43a256332c4f4e03ecbca5925f991be1c0e50338e6dd72f2
-  data.tar.gz: bd14241bf5f94a83ca3eb7cc59d16a1715b9ce77bb875b9da0f13daee62be0aab586a0d0c1dc4fddf4add14ac5ce631b4c675e0c7d2bcb9ee0018e66846f1ccd
+  metadata.gz: 53c7aaeb8b1e9ca54ab5305b51e9a9805d0c5a919c2531a210a46cbc6ebaa5ccf6e2d5982e5c5346fb86b411691914c53416340e5a7efea96a1e01aaa2318315
+  data.tar.gz: cab4eb1062aeb2e04d1ad68b4beb51913a11bfa1d2708ae0a6f5490f7f0d564850608bcbea51573e1021a76641024b2358827379d7ca4dcf29676e30b6ae37a4

data/lib/non_config/base.rb

@@ -77,7 +77,7 @@ module NonConfig
       @@files.reverse_each do |_name, file|
         default = file[key] if default.nil?
 
-        return file[@@env][key] if @@env && file[@@env] && file[@@env][key]
+        return file[@@env][key] if file[@@env] && file[@@env][key]
         return file[key] if !@@env && file[key]
       end
 
@@ -102,7 +102,7 @@ module NonConfig
       if file_alias
         @@files[file_alias].save
       else
-        @@files.values.each &:save
+        @@files.values.each(&:save)
       end
     end
   end

data/lib/non_config/non_hash.rb

@@ -5,12 +5,16 @@ module NonConfig
   class NonHash < Hash
     # creates NonHash from Hash with recursive conversion of sub hashes
     def self.from_hash(hash)
+      new_hash = {}
       hash.each do |k, v|
-        hash[k] = from_hash(v) if v.is_a? Hash
-        hash[k] = convert_array_subhashes(v) if v.is_a? Array
+        new_hash[k] = case v
+                      when Hash then from_hash(v)
+                      when Array then convert_array_subhashes(v)
+                      else v
+                      end
       end
 
-      new.merge(hash)
+      new.merge(new_hash)
     end
 
     # recursively converts subhashes of `array` to `self.class`
@@ -33,20 +37,31 @@ module NonConfig
       self[m.to_s] || self[m.to_sym]
     end
 
+    # recursive conversion
     def to_hash
+      result = {}
+
       each do |k, v|
-        case v.class
-        when self.class then self[k] = v.to_hash
-        when Array then self[k] = reconvert_array(v)
-        end
+        result[k] = case v
+                    when self.class then v.to_hash
+                    when Array then unconvert_array(v)
+                    else v
+                    end
       end
+
+      result
+    end
+
+    #
+    def to_yaml
+      to_hash.to_yaml
     end
 
     private
 
-    def reconvert_array(array)
+    def unconvert_array(array)
       array.map do |e|
-        next reconvert_array(e) if e.is_a? Array
+        next unconvert_array(e) if e.is_a? Array
         next e.to_hash if e.is_a? self.class
         e
       end

data/lib/non_config/version.rb

@@ -1,3 +1,3 @@
 module NonConfig
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: non_config
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Dmitriy Non