Replace Config::Options#delegate to simple method definitions (#185)

yhatt · pkuczynski · commit b35f4aff6851 · 2017-11-07T10:44:38.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -13,12 +13,17 @@ gemfile:
   - gemfiles/rails_4.1.gemfile
   - gemfiles/rails_4.2.gemfile
   - gemfiles/rails_5.gemfile
+  - gemfiles/sinatra.gemfile
 matrix:
   exclude:
     - rvm: 2.0.0
       gemfile: gemfiles/rails_5.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/sinatra.gemfile
     - rvm: 2.1.10
       gemfile: gemfiles/rails_5.gemfile
+    - rvm: 2.1.10
+      gemfile: gemfiles/sinatra.gemfile
     - rvm: 2.2.6
       gemfile: gemfiles/rails_3.gemfile
     - rvm: 2.3.3
diff --git a/Appraisals b/Appraisals
@@ -19,3 +19,7 @@ end
 appraise 'rails-5' do
   gem 'rails', '5.0.1'
 end
+
+appraise 'sinatra' do
+  gem 'sinatra', '2.0.0'
+end
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,8 @@
 
 ## Unreleased
 
-* Makje dry-validation dependency less strict allowing to use newer versions ([#183](https://github.com/railsconfig/config/pull/183))
+* Make dry-validation dependency less strict allowing to use newer versions ([#183](https://github.com/railsconfig/config/pull/183))
+* Fix `key?` and `has_key?`, which raise NoMethodError in non Rails environment, by using ActiveSupport `#delegate` implicitly ([#185](https://github.com/railsconfig/config/pull/185))
 
 ## 1.6.0
 
diff --git a/gemfiles/rails_3.gemfile b/gemfiles/rails_3.gemfile
@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gem "rails", "3.2.22.4"
 
-gemspec :path => "../"
+gemspec path: "../"
diff --git a/gemfiles/rails_4.1.gemfile b/gemfiles/rails_4.1.gemfile
@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails", "4.1.16"
-gem "tzinfo-data", :platforms => [:mingw, :mswin, :x64_mingw]
+gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw]
 
-gemspec :path => "../"
+gemspec path: "../"
diff --git a/gemfiles/rails_4.2.gemfile b/gemfiles/rails_4.2.gemfile
@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails", "4.2.7.1"
-gem "tzinfo-data", :platforms => [:mingw, :mswin, :x64_mingw]
+gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw]
 
-gemspec :path => "../"
+gemspec path: "../"
diff --git a/gemfiles/rails_4.gemfile b/gemfiles/rails_4.gemfile
@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gem "rails", "4.0.13"
 
-gemspec :path => "../"
+gemspec path: "../"
diff --git a/gemfiles/rails_5.gemfile b/gemfiles/rails_5.gemfile
@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gem "rails", "5.0.1"
 
-gemspec :path => "../"
+gemspec path: "../"
diff --git a/gemfiles/sinatra.gemfile b/gemfiles/sinatra.gemfile
@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sinatra", "2.0.0"
+
+gemspec path: "../"
diff --git a/lib/config/options.rb b/lib/config/options.rb
@@ -153,7 +153,13 @@ def []=(param, value)
       end
     end
 
-    delegate :key?, :has_key?, to: :table
+    def key?(key)
+      table.key?(key)
+    end
+
+    def has_key?(key)
+      table.has_key?(key)
+    end
 
     def method_missing(method_name, *args)
       if Config.fail_on_missing && method_name !~ /.*(?==\z)/m
diff --git a/spec/app/sinatra/app.rb b/spec/app/sinatra/app.rb
@@ -0,0 +1,9 @@
+require 'sinatra'
+require File.expand_path('../../../../lib/config', __FILE__)
+
+set :root, File.dirname(__FILE__)
+register Config
+
+get '/' do
+  'Hello world!'
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -14,27 +14,52 @@
 Dir['./spec/support/**/*.rb'].each { |f| require f }
 
 ##
-# Load Rails dummy application based on gemfile name substituted by Appraisal
+# Detect Rails/Sinatra dummy application based on gemfile name substituted by Appraisal
 #
 if ENV['APPRAISAL_INITIALIZED'] || ENV['TRAVIS']
   app_name = Pathname.new(ENV['BUNDLE_GEMFILE']).basename.sub('.gemfile', '')
 else
   app_name = 'rails_5'
 end
 
-require File.expand_path("../../spec/app/#{app_name}/config/environment", __FILE__)
-
-APP_RAKEFILE = File.expand_path("../../spec/app/#{app_name}/Rakefile", __FILE__)
+app_framework = %w{rails sinatra}.find { |f| app_name.to_s.include?(f) }
 
 ##
-# Load Rspec
+# Load dummy application and Rspec
 #
-require 'rspec/rails'
+case app_framework
+when 'rails'
+  # Load Rails
+  require File.expand_path("../app/#{app_name}/config/environment", __FILE__)
 
-# Configure
-RSpec.configure do |config|
-  config.fixture_path = File.join(File.dirname(__FILE__), '/fixtures')
+  APP_RAKEFILE = File.expand_path("../app/#{app_name}/Rakefile", __FILE__)
+
+  # Load Rspec
+  require 'rspec/rails'
+
+  # Configure
+  RSpec.configure do |config|
+    config.fixture_path = FixtureHelper::FIXTURE_PATH
+  end
+
+when 'sinatra'
+  # Load Sinatra
+  require File.expand_path("../app/#{app_name}/app", __FILE__)
+
+  # Load Rspec
+  require 'rspec'
 
+  # Configure
+  RSpec.configure do |config|
+    config.filter_run_excluding :rails
+    config.include FixtureHelper
+  end
+end
+
+##
+# Common Rspec configure
+#
+RSpec.configure do |config|
   # Turn the deprecation warnings into errors, giving you the full backtrace
   config.raise_errors_for_deprecations!
 
@@ -54,16 +79,15 @@ def self.reset
   end
 end
 
-
 ##
 # Print some debug info
 #
 puts
 puts "Gemfile: #{ENV['BUNDLE_GEMFILE']}"
-puts 'Rails version:'
+puts 'Version:'
 
 Gem.loaded_specs.each { |name, spec|
-  puts "\t#{name}-#{spec.version}" if %w{rails activesupport sqlite3 rspec-rails}.include?(name)
+  puts "\t#{name}-#{spec.version}" if %w{rails activesupport sqlite3 rspec-rails sinatra}.include?(name)
 }
 
 puts
diff --git a/spec/support/fixture_helper.rb b/spec/support/fixture_helper.rb
@@ -0,0 +1,12 @@
+##
+# Config Fixture Helpers
+#
+
+module FixtureHelper
+  FIXTURE_PATH = File.expand_path('../../fixtures', __FILE__)
+
+  # Provide fixture path as same way as rspec-rails
+  def fixture_path
+    FIXTURE_PATH
+  end
+end
diff --git a/spec/support/shared_contexts/rake.rb b/spec/support/shared_contexts/rake.rb
@@ -1,8 +1,9 @@
-require 'rake'
-
 shared_context 'rake' do
 
   # include rails rake tasks
-  load 'rails/tasks/engine.rake'
+  before do
+    require 'rake'
+    load 'rails/tasks/engine.rake'
+  end
 
-end
+end
diff --git a/spec/tasks/db_spec.rb b/spec/tasks/db_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'db:create' do
+describe 'db:create', :rails do
   include_context 'rake'
 
   it 'has access to Settings object and can read databases from settings.yml file' do

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@ source "https://rubygems.org"`
`4`	`4`
`5`	`5`	`gem "rails", "3.2.22.4"`
`6`	`6`
`7`		`-gemspec :path => "../"`
	`7`	`+gemspec path: "../"`
Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@ source "https://rubygems.org"`
`4`	`4`
`5`	`5`	`gem "rails", "4.0.13"`
`6`	`6`
`7`		`-gemspec :path => "../"`
	`7`	`+gemspec path: "../"`
Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@ source "https://rubygems.org"`
`4`	`4`
`5`	`5`	`gem "rails", "5.0.1"`
`6`	`6`
`7`		`-gemspec :path => "../"`
	`7`	`+gemspec path: "../"`