attribute_struct 0.2.4 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 709d30c8e86eba9009d9fca15051da16231cd56a
-  data.tar.gz: e8d57a6e7b239b494208dd58614502220775ebe6
+  metadata.gz: 4b26e0d9ceb950c12c4cc445bb3a64b34ab571ad
+  data.tar.gz: bd94f03ac86dec14a60ec5e7b16f77cb592c0853
 SHA512:
-  metadata.gz: 061d981d6a1d49882acf7acea0c231b0111e0163e47a448c5bb71b3ebdcec3ac5a077950d9a6237e3eb75050fcdf2883a9d46619a507fc147b9b0be920128b98
-  data.tar.gz: 9bc6279dc98283f19a27c09fc920ccd28455f34f2629c4573f50fb13d47b8fa2189b4216d3211e355d0c6511d531440a4e6f81232e3357bd0e2dd85555428ebb
+  metadata.gz: de3283d55f5e015ea981d797f2f22eb7b4d33ddfa717119d69c4ebbe45d2ce0a2f26dc15815784d9b9be2784c5e8b26d71e45d34ffc80d87490521bb6ebe9e9c
+  data.tar.gz: d109ff08acbaca3b6908f193f76b9600cede5442972d5e8e7f221d035069f8e8cbd5450604b11cec6990feeaf3bfe123c878dd65d0dd366dfab8fac99b0565dc

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.2.6
+* Vendor `Mash` and expand to provide required deep_merge functionality
+* Remove external dependencies
+
 ## v0.2.4
 * Revert #class method removal (required by hash helpers when duping)
 * Set base prior to path walking

data/Gemfile.lock

@@ -1,13 +1,11 @@
 PATH
   remote: .
   specs:
-    attribute_struct (0.2.4)
-      hashie (>= 2.0.0)
+    attribute_struct (0.2.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    hashie (2.1.1)
     minitest (5.0.6)
 
 PLATFORMS

data/attribute_struct.gemspec

@@ -10,6 +10,5 @@ Gem::Specification.new do |s|
   s.homepage = 'http://github.com/chrisroberts/attribute_struct'
   s.description = 'Attribute structures'
   s.require_path = 'lib'
-  s.add_dependency 'hashie', '>= 2.0.0'
   s.files = Dir['**/*']
 end

data/lib/attribute_struct/attribute_hash.rb

@@ -1,17 +1,267 @@
-require 'hashie/extensions/deep_merge'
-require 'hashie/extensions/indifferent_access'
+require 'attribute_struct'
 
 class AttributeStruct
-  class AttributeHash < ::Hash
-    include ::Hashie::Extensions::DeepMerge
-    include ::Hashie::Extensions::IndifferentAccess
 
+  # Copyright (c) 2009 Dan Kubb
+
+  # Permission is hereby granted, free of charge, to any person obtaining
+  # a copy of this software and associated documentation files (the
+  # "Software"), to deal in the Software without restriction, including
+  # without limitation the rights to use, copy, modify, merge, publish,
+  # distribute, sublicense, and/or sell copies of the Software, and to
+  # permit persons to whom the Software is furnished to do so, subject to
+  # the following conditions:
+
+  # The above copyright notice and this permission notice shall be
+  # included in all copies or substantial portions of the Software.
+
+  # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+  # ---
+  # ---
+
+  # Some portions of blank.rb and mash.rb are verbatim copies of software
+  # licensed under the MIT license. That license is included below:
+
+  # Copyright (c) 2005-2008 David Heinemeier Hansson
+
+  # Permission is hereby granted, free of charge, to any person obtaining
+  # a copy of this software and associated documentation files (the
+  # "Software"), to deal in the Software without restriction, including
+  # without limitation the rights to use, copy, modify, merge, publish,
+  # distribute, sublicense, and/or sell copies of the Software, and to
+  # permit persons to whom the Software is furnished to do so, subject to
+  # the following conditions:
+
+  # The above copyright notice and this permission notice shall be
+  # included in all copies or substantial portions of the Software.
+
+  # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+  # This class has dubious semantics and we only have it so that people can write
+  # params[:key] instead of params['key'].
+  class Mash < ::Hash
+
+    # @param constructor<Object>
+    #   The default value for the mash. Defaults to an empty hash.
+    #
+    # @details [Alternatives]
+    #   If constructor is a Hash, a new mash will be created based on the keys of
+    #   the hash and no default value will be set.
+    def initialize(constructor = {})
+      if constructor.is_a?(Hash)
+        super()
+        update(constructor)
+      else
+        super(constructor)
+      end
+    end
+
+    # @param orig<Object> Mash being copied
+    #
+    # @return [Object] A new copied Mash
+    def initialize_copy(orig)
+      super
+      # Handle nested values
+      each do |k,v|
+        if v.kind_of?(Mash) || v.is_a?(Array)
+          self[k] = v.dup
+        end
+      end
+      self
+    end
+
+    # @param key<Object> The default value for the mash. Defaults to nil.
+    #
+    # @details [Alternatives]
+    #   If key is a Symbol and it is a key in the mash, then the default value will
+    #   be set to the value matching the key.
+    def default(key = nil)
+      if key.is_a?(Symbol) && include?(key = key.to_s)
+        self[key]
+      else
+        super
+      end
+    end
+
+    unless method_defined?(:regular_writer)
+      alias_method :regular_writer, :[]=
+    end
+    unless method_defined?(:regular_update)
+      alias_method :regular_update, :update
+    end
+
+    # @param key<Object> The key to set.
+    # @param value<Object>
+    #   The value to set the key to.
+    #
+    # @see Mash#convert_key
+    # @see Mash#convert_value
+    def []=(key, value)
+      regular_writer(convert_key(key), convert_value(value))
+    end
+
+    # @param other_hash<Hash>
+    #   A hash to update values in the mash with. The keys and the values will be
+    #   converted to Mash format.
+    #
+    # @return [Mash] The updated mash.
+    def update(other_hash)
+      other_hash.each_pair { |key, value| regular_writer(convert_key(key), convert_value(value)) }
+      self
+    end
+
+    alias_method :merge!, :update
+
+    # @param key<Object> The key to check for. This will be run through convert_key.
+    #
+    # @return [Boolean] True if the key exists in the mash.
+    def key?(key)
+      super(convert_key(key))
+    end
+
+    # def include? def has_key? def member?
+    alias_method :include?, :key?
+    alias_method :has_key?, :key?
+    alias_method :member?, :key?
+
+    # @param key<Object> The key to fetch. This will be run through convert_key.
+    # @param *extras<Array> Default value.
+    #
+    # @return [Object] The value at key or the default value.
+    def fetch(key, *extras)
+      super(convert_key(key), *extras)
+    end
+
+    # @param *indices<Array>
+    #   The keys to retrieve values for. These will be run through +convert_key+.
+    #
+    # @return [Array] The values at each of the provided keys
+    def values_at(*indices)
+      indices.collect {|key| self[convert_key(key)]}
+    end
+
+    # @param hash<Hash> The hash to merge with the mash.
+    #
+    # @return [Mash] A new mash with the hash values merged in.
+    def merge(hash)
+      self.dup.update(hash)
+    end
+
+    # @param key<Object>
+    #   The key to delete from the mash.\
+    def delete(key)
+      super(convert_key(key))
+    end
+
+    # @param *rejected<Array[(String, Symbol)] The mash keys to exclude.
+    #
+    # @return [Mash] A new mash without the selected keys.
+    #
+    # @example
+    #   { :one => 1, :two => 2, :three => 3 }.except(:one)
+    #     #=> { "two" => 2, "three" => 3 }
+    def except(*keys)
+      super(*keys.map {|k| convert_key(k)})
+    end
+
+    # Used to provide the same interface as Hash.
+    #
+    # @return [Mash] This mash unchanged.
+    def stringify_keys!; self end
+
+    # @return [Hash] The mash as a Hash with symbolized keys.
+    def symbolize_keys
+      h = Hash.new(default)
+      each { |key, val| h[key.to_sym] = val }
+      h
+    end
+
+    # @return [Hash] The mash as a Hash with string keys.
     def to_hash
-      ::Hash[
-        self.map do |k,v|
-          [k, v.is_a?(::Hash) ? v.to_hash : v]
+      Hash.new(default).merge(self)
+    end
+
+    # @return [Mash] Convert a Hash into a Mash
+    # The input Hash's default value is maintained
+    def self.from_hash(hash)
+      mash = Mash.new(hash)
+      mash.default = hash.default
+      mash
+    end
+
+    protected
+    # @param key<Object> The key to convert.
+    #
+    # @param [Object]
+    #   The converted key. If the key was a symbol, it will be converted to a
+    #   string.
+    #
+    # @api private
+    def convert_key(key)
+      key.kind_of?(Symbol) ? key.to_s : key
+    end
+
+    # @param value<Object> The value to convert.
+    #
+    # @return [Object]
+    #   The converted value. A Hash or an Array of hashes, will be converted to
+    #   their Mash equivalents.
+    #
+    # @api private
+    def convert_value(value)
+      if value.class == Hash
+        Mash.from_hash(value)
+      elsif value.is_a?(Array)
+        value.collect { |e| convert_value(e) }
+      else
+        value
+      end
+    end
+
+    # == add required deep merging support
+
+    public
+
+    # Perform deep merge
+    #
+    # @return [AttributeStruct::Mash] merged hash
+    def deep_merge(hash)
+      unless(hash.is_a?(Hash))
+        raise ArgumentError.new "Expecting `Hash` type. Received: `#{hash.class}`"
+      end
+      new_self = self.dup
+      hash.each do |k,v|
+        if(new_self[k].is_a?(Hash) && v.is_a?(Hash))
+          new_self[k] = new_self[k].deep_merge(v)
+        else
+          new_self[k] = v
         end
-      ]
+      end
+      new_self
     end
+
+    # Perform deep merge and replace contents of self
+    #
+    # @return [self]
+    def deep_merge!(hash)
+      self.replace(self.deep_merge(hash))
+      self
+    end
+
   end
+
+  AttributeHash = Mash
 end

data/lib/attribute_struct/attribute_struct.rb

@@ -1,3 +1,4 @@
+require 'attribute_struct'
 require 'attribute_struct/irb_compat'
 
 class AttributeStruct < BasicObject
@@ -6,8 +7,6 @@ class AttributeStruct < BasicObject
 
     # @return [Truthy, Falsey] global flag for camel keys
     attr_reader :camel_keys
-    # @return [Truthy, Falsey] force chef tooling (Mash)
-    attr_accessor :force_chef
 
     # Automatically converts keys to camel case
     #
@@ -26,24 +25,9 @@ class AttributeStruct < BasicObject
       end
     end
 
-    # Determine what hash library to load based on availability
-    def load_the_hash
-      unless(@hash_loaded)
-        if(defined?(Chef) || force_chef)
-          require 'chef/mash'
-          require 'chef/mixin/deep_merge'
-          @hash_loaded = :chef
-        else
-          require 'attribute_struct/attribute_hash'
-          @hash_loaded = :attribute_hash
-        end
-      end
-    end
-
-    # @return [AttributeStruct::AttributeHash, Mash]
+    # @return [AttributeStruct::AttributeHash]
     def hashish
-      load_the_hash
-      @hash_loaded == :chef ? ::Mash : ::AttributeStruct::AttributeHash
+      ::AttributeStruct::AttributeHash
     end
 
     # Create AttributeStruct instance and dump the resulting hash
@@ -73,7 +57,6 @@ class AttributeStruct < BasicObject
   # @param init_hash [Hash] hash to initialize struct
   # @yield block to execute within struct context
   def initialize(init_hash=nil, &block)
-    _klass.load_the_hash
     @_camel_keys = _klass.camel_keys
     @_arg_state = __hashish.new
     @table = __hashish.new
@@ -107,7 +90,7 @@ class AttributeStruct < BasicObject
   # @param traverse [TrueClass, FalseClass] traverse towards root for matching key
   # @return [Object, NilClass]
   def _state(key, traverse=true)
-    if(_arg_state.keys.include?(key))
+    if(_arg_state.has_key?(key))
       _arg_state[key]
     else
       if(traverse && _parent)
@@ -326,11 +309,7 @@ class AttributeStruct < BasicObject
   def _merge(overlay)
     source = _deep_copy
     dest = overlay._deep_copy
-    if(defined?(::Chef))
-      result = ::Chef::Mixin::DeepMerge.merge(source, dest)
-    else
-      result = source.deep_merge(dest)
-    end
+    result = source.deep_merge(dest)
     _klass.new(result)
   end
 
@@ -346,7 +325,7 @@ class AttributeStruct < BasicObject
 
   # @return [Class] hashish type available
   def __hashish
-    defined?(::Chef) ? ::Mash : ::AttributeStruct::AttributeHash
+    ::AttributeStruct::AttributeHash
   end
 
   # Provide dup of instance
@@ -486,3 +465,5 @@ class AttributeStruct < BasicObject
   end
 
 end
+
+require 'attribute_struct/attribute_hash'

data/lib/attribute_struct/monkey_camels.rb

@@ -1,3 +1,5 @@
+require 'attribute_struct'
+
 module MonkeyCamels
 
   class << self

data/lib/attribute_struct/version.rb

@@ -1,9 +1,6 @@
-require 'attribute_struct/attribute_struct'
+require 'attribute_struct'
 
 class AttributeStruct
-  # Custom version container
-  class Version < ::Gem::Version
-  end
   # Current library version
-  VERSION = Version.new('0.2.4')
+  VERSION = ::Gem::Version.new('0.2.6')
 end

data/lib/attribute_struct.rb

@@ -1,2 +1,2 @@
 require 'attribute_struct/version'
-
+require 'attribute_struct/attribute_struct'

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: attribute_struct
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: hashie
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
+date: 2014-08-28 00:00:00.000000000 Z
+dependencies: []
 description: Attribute structures
 email: chrisroberts.code@gmail.com
 executables: []
@@ -73,3 +59,4 @@ signing_key:
 specification_version: 4
 summary: Attribute structures
 test_files: []
+has_rdoc: