serve 1.5.0.pre3 → 1.5.0.pre4

data/Gemfile

@@ -1,12 +1,12 @@
 source "http://rubygems.org"
 
 gem 'rake',             '~> 0.9.0'
-gem 'rack',             '~> 1.3.0'
-gem 'rack-test',        '~> 0.6.0'
+gem 'rack',             '~> 1.2.1'
+gem 'rack-test',        '~> 0.5.7'
 gem 'tilt',             '~> 1.3.1'
 gem 'activesupport',    '~> 3.0.7'
-gem 'tzinfo',           '~> 0.3.27'
-gem 'i18n',             '~> 0.6.0'
+gem 'tzinfo',           '~> 0.3.23'
+gem 'i18n',             '~> 0.5.0'
 
 group :development do
   gem 'rspec',          '~> 2.6.0'

data/Gemfile.lock

@@ -14,7 +14,7 @@ GEM
     gemcutter (0.6.1)
     git (1.2.5)
     haml (3.1.1)
-    i18n (0.6.0)
+    i18n (0.5.0)
     jeweler (1.4.0)
       gemcutter (>= 0.1.0)
       git (>= 1.2.5)
@@ -25,8 +25,8 @@ GEM
       treetop (>= 1.4.2)
     mutter (0.5.3)
     polyglot (0.3.1)
-    rack (1.3.0)
-    rack-test (0.6.0)
+    rack (1.2.3)
+    rack-test (0.5.7)
       rack (>= 1.0)
     radius (0.6.1)
     rake (0.9.0)
@@ -60,11 +60,11 @@ DEPENDENCIES
   compass (~> 0.11.1)
   erubis (~> 2.7.0)
   haml (~> 3.1.1)
-  i18n (~> 0.6.0)
+  i18n (~> 0.5.0)
   jeweler (~> 1.4.0)
   less (~> 1.2.21)
-  rack (~> 1.3.0)
-  rack-test (~> 0.6.0)
+  rack (~> 1.2.1)
+  rack-test (~> 0.5.7)
   radius (~> 0.6.1)
   rake (~> 0.9.0)
   rdiscount (~> 1.6.8)
@@ -72,4 +72,4 @@ DEPENDENCIES
   sass (~> 3.1.1)
   slim (~> 0.9.4)
   tilt (~> 1.3.1)
-  tzinfo (~> 0.3.27)
+  tzinfo (~> 0.3.23)

data/README.rdoc

@@ -1,15 +1,13 @@
-= Serve - A Rapid Prototyping Framework for Web Applications
+= Serve - Easy ERB, Haml, and Sass
 
-link:../../downloads/jlong/serve/logo-hifi-1.png
+link:../../downloads/jlong/serve/logo-hifi-3.png
 
 Serve is a small Rack-based web server that makes it easy to serve HTML, ERB,
 Haml, or a variety of template languages from any directory.
 
-But Serve is much more than a simple web server.
-
 Serve is meant to be a lightweight version of the Views part of the Rails MVC.
 This makes Serve an ideal framework for prototyping Rails applications or
-creating simple websites. Serve also has full support for Rails-style partials
+creating simple websites. Serve has full support for Rails-style partials
 and layouts.
 
 If you use a "Design First" approach to Web application development, you may
@@ -283,7 +281,7 @@ project to HTML. To get started with the prerelease version:
 
 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.

data/Rakefile

@@ -4,6 +4,7 @@ require 'rake'
 load 'tasks/jeweler.rake'
 load 'tasks/rdoc.rake'
 load 'tasks/rspec.rake'
+load 'tasks/website.rake'
 load 'tasks/undefine.rake'
 
 task :default => :spec

data/VERSION

@@ -1 +1 @@
-1.5.0.pre3
+1.5.0.pre4

data/lib/serve/application.rb

@@ -136,6 +136,7 @@ module Serve
     end
     
     private
+      
       def normalize_args(args)
         args = args.join(' ')
         args.gsub!(%r{http://}, '')
@@ -182,11 +183,12 @@ module Serve
       def extract_create(args)
         if args.delete('create')
           framework = extract_javascript_framework(args, '-j', '--javascript')
-          args.reverse!
+          name = args.shift
+          raise InvalidArgumentsError unless name
           {
            :framework => framework,
-           :name      => (args.first ? args.pop : 'mockups'),
-           :directory => (args.first ? File.expand_path(args.pop) : Dir.pwd)
+           :name      => name,
+           :directory => (args.last ? File.expand_path(args.shift) : Dir.pwd)
           }
         end
       end
@@ -203,10 +205,9 @@ module Serve
       
       def extract_export(args)
         if args.delete('export')
-          input, output = (args.shift || '').split(':')
-          output = args.shift            if output.nil?
+          input, output = args.shift, args.shift
           input, output = Dir.pwd, input if output.nil?
-          output = 'output'              if output.nil?
+          output ||= 'html'
           {
             :input => input,
             :output => output

data/lib/serve/export.rb

@@ -77,12 +77,12 @@ module Serve
         
         # request the path
         browser = Rack::Test::Session.new(Rack::MockSession.new(Serve::RackAdapter.new(@root)))
-        browser.get filename
+        browser.get filename, {}, {'REQUEST_URI' => "http://example.org/#{extract_request_path(filename)}"}
         response = browser.last_response
         
         # body and extension
         contents = response.body
-        ext = extract_ext(response.content_type)
+        ext = extract_ext(filename)
         
         # write contents
         to_path   = "#{@output}/#{remove_ext(filename)}#{ext}"
@@ -138,22 +138,27 @@ module Serve
         end
       end
       
-      def extract_ext(content_type)
-        case content_type
-        when %r{text/html}
-          ".html"
-        when %r{text/css}
-          ".css"
-        when %r{text/javascript}
-          ".js"
+      def extract_ext(path)
+        if path =~ /(\.[A-Za-z]+)\.[A-Za-z]+$/
+          $1
+        elsif path =~ /(\.[A-Za-z]+)$/
+          $1
         else
-          raise content_type.inspect
+          ''
         end
       end
       
+      def extract_request_path(filename)
+        result = remove_ext(filename)
+        result = result.sub(/index$/, '')
+        result = result.sub(/\/$/, '')
+        result
+      end
+      
       def rackified?
-        @rackified ||= File.directory?("#{@input}/views") && File.directory?("#{@input}/public")
+        File.directory?("#{@input}/views") && File.directory?("#{@input}/public")
       end
+      
   end
   
   def self.export(options={})

data/lib/serve/templates/gitignore

@@ -14,6 +14,7 @@ tmtags
 *.swp
 
 ## PROJECT::GENERAL
+.sass-cache
 coverage
 rdoc
 pkg
@@ -21,4 +22,4 @@ pkg
 ## PROJECT::SPECIFIC
 *.gem
 .rvmrc
-.bundle
+.bundle

data/spec/application_spec.rb

@@ -5,7 +5,7 @@ describe Serve::Application do
   
   before :each do
     @app = Serve::Application.new
-    @defopts = {
+    @options = {
       :help         => false,
       :version      => false,
       :environment  => 'development',
@@ -21,83 +21,127 @@ describe Serve::Application do
   end
   
   describe "parsing" do
-    it "should parse no arguments" do
-      @app.parse([]).should == @defopts
+    
+    it "no arguments" do
+      parse('').should == @options
     end
     
-    it "should parse with only the port" do
-      @app.parse(["2000"])[:port].should == 2000
+    it "with only the port" do
+      parse('2000')[:port].should == 2000
     end
     
-    it "should parse with the port and address" do
-      @app.parse(["1.1.1.1", "2000"]).should ==
-        @defopts.update(:address => "1.1.1.1", :port=>2000)
-      @app.parse(["1.1.1.1:2000"]).should ==
-        @defopts.update(:address => "1.1.1.1", :port=>2000)
+    it "with the port and address" do
+      parse('1.1.1.1 2000').should == @options.update(:address => "1.1.1.1", :port=>2000)
+      parse('1.1.1.1:2000').should == @options.update(:address => "1.1.1.1", :port=>2000)
     end
     
-    it "should parse with the port, address, and protocol" do
-      @app.parse(["http://1.1.1.1:2000"]).should ==
-        @defopts.update(:address => "1.1.1.1", :port=>2000)
+    it "with the port, address, and protocol" do
+      parse('http://1.1.1.1:2000').should == @options.update(:address => "1.1.1.1", :port=>2000)
     end
     
-    it "should parse help" do
-      @app.parse([])[:help].should be_false
-      @app.parse(["-h"])[:help].should be_true
-      @app.parse(["--help"])[:help].should be_true
+    it "help" do
+      parse('')[:help].should be_false
+      parse('-h')[:help].should be_true
+      parse('--help')[:help].should be_true
     end
     
-    it "should parse version" do
-      @app.parse([])[:version].should be_false
-      @app.parse(["-v"])[:version].should be_true
-      @app.parse(["--version"])[:version].should be_true
+    it "version" do
+      parse('')[:version].should be_false
+      parse('-v')[:version].should be_true
+      parse('--version')[:version].should be_true
     end
     
-    it "should parse environment" do
-      @app.parse([])[:environment].should == "development"
-      @app.parse(["production"])[:environment].should == "production"
-      @app.parse(["test"])[:environment].should == "test"
-      @app.parse(["development"])[:environment].should == "development"
+    it "environment" do
+      parse('')[:environment].should == "development"
+      parse('production')[:environment].should == "production"
+      parse('test')[:environment].should == "test"
+      parse('development')[:environment].should == "development"
     end
     
-    it "should parse working directory" do
-      @app.parse([])[:root].should == Dir.pwd
+    it "working directory" do
+      parse('')[:root].should == Dir.pwd
       dir = File.dirname(__FILE__)
-      @app.parse([dir])[:root].should == File.expand_path(dir)
+      parse(dir)[:root].should == File.expand_path(dir)
     end
     
-    it "should parse ceate" do
-      create = ['create', 'newapp', '/Users/user']
-      @app.parse(create)[:create][:name].should == 'newapp'
-      @app.parse(create)[:create][:directory].should == '/Users/user'
-      @app.parse(create)[:create][:framework].should be_nil
+    describe "create" do
+      it "with standard arguments" do
+        params = parse('create newapp /Users/user')[:create]
+        params[:name].should == 'newapp'
+        params[:directory].should == '/Users/user'
+        params[:framework].should be_nil
+      end
+      
+      it "without parent directory" do
+        params = parse('create newapp')[:create]
+        params[:name].should == 'newapp'
+        params[:directory].should == Dir.pwd
+      end
+      
+      it "with no arguments" do
+        lambda { parse('create') }.should raise_error(Serve::Application::InvalidArgumentsError)
+      end
+      
+      it "with a javascript framework" do
+        params = parse('create newapp /Users/user -j jquery')[:create]
+        params[:name].should == 'newapp'
+        params[:directory].should == '/Users/user'
+        params[:framework].should == 'jquery'
+      end
     end
     
-    it "should parse convert" do
-      convert = ['convert', '/Users/user']
-      @app.parse(convert)[:convert][:directory].should == '/Users/user'
-      @app.parse(convert)[:convert][:framework].should be_nil
+    describe "convert" do
+      it "with standard arguments" do
+        params = parse('convert /Users/user')[:convert]
+        params[:directory].should == '/Users/user'
+        params[:framework].should be_nil
+      end
+      
+      it "with no arguments" do
+        params = parse('convert')[:convert]
+        params[:directory].should == Dir.pwd
+        params[:framework].should be_nil
+      end
+      
+      it "with a javascript framework" do
+        params = parse('convert /Users/user --javascript mootools')[:convert]
+        params[:directory].should == '/Users/user'
+        params[:framework].should == 'mootools'
+      end
     end
     
-    
-    it "should parse create with a javascript framework" do
-      create = ['create', 'newapp', '/Users/user', '-j', 'jquery']
-      @app.parse(create)[:create][:name].should == 'newapp'
-      @app.parse(create)[:create][:directory].should == '/Users/user'
-      @app.parse(create)[:create][:framework].should == 'jquery'
+    describe "export" do
+      it "with standard arguments" do
+        params = parse('export input output')[:export]
+        params[:input].should == 'input'
+        params[:output].should == 'output'
+      end
+      
+      it "export with just an output directory" do
+        params = parse('export output')[:export]
+        params[:input].should == Dir.pwd
+        params[:output].should == 'output'
+      end
+      
+      it "export with no arguments" do
+        params = parse('export')[:export]
+        params[:input].should == Dir.pwd
+        params[:output].should == 'html'
+      end
     end
     
-    it "should parse convert with a javascript framework" do
-      convert = ['convert', '/Users/user', '--javascript', 'mootools']
-      @app.parse(convert)[:convert][:directory].should == '/Users/user'
-      @app.parse(convert)[:convert][:framework].should == 'mootools'
+    it "with invalid arguments" do
+      lambda { parse('--invalid') }.should raise_error(Serve::Application::InvalidArgumentsError)
+      lambda { parse('invalid') }.should raise_error(Serve::Application::InvalidArgumentsError)
     end
     
+    private
     
-    it "should detect invalid arguments" do
-      lambda { @app.parse(["--invalid"]) }.should raise_error(Serve::Application::InvalidArgumentsError)
-      lambda { @app.parse(["invalid"]) }.should raise_error(Serve::Application::InvalidArgumentsError)
-    end
+      def parse(*args)
+        args = args.split(' ')
+        @app.parse(*args)
+      end
+
   end
   
   describe "running" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: serve
 version: !ruby/object:Gem::Version 
-  hash: -1876988218
+  hash: -1876988217
   prerelease: true
   segments: 
   - 1
   - 5
   - 0
-  - pre3
-  version: 1.5.0.pre3
+  - pre4
+  version: 1.5.0.pre4
 platform: ruby
 authors: 
 - John W. Long
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-22 00:00:00 -04:00
+date: 2011-07-05 00:00:00 -04:00
 default_executable: serve
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,12 +29,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 29
         segments: 
         - 1
-        - 3
-        - 0
-        version: 1.3.0
+        - 2
+        - 1
+        version: 1.2.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -45,12 +45,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 0
-        - 6
-        - 0
-        version: 0.6.0
+        - 5
+        - 7
+        version: 0.5.7
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -93,12 +93,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 37
+        hash: 61
         segments: 
         - 0
         - 3
-        - 27
-        version: 0.3.27
+        - 23
+        version: 0.3.23
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -109,12 +109,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 11
         segments: 
         - 0
-        - 6
+        - 5
         - 0
-        version: 0.6.0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -178,7 +178,6 @@ files:
 - lib/serve/templates/view_helpers.rb
 - lib/serve/version.rb
 - lib/serve/view_helpers.rb
-- rails/init.rb
 - spec/application_spec.rb
 - spec/fixtures/directory/index.html
 - spec/fixtures/hello.html
@@ -187,10 +186,17 @@ files:
 - spec/router_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://github.com/jlong/serve
-licenses: []
-
-post_install_message: 
+homepage: http://get-serve.com
+licenses: 
+- MIT
+post_install_message: |-
+  Thanks for installing Serve! If you plan to use Serve with another
+  template language (apart from ERB), don't forget to install it.
+  
+  If you want use Sass or Compass remember to install them, too!
+  
+  Serve doesn't install these dependencies by default, so that you can
+  make your own decisions about what you want to use.
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 

data/rails/init.rb

@@ -1,6 +0,0 @@
-require 'serve/rails'
-
-ActionController::Routing::RouteSet::Mapper.send :include, Serve::Rails::Routing::MapperExtensions
-ActionController::AbstractResponse.module_eval do
-  attr_accessor :cache_timeout
-end