clean-hash 0.5.11 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b4ab8e9884ce9634b844cd3c4376ff353bbe1017279b49e0ce0cbd6d3c40301
-  data.tar.gz: dfe2c01fa31add7234eaa6fb05c62cdbb4ea1a6eccd79a02df40076e4db2a9e0
+  metadata.gz: ed7704c53ff11469472d74438b7c3b99a663e2c6226a930da13850425db16453
+  data.tar.gz: 4ecfc3fac7c9e3a957b11e3d89e2cf0f7d1bf468d5e8c5ca3ac6f2bc800f147d
 SHA512:
-  metadata.gz: d6af7a328d16dffe592cb6cbd4d341b5623b293efac278efb71f1dab6ca6bd0a9763a7f1f6ca5a18351c6d622595e639f89426861f3e8702b3f42e93fdffb576
-  data.tar.gz: f763eb0ef805f540e0133f381474d999cdbd63b62bb349b1208b7aad756e1243fd2859fe6b71c877b12ab9612320e47c5500a1fbe932195fc4a97aa99b72cf40
+  metadata.gz: 1d96dd9791146a09714230fed546573c53e0551ac65203a21e4dbd0da0f7b82841d6ccb5f3d6b09c3a71c6d052142bffda5da563b4a53e8aec668a741162bb66
+  data.tar.gz: 64d668f59ae76a6464f4e8109654350ea289df671d83ccb98ddf4f0a0b6983a35b4609203a8e7aa165d5db163f2882471943048bbe41228d19c6f78fc8a0633d

data/.version

@@ -1 +1 @@
-0.5.11
+0.6.0

data/lib/clean-hash.rb

@@ -1,10 +1,7 @@
 require 'hashie'
 
-require_relative 'clean-hash/base'
 require_relative 'clean-hash/types/indifferent_type'
-require_relative 'clean-hash/types/mutex_type'
 require_relative 'clean-hash/types/safe_type'
-require_relative 'clean-hash/types/strict_type'
 require_relative 'clean-hash/types/struct_type'
 require_relative 'clean-hash/deep_merge'
 require_relative 'clean-hash/hash_pollute'

data/lib/clean-hash/hash_pollute.rb

@@ -19,10 +19,9 @@ class CleanHash
           end
 
           mode.each { |el| self[el] = nil if self[el].nil? }
-          ::CleanHash.create_struct self
+          CleanHash.create_struct self
         else
-          mode ||= :indifferent
-          ::CleanHash.create mode, self
+          CleanHash.new self
         end
       end
     end

data/lib/clean-hash/types/indifferent_type.rb

@@ -1,84 +1,94 @@
+# raise error if accessing hash with method and key not found
+# stict_hash = { foo: :bar }.to_ch :strict
+# stict_hash[:not_found] # nil
+# stict_hash.foo         # :bar
+# stict_hash.not_found   # ArgumentError
+
 class CleanHash
-  class Indifferent
-    def initialize data
-      @data = data
-    end
+  MUTEX ||= Mutex.new
 
-    # for debug
-    def to_json
-      JSON.pretty_generate @data
-    end
+  def initialize data
+    @data = data
+  end
 
-    # for puts
-    def to_ary
-      [@data]
-    end
+  # for debug
+  def to_json
+    JSON.pretty_generate @data
+  end
 
-    # overload key ruby method because it is common hash key name
-    # still accessible via to_h.key
-    def key
-      self[:key]
-    end
+  # for puts
+  def to_ary
+    [@data]
+  end
 
-    def key? name
-      @data.key?(name) || @data.key?(name.to_s) || (name.respond_to?(:to_sym) ? @data.key?(name.to_sym) : nil)
-    end
+  # overload key ruby method because it is common hash key name
+  # still accessible via to_h.key
+  def key
+    self[:key]
+  end
 
-    def delete key
-      out = []
-      out.push @data.delete(key)
-      out.push @data.delete(key.to_s)
-      out.push @data.delete(key.to_sym) if key.respond_to?(:to_sym)
-      out.each { |el| return el unless el.nil? }
-      nil
-    end
+  def key? name
+    @data.key?(name) || @data.key?(name.to_s) || (name.respond_to?(:to_sym) ? @data.key?(name.to_sym) : nil)
+  end
 
-    def to_h
-      @data
-    end
+  def delete key
+    out = []
+    out.push @data.delete(key)
+    out.push @data.delete(key.to_s)
+    out.push @data.delete(key.to_sym) if key.respond_to?(:to_sym)
+    out.each { |el| return el unless el.nil? }
+    nil
+  end
 
-    def to_json *args
-      @data.to_json *args
-    end
+  def to_h
+    @data
+  end
+
+  def to_json *args
+    @data.to_json *args
+  end
 
-    def [] key
-      data = @data[key]
-      data = @data[key.to_s]   if data.nil? && !key.is_a?(String)
-      data = @data[key.to_sym] if data.nil? && key.respond_to?(:to_sym)
+  def [] key
+    data = @data[key]
+    data = @data[key.to_s]   if data.nil? && !key.is_a?(String)
+    data = @data[key.to_sym] if data.nil? && key.respond_to?(:to_sym)
 
-      if data.is_a?(Hash)
-        self.class.new data
-      else
-        data
-      end
+    if data.is_a?(Hash)
+      self.class.new data
+    else
+      data
     end
+  end
 
-    def []= key, value
-      delete key
+  def []= key, value
+    delete key
+    MUTEX.synchronize do
       @data[key] = value
     end
+  end
+
+  def method_missing name, *args, &block
+    return @data.send(name, *args, &block) if @data.respond_to?(name)
 
-    def method_missing name, *args, &block
-      return @data.send(name, *args, &block) if @data.respond_to?(name)
-
-      m = name.to_s
-
-      if m.end_with?('=')
-        m = m.sub('=', '')
-        self[m] = args.first
-      elsif m.end_with?('?')
-        !self[m.sub('?', '')].nil?
-      elsif block
-        self[m] = block
-      else
-        _method_missing_key m
-      end
+    m = name.to_s
+
+    if m.end_with?('=')
+      m = m.sub('=', '')
+      self[m] = args.first
+    elsif m.end_with?('?')
+      !self[m.sub('?', '')].nil?
+    elsif block
+      self[m] = block
+    else
+      _method_missing_key m
     end
+  end
 
-    private
+  private
 
-    def _method_missing_key key
-      self[key]
+  def _method_missing_key key
+    self[key].tap do |value|
+      raise ArgumentError.new('Key not found: %s' % key) if value.nil?
     end
   end
 end

data/lib/clean-hash/types/safe_type.rb

@@ -1,5 +1,5 @@
 class CleanHash
-  class Safe < Indifferent
+  class Safe < CleanHash
     def []= key, value
       value = value.to_s if value.is_a?(Symbol)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clean-hash
 version: !ruby/object:Gem::Version
-  version: 0.5.11
+  version: 0.6.0
 platform: ruby
 authors:
 - Dino Reic
@@ -32,14 +32,11 @@ extra_rdoc_files: []
 files:
 - "./.version"
 - "./lib/clean-hash.rb"
-- "./lib/clean-hash/base.rb"
 - "./lib/clean-hash/deep_merge.rb"
 - "./lib/clean-hash/hash_pollute.rb"
 - "./lib/clean-hash/pollute.rb"
 - "./lib/clean-hash/types/indifferent_type.rb"
-- "./lib/clean-hash/types/mutex_type.rb"
 - "./lib/clean-hash/types/safe_type.rb"
-- "./lib/clean-hash/types/strict_type.rb"
 - "./lib/clean-hash/types/struct_type.rb"
 homepage: https://github.com/dux/clean-hash
 licenses:

data/lib/clean-hash/base.rb

@@ -1,18 +0,0 @@
-class CleanHash
-  def self.create type, data={}
-    case type
-    when :indifferent
-      ::CleanHash::Indifferent.new data
-    when :safe
-      ::CleanHash::Safe.new data
-    when :strict
-      ::CleanHash::Strict.new data
-    when :stuct
-      ::CleanHash.create_strut data
-    when :mutex
-      ::CleanHash::MutexHash.new data
-    else
-      raise ArgumentError, 'Unsupported type: %s' % type
-    end
-  end
-end

data/lib/clean-hash/types/mutex_type.rb

@@ -1,17 +0,0 @@
-# Thread safe hash
-class CleanHash
-  class MutexHash < Indifferent
-    MUTEX = Mutex.new
-
-    def []= name, value
-      MUTEX.synchronize do
-        @data[name] =
-        if value.is_a?(Hash)
-          self.class.new value
-        else
-          value
-        end
-      end
-    end
-  end
-end

data/lib/clean-hash/types/strict_type.rb

@@ -1,18 +0,0 @@
-# Type good for configurations
-
-class CleanHash
-  class Strict < Indifferent
-    private 
-    
-    # raise error if accessing hash with method and key not found
-    # stict_hash = { foo: :bar }.to_ch :strict
-    # stict_hash[:not_found] # nil
-    # stict_hash.foo         # :bar
-    # stict_hash.not_found   # ArgumentError
-    def _method_missing_key key
-      self[key].tap do |value|
-        raise ArgumentError.new('Key not found: %s' % key) if value.nil?
-      end
-    end
-  end
-end