nyny 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d06702b70c5c8ae2b5b41dec0c6cdddd867e2cc
-  data.tar.gz: 771e4872192c8727b722181153822df8dd379985
+  metadata.gz: cc338178211fc422842846bf3bb23284b8e4924e
+  data.tar.gz: 16dedfbf23305f2e6bbf4e041b01b53b5b63e2d6
 SHA512:
-  metadata.gz: 20c1401e48e5dd9a690c084ac040bdf705db169f765ea4203ed7bcc9cc63149f2153d4a1f8a96bb6b0d12d4c3007ed39c36f4e353fcb5da7318814580347e163
-  data.tar.gz: 9bdd755fcd18570974ce27564a605618f8dd3ea944111d74c55268b86879a85e320c9672be7738d1d99a9edcfeb390ee398adcb0a9fcffd1afdcbb40d77c8f7c
+  metadata.gz: 950ce1b36a87d5da3d6fabb67c223a16c09016b32e381843b71e3028eb4456171204cdf4ab43e461a7b3cb9243c00dfb1359d1be9fa370a7e8e005cf6ecb9af4
+  data.tar.gz: abf1e6dcbf3ccd5e62a6af7ec21666f0f8c7f0b85d4fd0a512fa439cd36e1e47a620f616d2badd410ac97d637d5e39bd08949819231a3635ce61c25c0228ed69

data/lib/nyny/request_scope.rb

@@ -1,6 +1,7 @@
 module NYNY
   class RequestScope
     attr_reader :request, :response
+    HaltError = Class.new(StandardError)
 
     def self.add_helper_module m
       include m
@@ -33,21 +34,17 @@ module NYNY
     end
 
     def halt status, headers={}, body=''
-      @halt_response = Response.new body, status, @headers.merge(headers)
+      throw :halt, Response.new(body, status, @headers.merge(headers))
     end
 
-    def redirect_to path
-      @redirect = path
+    def redirect_to uri, status=302
+      halt status, {'Location' => uri}
     end
+    alias_method :redirect, :redirect_to
 
     def apply_to &handler
-      @response = @halt_response || begin
-        Response.new instance_eval(&handler), @status, @headers
-      end
-
+      @response = Response.new instance_eval(&handler), @status, @headers
       cookies.each {|k,v| @response.set_cookie k,v }
-      @response.redirect(@redirect) if @redirect
-      @response.finish
       @response
     end
   end

data/lib/nyny/router.rb

@@ -24,21 +24,26 @@ module NYNY
       handler, params = find_handler req
 
       if handler != NullHandler
-        process req, handler, params
+        prepare_params req, params
+        process req, handler
       else
         fallback.call env
       end
     end
 
-    def process request, handler, url_params
+    def prepare_params request, url_params
       request.params.merge! url_params
       request.params.default_proc = proc {|h,k| h[k.to_s] || h[k.to_sym]}
+    end
 
+    def process request, handler
       scope = RequestScope.new(request)
-      before_hooks.each {|h| scope.instance_eval &h }
-      response = scope.apply_to &handler
-      after_hooks.each {|h| scope.instance_eval &h }
-      response
+      catch (:halt) do
+        before_hooks.each {|h| scope.instance_eval &h }
+        response = scope.apply_to &handler
+        after_hooks.each {|h| scope.instance_eval &h }
+        response
+      end
     end
   end
 end

data/lib/nyny/version.rb

@@ -1,3 +1,3 @@
 module NYNY
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/nyny.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["andrei.lisnic@gmail.com"]
   spec.description   = %q{New York, New York - (very) small Sinatra clone.}
   spec.summary       = %q{New York, New York.}
-  spec.homepage      = "https://github.com/alisnic/nyny"
+  spec.homepage      = "http://alisnic.github.io/nyny/"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)

data/spec/request_scope_spec.rb

@@ -66,9 +66,33 @@ describe RequestScope do
       prc.should_not_receive(:call)
     end
 
+    it 'should halt if the statement is in the route definition' do
+      app = mock_app do
+        get '/' do
+          halt 200, {}, 'Halted'
+          'shouldnt be returned'
+        end
+      end
+      res = app.get '/'
+      res.status.should == 200
+      res.body.should == 'Halted'
+    end
+
+    it 'return prematurely with pass' do
+      app = mock_app do
+        get '/' do
+          next 'hui'
+          'shouldnt be returned'
+        end
+      end
+      res = app.get '/'
+      res.status.should == 200
+      res.body.should == 'hui'
+    end
+
     it '#redirect_to should redirect' do
       redir = Proc.new { redirect_to 'http://foo.bar' }
-      response = subject.apply_to &redir
+      response = catch(:halt) { subject.apply_to &redir }
       response.status.should == 302
       response.headers['Location'].should == 'http://foo.bar'
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nyny
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Andrei Lisnic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-26 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -113,7 +113,7 @@ files:
 - spec/route_signature_spec.rb
 - spec/runner_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/alisnic/nyny
+homepage: http://alisnic.github.io/nyny/
 licenses:
 - MIT
 metadata: {}