nyny 3.2.2 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64027ca973fda52e94edacef4d3570f8e78a6e8c
-  data.tar.gz: 47763de06fb5ffb12babdcc07d7ad0ab61ff86a0
+  metadata.gz: 107d11189a291b7486db035f572921ff75946129
+  data.tar.gz: 484670541b44ee3c37e59c219a5769a489caccce
 SHA512:
-  metadata.gz: 72a4aaad4c7473ec7b680ff1f52cf490084cf88d969a960f976bf7d79b854e2dc19ff63fadf968af9fd0a94d54046bedfb430e1b368e61c3621502bb29ec80eb
-  data.tar.gz: 3a81393aa445660e1105fecbc2002f8802c27c571d239621cb8a9bdc6041c06e5ad5037922a2a01232a4b6a83aea50de7ed410364bf04f189369e8e220822526
+  metadata.gz: a130aa58b46327176465becf3d4d030bdaad6bb6b681ca0c8be4f55658b6fe72351e06050c9d1eafc7a98e4319629045697ea55b09f02725023082453e27fa8c
+  data.tar.gz: 5fb16a4139ac277a4cea7da8320f2e3ead517d8bcaa54c5ae0b71aa20c5dbb7cfe1c75fe5462d33f7b8aa71a3adc85affb562e4997978d634563db9d8f3405db

data/.travis.yml

@@ -1,6 +1,5 @@
 ---
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - jruby-19mode

data/CHANGELOG

@@ -1,3 +1,8 @@
+3.3.0
+  - 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

data/README.md

@@ -40,6 +40,7 @@ Open the browser at [http://localhost:9292](http://localhost:9292)
 - [Why use NYNY instead of Sinatra](#why-use-nyny-instead-of-sinatra)
 - [Usage](#usage)
     - [Environment](#environment)
+    - [Configuration](#configuration)
     - [Running](#running)
     - [Defining routes](#defining-routes)
     - [Request scope](#request-scope)
@@ -105,6 +106,50 @@ production
 true
 ```
 
+## Configuration
+You can configure your app by attaching arbitrary properties to config object:
+```ruby
+class App << NYNY::App
+  config.foo = 'bar'
+end
+
+App.config.foo #=> 'bar'
+```
+
+Or, you can use the configure block:
+
+```ruby
+class App < NYNY::App
+  configure do
+    config.always = true
+  end
+
+  configdure :production do
+    config.prod = true
+  end
+
+  configure :test, :development do
+    config.unsafe = true
+  end
+end
+```
+
+Also, NYNY provides a simple api for hooking into the app's initialization:
+```ruby
+class App < NYNY::App
+  before_initialize do |app|
+    #this will be executed just before the Rack app is compiled
+    #'app' is the a App instance
+  end
+
+  after_initialize do |app, rack_app|
+    #this will be executed after the Rack app is compiled
+    #'app' is the a App instance
+    #'rack_app' is the main block which will be called on any request
+  end
+end
+```
+
 ## Running
 There are two ways to run a NYNY app __directly__ [[?]](#middleware):
 

data/lib/nyny.rb

@@ -1,34 +1,2 @@
-require 'rack'
-
 require 'nyny/version'
 require 'nyny/app'
-require 'nyny/core-ext/runner'
-require 'nyny/core-ext/templates'
-
-module NYNY
-  class EnvString < String
-    [:production, :development, :test].each do |env|
-      define_method "#{env}?" do
-        self == env.to_s
-      end
-    end
-  end
-
-  class PathString < String
-    def join other
-      File.join(self, other)
-    end
-  end
-
-  def self.root
-    @root ||= PathString.new(Dir.pwd)
-  end
-
-  def self.env
-    @env ||= EnvString.new(ENV['RACK_ENV'] || 'development')
-  end
-
-  App.register NYNY::Runner
-  App.register NYNY::Templates
-end
-

data/lib/nyny/app.rb

@@ -1,32 +1,24 @@
+require 'rack'
+require 'better_errors'
+require 'ostruct'
 require 'nyny/primitives'
 require 'nyny/request_scope'
 require 'nyny/router'
+require 'nyny/templates'
 
 module NYNY
   class App
+    include NYNY::Inheritable
     HTTP_VERBS = [:delete, :get, :head, :options, :patch, :post, :put, :trace]
 
-    def self.inheritable name, value
-      @_inheritables ||= []
-      @_inheritables << name
-      self.class.send :attr_accessor, name
-      self.send "#{name}=", value
-    end
-
-    def self.inherited subclass
-      @_inheritables.each do |attr|
-        subclass.send "#{attr}=", self.send(attr).clone
-        subclass.instance_variable_set "@_inheritables", @_inheritables.clone
-      end
-
-      super
-    end
-
-    inheritable :builder,       Rack::Builder.new
-    inheritable :route_defs,    []
-    inheritable :before_hooks,  []
-    inheritable :after_hooks,   []
-    inheritable :scope_class,   Class.new(RequestScope)
+    inheritable :builder,           Rack::Builder.new
+    inheritable :scope_class,       Class.new(RequestScope)
+    inheritable :config,            OpenStruct.new
+    inheritable :route_defs,        []
+    inheritable :before_hooks,      []
+    inheritable :after_hooks,       []
+    inheritable :before_init_hooks, []
+    inheritable :after_init_hooks,  []
 
     def initialize app=nil
       self.class.builder.run Router.new({
@@ -37,7 +29,9 @@ module NYNY
         :fallback       => app
       })
 
+      self.class.before_init_hooks.each {|h| h.call(self)}
       @app = self.class.builder.to_app
+      self.class.after_init_hooks.each {|h| h.call(self, @app)}
     end
 
     def call env
@@ -67,9 +61,8 @@ module NYNY
 
       def namespace url, &block
         scope  = self.scope_class
-        parent = self.superclass
 
-        klass = Class.new parent do
+        klass = Class.new self.superclass do
           self.scope_class = scope
           class_eval(&block)
         end
@@ -85,6 +78,20 @@ module NYNY
         after_hooks << Proc.new(&blk)
       end
 
+      def before_initialize &blk
+        before_init_hooks << Proc.new(&blk)
+      end
+
+      def after_initialize &blk
+        after_init_hooks << Proc.new(&blk)
+      end
+
+      def configure *envs, &block
+        if envs.map(&:to_sym).include?(NYNY.env.to_sym) or envs.empty?
+          instance_eval(&block)
+        end
+      end
+
       def use middleware, *args, &block
         builder.use middleware, *args, &block
       end
@@ -93,6 +100,14 @@ module NYNY
         args << Module.new(&block) if block_given?
         args.each {|m| scope_class.send :include, m }
       end
+
+      def run! port=9292
+        use Rack::CommonLogger
+        use BetterErrors::Middleware unless NYNY.env.production?
+        Rack::Handler.pick(['thin', 'webrick']).run new, :Port => port
+      end
     end #class methods
+
+    register NYNY::Templates
   end
 end

data/lib/nyny/primitives.rb

@@ -1,6 +1,36 @@
 require 'active_support/hash_with_indifferent_access'
+require 'pathname'
 
 module NYNY
+  module Inheritable
+    def self.included base
+      base.class_eval do
+        def self.inheritable name, value
+          @_inheritables ||= []
+          @_inheritables << name
+          self.class.send :attr_accessor, name
+          self.send "#{name}=", value
+        end
+
+        def self.inherited subclass
+          @_inheritables.each do |attr|
+            subclass.send "#{attr}=", self.send(attr).clone
+            subclass.instance_variable_set "@_inheritables", @_inheritables.clone
+          end
+          super
+        end
+      end
+    end
+  end
+
+  class EnvString < String
+    [:production, :development, :test].each do |env|
+      define_method "#{env}?" do
+        self == env.to_s
+      end
+    end
+  end
+
   class Request < Rack::Request
     def params
       @params ||= ActiveSupport::HashWithIndifferentAccess.new(super)
@@ -17,4 +47,12 @@ module NYNY
     end
     alias_method :body=, :rewrite
   end
+
+  def self.root
+    @root ||= Pathname.pwd
+  end
+
+  def self.env
+    @env ||= EnvString.new(ENV['RACK_ENV'] || 'development')
+  end
 end

data/lib/nyny/version.rb

@@ -1,3 +1,3 @@
 module NYNY
-  VERSION = "3.2.2"
+  VERSION = "3.3.0"
 end

data/spec/config_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe App do
+  describe 'config' do
+    let (:klass) do
+      mock_app_class do
+        get '/' do
+          p config
+          config.foo.should == 'bar'
+        end
+      end
+    end
+
+    let (:app) do
+      Rack::MockRequest.new(klass.new)
+    end
+
+    it 'sets any property' do
+      klass.config.foo = 'bar'
+      klass.config.foo.should == 'bar'
+    end
+
+    it 'can configure multiple environments at once' do
+      NYNY.stub :env => ['development', 'test'].sample
+
+      kls = mock_app_class do
+        configure :development, :test do
+          config.test_dev = true
+        end
+      end
+
+      kls.config.test_dev.should == true
+      NYNY.unstub :env
+    end
+
+    it 'configures all environments by default' do
+      kls = mock_app_class do
+        configure do
+          config.foo = true
+        end
+      end
+
+      kls.config.foo.should == true
+    end
+  end
+end

data/spec/inheritance_spec.rb

@@ -7,6 +7,8 @@ describe NYNY::App do
         def parent_helper; :parent; end
       end
 
+      config.parent = true
+
       before do
         headers['parent before'] = 'true'
       end
@@ -84,5 +86,12 @@ describe NYNY::App do
       child.get('/nested').headers['parent before'].should_not be_nil
       child.get('/nested').headers['parent after'].should_not be_nil
     end
+
+    it 'works correctly for config' do
+      Child.config.parent.should == true
+      Child.config.parent = false
+      Child.config.parent.should == false
+      Parent.config.parent.should == true
+    end
   end
 end

data/spec/initialize_hooks_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe NYNY::App do
+  let (:target) { OpenStruct.new }
+
+  let (:app) do
+    mock_app_class do
+      before_initialize do |app|
+        app.is_a?(NYNY::App).should == true
+        Rack::Builder.any_instance.should_receive(:to_app)
+                     .and_return(Proc.new {})
+      end
+
+      after_initialize do |app, prc|
+        app.is_a?(NYNY::App).should == true
+        prc.respond_to?(:call).should == true
+        Rack::Builder.any_instance.should_not_receive(:to_app)
+      end
+    end
+  end
+
+  it 'runs the hooks in the correct order' do
+    app.new
+  end
+end

data/spec/nyny_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe NYNY do
   its 'root points to pwd' do
-    NYNY.root.should == Dir.pwd
+    NYNY.root.should == Pathname.pwd
   end
 
   it 'has the correct env' do
@@ -10,6 +10,6 @@ describe NYNY do
   end
 
   its 'root can join a path' do
-    NYNY.root.join("foo").should == File.join(Dir.pwd, "foo")
+    NYNY.root.join("foo").should == Pathname.pwd + "foo"
   end
 end

data/spec/request_scope_spec.rb

@@ -43,7 +43,7 @@ describe RequestScope do
           delete '/cookie_halt' do
             cookies.delete 'foo'
             halt 200, {}, 'blah'
-            'blah'
+            cookies[:foo] = 'bar'
           end
         end
       end

data/spec/runner_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Runner do
+describe 'App.run!' do
   let (:kls) { mock_app_class {} }
 
   before do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nyny
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.3.0
 platform: ruby
 authors:
 - Andrei Lisnic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-contrib
@@ -126,15 +126,16 @@ files:
 - Rakefile
 - lib/nyny.rb
 - lib/nyny/app.rb
-- lib/nyny/core-ext/runner.rb
-- lib/nyny/core-ext/templates.rb
 - lib/nyny/primitives.rb
 - lib/nyny/request_scope.rb
 - lib/nyny/router.rb
+- lib/nyny/templates.rb
 - lib/nyny/version.rb
 - nyny.gemspec
 - spec/app_spec.rb
+- spec/config_spec.rb
 - spec/inheritance_spec.rb
+- spec/initialize_hooks_spec.rb
 - spec/nyny_spec.rb
 - spec/primitives_spec.rb
 - spec/request_scope_spec.rb
@@ -171,7 +172,9 @@ specification_version: 4
 summary: New York, New York.
 test_files:
 - spec/app_spec.rb
+- spec/config_spec.rb
 - spec/inheritance_spec.rb
+- spec/initialize_hooks_spec.rb
 - spec/nyny_spec.rb
 - spec/primitives_spec.rb
 - spec/request_scope_spec.rb

data/lib/nyny/core-ext/runner.rb

@@ -1,11 +0,0 @@
-require 'better_errors'
-
-module NYNY
-  module Runner
-    def run! port=9292
-      use Rack::CommonLogger
-      use BetterErrors::Middleware unless NYNY.env.production?
-      Rack::Handler.pick(['thin', 'webrick']).run new, :Port => port
-    end
-  end
-end