rack-server-pages 0.0.4 → 0.0.5

data/CHANGES.md

@@ -1,6 +1,22 @@
 CHANGES
 =======
 
+### [0.0.5](https://github.com/migrs/rack-server-pages/tree/v0.0.5) / 2012-03-18
+
+  * [Changes](https://github.com/migrs/rack-server-pages/compare/v0.0.4...v0.0.5)
+
+  * Feature
+    - Handle exceptions
+      - Add `config.show_exceptions` option
+      - Invoke `on_error` filter when an exception is caught
+
+  * Enhancement
+    - NotFound with 404 file
+        - Rack::ServerPages::NotFound['404.html']
+
+  * Bugfix
+    - Duplicated filters
+
 ### [0.0.4](https://github.com/migrs/rack-server-pages/tree/v0.0.4) / 2012-01-15
 
   * [Changes](https://github.com/migrs/rack-server-pages/compare/v0.0.3...v0.0.4)

data/Gemfile

@@ -1,7 +1,7 @@
 source :rubygems
 
+#gemspec
 gem 'rack'
-#gemspec #didn't work in heroku
 
 group :development do
   gem 'rake'

data/README.md

@@ -8,6 +8,7 @@ There are no controllers or models, just only views like a jsp, asp and php!
 
 [![Build Status](https://secure.travis-ci.org/migrs/rack-server-pages.png)](http://travis-ci.org/migrs/rack-server-pages)
 [![Dependency Status](https://gemnasium.com/migrs/rack-server-pages.png?travis)](https://gemnasium.com/migrs/rack-server-pages)
+[![Still Maintained](http://stillmaintained.com/migrs/rack-server-pages.png)](http://stillmaintained.com/migrs/rack-server-pages)
 
 ## Features
 
@@ -18,6 +19,7 @@ There are no controllers or models, just only views like a jsp, asp and php!
 - Include a partial template
 - Layout template
 - Before/After filters
+- Handle exceptions
 - Include helpers
 - Integrate with any rack applications (Rails, Sinatra, etc...)
 - Extremely simple and easy to use!

data/config.ru

@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 require 'bundler/setup'
-require './lib/rack/server_pages'
+$:.unshift File.dirname(__FILE__) + '/lib'
+require 'rack-server-pages'
 
 # Tilt settings
 require 'tilt'
@@ -25,6 +26,12 @@ module SampleHelper
 end
 
 run Rack::ServerPages.new { |config|
+  #config.show_exceptions = false
+
+  config.on_error do
+    response.body = ['Error!']
+  end
+
   config.helpers SampleHelper
   config.helpers do
     def sample4

data/lib/rack-server-pages.rb

@@ -1 +1,2 @@
-require File.dirname(__FILE__) + "/rack/server_pages"
+require 'rack/server_pages'
+require 'rack-server-pages/version'

data/lib/rack-server-pages/version.rb

@@ -0,0 +1,5 @@
+module Rack
+  class ServerPages
+    VERSION = '0.0.5'
+  end
+end

data/lib/rack/server_pages.rb

@@ -8,7 +8,6 @@ require 'forwardable'
 
 module Rack
   class ServerPages
-    VERSION = '0.0.4'
 
     class << self
       def call(env)
@@ -25,8 +24,8 @@ module Rack
       yield @config if block_given?
       @app = app || @config.failure_app || NotFound
 
-      require ::File.dirname(__FILE__) + "/server_pages/sample_helper"
-      @config.helpers Rack::ServerPages::SampleHelper
+      require ::File.dirname(__FILE__) + "/server_pages/php_helper"
+      @config.helpers Rack::ServerPages::PHPHelper
 
       @config.filter.merge_from_helpers(@config.helpers)
       @binding = Binding.extended_class(@config.helpers)
@@ -72,21 +71,34 @@ module Rack
     def server_page(template)
       lambda do |env|
         @binding.new(env).tap do |scope|
-          catch(:halt) { @config.filter.invoke(scope) { build_response(template, scope) }}
+          catch(:halt) do
+            begin
+              @config.filter.invoke(scope, :before)
+              build_response(template, scope)
+            rescue
+              if @config.show_exceptions?
+                raise $!
+              else
+                scope.response.status = 500
+                scope.response['Content-Type'] ||= "text/html"
+                @config.filter.invoke(scope, :on_error)
+              end
+            ensure
+              @config.filter.invoke(scope, :after)
+            end
+          end
         end.response.finish
       end
     end
 
     class Filter
-      TYPES = [:before, :after]
-      DEFAULT = Hash[[TYPES, [[]]*TYPES.size].transpose]
-
+      TYPES = [:before, :after, :on_error]
       TYPES.each do |type|
         define_method(type) {|*fn, &block| add(type, *fn, &block) }
       end
 
-      def initialize(filters = DEFAULT)
-        @filters = filters
+      def initialize
+        @filters = Hash[[TYPES, Array.new(TYPES.size) {[]}].transpose]
       end
 
       def [] type
@@ -94,7 +106,7 @@ module Rack
       end
 
       def merge(other)
-        TYPES.each { |type| self[type].concat other[type] }
+        TYPES.each { |type| @filters[type].concat other[type] }
       end
 
       def merge_from_helpers(helpers)
@@ -102,16 +114,12 @@ module Rack
       end
 
       def add(type, *args, &block)
-        self[type] << block if block_given?
-        self[type].concat args unless args.empty?
+        @filters[type] << block if block_given?
+        @filters[type].concat args unless args.empty?
       end
 
-      def invoke(scope, type = nil)
-        if block_given?
-          invoke(scope, TYPES.first); yield scope; invoke(scope, TYPES.last)
-        else
-          self[type].each { |f| f.respond_to?(:bind) ? f.bind(scope).call : scope.instance_exec(&f) }
-        end
+      def invoke(scope, type)
+        @filters[type].each { |f| f.respond_to?(:bind) ? f.bind(scope).call : scope.instance_exec(&f) }
       end
 
       def self.extract_filters_from_helpers(helpers)
@@ -139,8 +147,10 @@ module Rack
         end
       end
 
-      hash_accessor :view_path, :effective_path, :cache_control, :default_charset, :failure_app
+      hash_accessor :view_path, :effective_path, :cache_control, :default_charset, :failure_app, :show_exceptions
+
       attr_reader :filter
+
       def_delegators :filter, *Filter::TYPES
 
       def initialize
@@ -151,6 +161,14 @@ module Rack
         @filter  = Filter.new
       end
 
+      def show_exceptions?
+        if self[:show_exceptions].nil?
+          ENV['RACK_ENV'].nil? or (ENV['RACK_ENV'] == 'development')
+        else
+          self[:show_exceptions]
+        end
+      end
+
       def view_paths
         (v = self[:view_path]).kind_of?(Enumerable) ? v : [v.to_s]
       end
@@ -259,8 +277,12 @@ module Rack
     end
 
     class NotFound
+      def self.[](file)
+        ::File.file?(file) ? proc { Rack::Response.new([::File.read(file)], 404).finish } : self
+      end
+
       def self.call(env)
-        Rack::Response.new(["Not Found: #{env['REQUEST_PATH']}"], 404).finish
+        Rack::Response.new(["Not Found: #{env['PATH_INFO']}"], 404).finish
       end
     end
 

data/lib/rack/server_pages/{sample_helper.rb → php_helper.rb}

@@ -1,4 +1,4 @@
-module Rack::ServerPages::SampleHelper
+module Rack::ServerPages::PHPHelper
   require 'erb'
   def rubyinfo
     ERB.new(<<-RUBYINFO).result(binding)

data/rack-server-pages.gemspec

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "rack-server-pages"
+require "rack-server-pages/version"
 
 Gem::Specification.new do |s|
   s.name        = "rack-server-pages"
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.description = %q{Rack middleware and appilcation for serving dynamic pages in very simple way.
                      There are no controllers and no models, just only views like a asp, jsp and php!}
 
-  s.rubyforge_project = "rack-server-pages"
+  #s.rubyforge_project = "rack-server-pages"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@
 require 'rack/test'
 require 'tapp'
 require 'simplecov'
-require File.dirname(__FILE__) + '/../lib/rack/server_pages'
+require 'rack-server-pages'
 SimpleCov.start
 
 RSpec.configure do |conf|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-server-pages
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-14 00:00:00.000000000Z
+date: 2012-04-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70348646709060 !ruby/object:Gem::Requirement
+  requirement: &70273387486420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70348646709060
+  version_requirements: *70273387486420
 description: ! "Rack middleware and appilcation for serving dynamic pages in very
   simple way.\n                     There are no controllers and no models, just only
   views like a asp, jsp and php!"
@@ -41,8 +41,9 @@ files:
 - Rakefile
 - config.ru
 - lib/rack-server-pages.rb
+- lib/rack-server-pages/version.rb
 - lib/rack/server_pages.rb
-- lib/rack/server_pages/sample_helper.rb
+- lib/rack/server_pages/php_helper.rb
 - public/CHANGES.erb
 - public/README.erb
 - public/_layout.html.erb
@@ -99,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: rack-server-pages
+rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
@@ -108,3 +109,4 @@ summary: Rack middleware and appilcation for serving dynamic pages in very simpl
 test_files:
 - spec/lib/rack/server_pages_spec.rb
 - spec/spec_helper.rb
+has_rdoc: