nyny 3.3.1 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6db6a9ca35676823e643db65bc2b458c44bc793f
-  data.tar.gz: 582642543e721156d818975ced8ad08849c5c2eb
+  metadata.gz: 76cdf68418dfc6310bff3b868bd2c9c170f758e4
+  data.tar.gz: c2b1c2e3bfa9b35ff82f471d4e05e47bc75d162f
 SHA512:
-  metadata.gz: 0b4aeb7be4451c4d4663cecf2ce4bb0056bf9a2170d2afd0935399f0d114c37a32fb5f3101029509a839dee046d809fbf3dfd48a52faaa5b996c18d006cc3dfc
-  data.tar.gz: fc5e89993a3d8356c21fab47ca10b132ca1b0eeb1f5e46b7365f648353b35b8bfbfd873e2ec30a4a19717d191c63adfda8404c01fcc70708b203977b4ff53d23
+  metadata.gz: e8c96d40213a62519ffa4e68bfe545b252ce93dcf8f0f5548941fb3169dc86b89e1c3c257ed1e5e33bef452c0fae90b2dd22bda1f07398602c767d85f422fda1
+  data.tar.gz: 2ea78edc573c77a82cdf6431c456710aa50d0d38721bd7298396a4bfe28fa9bdd0a1b169600e6d4bb4e11901374548eb6d4b33338efb2bea8160cb2eb6475702

data/CHANGELOG

@@ -1,81 +1,85 @@
+3.4.0
+- Fix constraint matching
+- Add constraints class method to group constraints
+
 3.3.1
-  - if the response of the route is a enumerable, NYNY will try to
-    send it in chunks (given that both the client and the server support it)
-  - NYNY::Base for those who love the barebone (lacks config, namespaces,
-    templates, and run!)
+- if the response of the route is a enumerable, NYNY will try to
+send it in chunks (given that both the client and the server support it)
+- NYNY::Base for those who love the barebone (lacks config, namespaces,
+templates, and run!)
 
 3.3.0
-  - App.config
-  - before_initialize hooks
-  - after_initialize hooks
+- App.config
+- before_initialize hooks
+- after_initialize hooks
 
 3.2.2
-  - Use Journey directly from ActionDispatch, since rails/journey is obsolete
-  - Fix indifferent nested params
-  - Make helpers accessible inside namespaces
-  - Fix namespaces inheritance behaviour
+- Use Journey directly from ActionDispatch, since rails/journey is obsolete
+- Fix indifferent nested params
+- Make helpers accessible inside namespaces
+- Fix namespaces inheritance behaviour
 
 3.2.1
-  - Fallback to Tilt 1.4.1 since 2.0.0 has conflicts with a lot
-    of gems
-  - Improved and fixed the outdated examples
+- Fallback to Tilt 1.4.1 since 2.0.0 has conflicts with a lot
+of gems
+- Improved and fixed the outdated examples
 
 3.2.0
-  - Use Rails' Journey router as router to conquer the world and shorten
-    the codebase
+- Use Rails' Journey router as router to conquer the world and shorten
+the codebase
 
 3.1.0
-  - use latest Tilt (2.0.0)
-  - get rid of silly Rack::Response hacks, write to body properly
-  - Response#rewrite (body= aliases it for backward compatibility)
-  - Refactor .run! implementation, prefer thin, webrik.
-  - NYNY now ships with better_errors, which is only enabled in development
-  - Fixed builder instanciation logic
-  - removed benchmark script, since tilt dep version is not compatible with
-    Sinatra
+- use latest Tilt (2.0.0)
+- get rid of silly Rack::Response hacks, write to body properly
+- Response#rewrite (body= aliases it for backward compatibility)
+- Refactor .run! implementation, prefer thin, webrik.
+- NYNY now ships with better_errors, which is only enabled in development
+- Fixed builder instanciation logic
+- removed benchmark script, since tilt dep version is not compatible with
+Sinatra
 
 3.0.1
-  - File SystemStackError when accessing missing param (@holies)
+- File SystemStackError when accessing missing param (@holies)
 
 3.0.0
-  - Use Rack builder to shorten and simplify the code
-  - Add support for namespaces by using the builder
-  - Add ruby-prof as a development dependency
-  - NYNY will return a Rack-like response on each request ([status, headers, body])
-  - headers behave like a hash
-  - cookies behave like a hash
-  - added sprockets integration example
-  - improved documentation
-  - Fixed inheritance behaviour for App (routes, filters, helpers, middlewares
-    will be passed down the inheritance chain)
+- Use Rack builder to shorten and simplify the code
+- Add support for namespaces by using the builder
+- Add ruby-prof as a development dependency
+- NYNY will return a Rack-like response on each request ([status, headers, body])
+- headers behave like a hash
+- cookies behave like a hash
+- added sprockets integration example
+- improved documentation
+- Fixed inheritance behaviour for App (routes, filters, helpers, middlewares
+will be passed down the inheritance chain)
 
 2.2.1
-  - Added support for templates
+- Added support for templates
 
 2.1.1
-  - After blocks will now be evaluated even if the request was halted
+- 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
-    executed easily
-  - Simplified and optimized routing logic
-  - Fixed root path processing when a NYNY app is mounted
-  - Added Rails interop example
-  - Added session example
-  - Added NYNY.root
-  - Added NYNY.env
-  - NYNY will not show exceptions in production env
+- Add ability to define helpers with a block
+- Remove benchmark folder, and create a single benchmark file which can be
+executed easily
+- Simplified and optimized routing logic
+- Fixed root path processing when a NYNY app is mounted
+- Added Rails interop example
+- Added session example
+- Added NYNY.root
+- Added NYNY.env
+- NYNY will not show exceptions in production env
 
 2.0.0
-  - Simplified and improved RouteSignature implementation
-  - Simplified and improved RequestScope implementation
-  - Made response object available in RequestScope
-  - removed .use_protection! (the rack-protection middleware can be easily
-    used manually)
-  - added support for extensions (using .register, which works the same way as in sinatra)
+- Simplified and improved RouteSignature implementation
+- Simplified and improved RequestScope implementation
+- Made response object available in RequestScope
+- removed .use_protection! (the rack-protection middleware can be easily
+used manually)
+- added support for extensions (using .register, which works the same way as in sinatra)
 
 1.0.2
-  - Add rack to runtime deps (@etehtsea)
+- Add rack to runtime deps (@etehtsea)
 
 1.0.0 Initial release

data/README.md

@@ -108,7 +108,7 @@ true
 ## Configuration
 You can configure your app by attaching arbitrary properties to config object:
 ```ruby
-class App << NYNY::App
+class App < NYNY::App
   config.foo = 'bar'
 end
 
@@ -197,12 +197,31 @@ Each route definition call optionally accepts constraints:
 
 ```ruby
 class App < NYNY::App
-  get '/', :constraints => {:format => :html} do
+  get '/', :constraints => {:content_type => 'text/html'} do
     'html'
   end
 end
 ```
-You can use [the same constraints][constraints] you use in Rails.
+
+What are constraints? Constraints are assertions on the request object.
+That means that the route from above will match only if
+`request.content_type` is 'text/html'.
+
+To group multiple routes for a single constraint, use the constraints block:
+
+``ruby
+class App < NYNY::App
+  constraints :content_type => 'text/html' do
+    get '/' do
+      'html'
+    end
+
+    get '/foo' do
+      'foo html'
+    end
+  end
+end
+```
 
 Besides the constraints, you can specify defaults:
 ```ruby
@@ -224,8 +243,6 @@ This means that several methods/objects available inside that block:
 - `request` - A `Rack::Request` object which encapsulates the request
   to that route. (see [Rack::Request documentation][3] for more info)
 - `response` - A `Rack::Response` object which encapsulates the response.
-  Additionally, NYNY's response exposes 2 more methods in addition to Rack's ones.
-  (see [primitives.rb][primitivesrb])
 - `params` - a hash which contains both POST body params and GET querystring params.
 - `headers` - a hash with the response headers
   (ex: `headers['Content-Type'] = 'text/html'`)

data/lib/nyny/app.rb

@@ -34,4 +34,4 @@ module NYNY
       end
     end
   end
-end
+end

data/lib/nyny/base.rb

@@ -15,6 +15,7 @@ module NYNY
     inheritable :after_hooks,       []
     inheritable :before_init_hooks, []
     inheritable :after_init_hooks,  []
+    inheritable :default_constraints, {}
 
     def initialize app=nil
       self.class.before_init_hooks.each {|h| h.call(self)}
@@ -39,7 +40,7 @@ module NYNY
     class << self
       HTTP_VERBS.each do |method|
         define_method method do |path, options={}, &block|
-          options[:constraints] ||= {}
+          options[:constraints] = default_constraints.merge(options[:constraints] || {})
           options[:constraints].merge!(:request_method => method.to_s.upcase)
           define_route path, options, &block
         end
@@ -49,6 +50,13 @@ module NYNY
         self.route_defs << [path, options, Proc.new(&block)]
       end
 
+      def constraints args, &block
+        current = self.default_constraints.dup
+        self.default_constraints = args
+        instance_eval &block
+        self.default_constraints = current
+      end
+
       def before &blk
         before_hooks << Proc.new(&blk)
       end

data/lib/nyny/router.rb

@@ -29,7 +29,8 @@ module NYNY
     def prepare_for_journey route_defs
       routes = ActionDispatch::Journey::Routes.new
       @journey = ActionDispatch::Journey::Router.new(routes, {
-        :parameters_key => 'nyny.params'
+        :parameters_key => 'nyny.params',
+        :request_class => NYNY::Request
       })
 
       route_defs.each do |path, options, handler|
@@ -58,4 +59,4 @@ module NYNY
       end
     end
   end
-end
+end

data/lib/nyny/version.rb

@@ -1,3 +1,3 @@
 module NYNY
-  VERSION = "3.3.1"
+  VERSION = "3.4.0"
 end

data/nyny.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = NYNY::VERSION
   spec.authors       = ["Andrei Lisnic"]
   spec.email         = ["andrei.lisnic@gmail.com"]
-  spec.description   = %q{New York, New York - (very) small Sinatra clone.}
+  spec.description   = %q{New York, New York - a (ridiculously) small and powerful web framework.}
   spec.summary       = %q{New York, New York.}
   spec.homepage      = "http://alisnic.github.io/nyny/"
   spec.license       = "MIT"

data/spec/app_spec.rb

@@ -19,6 +19,23 @@ describe App do
     response.status.should == 404
   end
 
+  it 'can use constraints block' do
+    app = mock_app do
+      constraints :content_type => 'text/html' do
+        get '/' do
+          'HTML!'
+        end
+      end
+
+      get '/' do
+        'not html'
+      end
+    end
+
+    app.get('/').body.should == 'not html'
+    app.get('/', 'CONTENT_TYPE' => 'text/html').body.should == 'HTML!'
+  end
+
   it 'should able to register a extension' do
     module Foo
       def foo

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nyny
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.4.0
 platform: ruby
 authors:
 - Andrei Lisnic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-contrib
@@ -108,7 +108,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: New York, New York - (very) small Sinatra clone.
+description: New York, New York - a (ridiculously) small and powerful web framework.
 email:
 - andrei.lisnic@gmail.com
 executables: []
@@ -166,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: New York, New York.