nancy 0.2.0 → 0.3.0

data/README.md

@@ -104,6 +104,10 @@ Check examples folder for a detailed example.
 
 ## Version history
 
+### 0.3.0 (Octuber 3, 2012)
+* Removed unneccesary Thread accessors, use simple instance getters instead
+* Refactored Nancy::Base#halt
+
 ### 0.2.0 (April 12, 2012)
 
 *   Set PATH INFO to '/' when is blank

data/lib/nancy/base.rb

@@ -2,6 +2,8 @@ require 'rack'
 
 module Nancy
   class Base
+    attr_reader :request, :response, :params, :env
+
     class << self
       %w(GET POST PATCH PUT DELETE HEAD OPTIONS).each do |verb|
         define_method(verb.downcase) do |pattern, &block|
@@ -20,11 +22,7 @@ module Nancy
     end
 
     def self.route_set
-      @route_set ||= Hash.new { |h, k| h[k] = [] }
-    end
-
-    %w(request response params env).each do |accessor|
-      define_method(accessor){ Thread.current[accessor.to_sym] }
+      @route_set ||= Hash.new { |hash, key| hash[key] = [] }
     end
 
     def session
@@ -55,10 +53,10 @@ module Nancy
     end
 
     def call(env)
-      Thread.current[:request] = Rack::Request.new(env)
-      Thread.current[:response] = Rack::Response.new
-      Thread.current[:params] = request.params
-      Thread.current[:env] = env
+      @request = Rack::Request.new(env)
+      @response = Rack::Response.new
+      @params = request.params
+      @env = env
       response = catch(:halt) do
         route_eval(request.request_method, request.path_info)
       end.finish
@@ -70,7 +68,7 @@ module Nancy
         if match = path_info.match(matcher[0])
           if (captures = match.captures) && !captures.empty?
             url_params = Hash[*matcher[1].zip(captures).flatten]
-            Thread.current[:params] = url_params.merge(params)
+            @params = url_params.merge(params)
           end
           response.write instance_eval(&block)
           halt response
@@ -81,10 +79,9 @@ module Nancy
 
     def halt(*res)
       throw :halt, res.first if res.first.is_a?(Rack::Response)
-      response.status = res.select{|x| x.is_a?(Fixnum)}.first || 200
-      headers = res.select{|x| x.is_a?(Hash)}.first || {}
-      response.header.merge!(headers)
-      response.body = [(res.select{|x| x.is_a?(String)}.first || "")]
+      response.status = res.detect{|x| x.is_a?(Fixnum) } || 200
+      response.header.merge!(res.detect{|x| x.is_a?(Hash) } || {})
+      response.body = [res.detect{|x| x.is_a?(String) } || ""]
       throw :halt, response
     end
   end

data/lib/nancy/version.rb

@@ -1,3 +1,3 @@
 module Nancy
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nancy
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-12 00:00:00.000000000 Z
+date: 2012-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby Microframework inspired in Sinatra
@@ -138,3 +138,4 @@ test_files:
 - test/render_test.rb
 - test/test_helper.rb
 - test/use_test.rb
+has_rdoc: