nyny 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd3b0074fdefc837e7c08f4c760b894165bf2755
-  data.tar.gz: 4e7162b95bfbc2350f6f4cdccf36597ecf19ac8b
+  metadata.gz: eefb757442e7e6fee6409340e2764aaf6f561481
+  data.tar.gz: 43d71751f9f6563bdf36c86058b2b122e22ff528
 SHA512:
-  metadata.gz: c3dc84c5a09a7dbb15ea47c52e55ff9679a473ad1241872fa81c44582ba0b3efe339f1cc1700a3dd29416191f221f58f2c926a0254cff08367dfcd50d5b59a8b
-  data.tar.gz: 963aac17eefd5aa6d1b67fdacddba1fb4bd0e91c14a104739921701307792968f8a4d5011f568ba12a900598e30e8386286babb6c468232c01cf1a3a84be6426
+  metadata.gz: a99b05e35b1e634dc51a4351d19291a41020e31a81a1a592bfc623755833008422bfa77b020fe6b9372cf94f23d3ad8afdb8b485bf8a2105edcf9c15d8372fd1
+  data.tar.gz: c7cf0199e55dec48be37d4ef923058cc0ed25b61fc70c31bbc1683d7e1cd64633ca5066432cc7de69da3dcc357dbde973bc0de6ed4895d9644a53e57949aea52

data/CHANGELOG

@@ -1,3 +1,6 @@
+2.1.1
+  - After blocks will now be evaluated even if the request was halted
+
 2.1.0
   - Add ability to define helpers with a block
   - Remove benchmark folder, and create a single benchmark file which can be

data/README.md

@@ -7,25 +7,31 @@
 [![Dependency Status](https://gemnasium.com/alisnic/nyny.png)](https://gemnasium.com/alisnic/nyny)
 [![Gem Version](https://badge.fury.io/rb/nyny.png)](http://badge.fury.io/rb/nyny)
 
-    # myapp.rb
+```ruby
+# myapp.rb
 
-    require 'nyny'
-    class App < NYNY::App
-      get '/' do
-        'Hello world!'
-      end
-    end
+require 'nyny'
+class App < NYNY::App
+  get '/' do
+    'Hello world!'
+  end
+end
+
+App.run!
+```
 
-    App.run!
-    
 Install the gem:
 
-    gem install nyny
-    
+```bash
+gem install nyny
+```
+
 Run the file:
-    
-    ruby myapp.rb
-    
+
+```bash
+ruby myapp.rb
+```
+
 Open the browser at [http://localhost:9292](http://localhost:9292)
 
 - [TOP](#new-york-new-york)
@@ -74,11 +80,13 @@ as middleware.
 
 A NYNY app must _always_ be in a class which inherits from `NYNY::App`:
 
-    class App < NYNY::App
-      get '/' do
-        'Hello, World'
-      end
-    end
+```ruby
+class App < NYNY::App
+  get '/' do
+    'Hello, World'
+  end
+end
+```
 
 ## Environment
 To get the directory in which your app is running use `NYNY.root`

data/lib/nyny/router.rb

@@ -1,7 +1,5 @@
 module NYNY
   class Router
-    NullHandler = Class.new
-
     attr_reader :fallback, :routes, :before_hooks, :after_hooks
     def initialize options
       @fallback     = options[:fallback]
@@ -30,12 +28,16 @@ module NYNY
     end
 
     def eval_response scope, handler
-      catch (:halt) do
+      response = catch (:halt) do
         before_hooks.each {|h| scope.instance_eval &h }
-        response = scope.apply_to &handler
+        scope.apply_to &handler
+      end
+
+      catch (:halt) do
         after_hooks.each {|h| scope.instance_eval &h }
-        response
       end
+
+      response
     end
   end
 end

data/lib/nyny/version.rb

@@ -1,3 +1,3 @@
 module NYNY
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

data/spec/router_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Router do
+  let (:app) do
+    mock_app do
+      get '/' do
+        halt 200, {}, "Bar"
+        "Foo"
+      end
+
+      after do
+        response.body = "Zaz"
+      end
+    end
+  end
+
+  it "should eval after blocks even if the request was halted" do
+    response = app.get('/')
+    response.body.should == "Zaz"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nyny
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Andrei Lisnic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2013-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -98,6 +98,7 @@ files:
 - spec/nyny_spec.rb
 - spec/primitives_spec.rb
 - spec/request_scope_spec.rb
+- spec/router_spec.rb
 - spec/runner_spec.rb
 - spec/spec_helper.rb
 homepage: http://alisnic.github.io/nyny/
@@ -120,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
 summary: New York, New York.
@@ -129,5 +130,6 @@ test_files:
 - spec/nyny_spec.rb
 - spec/primitives_spec.rb
 - spec/request_scope_spec.rb
+- spec/router_spec.rb
 - spec/runner_spec.rb
 - spec/spec_helper.rb