roy 0.5.1 → 0.5.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    roy (0.5.1)
+    roy (0.5.2)
       rack
 
 GEM

data/lib/roy/base.rb

@@ -7,6 +7,7 @@ require 'ostruct'
 
 # local dependencies
 require 'roy/version'
+require 'roy/context'
 
 module Roy
   Defaults = {allow: [:get], prefix: :'', use: [:halt]}
@@ -16,26 +17,11 @@ module Roy
   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')

data/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

data/lib/roy/version.rb

@@ -1,3 +1,7 @@
 module Roy
-  VERSION = "0.5.1"
+  VERSION = [0, 5, 2]
+
+  def self.version
+    VERSION.join('.')
+  end
 end

data/roy.gemspec

@@ -4,7 +4,7 @@ require "roy/version"
 
 Gem::Specification.new do |s|
   s.name        = "roy"
-  s.version     = Roy::VERSION
+  s.version     = Roy.version
   s.authors     = ["madx"]
   s.email       = ["madx@yapok.org"]
   s.homepage    = "https://github.com/madx/roy"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roy
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-16 00:00:00.000000000 Z
+date: 2012-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &14552840 !ruby/object:Gem::Requirement
+  requirement: &19255820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14552840
+  version_requirements: *19255820
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &14552240 !ruby/object:Gem::Requirement
+  requirement: &19255280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14552240
+  version_requirements: *19255280
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &14551720 !ruby/object:Gem::Requirement
+  requirement: &19254660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14551720
+  version_requirements: *19254660
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &14551200 !ruby/object:Gem::Requirement
+  requirement: &19254220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14551200
+  version_requirements: *19254220
 description: ! 'roy is a small library which allows every Ruby object to be used
 
   as a Rack application.'
@@ -74,6 +74,7 @@ files:
 - lib/roy/base.rb
 - lib/roy/basic_auth.rb
 - lib/roy/before.rb
+- lib/roy/context.rb
 - lib/roy/halt.rb
 - lib/roy/render.rb
 - lib/roy/version.rb