docile 1.3.0 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba0cac2ae518dbcd219f26dfb0d8e8d556471a5043d69d9b4dc1e7300461a5a4
-  data.tar.gz: 2d588448f977a59f9f28e92ff98249fb31e5c7fee4e8485b4aaa32a31b11d022
+  metadata.gz: 3293fa913b3cac5e74f72a8c434b99917a9f7f131fd4afd29688a9dc000bb7dc
+  data.tar.gz: 4134e1db62d390e98d06752586a17d39d60417ec32eafb4b41f8f03ce9e8b510
 SHA512:
-  metadata.gz: 5bffdb49a9de2072292d8f78454e029f7d8545e9d36aac86ce8ed6360e4081be196a2dbb4b23c18764986b76b71446c9c6a3203c695b87c7b3aab980b4e22ec7
-  data.tar.gz: 7c2b89a311f27559e735bc7c7d8c6a008240f2b86b2b527074a788e0ed085c6abe6f75d54dd9b45a5d89f8f0f3f084c12292f22fcb9cbe33abcf904b47c228b6
+  metadata.gz: 3ceb48adefed44844c52059c3daebb27d1c5a23d729c9d8a17fa6b54093e374c6856e5bc2bfeff702cc1a315d511542be012b72f306a2cfb2c69252a1229ec45
+  data.tar.gz: 6f1c8e2bc1ed5f66510402454173147f951753d5161095e43894e66ffe689ea0045bbb4c02558ef142bfd54a7bd898acf637c49b4bdfa497a11b4298871d78fb

data/.travis.yml

@@ -1,34 +1,31 @@
 language: ruby
 
-# Apparently sudo is required to test on Rubinius and JRuby-head
-sudo: required
-
-# See https://docs.travis-ci.com/user/languages/ruby/#Rubinius
-dist: trusty
+branches:
+  only:
+    - master
 
 rvm:
   # MRI
   - ruby-head
+  - 2.7
+  - 2.6
   - 2.5
   - 2.4
   - 2.3
   - 2.2
   - 2.1
   - 1.9.3
-  - 1.8.7
-  - ree
   # JRuby
   - jruby-head
-  - jruby-9.1.15.0 # Specific version to work around https://github.com/travis-ci/travis-ci/issues/9049
-  - jruby-9.0
-  - jruby-19mode
-  - jruby-18mode
-  # Rubinius
-  - rubinius-3
+  - jruby-9.2
+  # Truffleruby
+  - truffleruby-head
+  - truffleruby-20.3.0
 
-matrix:
+jobs:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
-    - rvm: rubinius-3
+    - rvm: truffleruby-head
+
   fast_finish: true

data/Gemfile

@@ -2,7 +2,7 @@ require File.expand_path("on_what", File.dirname(__FILE__))
 source "https://rubygems.org"
 
 # Travis-only dependencies go here
-if on_travis? && !on_1_8? && !on_rubinius?
+if on_travis? && !on_less_than_2_3? && !on_rubinius?
   group :test do
     gem "codecov", ">= 0.0.9", :require => false
   end

data/HISTORY.md

@@ -1,8 +1,39 @@
 # HISTORY
 
-## [Unreleased changes](http://github.com/ms-ati/docile/compare/v1.3.0...master)
+## [Unreleased changes](http://github.com/ms-ati/docile/compare/v1.3.5...master)
 
-  - ...
+  ...
+
+## [v1.3.5 (Jan 13, 2021)](http://github.com/ms-ati/docile/compare/v1.3.4...v1.3.5)
+
+  - Special thanks to Jochen Seeber (@jochenseeber):
+    - Fix remaining delegation on Ruby 2.7 (PR #62)
+  - Remove support for Ruby 1.8.7 and REE, because they
+    [are no longer runnable on Travis CI](https://travis-ci.community/t/ruby-1-8-7-and-ree-builds-broken-by-ssl-certificate-failure/10866)
+  - Announce that continued support for any EOL Ruby versions (that is, versions
+    prior to Ruby 2.5 as of Jan 13 2021) will be decided on **Feb 1, 2021**
+    based on comments to [issue #58](https://github.com/ms-ati/docile/issues/58)
+
+## [v1.3.4 (Dec 22, 2020)](http://github.com/ms-ati/docile/compare/v1.3.3...v1.3.4)
+
+  - Special thanks to Benoit Daloze (@eregon):
+    - Fix delegation on Ruby 2.7 (issues #45 and #44, PR #52)
+
+## [v1.3.3 (Dec 18, 2020)](http://github.com/ms-ati/docile/compare/v1.3.2...v1.3.3)
+
+  - Special thanks (again!) to Taichi Ishitani (@taichi-ishitani):
+    - Fix keyword arg warnings on Ruby 2.7 (issue #44, PR #45)
+    - Filter Docile's source files from backtrace (issue #35, PR #36)
+
+## [v1.3.2 (Jun 12, 2019)](http://github.com/ms-ati/docile/compare/v1.3.1...v1.3.2)
+
+  - Special thanks (again!) to Taichi Ishitani (@taichi-ishitani):
+    - Fix for DSL object is replaced when #dsl_eval is nested (#33, PR #34)
+
+## [v1.3.1 (May 24, 2018)](http://github.com/ms-ati/docile/compare/v1.3.0...v1.3.1)
+
+  - Special thanks to Taichi Ishitani (@taichi-ishitani):
+    - Fix for when DSL object is also the block's context (#30)
 
 ## [v1.3.0 (Feb 7, 2018)](http://github.com/ms-ati/docile/compare/v1.2.0...v1.3.0)
 

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2012-2018 Marc Siegel
+Copyright (c) 2012-2021 Marc Siegel
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,3 +1,8 @@
+## ⚠️WARNING⚠️, 🔴IMPORTANT❗🔴
+### Using Docile on an [end-of-life Ruby version (< **2.5**)](https://www.ruby-lang.org/en/downloads/branches/)?
+#### Please comment on [issue #58](https://github.com/ms-ati/docile/issues/58) this month 📅!
+We'll decide which Ruby versions to continue supporting on **Feb 1st 2021**.
+
 # Docile
 
 [![Gem Version](https://img.shields.io/gem/v/docile.svg)](https://rubygems.org/gems/docile)
@@ -9,7 +14,6 @@
 
 [![Build Status](https://img.shields.io/travis/ms-ati/docile/master.svg)](https://travis-ci.org/ms-ati/docile)
 [![Code Coverage](https://img.shields.io/codecov/c/github/ms-ati/docile.svg)](https://codecov.io/github/ms-ati/docile)
-[![Dependency Status](https://gemnasium.com/ms-ati/docile.svg)](https://gemnasium.com/ms-ati/docile)
 [![Maintainability](https://api.codeclimate.com/v1/badges/79ca631bc123f7b83b34/maintainability)](https://codeclimate.com/github/ms-ati/docile/maintainability)
 
 Ruby makes it possible to create very expressive **Domain Specific
@@ -82,7 +86,7 @@ In short: **No**.
 Not if you want the code in the block to be able to refer to anything
 the block would normally have access to from the surrounding context.
 
-Let's be very specific. Docile internally uses `instance_exec` (see [execution.rb#25](lib/docile/execution.rb#L25)), adding a small layer to support referencing *local variables*, *instance variables*, and *methods* from the _block's context_ **or** the target _object's context_, interchangeably. This is "**the hard part**", where most folks making a DSL in Ruby throw up their hands.
+Let's be very specific. Docile internally uses `instance_exec` (see [execution.rb#26](lib/docile/execution.rb#L26)), adding a small layer to support referencing *local variables*, *instance variables*, and *methods* from the _block's context_ **or** the target _object's context_, interchangeably. This is "**the hard part**", where most folks making a DSL in Ruby throw up their hands.
 
 For example:
 
@@ -352,7 +356,7 @@ $ gem install docile
 
 ## Status
 
-Works on [all ruby versions since 1.8.7](https://github.com/ms-ati/docile/blob/master/.travis.yml), or so Travis CI [tells us](https://travis-ci.org/ms-ati/docile).
+Works on [all ruby versions since 1.9.3](https://github.com/ms-ati/docile/blob/master/.travis.yml), or so Travis CI [tells us](https://travis-ci.org/ms-ati/docile).
 
 Used by some pretty cool gems to implement their DSLs, notably including [SimpleCov](https://github.com/colszowka/simplecov). Keep an eye out for new gems using Docile at the [Ruby Toolbox](https://www.ruby-toolbox.com/projects/docile).
 
@@ -375,7 +379,7 @@ Docile releases follow [Semantic Versioning 2.0.0](https://semver.org/spec/v2.0.
 
 ## Copyright & License
 
-Copyright (c) 2012-2018 Marc Siegel.
+Copyright (c) 2012-2021 Marc Siegel.
 
 Licensed under the [MIT License](http://choosealicense.com/licenses/mit/), see [LICENSE](LICENSE) for details.
 

data/docile.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake", "~> 10.5" if on_less_than_1_9_3? # Pin compatible rake on old rubies, see: https://github.com/travis-ci/travis.rb/issues/380
   s.add_development_dependency "rake", "< 11.0"  unless on_less_than_1_9_3? # See http://stackoverflow.com/questions/35893584/nomethoderror-undefined-method-last-comment-after-upgrading-to-rake-11
   s.add_development_dependency "rspec", "~> 3.0"
+  s.add_development_dependency "rspec-expectations", "!= 3.8.3" # Workaround for RSpec's issue, see: https://github.com/rspec/rspec-expectations/issues/1111
 
   # Run code coverage where possible - not on Rubinius
   unless on_rubinius?

data/lib/docile.rb

@@ -2,6 +2,7 @@ require "docile/version"
 require "docile/execution"
 require "docile/fallback_context_proxy"
 require "docile/chaining_fallback_context_proxy"
+require "docile/backtrace_filter"
 
 # Docile keeps your Ruby DSLs tame and well-behaved.
 module Docile
@@ -43,6 +44,8 @@ module Docile
     exec_in_proxy_context(dsl, FallbackContextProxy, *args, &block)
     dsl
   end
+
+  ruby2_keywords :dsl_eval if respond_to?(:ruby2_keywords, true)
   module_function :dsl_eval
 
   # Execute a block in the context of an object whose methods represent the
@@ -82,6 +85,8 @@ module Docile
   def dsl_eval_with_block_return(dsl, *args, &block)
     exec_in_proxy_context(dsl, FallbackContextProxy, *args, &block)
   end
+
+  ruby2_keywords :dsl_eval_with_block_return if respond_to?(:ruby2_keywords, true)
   module_function :dsl_eval_with_block_return
 
   # Execute a block in the context of an immutable object whose methods,
@@ -119,5 +124,7 @@ module Docile
   def dsl_eval_immutable(dsl, *args, &block)
     exec_in_proxy_context(dsl, ChainingFallbackContextProxy, *args, &block)
   end
+  
+  ruby2_keywords :dsl_eval_immutable if respond_to?(:ruby2_keywords, true)
   module_function :dsl_eval_immutable
 end

data/lib/docile/backtrace_filter.rb

@@ -0,0 +1,22 @@
+module Docile
+  # @api private
+  #
+  # This is used to remove entries pointing to Docile's source files
+  # from {Exception#backtrace} and {Exception#backtrace_locations}.
+  #
+  # If {NoMethodError} is caught then the exception object will be extended
+  # by this module to add filter functionalities.
+  module BacktraceFilter
+    FILTER_PATTERN = /lib\/docile/
+
+    def backtrace
+      super.select { |trace| trace !~ FILTER_PATTERN }
+    end
+
+    if ::Exception.public_method_defined?(:backtrace_locations)
+      def backtrace_locations
+        super.select { |location| location.absolute_path !~ FILTER_PATTERN }
+      end
+    end
+  end
+end

data/lib/docile/chaining_fallback_context_proxy.rb

@@ -16,5 +16,7 @@ module Docile
     def method_missing(method, *args, &block)
       @__receiver__ = super(method, *args, &block)
     end
+    
+    ruby2_keywords :method_missing if respond_to?(:ruby2_keywords, true)
   end
 end

data/lib/docile/execution.rb

@@ -30,11 +30,14 @@ module Docile
         end
 
         block_context.instance_variables.each do |ivar|
+          next unless proxy_context.instance_variables.include?(ivar)
           value_from_dsl_proxy = proxy_context.instance_variable_get(ivar)
           block_context.instance_variable_set(ivar, value_from_dsl_proxy)
         end
       end
     end
+
+    ruby2_keywords :exec_in_proxy_context if respond_to?(:ruby2_keywords, true)
     module_function :exec_in_proxy_context
   end
 end

data/lib/docile/fallback_context_proxy.rb

@@ -21,6 +21,10 @@ module Docile
                               :instance_variable_get, :instance_variable_set,
                               :remove_instance_variable]
 
+    # The set of methods which will **not** fallback from the block's context
+    # to the dsl object.
+    NON_FALLBACK_METHODS = Set[:class, :self, :respond_to?, :instance_of?]
+
     # The set of instance variables which are local to this object and hidden.
     # All other instance variables will be copied in and out of this object
     # from the scope in which this proxy was created.
@@ -49,13 +53,16 @@ module Docile
         # contain calls to methods on the DSL object.
         singleton_class.
           send(:define_method, :method_missing) do |method, *args, &block|
-            if receiver.respond_to?(method.to_sym)
+            m = method.to_sym
+            if !NON_FALLBACK_METHODS.include?(m) && !fallback.respond_to?(m) && receiver.respond_to?(m)
               receiver.__send__(method.to_sym, *args, &block)
             else
               super(method, *args, &block)
             end
           end
 
+        singleton_class.send(:ruby2_keywords, :method_missing) if singleton_class.respond_to?(:ruby2_keywords, true)
+
         # instrument a helper method to remove the above instrumentation
         singleton_class.
           send(:define_method, :__docile_undo_fallback__) do
@@ -81,8 +88,15 @@ module Docile
       if @__receiver__.respond_to?(method.to_sym)
         @__receiver__.__send__(method.to_sym, *args, &block)
       else
-        @__fallback__.__send__(method.to_sym, *args, &block)
+        begin
+          @__fallback__.__send__(method.to_sym, *args, &block)
+        rescue NoMethodError => e
+          e.extend(BacktraceFilter)
+          raise e
+        end
       end
     end
+
+    ruby2_keywords :method_missing if respond_to?(:ruby2_keywords, true)
   end
 end

data/lib/docile/version.rb

@@ -1,4 +1,4 @@
 module Docile
   # The current version of this library
-  VERSION = "1.3.0"
+  VERSION = "1.3.5"
 end

data/on_what.rb

@@ -24,3 +24,7 @@ end
 def on_less_than_2_0?
   RUBY_VERSION < "2.0.0"
 end
+
+def on_less_than_2_3?
+  RUBY_VERSION < "2.3.0"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docile
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.5
 platform: ruby
 authors:
 - Marc Siegel
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-02-07 00:00:00.000000000 Z
+date: 2021-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 3.8.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 3.8.3
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +114,7 @@ files:
 - Rakefile
 - docile.gemspec
 - lib/docile.rb
+- lib/docile/backtrace_filter.rb
 - lib/docile/chaining_fallback_context_proxy.rb
 - lib/docile/execution.rb
 - lib/docile/fallback_context_proxy.rb
@@ -109,7 +124,7 @@ homepage: https://ms-ati.github.io/docile/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -124,9 +139,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Docile keeps your Ruby DSLs tame and well-behaved.
 test_files: []