nyny 3.4.0 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76cdf68418dfc6310bff3b868bd2c9c170f758e4
-  data.tar.gz: c2b1c2e3bfa9b35ff82f471d4e05e47bc75d162f
+  metadata.gz: 093564d10255044cd27165fa2d313495302037f7
+  data.tar.gz: 997dee45c86d07b9b63cc8fadf2bf00f398015ec
 SHA512:
-  metadata.gz: e8c96d40213a62519ffa4e68bfe545b252ce93dcf8f0f5548941fb3169dc86b89e1c3c257ed1e5e33bef452c0fae90b2dd22bda1f07398602c767d85f422fda1
-  data.tar.gz: 2ea78edc573c77a82cdf6431c456710aa50d0d38721bd7298396a4bfe28fa9bdd0a1b169600e6d4bb4e11901374548eb6d4b33338efb2bea8160cb2eb6475702
+  metadata.gz: bee6a1bfad4bd7e4c37ef9cdbcbafad13e56acbfe31056d015a906c6e12db77f247faa4a68165c33eead627c1ebe5f1289a310a344101d68644962783918ffc0
+  data.tar.gz: 46ab509c110aca5906ab448a04744d4c0623e1bc182360b950bfd61f000c5805381f48d646526c6404608850b830d6fb0252d9908ebf123023b08fbe300df898

data/.gitignore

@@ -18,3 +18,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.DS_Store

data/.travis.yml

@@ -2,8 +2,8 @@
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1
   - jruby-19mode
-  - jruby-20mode
 
 branches:
   only:

data/CHANGELOG

@@ -1,3 +1,6 @@
+3.4.1
+- Fix a bug when a NYNY app is used inside a namespace
+
 3.4.0
 - Fix constraint matching
 - Add constraints class method to group constraints

data/README.md

@@ -209,7 +209,7 @@ That means that the route from above will match only if
 
 To group multiple routes for a single constraint, use the constraints block:
 
-``ruby
+```ruby
 class App < NYNY::App
   constraints :content_type => 'text/html' do
     get '/' do
@@ -448,10 +448,6 @@ Optionally, an extension can add a `registered` method, which will be invoked
 once the extension is registered. That method will be called with the app class
 as a parameter.
 
-Since NYNY has the same extension interface as Sinatra, some Sinatra extensions
-might work with NYNY, although that is not guaranteed. However, an extension
-written for NYNY will always work with Sinatra. (Forward compatible)
-
 # F. A. Q.
 TBD.
 

data/lib/nyny/app.rb

@@ -16,17 +16,6 @@ module NYNY
         end
       end
 
-      def namespace url, &block
-        scope  = self.scope_class
-
-        klass = Class.new self.superclass do
-          self.scope_class = scope
-          class_eval(&block)
-        end
-
-        builder.map (url) { use klass }
-      end
-
       def run! port=9292
         use Rack::CommonLogger
         use BetterErrors::Middleware unless NYNY.env.production?

data/lib/nyny/base.rb

@@ -8,19 +8,27 @@ module NYNY
     include NYNY::Inheritable
     HTTP_VERBS = [:delete, :get, :head, :options, :patch, :post, :put, :trace]
 
-    inheritable :builder,           Rack::Builder.new
-    inheritable :scope_class,       Class.new(RequestScope)
-    inheritable :route_defs,        []
-    inheritable :before_hooks,      []
-    inheritable :after_hooks,       []
-    inheritable :before_init_hooks, []
-    inheritable :after_init_hooks,  []
+    inheritable :scope_class,         Class.new(RequestScope)
+    inheritable :route_defs,          []
+    inheritable :before_hooks,        []
+    inheritable :after_hooks,         []
+    inheritable :before_init_hooks,   []
+    inheritable :after_init_hooks,    []
     inheritable :default_constraints, {}
+    inheritable :middlewares,         []
+    inheritable :map,                 {}
 
     def initialize app=nil
+      builder = Rack::Builder.new
+
       self.class.before_init_hooks.each {|h| h.call(self)}
 
-      self.class.builder.run Router.new({
+      self.class.middlewares.each do |m, args, blk|
+        builder.use m, *args, &blk
+      end
+      self.class.map.each {|url, klass| builder.map(url) { use klass } }
+
+      builder.run Router.new({
         :scope_class    => self.class.scope_class,
         :route_defs     => self.class.route_defs,
         :before_hooks   => self.class.before_hooks,
@@ -28,7 +36,7 @@ module NYNY
         :fallback       => app
       })
 
-      @app = self.class.builder.to_app
+      @app = builder.to_app
       self.class.after_init_hooks.each {|h| h.call(self, @app)}
     end
 
@@ -46,6 +54,15 @@ module NYNY
         end
       end
 
+      def namespace url, &block
+        scope  = self.scope_class
+
+        map[url] = Class.new self.superclass do
+          self.scope_class = scope
+          class_eval(&block)
+        end
+      end
+
       def define_route path, options, &block
         self.route_defs << [path, options, Proc.new(&block)]
       end
@@ -74,7 +91,7 @@ module NYNY
       end
 
       def use middleware, *args, &block
-        builder.use middleware, *args, &block
+        middlewares << [middleware, args, block]
       end
 
       def register *extensions

data/lib/nyny/primitives.rb

@@ -1,4 +1,5 @@
 require 'active_support/hash_with_indifferent_access'
+require 'active_support/core_ext/object/deep_dup'
 require 'pathname'
 
 module NYNY
@@ -14,10 +15,8 @@ module NYNY
 
         def self.inherited subclass
           @_inheritables.each do |attr|
-            subclass.send "#{attr}=", self.send(attr).clone
-            subclass.instance_variable_set "@_inheritables", @_inheritables.clone
+            subclass.inheritable attr, self.send(attr).deep_dup
           end
-          super
         end
       end
     end

data/lib/nyny/version.rb

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

data/nyny.gemspec

@@ -24,5 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency             "actionpack",     "~> 4.0.2"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", "~> 2.14.1"
 end

data/spec/app_spec.rb

@@ -47,50 +47,6 @@ describe App do
     kls.should respond_to(:foo)
   end
 
-  describe 'namespace' do
-    let (:app) do
-      mock_app do
-        helpers do
-          def le_helper
-            :lulwut
-          end
-        end
-
-        namespace '/foo' do
-          get '/' do
-            le_helper.should == :lulwut
-            'bar'
-          end
-        end
-
-        namespace '/nested' do
-          namespace '/space' do
-            get '/' do
-              le_helper.should == :lulwut
-              'caramba'
-            end
-          end
-        end
-
-        get '/' do
-          'no namespace here'
-        end
-      end
-    end
-
-    it 'allows to specify stuff in namespaces' do
-      app.get('/foo').body.should == 'bar'
-    end
-
-    it 'does not break the main app' do
-      app.get('/').body.should == 'no namespace here'
-    end
-
-    it 'can be nested as well' do
-      app.get('/nested/space/').body.should == 'caramba'
-    end
-  end
-
   it 'should call registered method on extension' do
     module Foo
       def self.registered app
@@ -214,11 +170,16 @@ describe App do
     let (:app_class) { Class.new(App) }
 
     describe 'middlewares' do
-
       it 'delegates to builder' do
-        kls = mock_app_class
-        kls.builder.should_receive(:use).with(NullMiddleware)
-        kls.use(NullMiddleware)
+        app = mock_app do
+          use NullMiddleware
+
+          get '/' do
+            request.env['NULL'].should == true
+          end
+        end
+
+        app.get('/')
       end
     end
 

data/spec/namespace_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+
+describe NYNY::App do
+  describe 'namespace' do
+    let (:app) do
+      mock_app do
+        helpers do
+          def le_helper
+            :lulwut
+          end
+        end
+
+        namespace '/foo' do
+          get '/' do
+            le_helper.should == :lulwut
+            'bar'
+          end
+        end
+
+        namespace '/nested' do
+          namespace '/space' do
+            get '/' do
+              le_helper.should == :lulwut
+              'caramba'
+            end
+          end
+        end
+
+        get '/' do
+          'no namespace here'
+        end
+      end
+    end
+
+    it 'allows to use middlewares inside namespace' do
+      kls = Class.new(NYNY::Base) do
+        get '/' do
+          'foo'
+        end
+      end
+
+      app = mock_app do
+        namespace '/foo' do
+          use kls
+        end
+      end
+
+      app.get('/foo')
+    end
+
+    it 'allows to specify stuff in namespaces' do
+      app.get('/foo').body.should == 'bar'
+    end
+
+    it 'does not break the main app' do
+      app.get('/').body.should == 'no namespace here'
+    end
+
+    it 'can be nested as well' do
+      app.get('/nested/space/').body.should == 'caramba'
+    end
+  end
+end

data/spec/nyny_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe NYNY do
-  its 'root points to pwd' do
+  it 'root points to pwd' do
     NYNY.root.should == Pathname.pwd
   end
 
@@ -9,7 +9,7 @@ describe NYNY do
     NYNY.env.should be_test
   end
 
-  its 'root can join a path' do
+  it 'root can join a path' do
     NYNY.root.join("foo").should == Pathname.pwd + "foo"
   end
 end

data/spec/spec_helper.rb

@@ -49,6 +49,7 @@ class NullMiddleware
   end
 
   def call env
+    env['NULL'] = true
     @app.call env
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nyny
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.1
 platform: ruby
 authors:
 - Andrei Lisnic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-13 00:00:00.000000000 Z
+date: 2014-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-contrib
@@ -98,16 +98,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.1
 description: New York, New York - a (ridiculously) small and powerful web framework.
 email:
 - andrei.lisnic@gmail.com
@@ -137,6 +137,7 @@ files:
 - spec/config_spec.rb
 - spec/inheritance_spec.rb
 - spec/initialize_hooks_spec.rb
+- spec/namespace_spec.rb
 - spec/nyny_spec.rb
 - spec/request_scope_spec.rb
 - spec/runner_spec.rb
@@ -175,6 +176,7 @@ test_files:
 - spec/config_spec.rb
 - spec/inheritance_spec.rb
 - spec/initialize_hooks_spec.rb
+- spec/namespace_spec.rb
 - spec/nyny_spec.rb
 - spec/request_scope_spec.rb
 - spec/runner_spec.rb