hashie 2.1.2 → 4.1.0

data/lib/hashie/railtie.rb

@@ -0,0 +1,21 @@
+begin
+  require 'rails/railtie'
+
+  module Hashie
+    class Railtie < Rails::Railtie
+      # Set the Hashie.logger to use Rails.logger when used with rails.
+      initializer 'hashie.configure_logger', after: 'initialize_logger' do
+        Hashie.logger = Rails.logger
+      end
+
+      initializer 'hashie.patch_hash_except', after: 'load_active_support' do
+        if Rails::VERSION::MAJOR >= 6
+          require 'hashie/extensions/active_support/core_ext/hash'
+          Hashie::Mash.send(:include, Hashie::Extensions::ActiveSupport::CoreExt::Hash)
+        end
+      end
+    end
+  end
+rescue LoadError => e
+  Hashie.logger.info("Hashie skipping railtie as #{e.message}")
+end

data/lib/hashie/rash.rb

@@ -60,6 +60,28 @@ module Hashie
       all(key).first
     end
 
+    #
+    # Raise (or yield) unless something matches the key.
+    #
+    def fetch(*args)
+      raise ArgumentError, "Expected 1-2 arguments, got #{args.length}" \
+        unless (1..2).cover?(args.length)
+
+      key, default = args
+
+      all(key) do |value|
+        return value
+      end
+
+      if block_given?
+        yield key
+      elsif default
+        default
+      else
+        raise KeyError, "key not found: #{key.inspect}"
+      end
+    end
+
     #
     # Return everything that matches the query.
     #
@@ -78,25 +100,24 @@ module Hashie
         # see if any of the regexps match the string
         @regexes.each do |regex|
           match = regex.match(query)
-          if match
-            @regex_counts[regex] += 1
-            value = @hash[regex]
-            if value.respond_to? :call
-              yield value.call(match)
-            else
-              yield value
-            end
+          next unless match
+          @regex_counts[regex] += 1
+          value = @hash[regex]
+          if value.respond_to? :call
+            yield value.call(match)
+          else
+            yield value
           end
         end
 
-      when Integer
+      when Numeric
         # see if any of the ranges match the integer
         @ranges.each do |range|
-          yield @hash[range] if range.include? query
+          yield @hash[range] if range.cover? query
         end
 
       when Regexp
-        # Reverse operation: `rash[/regexp/]` returns all the hash's string keys which match the regexp
+        # Reverse operation: `rash[/regexp/]` returns all string keys matching the regexp
         @hash.each do |key, val|
           yield val if key.is_a?(String) && query =~ key
         end
@@ -104,16 +125,19 @@ module Hashie
     end
 
     def method_missing(*args, &block)
-      @hash.send(*args, &block)
+      @hash.send(*args, &block) || super
+    end
+
+    def respond_to_missing?(method_name, _include_private = false)
+      @hash.respond_to?(method_name)
     end
 
     private
 
     def optimize_if_necessary!
-      if (@lookups += 1) >= @optimize_every
-        @regexes = @regex_counts.sort_by { |regex, count| -count }.map { |regex, count| regex }
-        @lookups = 0
-      end
+      return unless (@lookups += 1) >= @optimize_every
+      @regexes = @regexes.sort_by { |regex| -@regex_counts[regex] }
+      @lookups = 0
     end
   end
 end

data/lib/hashie/trash.rb

@@ -1,4 +1,5 @@
 require 'hashie/dash'
+require 'hashie/extensions/dash/property_translation'
 
 module Hashie
   # A Trash is a 'translated' Dash where the keys can be remapped from a source
@@ -8,93 +9,6 @@ module Hashie
   # such as a Java api, where the keys are named differently from how we would
   # in Ruby.
   class Trash < Dash
-    # Defines a property on the Trash. Options are as follows:
-    #
-    # * <tt>:default</tt> - Specify a default value for this property, to be
-    # returned before a value is set on the property in a new Dash.
-    # * <tt>:from</tt> - Specify the original key name that will be write only.
-    # * <tt>:with</tt> - Specify a lambda to be used to convert value.
-    # * <tt>:transform_with</tt> - Specify a lambda to be used to convert value
-    # without using the :from option. It transform the property itself.
-    def self.property(property_name, options = {})
-      super
-
-      options[:from] = options[:from].to_sym if options[:from]
-      property_name = property_name.to_sym
-
-      if options[:from]
-        if property_name == options[:from]
-          fail ArgumentError, "Property name (#{property_name}) and :from option must not be the same"
-        end
-
-        translations[options[:from].to_sym] = property_name.to_sym
-
-        define_method "#{options[:from]}=" do |val|
-          with = options[:with] || options[:transform_with]
-          self[property_name.to_sym] = with.respond_to?(:call) ? with.call(val) : val
-        end
-      else
-        if options[:transform_with].respond_to? :call
-          transforms[property_name.to_sym] = options[:transform_with]
-        end
-      end
-    end
-
-    # Set a value on the Dash in a Hash-like way. Only works
-    # on pre-existing properties.
-    def []=(property, value)
-      if self.class.translations.key? property.to_sym
-        send("#{property}=", value)
-      elsif self.class.transforms.key? property.to_sym
-        super property, self.class.transforms[property.to_sym].call(value)
-      elsif property_exists? property
-        super
-      end
-    end
-
-    def self.permitted_input_keys
-      @permitted_input_keys ||= properties.map { |property| inverse_translations.fetch property, property }
-    end
-
-    private
-
-    def self.properties
-      @properties ||= []
-    end
-
-    def self.translations
-      @translations ||= {}
-    end
-
-    def self.inverse_translations
-      @inverse_translations ||= Hash[translations.map(&:reverse)]
-    end
-
-    def self.transforms
-      @transforms ||= {}
-    end
-
-    # Raises an NoMethodError if the property doesn't exist
-    #
-    def property_exists?(property)
-      unless self.class.property?(property.to_sym)
-        fail NoMethodError, "The property '#{property}' is not defined for this Trash."
-      end
-      true
-    end
-
-    private
-
-    # Deletes any keys that have a translation
-    def initialize_attributes(attributes)
-      return unless attributes
-      attributes_copy = attributes.dup.delete_if do |k, v|
-        if self.class.translations.include?(k.to_sym)
-          self[k] = v
-          true
-        end
-      end
-      super attributes_copy
-    end
+    include Hashie::Extensions::Dash::PropertyTranslation
   end
 end

data/lib/hashie/utils.rb

@@ -0,0 +1,44 @@
+module Hashie
+  # A collection of helper methods that can be used throughout the gem.
+  module Utils
+    # Describes a method by where it was defined.
+    #
+    # @param bound_method [Method] The method to describe.
+    # @return [String]
+    def self.method_information(bound_method)
+      if bound_method.source_location
+        "defined at #{bound_method.source_location.join(':')}"
+      else
+        "defined in #{bound_method.owner}"
+      end
+    end
+
+    # Duplicates a value or returns the value when it is not duplicable
+    #
+    # @api public
+    #
+    # @param value [Object] the value to safely duplicate
+    # @return [Object] the duplicated value
+    def self.safe_dup(value)
+      case value
+      when Complex, FalseClass, NilClass, Rational, Method, Symbol, TrueClass, *integer_classes
+        value
+      else
+        value.dup
+      end
+    end
+
+    # Lists the classes Ruby uses for integers
+    #
+    # @api private
+    # @return [Array<Class>]
+    def self.integer_classes
+      @integer_classes ||=
+        if 0.class == Integer
+          [Integer]
+        else
+          [Fixnum, Bignum] # rubocop:disable Lint/UnifiedInteger
+        end
+    end
+  end
+end

data/lib/hashie/version.rb

@@ -1,3 +1,3 @@
 module Hashie
-  VERSION = '2.1.2'
+  VERSION = '4.1.0'.freeze
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hashie
 version: !ruby/object:Gem::Version
-  version: 2.1.2
-  prerelease: 
+  version: 4.1.0
 platform: ruby
 authors:
 - Michael Bleigh
@@ -10,38 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2020-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Hashie is a collection of classes and mixins that make hashes more powerful.
@@ -52,99 +33,79 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .travis.yml
-- .yardopts
+- ".yardopts"
 - CHANGELOG.md
 - CONTRIBUTING.md
-- Gemfile
-- Guardfile
 - LICENSE
 - README.md
 - Rakefile
+- UPGRADING.md
 - hashie.gemspec
 - lib/hashie.rb
+- lib/hashie/array.rb
 - lib/hashie/clash.rb
 - lib/hashie/dash.rb
+- lib/hashie/extensions/active_support/core_ext/hash.rb
+- lib/hashie/extensions/array/pretty_inspect.rb
 - lib/hashie/extensions/coercion.rb
+- lib/hashie/extensions/dash/coercion.rb
+- lib/hashie/extensions/dash/indifferent_access.rb
+- lib/hashie/extensions/dash/property_translation.rb
 - lib/hashie/extensions/deep_fetch.rb
+- lib/hashie/extensions/deep_find.rb
+- lib/hashie/extensions/deep_locate.rb
 - lib/hashie/extensions/deep_merge.rb
 - lib/hashie/extensions/ignore_undeclared.rb
 - lib/hashie/extensions/indifferent_access.rb
+- lib/hashie/extensions/key_conflict_warning.rb
 - lib/hashie/extensions/key_conversion.rb
+- lib/hashie/extensions/mash/define_accessors.rb
+- lib/hashie/extensions/mash/keep_original_keys.rb
+- lib/hashie/extensions/mash/permissive_respond_to.rb
+- lib/hashie/extensions/mash/safe_assignment.rb
+- lib/hashie/extensions/mash/symbolize_keys.rb
 - lib/hashie/extensions/merge_initializer.rb
 - lib/hashie/extensions/method_access.rb
+- lib/hashie/extensions/parsers/yaml_erb_parser.rb
+- lib/hashie/extensions/pretty_inspect.rb
+- lib/hashie/extensions/ruby_version.rb
+- lib/hashie/extensions/ruby_version_check.rb
+- lib/hashie/extensions/strict_key_access.rb
+- lib/hashie/extensions/stringify_keys.rb
+- lib/hashie/extensions/symbolize_keys.rb
 - lib/hashie/hash.rb
-- lib/hashie/hash_extensions.rb
+- lib/hashie/logger.rb
 - lib/hashie/mash.rb
+- lib/hashie/railtie.rb
 - lib/hashie/rash.rb
 - lib/hashie/trash.rb
+- lib/hashie/utils.rb
 - lib/hashie/version.rb
-- spec/hashie/clash_spec.rb
-- spec/hashie/dash_spec.rb
-- spec/hashie/extensions/coercion_spec.rb
-- spec/hashie/extensions/deep_fetch_spec.rb
-- spec/hashie/extensions/deep_merge_spec.rb
-- spec/hashie/extensions/ignore_undeclared_spec.rb
-- spec/hashie/extensions/indifferent_access_spec.rb
-- spec/hashie/extensions/key_conversion_spec.rb
-- spec/hashie/extensions/merge_initializer_spec.rb
-- spec/hashie/extensions/method_access_spec.rb
-- spec/hashie/hash_spec.rb
-- spec/hashie/mash_spec.rb
-- spec/hashie/rash_spec.rb
-- spec/hashie/trash_spec.rb
-- spec/hashie/version_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
-homepage: https://github.com/intridea/hashie
+homepage: https://github.com/hashie/hashie
 licenses:
 - MIT
+metadata:
+  bug_tracker_uri: https://github.com/hashie/hashie/issues
+  changelog_uri: https://github.com/hashie/hashie/blob/master/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/hashie
+  source_code_uri: https://github.com/hashie/hashie
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 775336832915500848
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 775336832915500848
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 3.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Your friendly neighborhood hash library.
-test_files:
-- spec/hashie/clash_spec.rb
-- spec/hashie/dash_spec.rb
-- spec/hashie/extensions/coercion_spec.rb
-- spec/hashie/extensions/deep_fetch_spec.rb
-- spec/hashie/extensions/deep_merge_spec.rb
-- spec/hashie/extensions/ignore_undeclared_spec.rb
-- spec/hashie/extensions/indifferent_access_spec.rb
-- spec/hashie/extensions/key_conversion_spec.rb
-- spec/hashie/extensions/merge_initializer_spec.rb
-- spec/hashie/extensions/method_access_spec.rb
-- spec/hashie/hash_spec.rb
-- spec/hashie/mash_spec.rb
-- spec/hashie/rash_spec.rb
-- spec/hashie/trash_spec.rb
-- spec/hashie/version_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
+test_files: []