serve 1.5.1 → 1.5.2

data/Gemfile

@@ -1,31 +1,31 @@
-source :rubygems
+source "https://rubygems.org"
 
-gem 'rack',              '~> 1.2'
-gem 'rack-test',         '~> 0.5'
-gem 'tilt',              '~> 1.3'
-gem 'activesupport',     '~> 3.0'
+gem 'rack',              '~> 1.5.2'
+gem 'rack-test',         '~> 0.6.2'
+gem 'tilt',              '~> 1.3.3'
+gem 'activesupport',     '~> 3.2.12'
 gem 'tzinfo'
 gem 'i18n'
 
 group :development do
-  gem 'rake',           '~> 0.9.0'
-  gem 'rdoc',           '~> 3.8.0'
-  gem 'rspec',          '~> 2.6.0'
+  gem 'rake',           '~> 10.0.3'
+  gem 'rdoc',           '~> 3.12.1'
+  gem 'rspec',          '~> 2.12.0'
   gem 'jeweler',        '~> 1.6.4'
-  gem 'haml',           '~> 3.1.1'
-  gem 'sass',           '~> 3.1.1'
-  gem 'compass',        '~> 0.11.1'
-  gem 'slim',           '~> 0.9.4'
-  gem 'rdiscount',      '~> 1.6.8'
-  gem 'RedCloth',       '~> 4.2.7'
+  gem 'haml',           '~> 3.1.7'
+  gem 'sass',           '~> 3.2.5'
+  gem 'compass',        '~> 0.12.2'
+  gem 'slim',           '~> 1.3.6'
+  gem 'rdiscount',      '~> 2.0.7'
+  gem 'RedCloth',       '~> 4.2.9'
   gem 'erubis',         '~> 2.7.0'
-  gem 'less',           '~> 1.2.21'
-  gem 'radius',         '~> 0.6.1'
+  gem 'less',           '~> 2.2.2'
+  gem 'radius',         '~> 0.7.3'
   gem 'coffee-script',  '~> 2.2.0'
 end
 
 group :website do
   gem 'serve',          :git => 'git://github.com/jlong/serve.git'
-  gem 'css_parser',     '~> 1.1.9'
-  gem 'maruku',         '~> 0.6.0'
+  gem 'css_parser',     '~> 1.2.6'
+  gem 'maruku',         '~> 0.6.1'
 end

data/Gemfile.lock

@@ -1,8 +1,8 @@
 GIT
   remote: git://github.com/jlong/serve.git
-  revision: 17f3e31c7ccb9ec75bc8d056d3147731e12655f6
+  revision: fa84a08fad9b5364f8b4d93fc5b69507a7bd0363
   specs:
-    serve (1.5.0.pre5)
+    serve (1.5.1)
       activesupport (~> 3.0)
       i18n
       rack (~> 1.2)
@@ -11,90 +11,93 @@ GIT
       tzinfo
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    RedCloth (4.2.7)
-    activesupport (3.0.9)
-    chunky_png (1.2.0)
+    RedCloth (4.2.9)
+    activesupport (3.2.12)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    addressable (2.3.3)
+    chunky_png (1.2.7)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.1.1)
-    compass (0.11.4)
+    coffee-script-source (1.4.0)
+    commonjs (0.2.6)
+    compass (0.12.2)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
-    css_parser (1.1.9)
-    diff-lcs (1.1.2)
+    css_parser (1.2.6)
+      addressable
+      rdoc
+    diff-lcs (1.1.3)
     erubis (2.7.0)
-    execjs (1.2.0)
+    execjs (1.4.0)
       multi_json (~> 1.0)
-    fssm (0.2.7)
+    fssm (0.2.10)
     git (1.2.5)
-    haml (3.1.2)
-    i18n (0.5.0)
+    haml (3.1.8)
+    i18n (0.6.1)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    less (1.2.21)
-      mutter (>= 0.4.2)
-      treetop (>= 1.4.2)
-    maruku (0.6.0)
+    json (1.7.7)
+    less (2.2.2)
+      commonjs (~> 0.2.6)
+    maruku (0.6.1)
       syntax (>= 1.0.0)
-    multi_json (1.0.3)
-    mutter (0.5.3)
-    polyglot (0.3.1)
-    rack (1.2.3)
-    rack-test (0.5.7)
+    multi_json (1.6.1)
+    rack (1.5.2)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    radius (0.6.1)
-    rake (0.9.2)
-    rdiscount (1.6.8)
-    rdoc (3.8)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    sass (3.1.4)
-    slim (0.9.4)
-      temple (~> 0.3.0)
-      tilt (~> 1.2)
+    radius (0.7.3)
+    rake (10.0.3)
+    rdiscount (2.0.7)
+    rdoc (3.12.1)
+      json (~> 1.4)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.2)
+    sass (3.2.6)
+    slim (1.3.6)
+      temple (~> 0.5.5)
+      tilt (~> 1.3.3)
     syntax (1.0.0)
-    temple (0.3.2)
-    tilt (1.3.2)
-    treetop (1.4.9)
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.29)
+    temple (0.5.5)
+    tilt (1.3.3)
+    tzinfo (0.3.35)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  RedCloth (~> 4.2.7)
-  activesupport (~> 3.0)
+  RedCloth (~> 4.2.9)
+  activesupport (~> 3.2.12)
   coffee-script (~> 2.2.0)
-  compass (~> 0.11.1)
-  css_parser (~> 1.1.9)
+  compass (~> 0.12.2)
+  css_parser (~> 1.2.6)
   erubis (~> 2.7.0)
-  haml (~> 3.1.1)
+  haml (~> 3.1.7)
   i18n
   jeweler (~> 1.6.4)
-  less (~> 1.2.21)
-  maruku (~> 0.6.0)
-  rack (~> 1.2)
-  rack-test (~> 0.5)
-  radius (~> 0.6.1)
-  rake (~> 0.9.0)
-  rdiscount (~> 1.6.8)
-  rdoc (~> 3.8.0)
-  rspec (~> 2.6.0)
-  sass (~> 3.1.1)
+  less (~> 2.2.2)
+  maruku (~> 0.6.1)
+  rack (~> 1.5.2)
+  rack-test (~> 0.6.2)
+  radius (~> 0.7.3)
+  rake (~> 10.0.3)
+  rdiscount (~> 2.0.7)
+  rdoc (~> 3.12.1)
+  rspec (~> 2.12.0)
+  sass (~> 3.2.5)
   serve!
-  slim (~> 0.9.4)
-  tilt (~> 1.3)
+  slim (~> 1.3.6)
+  tilt (~> 1.3.3)
   tzinfo

data/README.rdoc

@@ -61,7 +61,7 @@ following on the command line:
 
   serve create project   # create a new project in the project directory
 
-Lear more: http://get-serve.com/documentation/create
+Learn more: http://get-serve.com/documentation/create
 
 
 == Layouts & Partials
@@ -108,6 +108,17 @@ Serve also provides a number of stock helpers methods that are very similar to t
 Learn more: http://get-serve.com/documentation/view-helpers
 
 
+== Exporting
+
+To export your project, use the new "export" command:
+
+  serve export project output
+
+Where "project" is the path to the project and "output" is the path to the
+directory where you would like your HTML and CSS generated.
+
+Learn more: http://get-serve.com/documentation/export
+
 == "Design First" Prototyping
 
 If you use a "Design First" methodology, you may find Serve especially useful
@@ -124,6 +135,7 @@ also be estimated with a high degree of accuracy.
 == Website & Documentation
 
 Detailed documentation is available on the Serve website: http://get-serve.com
+Build status: {<img src="https://secure.travis-ci.org/jlong/serve.png?branch=master" />}[http://travis-ci.org/jlong/serve]
 
 
 == Mailing List
@@ -137,4 +149,4 @@ http://groups.google.com/group/serve-users
 
 Serve is released under a MIT-style license and is copyright (c) 2007-2011
 John W. Long and Adam I. Williams. Portions have been contributed by Robert
-Evans and others. A copy of the license can be found in the LICENSE file.
+Evans and others. A copy of the license can be found in the LICENSE file.

data/VERSION

@@ -1 +1 @@
-1.5.1
+1.5.2

data/lib/serve.rb

@@ -9,10 +9,12 @@ end
 
 require 'serve/version'
 require 'serve/router'
+require 'serve/pipeline'
 require 'serve/handlers/file_type_handler'
 require 'serve/handlers/dynamic_handler'
 require 'serve/handlers/sass_handler'
 require 'serve/handlers/less_handler'
 require 'serve/handlers/email_handler'
 require 'serve/handlers/redirect_handler'
+require 'serve/handlers/coffee_handler'
 require 'serve/rack'

data/lib/serve/application.rb

@@ -160,7 +160,7 @@ module Serve
       end
       
       def extract_port(args)
-        (args.delete(args.find {|a| /^\d\d\d*$/.match(a) }) || ((rails_app? or rack_app?) ? 3000 : 4000)).to_i
+        (args.delete(args.find {|a| /^\d\d\d*$/.match(a) }) || ENV['PORT'] || ((rails_app? or rack_app?) ? 3000 : 4000)).to_i
       end
       
       def extract_address(args)

data/lib/serve/bootstrap/Gemfile

@@ -1,7 +1,10 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'serve', '#{Serve.version}'
 
+# TryStatic
+gem 'rack-contrib'
+
 # Use edge instead:
 # gem 'serve', :git => 'git://github.com/jlong/serve.git'
 

data/lib/serve/bootstrap/README.md

@@ -66,14 +66,9 @@ information about using Serve and Passenger see:
 Exporting
 ---------
 
-To export this project to pure HTML and CSS you will need the prerelease
-version of Serve. To get started with the prerelease version:
-
-    gem install --pre serve
-
 To export your project, use the new "export" command:
 
-    serve export <project>:<output>
+    serve export project output
 
 Where "project" is the path to the project and "output" is the path to the
 directory where you would like your HTML and CSS generated.
@@ -84,4 +79,4 @@ Learning More
 
 You can learn more about Serve on the GitHub project page:
 
-<http://github.com/jlong/serve>
+<http://github.com/jlong/serve>

data/lib/serve/bootstrap/config.ru

@@ -36,12 +36,16 @@ use Rack::ShowExceptions  # Nice looking errors
 
 # Rack Application
 if ENV['SERVER_SOFTWARE'] =~ /passenger/i
-  # Passendger only needs the adapter
+  # Passenger only needs the adapter
   run Serve::RackAdapter.new(root + '/views')
 else
+  # Use Rack::TryStatic to attempt to load files from public first
+  require 'rack/contrib/try_static'
+  use Rack::TryStatic, :root => (root + '/public'), :urls => %w(/), :try => %w(.html index.html /index.html)
+
   # 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')
   ])
-end
+end

data/lib/serve/handlers/coffee_handler.rb

@@ -0,0 +1,18 @@
+module Serve #:nodoc:  
+  class CoffeeHandler < FileTypeHandler #:nodoc:
+    extension 'coffee'
+    
+    def parse(input, context)
+      engine = Tilt::CoffeeScriptTemplate.new { input }
+      engine.render
+    end
+    
+    def content_type
+      'text/javascript'
+    end
+
+    def layout?
+      false
+    end
+  end
+end

data/lib/serve/handlers/dynamic_handler.rb

@@ -1,4 +1,3 @@
-require 'serve/view_helpers'
 require 'tilt'
 
 module Serve #:nodoc:
@@ -13,64 +12,25 @@ module Serve #:nodoc:
       self.class.extensions
     end
     
-    extension *extensions
+    extension(*extensions)
     
-    def process(request, response)
-      response.headers['content-type'] = content_type
-      response.body = parse(request, response)
-    end
-    
-    def parse(request, response)
-      context = Context.new(@root_path, request, response)
-      install_view_helpers(context)
-      parser = Parser.new(context)
-      context.content << parser.parse_file(@script_filename)
-      layout = find_layout_for(@script_filename)
-      if layout
-        parser.parse_file(layout)
-      else
-        context.content
-      end
-    end
-    
-    def find_layout_for(filename)
-      root = @root_path
-      path = filename[root.size..-1]
-      layout = nil
-      until layout or path == "/"
-        path = File.dirname(path)
-        possible_layouts = extensions.map do |ext|
-          l = "_layout.#{ext}"
-          possible_layout = File.join(root, path, l)
-          File.file?(possible_layout) ? possible_layout : false
-        end
-        layout = possible_layouts.detect { |o| o }
-      end
-      layout
-    end
-    
-    def install_view_helpers(context)
-      view_helpers_file_path = @root_path + '/view_helpers.rb'
-      if File.file?(view_helpers_file_path)
-        context.singleton_class.module_eval(File.read(view_helpers_file_path) + "\ninclude ViewHelpers", view_helpers_file_path)
-      end
+    def parse(input, context)
+      parser = Parser.new(context, @template_path)
+      parser.parse(input, extension)
     end
     
     class Parser #:nodoc:
-      attr_accessor :context, :script_filename, :script_extension, :engine
+      attr_accessor :context, :script_extension, :engine, :template_path
       
-      def initialize(context)
+      def initialize(context, template_path)
         @context = context
         @context.parser = self
+        @template_path = template_path
       end
       
-      def parse_file(filename, locals={})
-        old_script_filename, old_script_extension, old_engine = @script_filename, @script_extension, @engine
-        
-        @script_filename = filename
-        
-        ext = File.extname(filename).sub(/^\.html\.|^\./, '').downcase
-        
+      def parse(input, ext, locals={})
+        old_script_extension, old_engine = @script_extension, @engine
+
         if ext == 'slim' # Ugly, but works
           if Thread.list.size > 1
             warn "WARN: serve autoloading 'slim' in a non thread-safe way; " +
@@ -81,7 +41,7 @@ module Serve #:nodoc:
         
         @script_extension = ext
         
-        @engine = Tilt[ext].new(filename, nil, :outvar => '@_out_buf')
+        @engine = Tilt[ext].new(nil, nil, {:outvar => '@_out_buf'}.merge(FileTypeHandler.options_for(ext))){input}
         
         raise "#{ext} extension not supported" if @engine.nil?
         
@@ -89,23 +49,9 @@ module Serve #:nodoc:
           context.get_content_for(*args)
         end
       ensure
-        @script_filename = old_script_filename
         @script_extension = old_script_extension
         @engine = old_engine
       end
-      
-    end
-    
-    class Context #:nodoc:
-      attr_accessor :content, :parser
-      attr_reader :request, :response
-      
-      def initialize(root_path, request, response)
-        @root_path, @request, @response = root_path, request, response
-        @content = ''
-      end
-      
-      include Serve::ViewHelpers
     end
   end
 end