middleman 0.5.5 → 0.9.0.pre

data/spec/fixtures/sample/init.rb

@@ -1,2 +1,28 @@
-require File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "middleman", "maruku")
-#require File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "middleman", "markaby")
+with_layout false do
+  page "/inline-css.html"
+  page "/inline-js.html"
+end
+
+get "/page-class.html" do
+  haml :"page-classes.html", :layout => false
+end
+
+get "/sub1/page-class.html" do
+  haml :"page-classes.html", :layout => false
+end
+
+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
+end
+
+get "/sub1/auto-css.html" do
+  haml :"auto-css.html", :layout => false
+end
+
+get "/sub1/sub2/auto-css.html" do
+  haml :"auto-css.html", :layout => false
+end

data/spec/fixtures/sample/views/asset_host.html.haml

@@ -0,0 +1 @@
+= image_tag "blank.gif"

data/spec/fixtures/sample/views/auto-css.html.haml

@@ -0,0 +1 @@
+= auto_stylesheet_link_tag

data/spec/fixtures/sample/views/auto-image-sizes.html.haml

@@ -0,0 +1 @@
+= image_tag "blank.gif"

data/spec/fixtures/sample/views/cache-buster.html.haml

@@ -0,0 +1,2 @@
+= stylesheet_link_tag "site.css"
+= javascript_include_tag "empty-with-include.js"

data/spec/fixtures/sample/views/custom.haml

@@ -0,0 +1,5 @@
+%html
+  %head
+    %title Custom Layout
+  %body
+    = yield

data/spec/fixtures/sample/views/index.html.haml

@@ -0,0 +1 @@
+%h1 Welcome

data/spec/fixtures/sample/views/inline-css.html.haml

@@ -0,0 +1,4 @@
+:sass
+  body
+    test: style
+    good: deal

data/spec/fixtures/sample/views/layout.haml

@@ -1,6 +1,6 @@
 %html
   %head
-    %link{ :href => "/stylesheets/site.css", :rel => "stylesheet", :type => "text/css" }
     %title My Sample Site
+    / Comment in layout
   %body
     = yield

data/spec/fixtures/sample/views/page-classes.html.haml

@@ -0,0 +1 @@
+= page_classes

data/spec/fixtures/sample/views/stylesheets/asset_host.css.sass

@@ -0,0 +1,3 @@
+@import "compass"
+h1
+  background: image-url("blank.gif")

data/spec/fixtures/sample/views/stylesheets/relative_assets.css.sass

@@ -0,0 +1,3 @@
+@import "compass"
+h1
+  background: image-url("blank.gif")

data/spec/fixtures/sample/views/stylesheets/site.css.sass

@@ -0,0 +1 @@
+@import "compass/reset"

data/spec/fixtures/sample/views/stylesheets/site_scss.css.scss

@@ -0,0 +1 @@
+@import "compass/reset";

data/spec/fixtures/sample/views/stylesheets/test_less.css.less

@@ -0,0 +1,5 @@
+@brand_color: #666666;
+
+#header {
+  color: @brand_color;
+}

data/spec/helpers_spec.rb

@@ -0,0 +1,43 @@
+require File.join(File.dirname(__FILE__), "spec_helper")
+
+base = ::Middleman::Base
+
+describe "page_classes helper" do
+  it "should generate root paths correctly" do
+    browser = Rack::Test::Session.new(Rack::MockSession.new(base.new))
+    browser.get("/page-class.html")
+    browser.last_response.body.chomp.should == "page-class"
+  end
+  
+  it "should generate 1-deep paths correctly" do
+    browser = Rack::Test::Session.new(Rack::MockSession.new(base.new))
+    browser.get("/sub1/page-class.html")
+    browser.last_response.body.chomp.should == "sub1 sub1_page-class"
+  end
+
+  it "should generate 2-deep paths correctly" do
+    browser = Rack::Test::Session.new(Rack::MockSession.new(base.new))
+    browser.get("/sub1/sub2/page-class.html")
+    browser.last_response.body.chomp.should == "sub1 sub1_sub2 sub1_sub2_page-class"
+  end
+end
+
+describe "auto_stylesheet_link_tag helper" do
+  it "should generate root paths correctly" do
+    browser = Rack::Test::Session.new(Rack::MockSession.new(base.new))
+    browser.get("/auto-css.html")
+    browser.last_response.body.chomp.should include("stylesheets/auto-css.css")
+  end
+  
+  it "should generate 1-deep paths correctly" do
+    browser = Rack::Test::Session.new(Rack::MockSession.new(base.new))
+    browser.get("/sub1/auto-css.html")
+    browser.last_response.body.chomp.should include("stylesheets/sub1/auto-css.css")
+  end
+
+  it "should generate 2-deep paths correctly" do
+    browser = Rack::Test::Session.new(Rack::MockSession.new(base.new))
+    browser.get("/sub1/sub2/auto-css.html")
+    browser.last_response.body.chomp.should include("stylesheets/sub1/sub2/auto-css.css")
+  end
+end

data/spec/spec_helper.rb

@@ -1,9 +1,7 @@
-require 'rubygems'
+ENV["MM_DIR"] = File.join(File.dirname(__FILE__), "fixtures", "sample")
+require File.join(File.dirname(File.dirname(__FILE__)), 'lib', 'middleman')
 require 'spec'
-
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'middleman'
+require 'rack/test'
 
 Spec::Runner.configure do |config|
   

metadata

@@ -1,7 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  version: 0.5.5
+  hash: 961915916
+  prerelease: true
+  segments: 
+  - 0
+  - 9
+  - 0
+  - pre
+  version: 0.9.0.pre
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -9,89 +16,256 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-21 00:00:00 -07:00
+date: 2010-09-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: templater
+  name: rack
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: thin
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+        hash: 31
+        segments: 
+        - 1
+        - 2
+        - 0
+        version: 1.2.0
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: yui-compressor
+  name: shotgun
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 8
+        - 0
+        version: 0.8.0
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: templater
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: sprockets
+  name: sinatra
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: sinatra-content-for
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+        hash: 23
+        segments: 
+        - 0
+        - 2
+        - 0
+        version: 0.2.0
+  type: :runtime
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: rack-test
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 5
+        - 0
+        version: 0.5.0
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: yui-compressor
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 9
+        - 0
+        version: 0.9.0
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: haml
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  type: :runtime
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: markaby
+  name: compass
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 0
+        - 10
+        - 0
+        version: 0.10.0
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: json_pure
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        - 0
+        version: 1.4.0
+  type: :runtime
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: maruku
+  name: smusher
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 4
+        - 5
+        version: 0.4.5
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: compass-slickmap
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 3
+        - 0
+        version: 0.3.0
+  type: :runtime
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
-  name: haml
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: cucumber
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.1.0
-    version: 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
-  name: chriseppstein-compass
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: jeweler
+  prerelease: false
+  requirement: &id016 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id016
 description: 
 email: tdreyno@gmail.com
 executables: 
@@ -113,90 +287,79 @@ files:
 - bin/mm-build
 - bin/mm-init
 - bin/mm-server
+- features/asset_host.feature
+- features/automatic_image_sizes.feature
+- features/cache_buster.feature
+- features/generator.feature
+- features/minify_css.feature
+- features/minify_javascript.feature
+- features/page_alias_and_layouts.feature
+- features/relative_assets.feature
+- features/step_definitions/asset_host_steps.rb
+- features/step_definitions/env.rb
+- features/step_definitions/generator_steps.rb
+- features/step_definitions/middleman_steps.rb
+- features/step_definitions/page_layout_steps.rb
 - lib/middleman.rb
-- lib/middleman/helpers.rb
-- lib/middleman/markaby.rb
-- lib/middleman/maruku.rb
-- lib/middleman/sprockets_ext.rb
-- lib/middleman/template/init.rb
-- lib/middleman/template/views/index.haml
+- lib/middleman/assets.rb
+- lib/middleman/base.rb
+- lib/middleman/builder.rb
+- lib/middleman/config.ru
+- lib/middleman/features.rb
+- lib/middleman/features/asset_host.rb
+- lib/middleman/features/automatic_image_sizes.rb
+- lib/middleman/features/automatic_image_sizes/fastimage.rb
+- lib/middleman/features/cache_buster.rb
+- lib/middleman/features/default_helpers.rb
+- lib/middleman/features/livereload.rb
+- lib/middleman/features/minify_css.rb
+- lib/middleman/features/minify_javascript.rb
+- lib/middleman/features/minify_javascript/rack.rb
+- lib/middleman/features/relative_assets.rb
+- lib/middleman/features/slickmap.rb
+- lib/middleman/features/smush_pngs.rb
+- lib/middleman/features/ugly_haml.rb
+- lib/middleman/renderers.rb
+- lib/middleman/renderers/coffee.rb
+- lib/middleman/renderers/haml.rb
+- lib/middleman/renderers/sass.rb
+- lib/middleman/template/init.rbt
+- lib/middleman/template/views/index.html.haml
 - lib/middleman/template/views/layout.haml
-- lib/middleman/template/views/stylesheets/site.sass
+- lib/middleman/template/views/stylesheets/site.css.sass
+- lib/middleman/templater+dynamic_renderer.rb
 - middleman.gemspec
 - spec/builder_spec.rb
 - spec/fixtures/sample/init.rb
+- spec/fixtures/sample/public/images/blank.gif
 - spec/fixtures/sample/public/static.html
+- spec/fixtures/sample/public/stylesheets/auto-css.css
 - spec/fixtures/sample/public/stylesheets/static.css
+- spec/fixtures/sample/public/stylesheets/sub1/auto-css.css
+- spec/fixtures/sample/public/stylesheets/sub1/sub2/auto-css.css
 - spec/fixtures/sample/views/_partial.haml
-- spec/fixtures/sample/views/index.haml
-- spec/fixtures/sample/views/inline-js.haml
+- spec/fixtures/sample/views/asset_host.html.haml
+- spec/fixtures/sample/views/auto-css.html.haml
+- spec/fixtures/sample/views/auto-image-sizes.html.haml
+- spec/fixtures/sample/views/cache-buster.html.haml
+- spec/fixtures/sample/views/custom-layout.html.haml
+- spec/fixtures/sample/views/custom.haml
+- spec/fixtures/sample/views/index.html.haml
+- spec/fixtures/sample/views/inline-css.html.haml
+- spec/fixtures/sample/views/inline-js.html.haml
 - spec/fixtures/sample/views/layout.haml
-- spec/fixtures/sample/views/markaby.mab
-- spec/fixtures/sample/views/maruku.maruku
-- spec/fixtures/sample/views/services/index.haml
-- spec/fixtures/sample/views/stylesheets/site.sass
-- spec/generator_spec.rb
+- spec/fixtures/sample/views/maruku.html.maruku
+- spec/fixtures/sample/views/page-classes.html.haml
+- spec/fixtures/sample/views/services/index.html.haml
+- spec/fixtures/sample/views/stylesheets/asset_host.css.sass
+- spec/fixtures/sample/views/stylesheets/relative_assets.css.sass
+- spec/fixtures/sample/views/stylesheets/site.css.sass
+- spec/fixtures/sample/views/stylesheets/site_scss.css.scss
+- spec/fixtures/sample/views/stylesheets/test_less.css.less
+- spec/helpers_spec.rb
 - spec/spec_helper.rb
-- vendor/rack-test/History.txt
-- vendor/rack-test/MIT-LICENSE.txt
-- vendor/rack-test/README.rdoc
-- vendor/rack-test/Rakefile
-- vendor/rack-test/lib/rack/mock_session.rb
-- vendor/rack-test/lib/rack/test.rb
-- vendor/rack-test/lib/rack/test/cookie_jar.rb
-- vendor/rack-test/lib/rack/test/methods.rb
-- vendor/rack-test/lib/rack/test/mock_digest_request.rb
-- vendor/rack-test/lib/rack/test/uploaded_file.rb
-- vendor/rack-test/lib/rack/test/utils.rb
-- vendor/rack-test/spec/fixtures/config.ru
-- vendor/rack-test/spec/fixtures/fake_app.rb
-- vendor/rack-test/spec/fixtures/foo.txt
-- vendor/rack-test/spec/rack/test/cookie_spec.rb
-- vendor/rack-test/spec/rack/test/digest_auth_spec.rb
-- vendor/rack-test/spec/rack/test/multipart_spec.rb
-- vendor/rack-test/spec/rack/test/utils_spec.rb
-- vendor/rack-test/spec/rack/test_spec.rb
-- vendor/rack-test/spec/rcov.opts
-- vendor/rack-test/spec/spec.opts
-- vendor/rack-test/spec/spec_helper.rb
-- vendor/sinatra-content-for/LICENSE
-- vendor/sinatra-content-for/README.rdoc
-- vendor/sinatra-content-for/Rakefile
-- vendor/sinatra-content-for/lib/sinatra/content_for.rb
-- vendor/sinatra-content-for/sinatra-content-for.gemspec
-- vendor/sinatra-content-for/test/content_for_test.rb
-- vendor/sinatra-markaby/CHANGES
-- vendor/sinatra-markaby/LICENSE
-- vendor/sinatra-markaby/README.rdoc
-- vendor/sinatra-markaby/Rakefile
-- vendor/sinatra-markaby/TODO
-- vendor/sinatra-markaby/VERSION.yml
-- vendor/sinatra-markaby/lib/sinatra/markaby.rb
-- vendor/sinatra-markaby/sinatra-markaby.gemspec
-- vendor/sinatra-markaby/test/sinatra_markaby_test.rb
-- vendor/sinatra-markaby/test/test_helper.rb
-- vendor/sinatra-markaby/test/views/hello.mab
-- vendor/sinatra-markaby/test/views/html.mab
-- vendor/sinatra-maruku/LICENSE
-- vendor/sinatra-maruku/README.markdown
-- vendor/sinatra-maruku/Rakefile
-- vendor/sinatra-maruku/VERSION.yml
-- vendor/sinatra-maruku/examples/app.rb
-- vendor/sinatra-maruku/examples/config.ru
-- vendor/sinatra-maruku/examples/mapp.rb
-- vendor/sinatra-maruku/examples/public/javascripts/application.js
-- vendor/sinatra-maruku/examples/public/stylesheets/application.css
-- vendor/sinatra-maruku/examples/public/stylesheets/print.css
-- vendor/sinatra-maruku/examples/views/index.maruku
-- vendor/sinatra-maruku/examples/views/layout.maruku
-- vendor/sinatra-maruku/lib/sinatra/maruku.rb
-- vendor/sinatra-maruku/sinatra-maruku.gemspec
-- vendor/sinatra-maruku/test/sinatra_maruku_test.rb
-- vendor/sinatra-maruku/test/test_helper.rb
-- vendor/sinatra-maruku/test/views/hello.maruku
-- vendor/sinatra-maruku/test/views/layout2.maruku
 has_rdoc: true
-homepage: http://github.com/tdreyno/middleman
+homepage: http://wiki.github.com/tdreyno/middleman
 licenses: []
 
 post_install_message: 
@@ -205,26 +368,34 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: middleman
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: A static site generator utilizing Haml and Sass
+summary: A static site generator utilizing Haml, Sass and providing YUI compression and cache busting
 test_files: 
 - spec/builder_spec.rb
 - spec/fixtures/sample/init.rb
-- spec/generator_spec.rb
+- spec/helpers_spec.rb
 - spec/spec_helper.rb