clean-hash 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47a55f5f6060f690c49d7b3bcfc6ac8daf5d174c1ad8daa22fc9e4b0861c846e
-  data.tar.gz: a5e98c27b8688ffefbb27f552e771fb03d4cbdca2bd01cd6864e0c67c529fd10
+  metadata.gz: 45971a3560ed13e95d8f9b94230f7e1595b4e8c1244264cfe5f714d4a165c239
+  data.tar.gz: 0fe785d5fc385985182f762779c3edfb3236250a0a5df2dbc058f8efaf803ecc
 SHA512:
-  metadata.gz: f2892ecab841197330f48c5f5cb1b448dfcff43cf13d6a52b70c7c4c1e14cf6cd117fd886a6836aaa522342d1a9db53e84c05acd690b7856904b40d0459b42ef
-  data.tar.gz: ba9e7ff0f5438ebea25329cb57baef3f3e8df17897057685ae52113adb55be4f15d9e83f08bbe458aaf69d704d0bff5bdeb396f6d326d62dc61c88b82a7a58a5
+  metadata.gz: 43ee2cd7cec97d3bc6219c6402a8e7351d358b4bb7c8f2d2b8c0664d27a65b45f37c7396e8adf23755095431212bccfaacd1347279e60b9817566e785ff047cc
+  data.tar.gz: 57dfc84f72665d1ee5a5738afaeea9a5c3bc2befe5292303542d7454f6a85f5d73e2c8afb0a24ca45362bb39bebe0ee6553e2abd65ace7b9a64bbaf3be56a873

data/.version

@@ -1 +1 @@
-0.3.1
+0.4.0

data/lib/clean-hash/base.rb

@@ -22,16 +22,42 @@ class CleanHash
   end
 
   def [] key
-    __value_for key.to_s
+    data = @data[key.to_sym]
+    data = @data[key.to_s] if data.nil?
+
+    if data.nil?
+      if @is_strict && !keys.include?(key.to_sym)
+        raise NoMethodError, 'Clean hash: key "%s" not found' % key
+      else
+        nil
+      end
+    elsif data.is_a?(Hash)
+      CleanHash.new data, @mode
+    else
+      data
+    end
   end
 
   def []= key, value
+    key = key.to_sym unless key.class == Symbol
+
     __error_set if @is_strict && !key?(key)
-    @data[key.to_sym] = value
+
+    if @is_safe
+      value = value.to_s if value.is_a?(Symbol)
+
+      unless value.nil? || value.is_a?(Hash) || value.is_a?(Numeric) || value.is_a?(String)
+        raise ArgumentError.new('Unsupported safe type: %s' % value.class)
+      end
+    end
+
+    @data.delete(key.to_s)
+
+    @data[key] = value
   end
 
   def key? name
-    __value_for name
+    self[name]
     true
   rescue NoMethodError
     false
@@ -49,57 +75,29 @@ class CleanHash
     @data
   end
 
+  def to_json *args
+    @data.to_json *args
+  end
+
   def method_missing name, *args
     m = name.to_s
 
     if m.end_with?('=')
       m = m.sub('=', '')
-
-      __error_set if @is_strict && !key?(m)
-
-      value = args.first
-
-      if @is_safe
-        value = value.to_s if value.is_a?(Symbol)
-
-        unless value.nil? || value.is_a?(Hash) || value.is_a?(Numeric) || value.is_a?(String)
-          raise ArgumentError.new('Unsupported safe type: %s' % value.class)
-        end
-      end
-
-      m = m.to_sym if @data[m].nil?
-
-      @data[m] = value
+      self[m] = args.first
     elsif m.end_with?('?')
       begin
-        !__value_for(m.sub('?', '')).nil?
+        !self[m.sub('?', '')].nil?
       rescue NoMethodError
         false
       end
     else
-      __value_for m
+      self[m]
     end
   end
 
   private
 
-  def __value_for name
-    data = @data[name.to_s]
-    data = @data[name.to_sym] if data.nil?
-
-    if data.nil?
-      if @is_strict && !keys.include?(name.to_sym)
-        raise NoMethodError, 'Clean hash: key "%s" not found' % name
-      else
-        nil
-      end
-    elsif data.is_a?(Hash)
-      CleanHash.new data, @mode
-    else
-      data
-    end
-  end
-
   def __error_set
     raise NoMethodError, 'Clean hash: setting a key value is not allowedß'
   end

data/lib/clean-hash/mutex_hash.rb

@@ -3,17 +3,22 @@ class CleanHash
   class MutexHash
     MUTEX = Mutex.new
 
-    def initialize name=nil
-      @data ||= {}
+    def initialize data={}
+      @data ||= data
     end
 
     def [] name
-      @data[name.to_sym]
+      @data[name]
     end
 
     def []= name, value
       MUTEX.synchronize do
-        @data[name.to_sym] = value
+        @data[name] =
+        if value.is_a?(Hash)
+          self.class.new value
+        else
+           value
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clean-hash
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Dino Reic