diff options
| -rw-r--r-- | activesupport/CHANGELOG.md | 12 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/object.rb | 1 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/object/exclusion.rb | 15 | ||||
| -rw-r--r-- | activesupport/test/core_ext/object/exclusion_test.rb | 53 | ||||
| -rw-r--r-- | guides/source/debugging_rails_applications.md | 7 | ||||
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 1 | ||||
| -rw-r--r-- | railties/test/railties/engine_test.rb | 8 |
7 files changed, 1 insertions, 96 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index b39ef7bfb9..280620df1c 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,15 +1,3 @@ -* Introduce `not_in?` on `Object`. - - As an opposite method for `in?`, `not_in?` provides equivalent support for exclusion. This turns this: - - [1,2].exclude?(user_id) - - ...into this: - - user_id.not_in?([1,2]) - - *Jon McCartie* - * Defines `Regexp.match?` for Ruby versions prior to 2.4. The predicate has the same interface, but it does not have the performance boost. Its purpose is to be able to write 2.4 compatible code. diff --git a/activesupport/lib/active_support/core_ext/object.rb b/activesupport/lib/active_support/core_ext/object.rb index a2c5a472f5..f4f9152d6a 100644 --- a/activesupport/lib/active_support/core_ext/object.rb +++ b/activesupport/lib/active_support/core_ext/object.rb @@ -4,7 +4,6 @@ require 'active_support/core_ext/object/duplicable' require 'active_support/core_ext/object/deep_dup' require 'active_support/core_ext/object/try' require 'active_support/core_ext/object/inclusion' -require 'active_support/core_ext/object/exclusion' require 'active_support/core_ext/object/conversions' require 'active_support/core_ext/object/instance_variables' diff --git a/activesupport/lib/active_support/core_ext/object/exclusion.rb b/activesupport/lib/active_support/core_ext/object/exclusion.rb deleted file mode 100644 index 58dfb649e5..0000000000 --- a/activesupport/lib/active_support/core_ext/object/exclusion.rb +++ /dev/null @@ -1,15 +0,0 @@ -class Object - # Returns true if this object is excluded in the argument. Argument must be - # any object which responds to +#include?+. Usage: - # - # characters = ["Konata", "Kagami", "Tsukasa"] - # "MoshiMoshi".not_in?(characters) # => true - # - # This will throw an +ArgumentError+ if the argument doesn't respond - # to +#include?+. - def not_in?(another_object) - !another_object.include?(self) - rescue NoMethodError - raise ArgumentError.new("The parameter passed to #not_in? must respond to #include?") - end -end
\ No newline at end of file diff --git a/activesupport/test/core_ext/object/exclusion_test.rb b/activesupport/test/core_ext/object/exclusion_test.rb deleted file mode 100644 index 487c97d255..0000000000 --- a/activesupport/test/core_ext/object/exclusion_test.rb +++ /dev/null @@ -1,53 +0,0 @@ -require 'abstract_unit' -require 'active_support/core_ext/object/exclusion' - -class NotInTest < ActiveSupport::TestCase - def test_not_in_array - assert 1.not_in?([2, 3]) - assert_not 2.not_in?([1,2]) - end - - def test_not_in_hash - h = { "a" => 100, "b" => 200 } - assert "z".not_in?(h) - assert_not "a".not_in?(h) - end - - def test_not_in_string - assert "ol".not_in?("hello") - assert_not "lo".not_in?("hello") - assert ?z.not_in?("hello") - end - - def test_not_in_range - assert 75.not_in?(1..50) - assert_not 25.not_in?(1..50) - end - - def test_not_in_set - s = Set.new([1,2]) - assert 3.not_in?(s) - assert_not 1.not_in?(s) - end - - module A - end - class B - include A - end - class C < B - end - class D - end - - def test_not_in_module - assert A.not_in?(D) - assert A.not_in?(A) - assert_not A.not_in?(B) - assert_not A.not_in?(C) - end - - def test_no_method_catching - assert_raise(ArgumentError) { 1.not_in?(1) } - end -end diff --git a/guides/source/debugging_rails_applications.md b/guides/source/debugging_rails_applications.md index f0d0f9753a..e4fc7f4743 100644 --- a/guides/source/debugging_rails_applications.md +++ b/guides/source/debugging_rails_applications.md @@ -950,12 +950,5 @@ more. References ---------- -* [ruby-debug Homepage](http://bashdb.sourceforge.net/ruby-debug/home-page.html) -* [debugger Homepage](https://github.com/cldwalker/debugger) * [byebug Homepage](https://github.com/deivid-rodriguez/byebug) * [web-console Homepage](https://github.com/rails/web-console) -* [Article: Debugging a Rails application with ruby-debug](http://www.sitepoint.com/debug-rails-app-ruby-debug/) -* [Ryan Bates' debugging ruby (revised) screencast](http://railscasts.com/episodes/54-debugging-ruby-revised) -* [Ryan Bates' stack trace screencast](http://railscasts.com/episodes/24-the-stack-trace) -* [Ryan Bates' logger screencast](http://railscasts.com/episodes/56-the-logger) -* [Debugging with ruby-debug](http://bashdb.sourceforge.net/ruby-debug.html) diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 7d0c3daa23..285a63d4c6 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -34,6 +34,7 @@ module Rails @public_file_server.index_name = "index" @force_ssl = false @ssl_options = {} + @session_store = nil @time_zone = "UTC" @beginning_of_week = :monday @log_level = nil diff --git a/railties/test/railties/engine_test.rb b/railties/test/railties/engine_test.rb index 0eaa5bc351..fb8de84e1b 100644 --- a/railties/test/railties/engine_test.rb +++ b/railties/test/railties/engine_test.rb @@ -36,8 +36,6 @@ module RailtiesTest add_to_env_config "development", "config.assets.digest = false" boot_rails - require 'rack/test' - extend Rack::Test::Methods get "/assets/engine.js" assert_match "alert()", last_response.body @@ -321,8 +319,6 @@ module RailtiesTest RUBY boot_rails - require 'rack/test' - extend Rack::Test::Methods get "/sprokkit" assert_equal "I am a Sprokkit", last_response.body @@ -359,8 +355,6 @@ module RailtiesTest RUBY boot_rails - require 'rack/test' - extend Rack::Test::Methods get '/foo' assert_equal 'foo', last_response.body @@ -449,8 +443,6 @@ YAML RUBY boot_rails - require 'rack/test' - extend Rack::Test::Methods get "/admin/foo/bar" assert_equal 200, last_response.status |