serve 1.0.0 → 1.1.0

data/lib/serve/templates/config.ru

@@ -6,28 +6,32 @@ gem 'serve'
 require 'serve'
 require 'serve/rack'
 
-require 'sass/plugin/rack'
-require 'compass'
-
 # The project root directory
 root = ::File.dirname(__FILE__)
 
-# Compass
-Compass.add_project_configuration(root + '/compass.config')
-Compass.configure_sass_plugin!
+# Compile Sass on the fly with the Sass plugin. Some production environments
+# don't allow you to write to the file system on the fly (like Heroku).
+# Remove this conditional if you want to compile Sass in production.
+if ENV['RACK_ENV'] != 'production'
+  require 'sass/plugin/rack'
+  require 'compass'
+  
+  Compass.add_project_configuration(root + '/compass.config')
+  Compass.configure_sass_plugin!
+  
+  use Sass::Plugin::Rack  # Sass Middleware
+end
 
-# Rack Middleware
+# Other Rack Middleware
 use Rack::ShowStatus      # Nice looking 404s and other messages
 use Rack::ShowExceptions  # Nice looking errors
-use Sass::Plugin::Rack    # Compile Sass on the fly
 
 # Rack Application
 if ENV['SERVER_SOFTWARE'] =~ /passenger/i
   # Passendger only needs the adapter
   run Serve::RackAdapter.new(root + '/views')
 else
-  # We use Rack::Cascade and Rack::Directory on other platforms to handle static 
-  # assets
+  # Use Rack::Cascade and Rack::Directory on other platforms for static assets
   run Rack::Cascade.new([
     Serve::RackAdapter.new(root + '/views'),
     Rack::Directory.new(root + '/public')

data/lib/serve/view_helpers.rb

@@ -1,5 +1,5 @@
 module Serve #:nodoc:
-  # Many of the methods here have been extracted from Rails
+  # Many of the methods here have been extracted in some form from Rails
   
   module EscapeHelpers
     HTML_ESCAPE = { '&' => '&amp;',  '>' => '&gt;',   '<' => '&lt;', '"' => '&quot;' }
@@ -35,26 +35,8 @@ module Serve #:nodoc:
   end
   
   module ContentHelpers
-    def capture_erb(&block)
-      buffer = _erbout
-      pos = buffer.length
-      block.call
-      
-      # extract the block 
-      data = buffer[pos..-1]
-      
-      # replace it in the original with empty string
-      buffer[pos..-1] = ''
-      
-      data
-    end
-    
     def content_for(symbol, &block)
-      if @haml_buffer
-        set_content_for(symbol, capture_haml(&block))
-      else
-        set_content_for(symbol, capture_erb(&block))
-      end
+      set_content_for(symbol, capture(&block))
     end
     
     def content_for?(symbol)
@@ -72,6 +54,36 @@ module Serve #:nodoc:
     def set_content_for(symbol, value)
       instance_variable_set("@content_for_#{symbol}", value)
     end
+    
+    def capture_erb(&block)
+      buffer = ""
+      old_buffer, @_out_buf = @_out_buf, buffer
+      yield
+      buffer
+    ensure
+      @_out_buf = old_buffer
+    end
+    alias capture_rhtml capture_erb
+    alias capture_erubis capture_erb
+    
+    def capture(&block)
+      capture_method = "capture_#{script_extension}"
+      if respond_to? capture_method
+        send capture_method, &block
+      else
+        raise "Capture not supported for `#{script_extension}' template (#{engine_name})"
+      end
+    end
+    
+    private
+      
+      def engine_name
+        Tilt[script_extension].to_s
+      end
+      
+      def script_extension
+        parser.script_extension
+      end
   end
   
   module FlashHelpers
@@ -110,7 +122,7 @@ module Serve #:nodoc:
       template = options.delete(:template)
       case
       when partial
-        render_partial(partial)
+        render_partial(partial, options)
       when template
         render_template(template)
       else
@@ -118,8 +130,8 @@ module Serve #:nodoc:
       end
     end
     
-    def render_partial(partial)
-      render_template(partial, :partial => true)
+    def render_partial(partial, options={})
+      render_template(partial, options.merge(:partial => true))
     end
     
     def render_template(template, options={})
@@ -130,7 +142,7 @@ module Serve #:nodoc:
       end
       filename = template_filename(File.join(path, template), :partial => options.delete(:partial))
       if File.file?(filename)
-        parser.parse_file(filename)
+        parser.parse_file(filename, options[:locals])
       else
         raise "File does not exist #{filename.inspect}"
       end

data/spec/fixtures/directory/index.html

@@ -0,0 +1 @@
+<html><body>Directory Index</body></html>

data/spec/fixtures/hello.html

@@ -0,0 +1 @@
+<html><body>Hello World</body></html>

data/spec/fixtures/stylesheets/application.sass

@@ -0,0 +1,3 @@
+body
+  font-size: 90%
+  font-family: "Helvetica Neue", Helvitica, Arial, sans-serif;

data/spec/router_spec.rb

@@ -0,0 +1,60 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+require 'serve/router'
+
+describe Serve::Router do
+  
+  before do
+    @root = File.dirname(__FILE__) + '/fixtures'
+  end
+  
+  it 'should not resolve bad file names' do
+    resolve('404').should be_nil
+  end
+  
+  it 'should resolve file names' do
+    resolve('hello.html').should == 'hello.html'
+  end
+  
+  it 'should resolve filenames without extensions' do
+    resolve('hello').should == 'hello.html'
+    resolve('hello/').should == 'hello.html'
+  end
+  
+  it 'should resolve directory indexes' do
+    resolve('directory').should == 'directory/index.html'
+    resolve('directory/').should == 'directory/index.html'
+  end
+  
+  it 'should resolve references to css files to sass if css does not exist' do
+    resolve('stylesheets/application.css').should == 'stylesheets/application.sass'
+  end
+  
+  it 'should not resolve paths that attempt to climb up the directory tree' do
+    resolve('../CHANGELOG.rdoc').should be_nil
+    resolve('directory/../hello.html').should be_nil
+  end
+  
+  it 'should resolve files with various extensions' do
+    @root = File.dirname(__FILE__) + '/../tmp/'
+    random_extension = %w(a b c d e f g).shuffle[1..4].join
+    path = "test" 
+    full_path = path + "." + random_extension
+    FileUtils.touch(@root + full_path)
+    resolve(path).should == full_path
+    resolve(path + "/").should == full_path
+    FileUtils.rm(@root + full_path)
+  end
+  
+  it 'should resolve files without case sensitivity' do
+    resolve('HELLO').should == 'hello.html'
+  end
+  
+  it 'should resolve directories without case sensitivity' do
+    resolve('DIRECTORY').should == 'directory/index.html'
+  end
+  
+  def resolve(name)
+    Serve::Router.resolve(@root, name)
+  end
+  
+end

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'rubygems'
-gem 'activesupport'
 
 require 'serve'
 require 'rspec'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: serve
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - John W. Long
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-03 00:00:00 -04:00
+date: 2011-05-25 00:00:00 -04:00
 default_executable: serve
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,78 +28,94 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 27
         segments: 
         - 1
-        - 2
-        - 1
-        version: 1.2.1
+        - 3
+        - 0
+        version: 1.3.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: tilt
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 25
         segments: 
+        - 1
         - 3
-        - 0
         - 1
-        version: 3.0.1
+        version: 1.3.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: tzinfo
+  name: activesupport
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 61
+        hash: 9
         segments: 
-        - 0
         - 3
-        - 23
-        version: 0.3.23
+        - 0
+        - 7
+        version: 3.0.7
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: i18n
+  name: tzinfo
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 37
         segments: 
         - 0
-        - 4
-        - 1
-        version: 0.4.1
+        - 3
+        - 27
+        version: 0.3.27
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: i18n
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        - 0
+        version: 0.6.0
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 2
+        - 6
         - 0
-        - 1
-        version: 2.0.1
+        version: 2.6.0
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 description: Serve is a small Rack-based web server that makes it easy to serve ERB or HAML from any directory. Serve is an ideal tool for building HTML prototypes of Rails applications. Serve can also handle SASS, Textile, and Markdown if the appropriate gems are installed.
 email: me@johnwlong.com
 executables: 
@@ -121,25 +137,17 @@ files:
 - bin/serve
 - lib/serve.rb
 - lib/serve/application.rb
-- lib/serve/file_resolver.rb
 - lib/serve/handlers/dynamic_handler.rb
 - lib/serve/handlers/email_handler.rb
 - lib/serve/handlers/file_type_handler.rb
-- lib/serve/handlers/markdown_handler.rb
+- lib/serve/handlers/less_handler.rb
 - lib/serve/handlers/redirect_handler.rb
 - lib/serve/handlers/sass_handler.rb
-- lib/serve/handlers/static_handler.rb
-- lib/serve/handlers/textile_handler.rb
 - lib/serve/javascripts.rb
 - lib/serve/out.rb
 - lib/serve/project.rb
 - lib/serve/rack.rb
-- lib/serve/rails.rb
-- lib/serve/rails/configuration.rb
-- lib/serve/rails/mount.rb
-- lib/serve/rails/routing.rb
-- lib/serve/rails/serve_controller.rb
-- lib/serve/response_cache.rb
+- lib/serve/router.rb
 - lib/serve/templates/LICENSE
 - lib/serve/templates/README.markdown
 - lib/serve/templates/_layout.html.erb
@@ -154,8 +162,11 @@ files:
 - lib/serve/view_helpers.rb
 - rails/init.rb
 - spec/application_spec.rb
+- spec/fixtures/directory/index.html
+- spec/fixtures/hello.html
+- spec/fixtures/stylesheets/application.sass
 - spec/project_spec.rb
-- spec/response_cache_spec.rb
+- spec/router_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/jlong/serve
@@ -194,5 +205,5 @@ summary: Serve is a small web server that makes it easy to serve ERB or HAML fro
 test_files: 
 - spec/application_spec.rb
 - spec/project_spec.rb
-- spec/response_cache_spec.rb
+- spec/router_spec.rb
 - spec/spec_helper.rb

data/lib/serve/file_resolver.rb

@@ -1,48 +0,0 @@
-module Serve
-  mattr_accessor :file_resolver
-  
-  class FileResolver
-    cattr_accessor :alternate_extensions
-    self.alternate_extensions = %w(htm html txt text xml atom rss rdf haml erb rhtml html.erb html.haml textile markdown email redirect)
-    
-    def resolve(root, path)
-      return nil if path.nil?
-      path = File.join(path) # path may be array
-      return nil if path =~ /\.\./
-      path = path.sub(%r{/\Z}, '')
-      if path =~ /\.css\Z/ && !File.file?(File.join(root, path))  # if .css not found, try .scss, .sass:
-        alternates = %w{.scss .sass}.map { |ext| path.sub(/\.css\Z/, ext) }
-        sass_path = alternates.find do |p|
-          File.file?(File.join(root, p))
-        end
-      elsif File.directory?(File.join(root, path))
-        resolve(root, File.join(path, 'index'))
-      else
-        resolve_with_extension(root, path)
-      end
-    end
-    
-    def resolve_with_extension(root, path)
-      full_path = File.join(root, path)
-      if File.file?(full_path)
-        path
-      else
-        if extension = find_extension(alternate_extensions, full_path)
-          "#{path}.#{extension}"
-        end
-      end
-    end
-    
-    def find_extension(extensions_to_try, full_path)
-      extensions_to_try.find do |ext|
-        File.file?("#{full_path}.#{ext}")
-      end
-    end
-  end
-  
-  self.file_resolver = FileResolver.new
-  
-  def self.resolve_file(root, path)
-    file_resolver.resolve(root, path)
-  end
-end