Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes to suppress Rails3 warning #10

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.rdoc
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
=[FIXED] Moved contents of rails/init.rb into init.rb to avoid Rails 3 deprecation warnings.

= Resource Controller

resource_controller makes RESTful controllers easier, more maintainable, and super readable. With the RESTful controller pattern hidden away, you can focus on what makes your controller special.
Expand Down
9 changes: 8 additions & 1 deletion init.rb
Original file line number Diff line number Diff line change
@@ -1 +1,8 @@
require File.dirname(__FILE__)+'/rails/init.rb'
require 'resource_controller'

ActionController::Base.class_eval do
include Urligence
helper_method :smart_url

extend ResourceController::ActionControllerExtension
end
2 changes: 1 addition & 1 deletion lib/resource_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ def resource_controller(*args)
end
end

require File.dirname(__FILE__)+'/../rails/init.rb' unless ActionController::Base.include?(Urligence)
require File.dirname(__FILE__)+'/../init.rb' unless ActionController::Base.include?(Urligence)
6 changes: 0 additions & 6 deletions rails/init.rb

This file was deleted.

1 change: 0 additions & 1 deletion resource_controller.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ Gem::Specification.new do |s|
"lib/resource_controller/response_collector.rb",
"lib/resource_controller/singleton.rb",
"lib/urligence.rb",
"rails/init.rb",
"test/Rakefile",
"test/app/controllers/accounts_controller.rb",
"test/app/controllers/application_controller.rb",
Expand Down