meander 0.1.3 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5a3a8e4229801dbfdbe059575217825508f53cd9
-  data.tar.gz: 0e3cec51b79e748742755b4d1d64dfefeb9c8653
+SHA256:
+  metadata.gz: 4e6b293c17ad768d3896dab4b0efe4a74d2dfd55558debc8126c15ad9be3bcb3
+  data.tar.gz: 0f5a82ffc23700aef19c1a4324fba5f2d75d5d2dcc553f70da8150a463b87977
 SHA512:
-  metadata.gz: 94e34836c0816f24a00ab83a0c70c89733a34beb5b6036f402a4341e26565c80e49835d9af912b981edebdc731f86de56e90ce8d94ae450bbdb92d403c82f9eb
-  data.tar.gz: e80f1d6cb38feaa90d2575b1d993727020b11543b764cd0b35a3c5f9c8cfd2855ec81ac7b6e665b8ac445bec96e3ac09983a1464c779caa026074a12feac65e8
+  metadata.gz: 398a48194ae2511f88ca7567d2d19f07759cb6e5cffec76c53f7bc5e8678ab0048dba3f16824671b26b74102aaa806d55af8eddee7a1fed4fe3f3fc587a4ac1f
+  data.tar.gz: fad6c4adfe5b08f1cdc4a51506b1e69e402758653ab2e7096a0b5ff10ea3f09447f2f148c76fac5c3d02f1f11148cc4b0c304a13fff4a16352176c5c099a54df

data/.gitignore

@@ -12,3 +12,4 @@
 .rspec_status
 .DS_Store
 .byebug_history
+coverage

data/.rubocop.yml

@@ -1,11 +1,15 @@
-require: rubocop-rspec
+require:
+  - rubocop-rspec
+  - rubocop-performance
 AllCops:
   RSpec:
     Patterns:
     - 'spec/meander/.+.rb$'
     - 'spec/shared/.+.rb$'
 Metrics/MethodLength:
-  Max: 15
+  Max: 20
+Metrics/ClassLength:
+  Max: 110
 Metrics/BlockLength:
   Exclude:
     - 'spec/**/*.rb'

data/.travis.yml

@@ -1,5 +1,5 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.4.1
+  - 2.7.1
 before_install: gem install bundler -v 1.14.6

data/lib/meander.rb

@@ -1,7 +1,9 @@
-require 'meander/version'
-require 'meander/common_methods'
-require 'meander/plain'
-require 'meander/mutable'
+# frozen_string_literal: true
+
+require_relative 'meander/version'
+require_relative 'meander/common_methods'
+require_relative 'meander/plain'
+require_relative 'meander/mutable'
 
 module Meander # :nodoc:
 end

data/lib/meander/common_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Meander
   module CommonMethods # :nodoc:
     module ClassMethods # :nodoc:
@@ -8,10 +10,8 @@ module Meander
 
     def self.included(base)
       base.extend ClassMethods
-      base.instance_eval do
-        def cover_class=(val)
-          @cover_class = val
-        end
+      class << base
+        attr_writer :cover_class
 
         def cover_class
           @cover_class ||= self
@@ -21,22 +21,8 @@ module Meander
 
     private
 
-    def define_getter(method)
-      define_singleton_method method do |&b|
-        if key?(method)
-          b.call(self[method]) if block_given?
-          self[method]
-        else
-          instance_eval(method) do |name|
-            undef_method name
-          end
-          send method, &block
-        end
-      end
-    end
-
-    def new_key_method?(method)
-      method =~ /^([[:word:]]+)\=$/
+    def new_key_method?(method_name)
+      /=$/.match?(method_name)
     end
   end
 end

data/lib/meander/mutable.rb

@@ -1,7 +1,8 @@
-require 'meander/plain'
+# frozen_string_literal: true
+
+require_relative 'plain'
 require 'delegate'
 require 'forwardable'
-
 module Meander
   ##
   # This class is a mutable version of Meander::Plain
@@ -29,7 +30,7 @@ module Meander
   #   a[:a][:b][:c] = 3
   #   m.a.b.c     # => 3
   # ==== Notice
-  # Meander::Mutable support only one up to date object reference
+  # Meander::Mutable support multiple object references
   #   a = {a: 1}
   #   m = Meander::Mutable.new(a)
   #   b = {b: 2}
@@ -37,8 +38,16 @@ module Meander
   #   a[:a] = 3
   #   b[:b] = 4
   #   m.a # => 3  # Value is up to date
-  #   m.b # => 2  # Attention! Value remains unchanged
-  class Mutable < Delegator
+  #   m.b # => 4  # This value is also up to date
+  # You can also initialize Meander::Mutable with multiple nested hashes
+  #   a = {a: 1}
+  #   b = {b: 2}
+  #   m = Meander::Mutable.new(a, b)
+  #   a[:a] = 3
+  #   b[:b] = 4
+  #   m.a # => 3  # Value is up to date
+  #   m.b # => 4  # This value is also up to date
+  class Mutable < ::Thor::CoreExt::HashWithIndifferentAccess
     include CommonMethods
     include Enumerable
 
@@ -49,46 +58,42 @@ module Meander
       end
     end
 
-    def initialize(obj = {})
-      super
-      @delegate_sd_obj = obj
+    def initialize(required = {}, *args)
+      __setobj__(required, *args)
       @own_keys = self.class.own_keys_cover_class.new
     end
 
     def __getobj__
-      @delegate_sd_obj
+      @delegate
+    end
+
+    def __setobj__(*args)
+      @delegate = []
+      @delegate += args
+      @delegate
     end
 
-    def __setobj__(obj)
-      @delegate_sd_obj = obj
+    def merge!(hsh)
+      @delegate ||= []
+      @delegate.unshift hsh
     end
 
     def key?(key)
-      @own_keys.key?(key) ||
-        begin
-          obj = __getobj__
-          obj.key?(key.to_s) || obj.key?(key.to_sym)
-        end
+      @own_keys.key?(key) || delegated_key?(key)
     end
 
     def dup
-      self.class.new(self)
+      self.class.new(*__getobj__)
     end
 
-    def each &block
-      if block_given?
-        __getobj__.each{ |i| yield i }
-        @own_keys.each{ |i| yield i }
-      else
-        enum_for :each
-      end
+    def each(*args, &block)
+      return enum_for(:each) unless block_given?
+
+      deep_call.each { |i| i.each(*args, &block) }
     end
 
     def keys
-      origin = __getobj__
-      own = @own_keys
-      [(origin && origin.keys), (own && own.keys)].flatten
-                                                  .compact.map(&:to_s).uniq
+      map { |k, _| convert_key(k) }
     end
 
     def [](key)
@@ -96,7 +101,7 @@ module Meander
       if @own_keys.key? key
         val = @own_keys[key]
       else
-        val = get_delegated_value key
+        val = get_delegated_value(key)
         if val.is_a?(Hash)
           val = self.class.new(val)
           self[key] = val
@@ -105,39 +110,67 @@ module Meander
       val
     end
 
-    def respond_to_missing?(method, include_private = false)
-      @own_keys.respond_to?(method) || delegated_key?(method.to_s) || super
+    def respond_to_missing?(method_name, include_private = false)
+      @own_keys.respond_to?(method_name) || delegated_key?(method_name) || super
     end
 
-    def method_missing(method, *args, &block)
-      if @own_keys.respond_to?(method) || block_given?
-        @own_keys.send method, *args, &block
-      elsif delegated_key? method
-        define_getter method
-        send method, *args, &block
+    def method_missing(method_name, *args, &block)
+      if @own_keys.respond_to?(method_name) || block_given?
+        @own_keys.send method_name, *args, &block
+      elsif delegated_key?(method_name)
+        self[method_name]
       else
         super
       end
     end
 
+    def kind_of?(klass)
+      (self.class.cover_class == klass) || __getobj__.all?(klass)
+    end
+
+    alias is_a? kind_of?
+
     extend Forwardable
-    def_delegators :@own_keys, :[]=, :is_a?
+    def_delegators :@own_keys, :[]=
 
     private
 
+    def deep_call(origin: self)
+      stack = []
+      if origin.is_a?(Array)
+        stack.unshift(*origin)
+        origin = stack.pop
+      end
+      Enumerator.new do |yielder|
+        while origin
+          own_keys = origin.instance_variable_get(:@own_keys)
+          if own_keys
+            yielder.yield own_keys
+            stack.unshift(*origin.__getobj__)
+            origin = stack.pop
+          else
+            yielder.yield origin
+            origin = stack.empty? ? nil : stack.pop
+          end
+        end
+        self
+      end
+    end
+
     def delegated_key?(key)
-      __getobj__.keys.map(&:to_s).include? key.to_s
+      key = convert_key(key)
+      deep_call(origin: __getobj__).any? do |i|
+        i.keys.any? { |k| convert_key(k) == key }
+      end
     end
 
     def get_delegated_value(key)
-      delegated = __getobj__
-      if key.respond_to?(:to_s) && delegated.key?(key.to_s)
-        delegated[key.to_s]
-      elsif key.respond_to?(:to_sym) && delegated.key?(key.to_sym)
-        delegated[key.to_sym]
-      else
-        delegated[key]
+      value = nil
+      key = convert_key(key)
+      deep_call(origin: __getobj__).detect do |i|
+        i.keys.any? { |k| convert_key(k) == key && value = i[k] }
       end
+      value
     end
   end
 end

data/lib/meander/plain.rb

@@ -1,11 +1,13 @@
-require 'thor/core_ext/hash_with_indifferent_access'
+# frozen_string_literal: true
 
+require 'thor/core_ext/hash_with_indifferent_access'
+require_relative 'common_methods'
 module Meander
   ##
   # == Brief
   # This class is a sugar filled version of HashWithIndifferentAccess
   #
-  # It supports key-based method calling and value block evaluation
+  # It supports key-based method_name calling and value block evaluation
   # == Configuration
   # You can set class that will be applied to newly assigned values
   #   require 'active_support/core_ext/hash'
@@ -17,7 +19,7 @@ module Meander
   #   m[:a] = {}
   #   m[:a].class # => ActiveSupport::HashWithIndifferentAccess
   # == Usage
-  # === Key based method evaluation
+  # === Key based method_name evaluation
   #   m = Meander::Plain.new({:a => 1})
   #   m.a # => 1
   # === New value assignment
@@ -46,26 +48,25 @@ module Meander
       end
     end
 
-    def method_missing(method, *args, &block)
-      method = method.to_s
-      if new_key_method? method
-        key_name = method.gsub(/\=$/, '')
+    def method_missing(method_name, *args, &block)
+      method_name = method_name.to_s
+      if new_key_method? method_name
+        key_name = method_name.gsub(/=$/, '')
         send :[]=, key_name, *args, &block
       elsif block_given?
-        val = self[method]
+        val = self[method_name]
         val = {} unless self.class.hash_or_cover_class?(val)
-        send :[]=, method, val
-        yield(self[method])
-      elsif key?(method)
-        define_getter(method)
-        send method, &block
+        send :[]=, method_name, val
+        yield(self[method_name])
+      elsif key?(method_name)
+        self[method_name]
       else
         super
       end
     end
 
-    def respond_to_missing?(method, include_private = false)
-      new_key_method?(method) || key?(method) || super
+    def respond_to_missing?(method_name, include_private = false)
+      new_key_method?(method_name) || key?(method_name) || super
     end
   end
 end

data/lib/meander/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Meander
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.2'
 end

data/meander.gemspec

@@ -31,12 +31,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'thor', '~> 0.19.4'
+  spec.add_runtime_dependency 'thor'
 
-  spec.add_development_dependency 'bundler', '~> 1.14'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'rubocop-rspec'
+  spec.add_development_dependency 'rubocop-performance'
   spec.add_development_dependency 'hashie'
+  spec.add_development_dependency 'simplecov'
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: meander
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: '0.2'
 platform: ruby
 authors:
 - Kostrov Alexander
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2020-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.4
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Hashie clone with a bit more sugar
 email:
 - bombazook@gmail.com
@@ -136,7 +164,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -151,9 +179,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Just another ruby Hash extension
 test_files: []