middleman 1.0.2 → 1.0.3

data/lib/middleman/builder.rb

@@ -6,9 +6,6 @@ require 'middleman/templater+dynamic_renderer.rb'
 module Middleman
   class Builder < ::Templater::Generator
     
-    # Support all Tilt-enabled templates and treat js like a template
-    @@template_extensions = ::Tilt.mappings.keys << "js"
-    
     # Define source and desintation
     def self.source_root; Dir.pwd; end
     def destination_root; File.join(Dir.pwd, Middleman::Server.build_dir); end
@@ -43,6 +40,8 @@ module Middleman
     end
 
     def self.init!
+      # Support all Tilt-enabled templates and treat js like a template
+      @@template_extensions ||= ::Tilt.mappings.keys << "js"
       glob! File.basename(Middleman::Server.public),  @@template_extensions
       glob! File.basename(Middleman::Server.views),   @@template_extensions
     end

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
+      options[:layout] = current_layout if options[:layout].nil?
       get(url) do
         return yield if block_given?
         process_request(options)
@@ -119,7 +119,9 @@ module Middleman
       
       old_layout = settings.current_layout
       settings.layout(options[:layout]) if !options[:layout].nil?
-      result = render(path, :layout => settings.fetch_layout_path.to_sym)
+      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])
       settings.layout(old_layout)
       
       if result

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-23 00:00:00 -08:00
+date: 2011-01-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -443,56 +443,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: middleman
-rubygems_version: 1.3.7
+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: 
-- 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
+test_files: []
+