Skip to content

Commit

Permalink
use a separate class for the context
Browse files Browse the repository at this point in the history
  • Loading branch information
madx committed Jan 17, 2012
1 parent cbee3cb commit de0441f
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 17 deletions.
20 changes: 3 additions & 17 deletions lib/roy/base.rb
Expand Up @@ -7,6 +7,7 @@

# local dependencies
require 'roy/version'
require 'roy/context'

module Roy
Defaults = {allow: [:get], prefix: :'', use: [:halt]}
Expand All @@ -16,26 +17,11 @@ def self.included(base)
end

def roy
@roy ||= OpenStruct.new.tap {|r|
r.app = self
r.conf = self.class.conf
self.class.ancestors.reverse.each do |mod|
mod.setup(r) if mod.respond_to?(:setup)
end
}
@roy ||= Context.new(self)
end

def call(env)
roy.tap { |r|
r.env = env
r.request = Rack::Request.new(env)
r.response = Rack::Response.new
r.headers = r.response.header
r.params = r.request.GET.merge(r.request.POST)
r.params.default_proc = proc do |hash, key|
hash[key.to_s] if Symbol === key
end
}
roy.prepare!(env)

method = roy.env['REQUEST_METHOD'].downcase.to_sym
roy.env['PATH_INFO'].sub!(/^([^\/])/, '/\1')
Expand Down
25 changes: 25 additions & 0 deletions lib/roy/context.rb
@@ -0,0 +1,25 @@
module Roy
class Context
attr_reader :app, :conf, :env, :request, :response, :headers, :params

def initialize(app)
@app = app
@conf = app.class.conf

app.class.ancestors.reverse.each do |mod|
mod.setup(self) if mod.respond_to?(:setup)
end
end

def prepare!(env)
@env = env
@request = Rack::Request.new(env)
@response = Rack::Response.new
@headers = @response.header
@params = @request.GET.merge(@request.POST)
@params.default_proc = proc do |hash, key|
hash[key.to_s] if Symbol === key
end
end
end
end

0 comments on commit de0441f

Please sign in to comment.