rack-server-pages 0.0.6 → 0.1.0

data/Rakefile

@@ -1,11 +1,12 @@
 require 'rubygems'
 require 'rake'
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
-task :default => :spec
+desc 'Run all specs in spec directory'
+RSpec::Core::RakeTask.new :spec
 
-desc "Run all specs in spec directory"
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = %w(-fs --color)
-end
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new
+
+task default: [:rubocop, :spec]

data/config.ru

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 require 'bundler/setup'
-$:.unshift File.dirname(__FILE__) + '/lib'
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/lib'
 require 'rack-server-pages'
 
 # Tilt settings
@@ -9,7 +9,7 @@ require 'slim'
 
 # .php as ERB template :)
 Rack::ServerPages::Template::ERBTemplate.extensions << 'php' # ERBTemplate
-#Rack::ServerPages::Template.use_tilt false
+# Rack::ServerPages::Template.use_tilt false
 Tilt.register Tilt::ERBTemplate, 'php' # TiltTemplate
 
 module SampleHelper
@@ -26,7 +26,7 @@ module SampleHelper
 end
 
 run Rack::ServerPages.new { |config|
-  #config.show_exceptions = false
+  # config.show_exceptions = false
 
   config.on_error do
     response.body = ['Error!']

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

@@ -1,5 +1,5 @@
 module Rack
   class ServerPages
-    VERSION = '0.0.6'
+    VERSION = '0.1.0'.freeze
   end
 end

data/lib/rack/server_pages.rb

@@ -8,13 +8,12 @@ require 'forwardable'
 
 module Rack
   class ServerPages
-
     class << self
       def call(env)
         new.call(env)
       end
 
-      def [](options={}, &block)
+      def [](options = {}, &block)
         new(nil, options, &block)
       end
     end
@@ -24,13 +23,13 @@ module Rack
       yield @config if block_given?
       @app = app || @config.failure_app || NotFound
 
-      require ::File.dirname(__FILE__) + "/server_pages/php_helper"
+      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)
 
-      @path_regex = %r!^#{@config.effective_path}/((?:[\w-]+/)+)?([A-z0-9][\w\.\-]*?\w)?(\.\w+)?$!
+      @path_regex = %r{^#{@config.effective_path}/((?:[\w-]+/)+)?([A-z0-9][\w\.\-\@]*?\w)?(\.\w+)?$}
     end
 
     def call(env)
@@ -39,18 +38,18 @@ module Rack
 
     def serving(env)
       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
+      if files.nil? || files.empty?
         @app
+      else
+        file = select_template_file(files)
+        (tpl = Template[file]) ? server_page(tpl) : File.new(file.split(env['PATH_INFO']).first)
       end.call(env)
     end
 
     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?('.')}
+          files.concat Dir["#{path}/#{m[1]}#{m[2] || 'index'}#{m[3]}{.*,}"].select { |s| s.include?('.') }
         end
       end
     end
@@ -80,7 +79,7 @@ module Rack
                 raise $!
               else
                 scope.response.status = 500
-                scope.response['Content-Type'] ||= "text/html"
+                scope.response['Content-Type'] ||= 'text/html'
                 @config.filter.invoke(scope, :on_error)
               end
             ensure
@@ -92,16 +91,16 @@ module Rack
     end
 
     class Filter
-      TYPES = [:before, :after, :on_error]
+      TYPES = [:before, :after, :on_error].freeze
       TYPES.each do |type|
-        define_method(type) {|*fn, &block| add(type, *fn, &block) }
+        define_method(type) { |*fn, &block| add(type, *fn, &block) }
       end
 
       def initialize
-        @filters = Hash[[TYPES, Array.new(TYPES.size) {[]}].transpose]
+        @filters = Hash[[TYPES, Array.new(TYPES.size) { [] }].transpose]
       end
 
-      def [] type
+      def [](type)
         @filters[type]
       end
 
@@ -163,14 +162,14 @@ module Rack
 
       def show_exceptions?
         if self[:show_exceptions].nil?
-          ENV['RACK_ENV'].nil? or (ENV['RACK_ENV'] == 'development')
+          ENV['RACK_ENV'].nil? || (ENV['RACK_ENV'] == 'development')
         else
           self[:show_exceptions]
         end
       end
 
       def view_paths
-        (v = self[:view_path]).kind_of?(Enumerable) ? v : [v.to_s]
+        (v = self[:view_path]).is_a?(Enumerable) ? v : [v.to_s]
       end
 
       def helpers(*args, &block)
@@ -181,9 +180,8 @@ module Rack
     end
 
     class Template
-
       class << self
-        def [] file
+        def [](file)
           engine.new(file).find_template
         end
 
@@ -192,10 +190,10 @@ module Rack
         end
 
         def tilt?
-          @use_tilt.nil? ? (@use_tilt ||= !!defined?(Tilt)) : @use_tilt and defined?(Tilt)
+          @use_tilt.nil? ? (@use_tilt ||= !!defined?(Tilt)) : @use_tilt && defined?(Tilt)
         end
 
-        def use_tilt bool = true
+        def use_tilt(bool = true)
           @use_tilt = !!bool
         end
       end
@@ -212,16 +210,16 @@ module Rack
       end
 
       def mime_type_with_charset(charset = 'utf-8')
-        if (m = mime_type) =~ %r!^(text/\w+|application/(?:javascript|(xhtml\+)?xml|json))$!
-         "#{m}; charset=#{charset}"
+        if (m = mime_type) =~ %r{^(text/\w+|application/(?:javascript|(xhtml\+)?xml|json))$}
+          "#{m}; charset=#{charset}"
         else
-         m
+          m
         end
       end
 
       def render_with_layout(scope, locals = {}, &block)
-        content = render(scope, locals = {}, &block)
-        if layout = scope.layout and layout_file = Dir["#{layout}{.*,}"].first
+        content = render(scope, locals, &block)
+        if (layout = scope.layout) && (layout_file = Dir["#{layout}{.*,}"].first)
           scope.layout(false)
           Template[layout_file].render_with_layout(scope) { content }
         else
@@ -231,7 +229,8 @@ module Rack
 
       class TiltTemplate < Template
         def find_template
-          (@tilt ||= Tilt[@file]) ? self : nil
+          @tilt ||= Tilt[@file]
+          @tilt ? self : nil
         end
 
         def render(scope, locals = {}, &block)
@@ -252,31 +251,20 @@ module Rack
         end
 
         def find_template
-          (@file =~ /\.(#{self.class.extensions.join('|')})$/) and ::File.exist?(@file) ? self : nil
+          (@file =~ /\.(#{self.class.extensions.join('|')})$/) && ::File.exist?(@file) ? self : nil
         end
 
-        def render(scope, locals = {}, &block)
+        def render(scope, _locals = {}, &block)
           ## TODO: support locals
           ERB.new(IO.read(@file)).result(scope._binding(&block))
         end
 
         def default_mime_type
-          "text/html"
+          'text/html'
         end
       end
     end
 
-    class StaticFile < File
-      def initialize(path, cache_control = nil)
-        @path = path
-        @cache_control = cache_control
-      end
-
-      def _call(env)
-        serving(env)
-      end
-    end
-
     class NotFound
       def self.[](file)
         ::File.file?(file) ? proc { Rack::Response.new([::File.read(file)], 404).finish } : self
@@ -288,13 +276,13 @@ module Rack
     end
 
     module CoreHelper
-      def redirect(target, status=302)
+      def redirect(target, status = 302)
         response.redirect(target, status)
         halt
       end
 
       def partial(file, locals = {}, &block)
-        if tpl_file = Dir["#{file}{.*,}"].first and template = Template[tpl_file]
+        if (tpl_file = Dir["#{file}{.*,}"].first) && (template = Template[tpl_file])
           template.render(self, locals, &block)
         else
           IO.read(file)
@@ -307,18 +295,18 @@ module Rack
       end
 
       def halt(*args)
-        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]]
+        if args[0].is_a? Integer
+          response.headers.merge! args[1] if (a1_is_h = args[1].is_a? Hash)
+          response.body = [a1_is_h ? args[2] : args[1]]
           response.status = args[0]
-        else
+        elsif args[0]
           response.body = [args[0]]
         end
         throw :halt
       end
 
-      def url(path = "")
-        env['SCRIPT_NAME'] + (path.to_s[0,1]!= '/' ? '/' : '') + path.to_s
+      def url(path = '')
+        env['SCRIPT_NAME'] + (path.to_s[0, 1] != '/' ? '/' : '') + path.to_s
       end
     end
 
@@ -347,7 +335,7 @@ module Rack
       def initialize(env)
         @request  = Rack::Request.new(env)
         @response = Rack::Response.new
-        @response['Content-Type'] = nil
+        # @response['Content-Type'] = nil
       end
 
       def _binding

data/lib/rack/server_pages/php_helper.rb

@@ -59,7 +59,7 @@ module Rack::ServerPages::PHPHelper
         <% if defined?(Tilt) %>
         <h2>Tilt</h2>
         <table border="0" cellpadding="3" width="600">
-          <% for key, value in Tilt.mappings do %>
+          <% for key, value in (Tilt.respond_to?(:mappings) ? Tilt.mappings : Tilt.lazy_map) do %>
             <tr><td class="e"><%= key %></td><td class="v"><%= value %></td></tr>
           <% end %>
         </table>

data/public/_layout.html.erb

@@ -4,6 +4,6 @@
     <link href="<%=url("/style.css")%>" media="screen" rel="stylesheet" type="text/css" />
   </head>
   <body>
-    <%=yield%>
+    <%= yield if block_given? %>
   </body>
 </html>

data/rack-server-pages.gemspec

@@ -1,23 +1,24 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "rack-server-pages/version"
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+require 'rack-server-pages/version'
 
 Gem::Specification.new do |s|
-  s.name        = "rack-server-pages"
+  s.name        = 'rack-server-pages'
   s.version     = Rack::ServerPages::VERSION
-  s.authors     = ["Masato Igarashi"]
-  s.email       = ["m@igrs.jp"]
-  s.homepage    = "http://github.com/migrs/rack-server-pages"
-  s.summary     = %q{Rack middleware and appilcation for serving dynamic pages in very simple way.}
-  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.authors     = ['Masato Igarashi', 'Daniel Doubrovkine']
+  s.email       = ['m@igrs.jp']
+  s.homepage    = 'http://github.com/migrs/rack-server-pages'
+  s.licenses    = ['MIT']
+  s.summary     = 'Rack middleware and appilcation for serving dynamic pages in very simple way.'
+  s.description = '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")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = ['lib']
 
   s.add_dependency 'rack'
 end

data/spec/integration_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+Capybara.app, = Rack::Builder.parse_file(File.expand_path('../../config.ru', __FILE__))
+Capybara.current_driver = :selenium
+
+describe 'Integration', js: true do
+  context 'root' do
+    before do
+      visit '/'
+    end
+    it 'loads homepage' do
+      expect(page.find('h1')).to have_content 'rack-server-pages'
+    end
+    it 'loads markdown README' do
+      click_link 'README'
+      expect(page.first('h1')).to have_content 'Rack Server Pages'
+    end
+    it 'rendered ERB' do
+      click_link 'sample.erb'
+      expect(page).to have_content 'PartAPartB'
+    end
+    it 'rendered PHP' do
+      click_link 'info.php'
+      expect(page).to have_content 'CGI/1.1'
+    end
+  end
+  it 'renders all tilt examples' do
+    visit '/examples/'
+    page.all('body ul li a').map { |a| a['href'] }.each do |href|
+      puts href
+      visit href
+    end
+  end
+end

data/spec/lib/rack/server_pages_spec.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 begin
-require 'ruby-debug'
-require 'tapp'
+  require 'ruby-debug'
+  require 'tapp'
 rescue LoadError
 end
 
@@ -37,50 +37,56 @@ describe 'Rack::ServerPages' do
       should_be_ok        '/betty.css'
       should_be_ok        '/betty.css.sass'
     end
+
+    context 'content-type: image/png' do
+      let(:content_type) { 'image/png' }
+      should_be_ok        '/rack_logo.png'
+      should_be_ok        '/rack_logo@2x.png'
+    end
   end
 
   describe 'Rack::ServerPages private methods' do
     describe '#evalute_path_info' do
-      subject { m = app.new.instance_variable_get(:@path_regex).match(path_info); m[1,3] if m }
+      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' }
-        it { should eq %w(aaa/ bbb .erb) }
+        it { is_expected.to eq %w(aaa/ bbb .erb) }
       end
 
       context '/aaa/bbb/ccc.erb' do
         let(:path_info) { '/aaa/bbb/ccc.erb' }
-        it { should eq %w(aaa/bbb/ ccc .erb) }
+        it { is_expected.to eq %w(aaa/bbb/ ccc .erb) }
       end
 
       context '/aaa/bbb/ccc.' do
         let(:path_info) { '/aaa/bbb/ccc.' }
-        it { should be_nil }
+        it { is_expected.to be_nil }
       end
 
       context '/aaa/bbb/ccc' do
         let(:path_info) { '/aaa/bbb/ccc' }
-        it { should eq ['aaa/bbb/', 'ccc', nil] }
+        it { is_expected.to eq ['aaa/bbb/', 'ccc', nil] }
       end
 
       context '/aaa-bbb/ccc' do
         let(:path_info) { '/aaa-bbb/ccc' }
-        it { should eq ['aaa-bbb/', 'ccc', nil] }
+        it { is_expected.to eq ['aaa-bbb/', 'ccc', nil] }
       end
 
       context '/aaa/bbb/' do
         let(:path_info) { '/aaa/bbb/' }
-        it { should eq ['aaa/bbb/', nil, nil] }
+        it { is_expected.to eq ['aaa/bbb/', nil, nil] }
       end
 
       context '/' do
         let(:path_info) { '/' }
-        it { should eq [nil, nil, nil] }
+        it { is_expected.to 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'] }
+        it { is_expected.to eq ['aaa/bbb/', 'AB-c.182-d.min', '.js'] }
       end
     end
   end