clean-hash 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8da8615041dbba1d87e61ea20b29829ec35a5c6143020b2da7195cd39807dc1
-  data.tar.gz: 03e0e0588325dca5eb1ad9c61fbace8efc0541f7c46a54c669a9aa2b798bd9ea
+  metadata.gz: bca462b038bfca67047b36bb224811ddc6e0bd479418c015b6fb4db81aa27a5f
+  data.tar.gz: 12cd3f411a29764539e7f4056a37edb1b7aecb9fb6b10a3c074c4f828f9c3e8f
 SHA512:
-  metadata.gz: 16687111810848bf0fad3a7f00560621d96b0be2aadc6593536f1e11a9e787f25716a42ff1e92ac2efe41a6cb713d7ad3776dea72b897143a292717e21679a85
-  data.tar.gz: ebd5a5eafbf830059730a6b1e9c1a375f2a0e5cc194f6b4bee279b9d1bcaebe994d702d57226b48ce7b5f1e244f06343343c09115b28a7e774acf20e93a10194
+  metadata.gz: e79d1c984d8afa266df0bb1b38d8c0c868d5f1446d97c37887568766156273f009a8ae22b900e12e3188ea5af9aff5c1de574fc583db463d1de725358a241e1b
+  data.tar.gz: 7073960b6690ab77393f8612ff134d26db236149d66ad9934d1b4b04dcc2502522c0ab2eebeb4daf87a2504c8c0a559e450633f5d5a5f664d8ae9ab4086effdc

data/.version

@@ -1 +1 @@
-0.4.1
+0.5.0

data/lib/clean-hash.rb

@@ -1,8 +1,11 @@
 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/mutex_hash'
-require_relative 'clean-hash/opts_hash'
 require_relative 'clean-hash/hash_pollute'
 

data/lib/clean-hash/base.rb

@@ -1,104 +1,18 @@
 class CleanHash
-  def initialize data, mode=nil
-    @data = data
-    @mode = mode
-
-    case mode
+  def self.create type, data={}
+    case type
+    when :indifferent
+      ::CleanHash::Indifferent.new data
     when :safe
-      @is_safe = true
+      ::CleanHash::Safe.new data
+    when :strict
+      ::CleanHash::Strict.new data
+    when :stuct
+      ::CleanHash.create_strut data
+    when :mutex
+      ::CleanHash::MutexHash.new data
     else
-      @is_strict = true if mode
+      raise ArgumentError, 'Unsupported type: %s' % type
     end
   end
-
-  # for debug
-  def to_json
-    JSON.pretty_generate @data
-  end
-
-  # for puts
-  def to_ary
-    [@data]
-  end
-
-  def [] key
-    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 (%s)' % [key, keys]
-      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)
-
-    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
-    self[name]
-    true
-  rescue NoMethodError
-    false
-  end
-
-  def keys
-    @data.keys
-  end
-
-  def values
-    @data.values
-  end
-
-  def to_h
-    @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('=', '')
-      self[m] = args.first
-    elsif m.end_with?('?')
-      begin
-        !self[m.sub('?', '')].nil?
-      rescue NoMethodError
-        false
-      end
-    else
-      self[m]
-    end
-  end
-
-  private
-
-  def __error_set
-    raise NoMethodError, 'Clean hash: setting a key value is not allowedß'
-  end
-end
+end

data/lib/clean-hash/hash_pollute.rb

@@ -14,34 +14,13 @@ class CleanHash
 
       def to_ch mode=nil
         if mode.is_a?(Array)
-          for key in keys
-            raise ArgumentError, 'CleanHash key "%s" not allowed' % key unless mode.include?(key)
-          end
-
-          for key in mode
-            self[key] = nil unless key?(key)
-          end
-
-          ::CleanHash::OptsHash.new self
+          mode.each { |el| self[el] = nil if self[el].nil? }
+          ::CleanHash.create_struct self
         else
-          supported = %i{safe mutex strict}
-          raise ArgumentError, 'Unsupported type "%s", supported: %s' % [mode, supported] if mode && !supported.include?(mode)
-
-          if mode == :mutex
-            ::CleanHash::MutexHash.new self
-          else
-            ::CleanHash.new self, mode
-          end
+          mode ||= :indifferent
+          ::CleanHash.create mode, self
         end
       end
     end
-
-    ::Array.class_eval do
-      # coverts keys to empty hash methods and returns read_only hash
-      def to_ch strict=false
-        hash = inject({}) { |h, key| h[key] = nil; h }
-        ::CleanHash::OptsHash.new hash
-      end
-    end
   end
 end

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

@@ -0,0 +1,73 @@
+class CleanHash
+  class Indifferent
+    def initialize data
+      @data = data
+    end
+
+    # for debug
+    def to_json
+      JSON.pretty_generate @data
+    end
+
+    # for puts
+    def to_ary
+      [@data]
+    end
+
+    def key? name
+      @data.key?(name.to_sym) || @data.key?(name.to_s)
+    end
+
+    def keys
+      @data.keys
+    end
+
+    def values
+      @data.values
+    end
+
+    def to_h
+      @data
+    end
+
+    def to_json *args
+      @data.to_json *args
+    end
+
+    def [] key
+      data = @data[key.to_sym]
+      data = @data[key.to_s] if data.nil?
+
+      if data.is_a?(Hash)
+        self.class.new data
+      else
+        data
+      end
+    end
+
+    def []= key, value
+      key = key.to_sym unless key.class == Symbol
+      @data.delete(key.to_s)
+      @data[key] = value
+    end
+
+    def method_missing name, *args, &block
+      m = name.to_s
+
+      if m.end_with?('=')
+        m = m.sub('=', '')
+        self[m] = args.first
+      elsif m.end_with?('?')
+        begin
+          !self[m.sub('?', '')].nil?
+        rescue NoMethodError
+          false
+        end
+      elsif block
+        self[m] = block
+      else
+        self[m]
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+class CleanHash
+  class Safe < Indifferent
+    def []= key, value
+      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
+
+      super
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+# Type good for configurations
+
+class CleanHash
+  class Strict < Indifferent
+    def [] key
+      _check_key_existance key
+      super
+    end
+
+    def []= key, value
+      _check_key_existance key
+      super
+    end
+
+    private
+
+    def _check_key_existance key
+      raise ArgumentError.new('Key not found: %s' % key) unless key?(key)
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+# Creates dynamic struct based on arguments
+
+class CleanHash
+  STRUCTS = {}
+
+  def self.create_struct hash
+    raise ArgumentError.new('Not a hash') unless hash.is_a?(Hash)
+
+    name = 'DynStruct_' + hash.keys.join('_')
+    STRUCTS[name] ||= ::Struct.new(name, *hash.keys.sort)
+
+    STRUCTS[name].new.tap do |o|
+      hash.each do |k, v|
+        o.send('%s=' % k, v) unless v.nil?
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clean-hash
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Dino Reic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-01 00:00:00.000000000 Z
+date: 2020-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -35,9 +35,12 @@ files:
 - "./lib/clean-hash/base.rb"
 - "./lib/clean-hash/deep_merge.rb"
 - "./lib/clean-hash/hash_pollute.rb"
-- "./lib/clean-hash/mutex_hash.rb"
-- "./lib/clean-hash/opts_hash.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:
 - MIT

data/lib/clean-hash/opts_hash.rb

@@ -1,41 +0,0 @@
-# @ivars = [:foo, :bar].to_ch
-# @ivars = {foo: nil, bar: 2}.to_ch [:foo, :bar, :baz]
-
-class CleanHash
-  class OptsHash
-    def initialize *hash
-      if hash.first.class == Hash
-        @hash = hash.first
-      else
-        @hash = hash.inject({}) { |h, el| h[el.to_sym] = nil; h }
-      end
-    end
-
-    def [] key
-      method_missing key
-    end
-
-    def []= key, value
-      method_missing '%s=' % key, value
-    end
-
-    def method_missing name, value=nil
-      name   = name.to_s
-      is_set = !!name.sub!('=', '')
-      name   = name.to_sym
-
-      raise NoMethodError.new('Key %s not found' % name) unless @hash.has_key?(name)
-
-      if is_set
-        @hash[name] = value
-      else
-        @hash[name]
-      end
-    end
-
-    def to_h
-      @hash.dup
-    end
-  end
-end
-