hash_wia 0.7.12 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21df027abd49f7b71a57b22e4b33eae7a9446132b7afb300368de7d0d4b7f365
-  data.tar.gz: 529fe29a3eec11e03a54e99770ea8706bae0a9c24e6797e9cca2ad1e47223668
+  metadata.gz: bf1316795c66debebb5c2e3f2252a6f5e10a3ff43159d1f0cec03c5d978a50aa
+  data.tar.gz: 6ba10b0913e09ae31a97e49792c43aaf715281a8da72bc5e25a6a8068fed9dd8
 SHA512:
-  metadata.gz: 853abb6448ccc27730dba7880edd91f70e54d1a865537397ede4706c1b10fbfa207236090353da19ef7bfadb3fb20673b4c198e56746cd40201ba77056cbb163
-  data.tar.gz: fa564c45e2b991fce99ef8c6f0dbdc786c92a2d1de55533b9bd4d0e9da2448eb12a3b8aa9ae3c28441a423da084a108bf6f1e7e584354b070e5ee368644e0d10
+  metadata.gz: 97de64c3717994fc15700c60b54b45a8a288ac0c82e09e1c9f1d6464ab190c2e78c238f32d3d33326627fe7e4faf3c78897102a8d4e5aa1f72e33289b7896f97
+  data.tar.gz: 0e8949fc406b0d2959bf97321825071cc619a9031fdc5df489eabd2d847094cb82dbd32f9bc3089f5a3eff2e4eb7cc66390025d49593d8bdbc62b1e565a9ef05

data/.version

@@ -1 +1 @@
-0.7.12
+0.8.2

data/lib/hash_wia/class.rb

@@ -4,13 +4,15 @@ end
 
 class HashWia
   class NamedOptions
-    def initialize hash
-      @hash = hash
+    def initialize hash, &block
+      @hash  = hash
+      @block = block
     end
 
-    def set constant, code, name
+    def set constant, code, value
+      @block.call constant.to_s, code, value
       @hash[constant.to_s] = code
-      @hash[code]          = name.to_s
+      @hash[code]          = value
     end
 
     def method_missing code, key_val
@@ -28,7 +30,7 @@ end
 #   # or
 #   opt.set 'DONE', :d, 'Done'
 # end
-def HashWia klass = nil, name = nil, opts = nil
+def HashWia klass = nil, opts = nil
   if block_given?
     hash = HashWia.new
 
@@ -37,19 +39,25 @@ def HashWia klass = nil, name = nil, opts = nil
       klass = nil
     end
 
-    if name
-      if !opts || opts[:constant] != false
-        constant = name.to_s.upcase
-        klass.const_set constant, hash
-      end
+    opts ||= {}
 
-      klass.define_singleton_method(name) { klass.const_get(constant) }
+    named_opts = HashWia::NamedOptions.new hash do |constant, code, value|
+      if opts[:constants]
+        if klass
+          klass.const_set "#{opts[:constants]}_#{constant}".upcase, code
+        else
+          raise "Host class not given (call as HashWia self, constants: ...)"
+        end
+      end
     end
 
-    named_opts = HashWia::NamedOptions.new hash
     yield named_opts
 
-    if !opts || opts[:freeze] != false
+    if opts[:method]
+      klass.define_singleton_method(opts[:method]) { hash }
+    end
+
+    unless opts[:freeze] == false
       hash.freeze
     end
 

data/lib/hash_wia/module.rb

@@ -13,33 +13,37 @@ module HashWiaModule
   end
 
   def [] key
-    data = super key
-    data = super key.to_s if data.nil?
-    data = super key.to_sym if key.respond_to?(:to_sym) && data.nil?
+    data = super(key)
+    skey = key.to_s
+    data = super(skey) if data.nil?
+    data = super(skey.to_sym) if data.nil? && key.class != Symbol
 
-    # if we are returning hash as a value, just include with wia methods hash
     if data.is_a?(Hash)
       data.extend HashWiaModule
+      data
+    else
+      data
     end
-
-    data
   end
 
   def []= key, value
-    if @frozen_keys && !keys.include?(key)
-      raise FrozenError, "HashWia keys are frozen and can't be modified (key: #{key})"
-    end
-
-    delete key
+    key = key.to_s unless key.class == Symbol
+  
     super key, value
   end
 
+  def __val key
+    data = self[key.to_s]
+    data = self[to_s] if data.nil?
+    data
+  end
+
   def delete key
-    self[key].tap do
-      super key
-      super key.to_s
-      super key.to_sym if key.respond_to?(:to_sym)
-    end
+    data = super(key)
+    skey = key.to_s
+    data = super(skey) if data.nil?
+    data = super(skey.to_sym) if data.nil? && key.class != Symbol
+    data
   end
 
   # we never return array from hash, ruby internals
@@ -49,7 +53,7 @@ module HashWiaModule
 
   # key is common id direct access
   # allow direct get or fuction the same if name given
-  def key name=nil
+  def key name = nil
     name.nil? ? self[:key] : self[name.to_s]
   end
 
@@ -60,13 +64,12 @@ module HashWiaModule
 
   def merge hash
     dup.tap do |h|
-      hash.each { |k, v| h[k] = v }
+      hash.each { |k, v| h[k.to_s] = v }
     end
   end
 
-  def freeze_keys!
-    @frozen_keys = true
-    self
+  def merge! hash
+    hash.each { |k, v| self[k.to_s] = v }
   end
 
   def each &block
@@ -81,6 +84,17 @@ module HashWiaModule
     self
   end
 
+  def dig *args
+    root = self
+    while args[0]
+      key = args.shift
+      root = root[key] || root[key.to_s]
+      return if root.nil?
+      root = HashWia.new root if root.class == Hash
+    end
+    root
+  end
+
   def method_missing name, *args, &block
     strname = name.to_s
 
@@ -89,19 +103,20 @@ module HashWiaModule
       !!self[strname]
     elsif strname.sub!(/=$/, '')
       # h.foo = :bar
-      self[strname.to_sym] = args.first
+      self[strname] = args.first
     else
       value = self[strname]
+      value = self[strname.to_sym] if value.nil?
 
       if value.nil?
         if block
-          # h.foo { rand }
-          self[name] = block
-        elsif !keys.include?(name.to_sym)
-          # h.foo
-          raise NoMethodError.new('%s not defined' % strname)
+          self[strname.to_s] = block
         else
-          nil
+          if key?(strname) || key(strname.to_sym)
+            nil
+          else
+            raise NoMethodError.new('%s not defined in HashWia' % strname)
+          end
         end
       else
         value

data/lib/hash_wia/pollute.rb

@@ -2,11 +2,11 @@ class Hash
   # { foo: :bar }.to_hwia            #
   # { foo: :bar }.to_hwia :foo, :bar # create struct and fill
   def to_hwia *args
-    unless args.first
+    if args.first.nil?
       HashWia.new self
     else
-      list  = args.flatten
-      extra = keys - list
+      list  = args.map(&:to_s).flatten
+      extra = keys.map(&:to_s) - list
 
       if extra.first
         raise ArgumentError.new('Unallowed key/s: %s' % extra.map{ |_| ':%s' % _ }.join(', '))
@@ -15,9 +15,8 @@ class Hash
       HashWia.new.tap do |o|
         list.each do |k|
           o[k] = self[k]
+          o[k] = self[k.to_sym] if o[k].nil?
         end
-
-        o.freeze_keys!
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hash_wia
 version: !ruby/object:Gem::Version
-  version: 0.7.12
+  version: 0.8.2
 platform: ruby
 authors:
 - Dino Reic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-06 00:00:00.000000000 Z
+date: 2024-01-03 00:00:00.000000000 Z
 dependencies: []
 description: Gem provides simple access to common Ruby hash types bundled in one simple
   class
@@ -41,7 +41,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Hash with indifferent access + goodies