nyny 2.2.1 → 3.0.0

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

@@ -1,19 +1,19 @@
-module NYNY
-  module Runner
-    def optimal_runner
-      return Rack::Handler::WEBrick if RUBY_PLATFORM == 'java'
-
-      begin
-        Rack::Handler::Thin
-      rescue LoadError
-        Rack::Handler::WEBrick
-      end
-    end
-
-    def run! port=9292
-      middlewares.unshift Rack::CommonLogger
-      middlewares.unshift Rack::ShowExceptions unless NYNY.env.production?
-      optimal_runner.run new, :Port => port
-    end
-  end
-end
+module NYNY
+  module Runner
+    def optimal_runner
+      return Rack::Handler::WEBrick if RUBY_PLATFORM == 'java'
+
+      begin
+        Rack::Handler::Thin
+      rescue LoadError
+        Rack::Handler::WEBrick
+      end
+    end
+
+    def run! port=9292
+      use Rack::CommonLogger
+      use Rack::ShowExceptions unless NYNY.env.production?
+      optimal_runner.run new, :Port => port
+    end
+  end
+end

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

@@ -1,19 +1,21 @@
-module NYNY
-  module Templates
-    module Helpers
-      def render template, locals = {}, options = {}, &block
-        template_cache.fetch(template) do
-          Tilt.new(template, options)
-        end.render(self, locals, &block)
-      end
-
-      def template_cache
-        Thread.current[:template_cache] ||= Tilt::Cache.new
-      end
-    end
-
-    def self.registered app
-      app.helpers Helpers
-    end
-  end
+require 'tilt'
+
+module NYNY
+  module Templates
+    module Helpers
+      def render template, locals = {}, options = {}, &block
+        template_cache.fetch(template) do
+          Tilt.new(template, options)
+        end.render(self, locals, &block)
+      end
+
+      def template_cache
+        Thread.current[:template_cache] ||= Tilt::Cache.new
+      end
+    end
+
+    def self.registered app
+      app.helpers Helpers
+    end
+  end
 end

data/lib/nyny/primitives.rb

@@ -1,25 +1,25 @@
-module NYNY
-  class Request < Rack::Request
-  end
-
-  class Response < Rack::Response
-    attr_reader :raw_body
-
-    def initialize body=[], status=200, header={}
-      @raw_body = body
-      super body.to_s, status, header
-    end
-
-    def body= value
-      @raw_body = value
-      @body = []
-      @length = 0
-
-      if value.respond_to? :to_str
-        write value.to_str
-      elsif value.respond_to?(:each)
-        value.each {|part| write part.to_s }
-      end
-    end
-  end
-end
+module NYNY
+  class Request < Rack::Request
+  end
+
+  class Response < Rack::Response
+    attr_reader :raw_body
+
+    def initialize body=[], status=200, header={}
+      @raw_body = body
+      super body.to_s, status, header
+    end
+
+    def body= value
+      @raw_body = value
+      @body = []
+      @length = 0
+
+      if value.respond_to? :to_str
+        write value.to_str
+      elsif value.respond_to?(:each)
+        value.each {|part| write part.to_s }
+      end
+    end
+  end
+end

data/lib/nyny/request_scope.rb

@@ -1,52 +1,43 @@
-module NYNY
-  class RequestScope
-    attr_reader :request, :response
-
-    def self.add_helper_module m
-      include m
-    end
-
-    def initialize request
-      @request = request
-      @response = Response.new '', 200, {'Content-Type' => 'text/html'}
-    end
-
-    def params
-      request.params
-    end
-
-    def headers hash={}
-      response.headers.merge! hash
-    end
-
-    def session
-      request.session
-    end
-
-    def cookies
-      request.cookies
-    end
-
-    def status code
-      response.status = code
-    end
-
-    def halt status, headers={}, body=''
-      response.status = status
-      response.headers.merge! headers
-      response.body = body
-      throw :halt, response
-    end
-
-    def redirect_to uri, status=302
-      halt status, {'Location' => uri}
-    end
-    alias_method :redirect, :redirect_to
-
-    def apply_to &handler
-      response.body = instance_eval(&handler)
-      cookies.each {|k,v| response.set_cookie k,v }
-      response
-    end
-  end
-end
+require 'forwardable'
+require 'rack/contrib/cookies'
+
+module NYNY
+  class RequestScope
+    extend Forwardable
+
+    attr_reader :request, :response
+    def_delegators :request, :params, :session
+    def_delegators :response, :headers
+
+    def initialize request
+      @request  = request
+      @response = Response.new '', 200, {'Content-Type' => 'text/html'}
+    end
+
+    def cookies
+      @cookies ||= Rack::Cookies::CookieJar.new(request.cookies)
+    end
+
+    def status code
+      response.status = code
+    end
+
+    def halt status, headers={}, body=''
+      response.status = status
+      response.headers.merge! headers
+      response.body = body
+      throw :halt, response.finish
+    end
+
+    def redirect_to uri, status=302
+      halt status, {'Location' => uri}
+    end
+    alias_method :redirect, :redirect_to
+
+    def apply_to &handler
+      response.body = instance_eval(&handler)
+      cookies.finish!(response)
+      response.finish
+    end
+  end
+end

data/lib/nyny/route.rb

@@ -1,40 +1,40 @@
-module NYNY
-  class Route
-    NAME_PATTERN = /:(\S+)/
-
-    attr_reader :pattern, :handler, :method
-    def initialize method, signature, &block
-      @pattern = pattern_for signature
-      @handler = Proc.new(&block)
-      @method = method.to_s.upcase
-    end
-
-    def pattern_for signature
-      return signature if signature.is_a? Regexp
-      build_regex(signature.start_with?('/') ? signature : "/#{signature}")
-    end
-
-    def build_regex signature
-      return %r(^#{signature}$) unless signature.include?(':')
-
-      groups = signature.split('/').map do |part|
-        next part if part.empty?
-        next part unless part.start_with? ':'
-        name = NAME_PATTERN.match(part)[1]
-        %Q{(?<#{name}>\\S+)}
-      end.select {|s| !s.empty? }.join('\/')
-
-      %r(^\/#{groups}$)
-    end
-
-    def match? env
-      return false unless method == env['REQUEST_METHOD']
-      not pattern.match(env['PATH_INFO']).nil?
-    end
-
-    def url_params env
-      data = pattern.match(env['PATH_INFO'])
-      Hash[data.names.map {|n| [n.to_sym, URI.unescape(data[n])]}]
-    end
-  end
-end
+module NYNY
+  class Route
+    NAME_PATTERN = /:(\S+)/
+
+    attr_reader :pattern, :handler, :method
+    def initialize method, signature, &block
+      @pattern = pattern_for signature
+      @handler = Proc.new(&block)
+      @method = method.to_s.upcase
+    end
+
+    def pattern_for signature
+      return signature if signature.is_a? Regexp
+      build_regex(signature.start_with?('/') ? signature : "/#{signature}")
+    end
+
+    def build_regex signature
+      return %r(^#{signature}$) unless signature.include?(':')
+
+      groups = signature.split('/').map do |part|
+        next part if part.empty?
+        next part unless part.start_with? ':'
+        name = NAME_PATTERN.match(part)[1]
+        %Q{(?<#{name}>\\S+)}
+      end.select {|s| !s.empty? }.join('\/')
+
+      %r(^\/#{groups}$)
+    end
+
+    def match? env
+      return false unless method == env['REQUEST_METHOD']
+      not pattern.match(env['PATH_INFO']).nil?
+    end
+
+    def url_params env
+      data = pattern.match(env['PATH_INFO'])
+      Hash[data.names.map {|n| [n.to_sym, URI.unescape(data[n])]}]
+    end
+  end
+end

data/lib/nyny/router.rb

@@ -1,43 +1,44 @@
-module NYNY
-  class Router
-    attr_reader :fallback, :routes, :before_hooks, :after_hooks
-    def initialize options
-      @fallback     = options[:fallback]
-      @routes       = options[:routes]
-      @before_hooks = options[:before_hooks]
-      @after_hooks  = options[:after_hooks]
-    end
-
-    def call env
-      env['PATH_INFO'] = '/' if env['PATH_INFO'].empty?
-      route = routes.find {|route| route.match? env }
-
-      if route
-        process route, env
-      else
-        fallback.call env
-      end
-    end
-
-    def process route, env
-      request = Request.new(env)
-      request.params.merge! route.url_params(env)
-      request.params.default_proc = proc {|h,k| h[k.to_s] || h[k.to_sym]}
-
-      eval_response RequestScope.new(request), route.handler
-    end
-
-    def eval_response scope, handler
-      response = catch (:halt) do
-        before_hooks.each {|h| scope.instance_eval &h }
-        scope.apply_to &handler
-      end
-
-      catch (:halt) do
-        after_hooks.each {|h| scope.instance_eval &h }
-      end
-
-      response
-    end
-  end
-end
+module NYNY
+  class Router
+    attr_reader :fallback, :routes, :before_hooks, :after_hooks, :scope_class
+    def initialize options
+      @fallback     = options[:fallback]
+      @routes       = options[:routes]
+      @before_hooks = options[:before_hooks]
+      @after_hooks  = options[:after_hooks]
+      @scope_class  = options[:scope_class]
+    end
+
+    def call env
+      env['PATH_INFO'] = '/' if env['PATH_INFO'].empty?
+      route = routes.find {|route| route.match? env }
+
+      if route
+        process route, env
+      else
+        fallback.call env
+      end
+    end
+
+    def process route, env
+      request = Request.new(env)
+      request.params.merge! route.url_params(env)
+      request.params.default_proc = proc {|h,k| h[k.to_s] || h[k.to_sym]}
+
+      eval_response scope_class.new(request), route.handler
+    end
+
+    def eval_response scope, handler
+      response = catch (:halt) do
+        before_hooks.each {|h| scope.instance_eval &h }
+        scope.apply_to &handler
+      end
+
+      catch (:halt) do
+        after_hooks.each {|h| scope.instance_eval &h }
+      end
+
+      response
+    end
+  end
+end

data/lib/nyny/version.rb

@@ -1,3 +1,3 @@
-module NYNY
-  VERSION = "2.2.1"
-end
+module NYNY
+  VERSION = "3.0.0"
+end

data/nyny.gemspec

@@ -1,26 +1,27 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'nyny/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "nyny"
-  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.summary       = %q{New York, New York.}
-  spec.homepage      = "http://alisnic.github.io/nyny/"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files`.split($/).select {|f| !f.start_with?('examples')}
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency             "rack"
-  spec.add_dependency             "tilt"
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-end
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'nyny/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "nyny"
+  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.summary       = %q{New York, New York.}
+  spec.homepage      = "http://alisnic.github.io/nyny/"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files`.split($/).select {|f| !f.start_with?('examples')}
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency             "rack",         "~> 1.5.2"
+  spec.add_dependency             "rack-contrib", "~> 1.1.0"
+  spec.add_dependency             "tilt",         "~> 1.4.1"
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+end