middleman 2.0.0.beta3 → 2.0.0.beta4

data/.gitignore

@@ -8,3 +8,5 @@ pkg
 Gemfile.lock
 docs
 .rvmrc
+fixtures/test-app/build
+.*.swp

data/features/helpers_auto_javascript_include_tag.feature

@@ -0,0 +1,27 @@
+Feature: Built-in auto_javascript_include_tag view helper
+  In order to simplify including javascript files
+
+  Scenario: Viewing the root path
+    Given the Server is running
+    When I go to "/auto-js.html"
+    Then I should see "javascripts/auto-js.js"
+
+  Scenario: Viewing a tier-1 path
+    Given the Server is running
+    When I go to "/auto-js/auto-js.html"
+    Then I should see "javascripts/auto-js/auto-js.js"
+
+  Scenario: Viewing the index file of a tier-1 path, without filename
+    Given the Server is running
+    When I go to "/auto-js"
+    Then I should see "javascripts/auto-js/index.js"
+
+  Scenario: Viewing the index file of a tier-1 path, without filename, with a trailing slash
+    Given the Server is running
+    When I go to "/auto-js/"
+    Then I should see "javascripts/auto-js/index.js"
+
+  Scenario: Viewing a tier-2 path
+    Given the Server is running
+    When I go to "/auto-js/sub/auto-js.html"
+    Then I should see "javascripts/auto-js/sub/auto-js.js"

data/features/helpers_auto_stylesheet_link_tag.feature

@@ -8,10 +8,20 @@ Feature: Built-in auto_stylesheet_link_tag view helper
 
   Scenario: Viewing a tier-1 path
     Given the Server is running
-    When I go to "/sub1/auto-css.html"
-    Then I should see "stylesheets/sub1/auto-css.css"
+    When I go to "/auto-css/auto-css.html"
+    Then I should see "stylesheets/auto-css/auto-css.css"
+
+  Scenario: Viewing the index file of a tier-1 path, without filename
+    Given the Server is running
+    When I go to "/auto-css"
+    Then I should see "stylesheets/auto-css/index.css"
+
+  Scenario: Viewing the index file of a tier-1 path, without filename, with a trailing slash
+    Given the Server is running
+    When I go to "/auto-css/"
+    Then I should see "stylesheets/auto-css/index.css"
 
   Scenario: Viewing a tier-2 path
     Given the Server is running
-    When I go to "/sub1/sub2/auto-css.html"
-    Then I should see "stylesheets/sub1/sub2/auto-css.css"
+    When I go to "/auto-css/sub/auto-css.html"
+    Then I should see "stylesheets/auto-css/sub/auto-css.css"

data/fixtures/test-app/config.rb

@@ -17,14 +17,27 @@ get "/sub1/sub2/page-class.html" do
   haml :"page-classes.html", :layout => false
 end
 
-get "/auto-css.html" do
-  haml :"auto-css.html", :layout => false
+%w{
+	/auto-css.html
+	/auto-css
+	/auto-css/
+	/auto-css/auto-css.html
+	/auto-css/sub/auto-css.html
+}.each do |path|
+	get path do
+		haml :"auto-css.html", :layout => false
+	end
 end
 
-get "/sub1/auto-css.html" do
-  haml :"auto-css.html", :layout => false
+%w{
+	/auto-js.html
+	/auto-js
+	/auto-js/
+	/auto-js/auto-js.html
+	/auto-js/sub/auto-js.html
+}.each do |path|
+	get path do
+		haml :"auto-js.html", :layout => false
+	end
 end
 
-get "/sub1/sub2/auto-css.html" do
-  haml :"auto-css.html", :layout => false
-end

data/fixtures/test-app/source/auto-js.html.haml

@@ -0,0 +1 @@
+= auto_javascript_include_tag

data/fixtures/test-app/source/javascripts/auto-js.js

@@ -0,0 +1 @@
+

data/fixtures/test-app/source/javascripts/auto-js/auto-js.js

@@ -0,0 +1 @@
+

data/fixtures/test-app/source/javascripts/auto-js/index.js

@@ -0,0 +1 @@
+

data/fixtures/test-app/source/javascripts/auto-js/sub/auto-js.js

@@ -0,0 +1 @@
+

data/lib/middleman.rb

@@ -19,7 +19,7 @@
 # * Sass                       (.sass)
 # * Scss                       (.scss)
 # * Haml                       (.haml)
-# * Sass                       (.sass)
+# * Slim                       (.slim)
 # * Less CSS                   (.less)
 # * Builder                    (.builder)
 # * Liquid                     (.liquid)

data/lib/middleman/features/default_helpers.rb

@@ -8,22 +8,36 @@ module Middleman::Features::DefaultHelpers
   
   module Helpers
     def auto_stylesheet_link_tag(separator="/")
+      auto_tag(:css, separator) do |path|
+        stylesheet_link_tag path
+      end
+    end
+    
+    def auto_javascript_include_tag(separator="/")
+      auto_tag(:js, separator) do |path|
+        javascript_include_tag path
+      end
+    end
+
+    def auto_tag(asset_ext, separator="/", asset_dir=nil)
+      if asset_dir.nil?
+        asset_dir = case asset_ext
+          when :js  then self.class.js_dir
+          when :css then self.class.css_dir
+        end
+      end
       path = request.path_info.dup
-      path << self.class.index_file if path.match(%r{/$})
+      # If the basename of the request as no extension, assume we are serving a
+      # directory and join index_file to the path.
+      path = File.join(path, self.class.index_file) if File.extname(path).empty?
       path = path.gsub(%r{^/}, '')
-      path = path.gsub(File.extname(path), '')
+      path = path.gsub(File.extname(path), ".#{asset_ext}")
       path = path.gsub("/", separator)
 
-      css_file = File.join(self.class.views, self.class.css_dir, "#{path}.css")
-      sass_file = File.join(self.class.views, self.class.css_dir, "#{path}.css.sass")
-      scss_file = File.join(self.class.views, self.class.css_dir, "#{path}.css.scss")
-      less_file = File.join(self.class.views, self.class.css_dir, "#{path}.css.less")
-    
-      if File.exists?(css_file) || File.exists?(sass_file) || File.exists?(scss_file) || File.exists?(less_file)
-        stylesheet_link_tag "#{path}.css"
-      end
+      view = File.join(self.class.views, asset_dir, path)
+      yield path if File.exists?(view) or Dir["#{view}.*"].any?
     end
-    
+
     def page_classes
       path = request.path_info.dup
       path << settings.index_file if path.match(%r{/$})
@@ -58,4 +72,4 @@ module Middleman::Features::DefaultHelpers
        "#{result_path}#{timestamp}"
      end
   end
-end
+end

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "2.0.0.beta3"
+  VERSION = "2.0.0.beta4"
 end

data/middleman.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("coffee-script", ["~> 2.2.0"])
   s.add_runtime_dependency("httparty", ["~> 0.7.0"])
   s.add_development_dependency("cucumber", ["~> 0.10.0"])
+  s.add_development_dependency("rake", ["0.8.7"])
   s.add_development_dependency("rspec", [">= 0"])
   s.add_development_dependency("rocco", [">= 0"]) unless defined?(JRUBY_VERSION)
 end

metadata

@@ -2,7 +2,7 @@
 name: middleman
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 2.0.0.beta3
+  version: 2.0.0.beta4
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -10,7 +10,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-14 00:00:00 Z
+date: 2011-06-24 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -211,18 +212,18 @@ dependencies:
   type: :development
   version_requirements: *id018
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rake
   prerelease: false
   requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.8.7
   type: :development
   version_requirements: *id019
 - !ruby/object:Gem::Dependency 
-  name: rocco
+  name: rspec
   prerelease: false
   requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
@@ -232,6 +233,17 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id020
+- !ruby/object:Gem::Dependency 
+  name: rocco
+  prerelease: false
+  requirement: &id021 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id021
 description: 
 email: 
 - tdreyno@gmail.com
@@ -259,6 +271,7 @@ files:
 - features/builder.feature
 - features/coffee-script.feature
 - features/generator.feature
+- features/helpers_auto_javascript_include_tag.feature
 - features/helpers_auto_stylesheet_link_tag.feature
 - features/helpers_page_classes.feature
 - features/minify_css.feature
@@ -283,6 +296,7 @@ files:
 - fixtures/test-app/source/asset_host.html.haml
 - fixtures/test-app/source/auto-css.html.haml
 - fixtures/test-app/source/auto-image-sizes.html.haml
+- fixtures/test-app/source/auto-js.html.haml
 - fixtures/test-app/source/cache-buster.html.haml
 - fixtures/test-app/source/custom-layout-dir/index.html.haml
 - fixtures/test-app/source/custom-layout.html.haml
@@ -292,6 +306,10 @@ files:
 - fixtures/test-app/source/inline-coffeescript.html.haml
 - fixtures/test-app/source/inline-css.html.haml
 - fixtures/test-app/source/inline-js.html.haml
+- fixtures/test-app/source/javascripts/auto-js.js
+- fixtures/test-app/source/javascripts/auto-js/auto-js.js
+- fixtures/test-app/source/javascripts/auto-js/index.js
+- fixtures/test-app/source/javascripts/auto-js/sub/auto-js.js
 - fixtures/test-app/source/javascripts/coffee_test.js.coffee
 - fixtures/test-app/source/javascripts/jquery.plugin.with.dots.js
 - fixtures/test-app/source/layout.haml
@@ -303,12 +321,13 @@ files:
 - fixtures/test-app/source/static.html
 - fixtures/test-app/source/stylesheets/asset_host.css.sass
 - fixtures/test-app/source/stylesheets/auto-css.css
+- fixtures/test-app/source/stylesheets/auto-css/auto-css.css
+- fixtures/test-app/source/stylesheets/auto-css/index.css
+- fixtures/test-app/source/stylesheets/auto-css/sub/auto-css.css
 - fixtures/test-app/source/stylesheets/relative_assets.css.sass
 - fixtures/test-app/source/stylesheets/site.css.sass
 - fixtures/test-app/source/stylesheets/site_scss.css.scss
 - fixtures/test-app/source/stylesheets/static.css
-- fixtures/test-app/source/stylesheets/sub1/auto-css.css
-- fixtures/test-app/source/stylesheets/sub1/sub2/auto-css.css
 - fixtures/test-app/source/tiny_src.html.haml
 - lib/middleman.rb
 - lib/middleman/assets.rb
@@ -374,6 +393,7 @@ files:
 - lib/middleman/templates/xhtml/source/stylesheets/site.css.sass
 - lib/middleman/version.rb
 - middleman.gemspec
+has_rdoc: true
 homepage: http://wiki.github.com/tdreyno/middleman
 licenses: []
 
@@ -397,7 +417,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: middleman
-rubygems_version: 1.7.2
+rubygems_version: 1.3.9.2
 signing_key: 
 specification_version: 3
 summary: A static site generator based on Sinatra. Providing Haml, Sass, Compass, Less, Coffee Script and including minification, compression and cache busting.
@@ -405,6 +425,7 @@ test_files:
 - features/builder.feature
 - features/coffee-script.feature
 - features/generator.feature
+- features/helpers_auto_javascript_include_tag.feature
 - features/helpers_auto_stylesheet_link_tag.feature
 - features/helpers_page_classes.feature
 - features/minify_css.feature
@@ -429,6 +450,7 @@ test_files:
 - fixtures/test-app/source/asset_host.html.haml
 - fixtures/test-app/source/auto-css.html.haml
 - fixtures/test-app/source/auto-image-sizes.html.haml
+- fixtures/test-app/source/auto-js.html.haml
 - fixtures/test-app/source/cache-buster.html.haml
 - fixtures/test-app/source/custom-layout-dir/index.html.haml
 - fixtures/test-app/source/custom-layout.html.haml
@@ -438,6 +460,10 @@ test_files:
 - fixtures/test-app/source/inline-coffeescript.html.haml
 - fixtures/test-app/source/inline-css.html.haml
 - fixtures/test-app/source/inline-js.html.haml
+- fixtures/test-app/source/javascripts/auto-js.js
+- fixtures/test-app/source/javascripts/auto-js/auto-js.js
+- fixtures/test-app/source/javascripts/auto-js/index.js
+- fixtures/test-app/source/javascripts/auto-js/sub/auto-js.js
 - fixtures/test-app/source/javascripts/coffee_test.js.coffee
 - fixtures/test-app/source/javascripts/jquery.plugin.with.dots.js
 - fixtures/test-app/source/layout.haml
@@ -449,10 +475,11 @@ test_files:
 - fixtures/test-app/source/static.html
 - fixtures/test-app/source/stylesheets/asset_host.css.sass
 - fixtures/test-app/source/stylesheets/auto-css.css
+- fixtures/test-app/source/stylesheets/auto-css/auto-css.css
+- fixtures/test-app/source/stylesheets/auto-css/index.css
+- fixtures/test-app/source/stylesheets/auto-css/sub/auto-css.css
 - fixtures/test-app/source/stylesheets/relative_assets.css.sass
 - fixtures/test-app/source/stylesheets/site.css.sass
 - fixtures/test-app/source/stylesheets/site_scss.css.scss
 - fixtures/test-app/source/stylesheets/static.css
-- fixtures/test-app/source/stylesheets/sub1/auto-css.css
-- fixtures/test-app/source/stylesheets/sub1/sub2/auto-css.css
 - fixtures/test-app/source/tiny_src.html.haml