middleman 1.0.3 → 1.1.0.alpha.1

data/lib/middleman/server.rb

@@ -97,7 +97,7 @@ module Middleman
     def self.page(url, options={}, &block)
       url << settings.index_file if url.match(%r{/$})
   
-      options[:layout] = current_layout if options[:layout].nil?
+      options[:layout] ||= current_layout
       get(url) do
         return yield if block_given?
         process_request(options)
@@ -119,9 +119,7 @@ module Middleman
       
       old_layout = settings.current_layout
       settings.layout(options[:layout]) if !options[:layout].nil?
-      layout = settings.fetch_layout_path.to_sym
-      layout = false if options[:layout] == false or path =~ /\.(css|js)$/
-      result = render(path, :layout => layout, :layout_engine => options[:layout_engine])
+      result = render(path, :layout => settings.fetch_layout_path.to_sym)
       settings.layout(old_layout)
       
       if result

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "1.0.3"
+  VERSION = "1.1.0.alpha.1"
 end

data/middleman.gemspec

@@ -28,8 +28,9 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("padrino-helpers", ["~> 0.9.0"])
   s.add_runtime_dependency("rack-test", ["~> 0.5.0"])
   s.add_runtime_dependency("yui-compressor", ["~> 0.9.0"])
-  s.add_runtime_dependency("haml", ["~> 3.0"])
-  s.add_runtime_dependency("compass", ["~> 0.10.0"])
+  s.add_runtime_dependency("haml", ["3.1.0.alpha.147"])
+  s.add_runtime_dependency("sass", ["3.1.0.alpha.214"])
+  s.add_runtime_dependency("compass", ["0.11.alpha.4"])
   s.add_runtime_dependency("json_pure", ["~> 1.4.0"])
   s.add_runtime_dependency("smusher", ["~> 0.4.5"])
   s.add_runtime_dependency("compass-slickmap", ["~> 0.4.0"])

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: 
+  hash: -3702664338
+  prerelease: 6
   segments: 
   - 1
+  - 1
   - 0
-  - 3
-  version: 1.0.3
+  - alpha
+  - 1
+  version: 1.1.0.alpha.1
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-05 00:00:00 -08:00
+date: 2011-01-01 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -181,35 +183,57 @@ dependencies:
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: -3702664694
         segments: 
         - 3
+        - 1
         - 0
-        version: "3.0"
+        - alpha
+        - 147
+        version: 3.1.0.alpha.147
   type: :runtime
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: compass
+  name: sass
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 55
+        hash: -3702664576
         segments: 
+        - 3
+        - 1
         - 0
-        - 10
-        - 0
-        version: 0.10.0
+        - alpha
+        - 214
+        version: 3.1.0.alpha.214
   type: :runtime
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: json_pure
+  name: compass
   prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: -3702664196
+        segments: 
+        - 0
+        - 11
+        - alpha
+        - 4
+        version: 0.11.alpha.4
+  type: :runtime
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  name: json_pure
+  prerelease: false
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -221,11 +245,11 @@ dependencies:
         - 0
         version: 1.4.0
   type: :runtime
-  version_requirements: *id013
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: smusher
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -237,11 +261,11 @@ dependencies:
         - 5
         version: 0.4.5
   type: :runtime
-  version_requirements: *id014
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: compass-slickmap
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -253,11 +277,11 @@ dependencies:
         - 0
         version: 0.4.0
   type: :runtime
-  version_requirements: *id015
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
   name: coffee-script
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -269,11 +293,11 @@ dependencies:
         - 0
         version: 2.1.0
   type: :runtime
-  version_requirements: *id016
+  version_requirements: *id017
 - !ruby/object:Gem::Dependency 
   name: less
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -285,11 +309,11 @@ dependencies:
         - 0
         version: 1.2.0
   type: :runtime
-  version_requirements: *id017
+  version_requirements: *id018
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -299,11 +323,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id018
+  version_requirements: *id019
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -313,7 +337,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id019
+  version_requirements: *id020
 description: 
 email: 
 - tdreyno@gmail.com
@@ -434,12 +458,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: middleman
@@ -447,5 +473,52 @@ rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: A static site generator utilizing Haml, Sass and providing YUI compression and cache busting
-test_files: []
-
+test_files: 
+- features/builder.feature
+- features/coffee-script.feature
+- features/generator.feature
+- features/helpers_auto_stylesheet_link_tag.feature
+- features/helpers_page_classes.feature
+- features/less-css.feature
+- features/minify_css.feature
+- features/minify_javascript.feature
+- features/padrino_helpers.feature
+- features/page_alias_and_layouts.feature
+- features/scss-support.feature
+- features/step_definitions/asset_host_steps.rb
+- features/step_definitions/builder_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
+- features/w_asset_host.feature
+- features/x_automatic_image_sizes.feature
+- features/y_cache_buster.feature
+- features/z_relative_assets.feature
+- fixtures/test-app/config.rb
+- fixtures/test-app/public/images/blank.gif
+- fixtures/test-app/public/static.html
+- fixtures/test-app/public/stylesheets/auto-css.css
+- fixtures/test-app/public/stylesheets/static.css
+- fixtures/test-app/public/stylesheets/sub1/auto-css.css
+- fixtures/test-app/public/stylesheets/sub1/sub2/auto-css.css
+- fixtures/test-app/views/_partial.haml
+- fixtures/test-app/views/asset_host.html.haml
+- fixtures/test-app/views/auto-css.html.haml
+- fixtures/test-app/views/auto-image-sizes.html.haml
+- fixtures/test-app/views/cache-buster.html.haml
+- fixtures/test-app/views/custom-layout.html.haml
+- fixtures/test-app/views/index.html.haml
+- fixtures/test-app/views/inline-css.html.haml
+- fixtures/test-app/views/inline-js.html.haml
+- fixtures/test-app/views/javascripts/coffee_test.js.coffee
+- fixtures/test-app/views/layout.haml
+- fixtures/test-app/views/layouts/custom.haml
+- fixtures/test-app/views/padrino_test.html.haml
+- fixtures/test-app/views/page-classes.html.haml
+- fixtures/test-app/views/services/index.html.haml
+- fixtures/test-app/views/stylesheets/asset_host.css.sass
+- fixtures/test-app/views/stylesheets/relative_assets.css.sass
+- fixtures/test-app/views/stylesheets/site.css.sass
+- fixtures/test-app/views/stylesheets/site_scss.css.scss
+- fixtures/test-app/views/stylesheets/test_less.css.less