Skip to content

Commit

Permalink
move doGet doPost to action controller
Browse files Browse the repository at this point in the history
  • Loading branch information
baroquebobcat committed Oct 25, 2010
1 parent 535e864 commit 6bf81a5
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 8 deletions.
8 changes: 0 additions & 8 deletions examples/contacts/app/controllers/contacts_controller.mirah
Expand Up @@ -45,14 +45,6 @@ class ContactsController < ApplicationController
redirect_to params.show
end

def doGet(request, response)
action_response(response, action_request(request, 'get'))
end

def doPost(request, response)
action_response(response, action_request(request, 'post'))
end

# render templates
def_edb(index_erb, 'views/contacts/index.html.erb')
def_edb(show_erb, 'views/contacts/show.html.erb')
Expand Down
24 changes: 24 additions & 0 deletions spec/dubious/action_controller_spec.rb
@@ -0,0 +1,24 @@
require File.dirname(__FILE__)+'/../spec_helper.rb'

describe Dubious::ActionController do
subject { Dubious::ActionController.new }

it { should respond_to :do_get }

describe "#do_get" do
let(:req) { HttpServletRequest.new }
let(:resp){ HttpServletResponse.new }
it {
req.stubs :get_path_info => '/somepath',
:get_servlet_path => '/someotherpath',
:get_parameter => nil
resp.expects(:set_status).with 404
resp.stubs :send_redirect => nil
subject.do_get req, resp
}
end

describe "#action_request" do

end
end
25 changes: 25 additions & 0 deletions spec/spec_helper.rb
@@ -0,0 +1,25 @@
require 'java'
require 'mirah'
require 'appengine-sdk'
require 'rspec'

require AppEngine::SDK::SDK_ROOT + '/lib/shared/geronimo-servlet_2.5_spec-1.2.jar'
require File.dirname(__FILE__)+'/../lib/dubious.jar'
require File.dirname(__FILE__)+'/../javalib/dubydatastore.jar'

import javax.servlet.http.HttpServletRequest
import javax.servlet.http.HttpServletRequest
import javax.servlet.http.HttpServletResponse

import javax.servlet.Filter
import javax.servlet.FilterChain
import javax.servlet.FilterConfig


Rspec.configure do |config|
config.mock_with :mocha
end

module Dubious
include_package 'dubious'
end
8 changes: 8 additions & 0 deletions src/dubious/action_controller.mirah
Expand Up @@ -79,6 +79,14 @@ class ActionController < HttpServlet
response.getWriter.write("Unsupported Response Type")
end
end

def doGet(request, response)
action_response(response, action_request(request, 'get'))
end

def doPost(request, response)
action_response(response, action_request(request, 'post'))
end

# route request to the appropriate action
def action_request(request:HttpServletRequest, method:String) returns Object
Expand Down

0 comments on commit 6bf81a5

Please sign in to comment.