middleman 2.0.0.rc8 → 2.0.0.rc91

data/lib/middleman/templates/html5/source/test/tests.js

@@ -0,0 +1,27 @@
+
+// documentation on writing tests here: http://docs.jquery.com/QUnit
+// example tests: https://github.com/jquery/qunit/blob/master/test/same.js
+
+// below are some general tests but feel free to delete them.
+
+module("example tests");
+test("HTML5 Boilerplate is sweet",function(){
+  expect(1);
+  equals("boilerplate".replace("boilerplate","sweet"),"sweet","Yes. HTML5 Boilerplate is, in fact, sweet");
+  
+})
+
+// these test things from plugins.js
+test("Environment is good",function(){
+  expect(3);
+  ok( !!window.log, "log function present");
+  
+  var history = log.history && log.history.length || 0;
+  log("logging from the test suite.")
+  equals( log.history.length - history, 1, "log history keeps track" )
+  
+  ok( !!window.Modernizr, "Modernizr global is present")
+})
+
+
+

data/lib/middleman/templates/{default → shared}/config.tt

@@ -1,7 +1,20 @@
+### 
+# Compass
+###
+
 # Susy grids in Compass
 # First: gem install compass-susy-plugin
 # require 'susy'
 
+# Change Compass configuration
+# compass_config do |config|
+#   config.output_style = :compact
+# end
+
+###
+# Haml
+###
+
 # CodeRay syntax highlighting in Haml
 # First: gem install haml-coderay
 # require 'haml-coderay'
@@ -10,23 +23,38 @@
 # First: gem install coffee-filter
 # require 'coffee-filter'
 
-# Automatic sitemaps
-# First: gem install middleman-slickmap
-# require "middleman-slickmap"
-# activate :slickmap
-
-# Automatic image dimension calculations
+# Automatic image dimensions on image_tag helper
 # activate :automatic_image_sizes
 
-# Per-page layout changes
+###
+# Page command
+###
+
+# Per-page layout changes:
+# 
 # With no layout
 # page "/path/to/file.html", :layout => false
+# 
 # With alternative layout
 # page "/path/to/file.html", :layout => :otherlayout
+# 
+# A path which all have the same layout
+# with_layout :admin do
+#   page "/admin/*"
+# end
 
+# Proxy (fake) files
+# page "/this-page-has-no-template.html", :proxy => "/template-file.html" do
+#   @which_fake_page = "Rendering a fake page with a variable"
+# end
+
+###
 # Helpers
+###
+
+# Methods defined in the helpers block are available in templates
 # helpers do
-#   def some_helper(*args)
+#   def some_helper
 #     "Helping"
 #   end
 # end

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "2.0.0.rc8"
+  VERSION = "2.0.0.rc91"
 end

data/middleman.gemspec

@@ -27,19 +27,19 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("padrino-helpers", ["~> 0.9.23"])
   s.add_runtime_dependency("rack-test", ["~> 0.5.0"])
   s.add_runtime_dependency("uglifier", ["~> 0.5.0"])
-  s.add_runtime_dependency("slim", ["~> 0.9.4"])
+  s.add_runtime_dependency("slim", ["~> 1.0.0"])
   s.add_runtime_dependency("haml", ["~> 3.1.0"])
-  s.add_runtime_dependency("sass", ["~> 3.1.0"])
+  s.add_runtime_dependency("sass", ["~> 3.1.5"])
   s.add_runtime_dependency("coffee-script", ["~> 2.2.0"])
   s.add_runtime_dependency("compass", ["~> 0.11.3"])
   s.add_runtime_dependency("sprockets", ["2.0.0.beta.10"])
   s.add_runtime_dependency("httparty", ["~> 0.7.0"])
-  s.add_runtime_dependency("guard", [">= 0"])
-  s.add_runtime_dependency("guard-livereload", [">= 0"])
+  s.add_runtime_dependency("guard", ["~> 0.5.1"])
+  s.add_runtime_dependency("guard-livereload", ["~> 0.2.0"])
   s.add_development_dependency("coffee-filter", ["~> 0.1.1"])
   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)
+  s.add_development_dependency("rspec", ["~> 2.6.0"])
+  s.add_development_dependency("rocco", ["~> 0.8.1"]) unless defined?(JRUBY_VERSION)
 end
 

metadata

@@ -1,8 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
+  hash: 15424227
   prerelease: 6
-  version: 2.0.0.rc8
+  segments: 
+  - 2
+  - 0
+  - 0
+  - rc
+  - 91
+  version: 2.0.0.rc91
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -10,8 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-21 00:00:00 -07:00
-default_executable: 
+date: 2011-07-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -21,6 +27,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
         version: 1.3.0
   type: :runtime
   version_requirements: *id001
@@ -32,6 +43,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 39
+        segments: 
+        - 0
+        - 14
+        - 0
         version: 0.14.0
   type: :runtime
   version_requirements: *id002
@@ -43,6 +59,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 3
+        - 1
         version: 1.3.1
   type: :runtime
   version_requirements: *id003
@@ -54,6 +75,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 6
+        - 8
         version: 1.6.8
   type: :runtime
   version_requirements: *id004
@@ -65,6 +91,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 2
+        - 0
         version: 1.2.0
   type: :runtime
   version_requirements: *id005
@@ -76,6 +107,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 9
+        - 23
         version: 0.9.23
   type: :runtime
   version_requirements: *id006
@@ -87,6 +123,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 9
+        - 23
         version: 0.9.23
   type: :runtime
   version_requirements: *id007
@@ -98,6 +139,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 5
+        - 0
         version: 0.5.0
   type: :runtime
   version_requirements: *id008
@@ -109,6 +155,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 5
+        - 0
         version: 0.5.0
   type: :runtime
   version_requirements: *id009
@@ -120,7 +171,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.4
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
   type: :runtime
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
@@ -131,6 +187,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 3
+        - 1
+        - 0
         version: 3.1.0
   type: :runtime
   version_requirements: *id011
@@ -142,7 +203,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.1.0
+        hash: 9
+        segments: 
+        - 3
+        - 1
+        - 5
+        version: 3.1.5
   type: :runtime
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
@@ -153,6 +219,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 2
+        - 0
         version: 2.2.0
   type: :runtime
   version_requirements: *id013
@@ -164,6 +235,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 53
+        segments: 
+        - 0
+        - 11
+        - 3
         version: 0.11.3
   type: :runtime
   version_requirements: *id014
@@ -175,6 +251,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 62196471
+        segments: 
+        - 2
+        - 0
+        - 0
+        - beta
+        - 10
         version: 2.0.0.beta.10
   type: :runtime
   version_requirements: *id015
@@ -186,6 +269,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 7
+        - 0
         version: 0.7.0
   type: :runtime
   version_requirements: *id016
@@ -195,9 +283,14 @@ dependencies:
   requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        hash: 9
+        segments: 
+        - 0
+        - 5
+        - 1
+        version: 0.5.1
   type: :runtime
   version_requirements: *id017
 - !ruby/object:Gem::Dependency 
@@ -206,9 +299,14 @@ dependencies:
   requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        hash: 23
+        segments: 
+        - 0
+        - 2
+        - 0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id018
 - !ruby/object:Gem::Dependency 
@@ -219,6 +317,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 1
+        - 1
         version: 0.1.1
   type: :development
   version_requirements: *id019
@@ -230,6 +333,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 0
+        - 10
+        - 0
         version: 0.10.0
   type: :development
   version_requirements: *id020
@@ -241,6 +349,11 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
         version: 0.8.7
   type: :development
   version_requirements: *id021
@@ -250,9 +363,14 @@ dependencies:
   requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
+        version: 2.6.0
   type: :development
   version_requirements: *id022
 - !ruby/object:Gem::Dependency 
@@ -261,9 +379,14 @@ dependencies:
   requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        hash: 61
+        segments: 
+        - 0
+        - 8
+        - 1
+        version: 0.8.1
   type: :development
   version_requirements: *id023
 description: 
@@ -279,10 +402,8 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- .document
 - .gemtest
 - .gitignore
-- .gitmodules
 - CHANGELOG
 - Gemfile
 - LICENSE
@@ -298,6 +419,7 @@ files:
 - features/cache_buster.feature
 - features/coffee-script.feature
 - features/data.feature
+- features/dynamic_pages.feature
 - features/front-matter.feature
 - features/generator.feature
 - features/helpers_auto_javascript_include_tag.feature
@@ -337,7 +459,10 @@ files:
 - fixtures/test-app/source/custom-layout.html.haml
 - fixtures/test-app/source/data.html.erb
 - fixtures/test-app/source/front-matter.html.erb
+- fixtures/test-app/source/images/Child folder/regular_file(example).txt
+- fixtures/test-app/source/images/Read me (example).txt
 - fixtures/test-app/source/images/blank.gif
+- fixtures/test-app/source/img/blank.gif
 - fixtures/test-app/source/index.html.haml
 - fixtures/test-app/source/inline-coffeescript.html.haml
 - fixtures/test-app/source/inline-css.html.haml
@@ -346,6 +471,7 @@ files:
 - 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/broken-coffee.js.coffee
 - fixtures/test-app/source/javascripts/coffee_test.js.coffee
 - fixtures/test-app/source/javascripts/jquery.plugin.with.dots.js
 - fixtures/test-app/source/javascripts/sprockets_base.js
@@ -354,8 +480,12 @@ files:
 - fixtures/test-app/source/layouts/custom.haml
 - fixtures/test-app/source/padrino_test.html.haml
 - fixtures/test-app/source/page-classes.html.haml
+- fixtures/test-app/source/real.html
+- fixtures/test-app/source/real/index.html.erb
+- fixtures/test-app/source/relative_image.html.erb
 - fixtures/test-app/source/services/index.html.haml
 - fixtures/test-app/source/slim.html.slim
+- fixtures/test-app/source/spaces in file.html.erb
 - fixtures/test-app/source/static.html
 - fixtures/test-app/source/stylesheets/asset_host.css.sass
 - fixtures/test-app/source/stylesheets/auto-css.css
@@ -402,43 +532,49 @@ files:
 - lib/middleman/renderers/sass.rb
 - lib/middleman/renderers/slim.rb
 - lib/middleman/templates.rb
-- lib/middleman/templates/compass.rb
+- lib/middleman/templates/blog.rb
+- lib/middleman/templates/blog/config.ru
+- lib/middleman/templates/blog/config.tt
+- lib/middleman/templates/blog/source/2011/01/01/new-article.html.markdown
+- lib/middleman/templates/blog/source/archives/index.html.erb
+- lib/middleman/templates/blog/source/feed.xml.builder
+- lib/middleman/templates/blog/source/index.html.erb
+- lib/middleman/templates/blog/source/layout.erb
 - lib/middleman/templates/default.rb
-- lib/middleman/templates/default/config.ru
-- lib/middleman/templates/default/config.tt
-- lib/middleman/templates/default/source/index.html.haml
-- lib/middleman/templates/default/source/layout.haml
-- lib/middleman/templates/default/source/stylesheets/site.css.sass
+- lib/middleman/templates/default/source/index.html.erb
+- lib/middleman/templates/default/source/layout.erb
+- lib/middleman/templates/default/source/stylesheets/site.css.scss
 - lib/middleman/templates/html5.rb
-- lib/middleman/templates/html5/config.ru
-- lib/middleman/templates/html5/config.tt
 - lib/middleman/templates/html5/source/404.html
+- lib/middleman/templates/html5/source/apple-touch-icon-114x114-precomposed.png
+- lib/middleman/templates/html5/source/apple-touch-icon-57x57-precomposed.png
+- lib/middleman/templates/html5/source/apple-touch-icon-72x72-precomposed.png
+- lib/middleman/templates/html5/source/apple-touch-icon-precomposed.png
 - lib/middleman/templates/html5/source/apple-touch-icon.png
 - lib/middleman/templates/html5/source/crossdomain.xml
 - lib/middleman/templates/html5/source/css/handheld.css
 - lib/middleman/templates/html5/source/css/style.css
 - lib/middleman/templates/html5/source/favicon.ico
 - lib/middleman/templates/html5/source/humans.txt
-- lib/middleman/templates/html5/source/images/.gitignore
+- lib/middleman/templates/html5/source/img/.gitignore
 - lib/middleman/templates/html5/source/index.html
 - lib/middleman/templates/html5/source/js/libs/dd_belatedpng.js
-- lib/middleman/templates/html5/source/js/libs/jquery-1.5.0.js
-- lib/middleman/templates/html5/source/js/libs/jquery-1.5.0.min.js
-- lib/middleman/templates/html5/source/js/libs/modernizr-1.6.min.js
+- lib/middleman/templates/html5/source/js/libs/jquery-1.5.1.js
+- lib/middleman/templates/html5/source/js/libs/jquery-1.5.1.min.js
+- lib/middleman/templates/html5/source/js/libs/modernizr-1.7.min.js
 - lib/middleman/templates/html5/source/js/mylibs/.gitignore
 - lib/middleman/templates/html5/source/js/plugins.js
 - lib/middleman/templates/html5/source/js/script.js
 - lib/middleman/templates/html5/source/robots.txt
+- lib/middleman/templates/html5/source/test/index.html
+- lib/middleman/templates/html5/source/test/qunit/qunit.css
+- lib/middleman/templates/html5/source/test/qunit/qunit.js
+- lib/middleman/templates/html5/source/test/tests.js
 - lib/middleman/templates/local.rb
-- lib/middleman/templates/xhtml.rb
-- lib/middleman/templates/xhtml/config.ru
-- lib/middleman/templates/xhtml/config.tt
-- lib/middleman/templates/xhtml/source/index.html.haml
-- lib/middleman/templates/xhtml/source/layout.haml
-- lib/middleman/templates/xhtml/source/stylesheets/site.css.sass
+- lib/middleman/templates/shared/config.ru
+- lib/middleman/templates/shared/config.tt
 - lib/middleman/version.rb
 - middleman.gemspec
-has_rdoc: true
 homepage: http://middlemanapp.com
 licenses: []
 
@@ -452,17 +588,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
 
 rubyforge_project: middleman
-rubygems_version: 1.3.9.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: A static site generator based on Sinatra. Providing Haml, Sass, Compass, CoffeeScript and including minification, compression and cache busting.
@@ -473,6 +617,7 @@ test_files:
 - features/cache_buster.feature
 - features/coffee-script.feature
 - features/data.feature
+- features/dynamic_pages.feature
 - features/front-matter.feature
 - features/generator.feature
 - features/helpers_auto_javascript_include_tag.feature
@@ -512,7 +657,10 @@ test_files:
 - fixtures/test-app/source/custom-layout.html.haml
 - fixtures/test-app/source/data.html.erb
 - fixtures/test-app/source/front-matter.html.erb
+- fixtures/test-app/source/images/Child folder/regular_file(example).txt
+- fixtures/test-app/source/images/Read me (example).txt
 - fixtures/test-app/source/images/blank.gif
+- fixtures/test-app/source/img/blank.gif
 - fixtures/test-app/source/index.html.haml
 - fixtures/test-app/source/inline-coffeescript.html.haml
 - fixtures/test-app/source/inline-css.html.haml
@@ -521,6 +669,7 @@ test_files:
 - 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/broken-coffee.js.coffee
 - fixtures/test-app/source/javascripts/coffee_test.js.coffee
 - fixtures/test-app/source/javascripts/jquery.plugin.with.dots.js
 - fixtures/test-app/source/javascripts/sprockets_base.js
@@ -529,8 +678,12 @@ test_files:
 - fixtures/test-app/source/layouts/custom.haml
 - fixtures/test-app/source/padrino_test.html.haml
 - fixtures/test-app/source/page-classes.html.haml
+- fixtures/test-app/source/real.html
+- fixtures/test-app/source/real/index.html.erb
+- fixtures/test-app/source/relative_image.html.erb
 - fixtures/test-app/source/services/index.html.haml
 - fixtures/test-app/source/slim.html.slim
+- fixtures/test-app/source/spaces in file.html.erb
 - fixtures/test-app/source/static.html
 - fixtures/test-app/source/stylesheets/asset_host.css.sass
 - fixtures/test-app/source/stylesheets/auto-css.css