Skip to content

Commit

Permalink
Made it work with rails 3.0.5
Browse files Browse the repository at this point in the history
  • Loading branch information
Nathan Van der Auwera committed Apr 6, 2011
1 parent af20d18 commit 665eef2
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
16 changes: 10 additions & 6 deletions lib/action_web_service.rb
Expand Up @@ -22,15 +22,19 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#++


begin
require 'active_support'
require 'action_controller'
require 'active_record'
require 'activesupport'
require 'actioncontroller'
require 'activerecord'
require 'actionpack'
require 'active_support/core_ext/class/inheritable_attributes'
require 'action_dispatch/routing'
rescue LoadError
require 'rubygems'
gem 'activesupport'
gem 'actionpack'
gem 'activerecord'
gem 'activesupport', '>=3.0.5'
gem 'actionpack' , '>=3.0.5'
gem 'activerecord' , '>=3.0.5'
end

$:.unshift(File.dirname(__FILE__) + "/action_web_service/vendor/")
Expand Down
2 changes: 1 addition & 1 deletion lib/action_web_service/protocol/abstract.rb
Expand Up @@ -72,7 +72,7 @@ def initialize(body, content_type, return_value)
end
end

class SimpleActionPackRequest < ActionController::Request # :nodoc:
class SimpleActionPackRequest < ActionDispatch::Request # :nodoc:
def initialize(env = {})
@env = env
@qparams = {}
Expand Down

0 comments on commit 665eef2

Please sign in to comment.