rack-server-pages 0.0.3 → 0.0.4

data/CHANGES.md

@@ -0,0 +1,60 @@
+CHANGES
+=======
+
+### [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)
+
+  * Enhancement
+    - Thread safety
+    - Add instance variables info in `rubyinfo`
+    - Better PATH\_INFO parsing
+
+  * Bufix
+    - Didn't work `Rack::ServerPages::Template.tilt=`
+    - and rename to `Rack::ServerPages::Template.use_tilt`
+
+  * Refactor
+    - Create Filter class
+    - Binding setup in own class method
+
+  * Documents
+    - Filters and Helpers
+    - Add [CHAMGES.md](https://github.com/migrs/rack-server-pages/blob/master/CHAMGES.md) (this document)
+
+
+### [0.0.3](https://github.com/migrs/rack-server-pages/tree/v0.0.3) / 2012-01-06
+
+  * [Changes](https://github.com/migrs/rack-server-pages/compare/v0.0.2...v0.0.3)
+
+  * Feature
+    - Before/After Filters
+    - Include Helpers
+
+  * Enhancement
+    - Binding class initialized at boot
+    - `partial` accepts block
+    - bundle update
+
+  * Refactor
+    - Move rubyinfo helper to other file
+
+
+### [0.0.2](https://github.com/migrs/rack-server-pages/tree/v0.0.2) / 2012-01-01
+
+  * [Changes](https://github.com/migrs/rack-server-pages/compare/v0.0.1...v0.0.2)
+
+  * Bugfix
+    - Didn't launch with ERBTemplate
+
+
+### [0.0.1](https://github.com/migrs/rack-server-pages/tree/v0.0.1) / 2012-01-01
+
+  * Initial Release
+
+  * Feature
+    - Serving dynamic pages (default: ERB)
+    - Serving static files
+    - Tilt support (optional)
+    - Include a partial template
+    - Layout template

data/README.md

@@ -141,6 +141,93 @@ with block
 - failure\_app
   - default: nil
 
+### Helpers
+
+with helpers block
+
+    use Rack::ServerPages do |config|
+      config.helpers do
+        def three_times(name)
+          "#{([name.to_s]*3).join(' ')}!!"
+        end
+      end
+    end
+
+in view file (erb)
+
+    <%= three_times('blah') %>
+
+with helper module
+
+    module SampleHelper
+      def three_times(name)
+        "#{([name.to_s]*3).join(' ')}!!"
+      end
+    end
+
+    use Rack::ServerPages do |config|
+      config.helpers SampleHelper
+    end
+
+with procs
+
+    help1 = proc do
+      def three_times(name)
+        "#{([name.to_s]*3).join(' ')}!!"
+      end
+    end
+
+    help2 = proc {...}
+
+    use Rack::ServerPages do |config|
+      config.helpers help1, help2
+    end
+
+### Filters
+
+with before/after block
+
+    use Rack::ServerPages do |config|
+      config.before do
+        @title = 'Hello!'
+      end
+
+      config.after do
+        logger.debug 'xxxx'
+      end
+    end
+
+with procs
+
+    proc1 = proc { @name = 'Jonny' }
+    proc2 = proc { @age = 24 }
+    proc3 = proc { logger.debug 'xxxx' }
+
+    use Rack::ServerPages do |config|
+      config.before proc1, proc2
+      config.after proc3
+    end
+
+if you define before/after method in helper module, it will be treated as filters
+
+    module SampleHelper
+      def before
+        @title = 'Hello!'
+      end
+
+      def three_times(name)
+        "#{([name.to_s]*3).join(' ')}!!"
+      end
+    end
+
+    use Rack::ServerPages do |config|
+      config.helpers SampleHelper
+    end
+
+in view file
+
+    <%= three_times(@title) %>
+
 ## Tilt support
 [Tilt](http://github.com/rtomayko/tilt) is generic interface to multiple Ruby template engines.  
 If you want to use Tilt, just `require 'tilt'` and require template engine libraries that you want.
@@ -403,4 +490,4 @@ And create `public/info.php` :)
   - Benchmark
 
 ## License
-[rack-server-pages](http://github.com/migrs/rack-server-pages) is Copyright (c) 2011 [Masato Igarashi](http://github.com/migrs)(@[migrs](http://twitter.com/migrs)) and distributed under the [MIT license](http://www.opensource.org/licenses/mit-license).
+[rack-server-pages](http://github.com/migrs/rack-server-pages) is Copyright (c) 2012 [Masato Igarashi](http://github.com/migrs)(@[migrs](http://twitter.com/migrs)) and distributed under the [MIT license](http://www.opensource.org/licenses/mit-license).

data/config.ru

@@ -8,6 +8,7 @@ require 'slim'
 
 # .php as ERB template :)
 Rack::ServerPages::Template::ERBTemplate.extensions << 'php' # ERBTemplate
+#Rack::ServerPages::Template.use_tilt false
 Tilt.register Tilt::ERBTemplate, 'php' # TiltTemplate
 
 module SampleHelper

data/lib/rack/server_pages.rb

@@ -1,98 +1,137 @@
 # -*- encoding: utf-8 -*-
 require 'rack'
-require 'time'
 require 'rack/utils'
 require 'rack/mime'
 require 'rack/logger'
+require 'time'
 require 'forwardable'
 
 module Rack
   class ServerPages
-    VERSION = '0.0.3'
+    VERSION = '0.0.4'
 
-    def self.call(env)
-      new.call(env)
-    end
+    class << self
+      def call(env)
+        new.call(env)
+      end
 
-    def self.[](options={}, &block)
-      new(nil, options, &block)
+      def [](options={}, &block)
+        new(nil, options, &block)
+      end
     end
 
     def initialize(app = nil, options = {})
       @config = Config.new(*options)
       yield @config if block_given?
       @app = app || @config.failure_app || NotFound
-      @binding = Class.new(Binding)
 
       require ::File.dirname(__FILE__) + "/server_pages/sample_helper"
       @config.helpers Rack::ServerPages::SampleHelper
 
-      @binding.setup(@config.helpers, @config.filters)
+      @config.filter.merge_from_helpers(@config.helpers)
+      @binding = Binding.extended_class(@config.helpers)
+
+      @path_regex = %r!^#{@config.effective_path}/((?:[\w-]+/)+)?([A-z0-9][\w\.\-]*?\w)?(\.\w+)?$!
     end
 
     def call(env)
-      serving(env)
+      dup.serving(env)
     end
 
-  private
-
     def serving(env)
-      files = find_template_files *evalute_path_info(env['PATH_INFO']) rescue nil
-
+      files = find_template_files(env['PATH_INFO'])
       unless files.nil? or files.empty?
         file = select_template_file(files)
+        (tpl = Template[file]) ? server_page(tpl) : StaticFile.new(file, @config.cache_control)
+      else
+        @app
+      end.call(env)
+    end
 
-        if template = Template[file]
-          render(template, @binding.new(env))
-        else
-          StaticFile.new(file, @config.cache_control).call(env)
+    def find_template_files(path_info)
+      if m = path_info.match(@path_regex)
+        @config.view_paths.inject([]) do |files, path|
+          files.concat Dir["#{path}/#{m[1]}#{m[2]||'index'}#{m[3]}{.*,}"].select{|s|s.include?('.')}
         end
-      else
-        @app.call(env)
       end
     end
 
-    def render(template, scope)
-      scope.response.tap do |res|
-        catch(:halt) do
-          invoke_filter(:before, scope)
-          res.write template.render_with_layout(scope)
-          res['Last-Modified'] ||= ::File.mtime(template.file).httpdate
-          res['Content-Type']  ||= template.mime_type_with_charset(@config.default_charset)
-          res['Cache-Control'] ||= @config.cache_control if @config.cache_control
-          invoke_filter(:after, scope)
-        end
-      end.finish
+    def select_template_file(files)
+      files.first
     end
 
-    def invoke_filter(type, scope)
-      @config.filters[type].each do |filter|
-        filter.respond_to?(:bind) ? filter.bind(scope).call : scope.instance_exec(&filter)
+    def build_response(template, scope)
+      scope.response.tap do |response|
+        response.write template.render_with_layout(scope)
+        response['Last-Modified'] ||= ::File.mtime(template.file).httpdate
+        response['Content-Type']  ||= template.mime_type_with_charset(@config.default_charset)
+        response['Cache-Control'] ||= @config.cache_control if @config.cache_control
       end
     end
 
-    def evalute_path_info(path)
-      if m = path.match(%r!^#{@config.effective_path}/((?:[\w-]+/)+)?([A-z0-9]\w*)?(\.\w+)?(\.\w+)?$!)
-        m[1,3] # dir, file, ext
+    def server_page(template)
+      lambda do |env|
+        @binding.new(env).tap do |scope|
+          catch(:halt) { @config.filter.invoke(scope) { build_response(template, scope) }}
+        end.response.finish
       end
     end
 
-    def find_template_files(dir, file, ext)
-      #path = @config.view_paths.map{|root|"#{root}/#{dir}#{file||'index'}#{ext}{.*,}"}.join("\0") # Ruby 1.8
-      #path = @config.view_paths.map{|root|"#{root}/#{dir}#{file||'index'}#{ext}{.*,}"} # Ruby 1.9
-      #Dir[path].select{|s|s.include?('.')}
-      [].tap do |files| # universal way
-        @config.view_paths.each do |root|
-          files.concat Dir["#{root}/#{dir}#{file||'index'}#{ext}{.*,}"].select{|s|s.include?('.')}
+    class Filter
+      TYPES = [:before, :after]
+      DEFAULT = Hash[[TYPES, [[]]*TYPES.size].transpose]
+
+      TYPES.each do |type|
+        define_method(type) {|*fn, &block| add(type, *fn, &block) }
+      end
+
+      def initialize(filters = DEFAULT)
+        @filters = filters
+      end
+
+      def [] type
+        @filters[type]
+      end
+
+      def merge(other)
+        TYPES.each { |type| self[type].concat other[type] }
+      end
+
+      def merge_from_helpers(helpers)
+        merge(self.class.extract_filters_from_helpers(helpers))
+      end
+
+      def add(type, *args, &block)
+        self[type] << block if block_given?
+        self[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
       end
-    end
 
-    def select_template_file(files)
-      files.first
+      def self.extract_filters_from_helpers(helpers)
+        new.tap do |filter|
+          helpers.each do |helper|
+            next unless helper.is_a? Module
+            TYPES.each do |type|
+              if helper.method_defined?(type)
+                filter[type] << helper.instance_method(type)
+                helper.class_eval { undef :"#{type}" }
+              end
+            end
+          end
+        end
+      end
     end
 
     class Config < Hash
+      extend Forwardable
+
       def self.hash_accessor(*names)
         names.each do |name|
           define_method("#{name}=") { |v| self[name] = v }
@@ -101,33 +140,21 @@ module Rack
       end
 
       hash_accessor :view_path, :effective_path, :cache_control, :default_charset, :failure_app
-      attr_reader :filters
+      attr_reader :filter
+      def_delegators :filter, *Filter::TYPES
 
       def initialize
         super
         self[:default_charset] ||= 'utf-8'
         self[:view_path] ||= %w(views public)
         @helpers = []
-        @filters = { :before => [], :after => [] }
+        @filter  = Filter.new
       end
 
       def view_paths
         (v = self[:view_path]).kind_of?(Enumerable) ? v : [v.to_s]
       end
 
-      def before(*fn, &block)
-        add_filter(:before, *fn, &block)
-      end
-
-      def after(*fn, &block)
-        add_filter(:after, *fn, &block)
-      end
-
-      def add_filter(type, *args, &block)
-        @filters[type] << block if block_given?
-        @filters[type].concat args unless args.empty?
-      end
-
       def helpers(*args, &block)
         @helpers << block if block_given?
         @helpers.concat args unless args.empty?
@@ -135,28 +162,24 @@ module Rack
       end
     end
 
-    class NotFound
-      def self.call(env)
-        Rack::Response.new(["Not Found: #{env['REQUEST_PATH']}"], 404).finish
-      end
-    end
-
     class Template
 
-      def self.[] file
-        engine.new(file).find_template
-      end
+      class << self
+        def [] file
+          engine.new(file).find_template
+        end
 
-      def self.engine
-        tilt? ? TiltTemplate : ERBTemplate
-      end
+        def engine
+          tilt? ? TiltTemplate : ERBTemplate
+        end
 
-      def self.tilt?
-        (@@use_tilt ||= defined?(Tilt)) and defined?(Tilt)
-      end
+        def tilt?
+          @use_tilt.nil? ? (@use_tilt ||= !!defined?(Tilt)) : @use_tilt and defined?(Tilt)
+        end
 
-      def self.tilt= bool
-        @@use_tilt = !!bool
+        def use_tilt bool = true
+          @use_tilt = !!bool
+        end
       end
 
       attr_reader :file
@@ -235,6 +258,12 @@ module Rack
       end
     end
 
+    class NotFound
+      def self.call(env)
+        Rack::Response.new(["Not Found: #{env['REQUEST_PATH']}"], 404).finish
+      end
+    end
+
     module CoreHelper
       def redirect(target, status=302)
         response.redirect(target, status)
@@ -255,18 +284,12 @@ module Rack
       end
 
       def halt(*args)
-        case args[0]
-        when String
-          response.body = [args[0]]
-        when Fixnum
+        if args[0].kind_of? Fixnum
+          response.headers.merge! args[1] if (a1_is_h = args[1].kind_of? Hash)
+          response.body = [(a1_is_h) ? args[2] : args[1]]
           response.status = args[0]
-          case args[1]
-          when Hash
-            response.headers.merge! args[1]
-            response.body = [args[2]]
-          else
-            response.body = [args[1]]
-          end
+        else
+          response.body = [args[0]]
         end
         throw :halt
       end
@@ -286,18 +309,14 @@ module Rack
       def_delegators :request, :env, :params, :session, :cookies, :logger
       def_delegators :response, :headers, :set_cookies, :delete_cookie
 
-      def self.setup(helpers, filters)
-        helpers.each do |helper|
-          if helper.kind_of? Proc
-            class_eval(&helper)
-          else
-            class_eval { include helper }
-            [:before, :after].each do |type|
-              if helper.method_defined?(type)
-                filters[type] << helper.instance_method(type)
-                class_eval { undef :"#{type}" }
-              end
-            end
+      class << self
+        def extended_class(helpers)
+          Class.new(self).tap { |k| k.setup(helpers) }
+        end
+
+        def setup(helpers)
+          helpers.each do |helper|
+            helper.is_a?(Module) ? class_eval { include helper } : class_eval(&helper)
           end
         end
       end

data/lib/rack/server_pages/sample_helper.rb

@@ -7,7 +7,6 @@ module Rack::ServerPages::SampleHelper
     body {background-color: #ffffff; color: #000000;}
     body, td, th, h1, h2 {font-family: sans-serif;}
     pre {margin: 0px; font-family: monospace;}
-    a:link {color: #000099; text-decoration: none; background-color: #ffffff;}
     a:hover {text-decoration: underline;}
     table {border-collapse: collapse;}
     .center {text-align: center;}
@@ -72,13 +71,14 @@ module Rack::ServerPages::SampleHelper
         <% end %>
         <h2>Binding</h2>
         <table border="0" cellpadding="3" width="600">
+          <tr><td class="e">variables</td><td class="v"><%= (instance_variables).join(', ') %></td></tr>
           <tr><td class="e">methods</td><td class="v"><%= (methods - Object.methods).join(', ') %></td></tr>
         </table>
         <h2>License</h2>
         <table border="0" cellpadding="3" width="600">
         <tr class="v"><td>
         <p>
-        MIT License
+        <a href="http://github.com/migrs/rack-server-pages">rack-server-pages</a> is Copyright (c) 2012 <a href="http://github.com/migrs">Masato Igarashi</a>(@<a href="http://twitter.com/migrs">migrs</a>) and distributed under the <a href="http://www.opensource.org/licenses/mit-license">MIT license</a>.
         </p>
         </td></tr>
         </table><br />

data/public/CHANGES.erb

@@ -0,0 +1,3 @@
+<% Rack::ServerPages::Template.tilt? ? layout('public/_layout.html') : headers['Content-Type'] = 'text/plain' %>
+<% @title = 'CHANGES.md' %>
+<%= partial 'CHANGES.md' %>

data/public/index.html

@@ -10,6 +10,7 @@
       <li><a href="./sample">sample.erb</a></li>
       <li><a href="./info">info.php</a></li>
       <li><a href="./README">README</a></li>
+      <li><a href="./CHANGES">CHANGES</a></li>
     </ul>
     <a href="http://github.com/migrs/rack-server-pages">github</a>
   </body>

data/spec/lib/rack/server_pages_spec.rb

@@ -41,7 +41,7 @@ describe 'Rack::ServerPages' do
 
   describe 'Rack::ServerPages private methods' do
     describe '#evalute_path_info' do
-      subject { app.new.__send__(:evalute_path_info, path_info) }
+      subject { m = app.new.instance_variable_get(:@path_regex).match(path_info); m[1,3] if m }
 
       context '/aaa/bbb.erb' do
         let(:path_info) { '/aaa/bbb.erb' }
@@ -77,6 +77,19 @@ describe 'Rack::ServerPages' do
         let(:path_info) { '/' }
         it { should eq [nil, nil, nil] }
       end
+
+      context path = '/aaa/bbb/AB-c.182-d.min.js' do
+        let(:path_info) { path }
+        it { should eq ['aaa/bbb/', 'AB-c.182-d.min', '.js'] }
+      end
+    end
+  end
+
+  describe 'Configuration' do
+    it 'test' do
+      mock_app do
+        run Rack::ServerPages
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-server-pages
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-06 00:00:00.000000000Z
+date: 2012-01-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70252865364220 !ruby/object:Gem::Requirement
+  requirement: &70348646709060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70252865364220
+  version_requirements: *70348646709060
 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!"
@@ -33,6 +33,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGES.md
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -42,6 +43,7 @@ files:
 - lib/rack-server-pages.rb
 - lib/rack/server_pages.rb
 - lib/rack/server_pages/sample_helper.rb
+- public/CHANGES.erb
 - public/README.erb
 - public/_layout.html.erb
 - public/index.html