middleman-core 3.0.0.beta.3 → 3.0.0.rc.1

data/lib/middleman-core/renderers/slim.rb

@@ -0,0 +1,30 @@
+# Load gem
+require "slim"
+
+module Middleman
+  module Renderers
+    
+    # Slim renderer
+    module Slim
+  
+      # Setup extension
+      class << self
+    
+        # Once registered
+        def registered(app)
+          app.before_configuration do
+            template_extensions :slim => :html
+          end
+      
+          # Setup Slim options to work with partials
+          ::Slim::Engine.set_default_options(
+            :buffer    => '@_out_buf', 
+            :generator => ::Temple::Generators::StringBuffer
+          )
+        end
+    
+        alias :included :registered
+      end
+    end
+  end
+end

data/lib/middleman-core/sitemap/resource.rb

@@ -69,6 +69,8 @@ module Middleman
         end
         result.deep_merge!(local_meta)
 
+        result[:blocks] = result[:blocks].flatten.compact
+        
         result
       end
 
@@ -125,11 +127,13 @@ module Middleman
           app.data.store("page", md[:page])
         end
 
-        md[:blocks].flatten.compact.each do |block|
-          app.instance_eval(&block)
+        md[:blocks].each do |aBlock|
+          app.instance_eval(&aBlock)
         end
       
         app.instance_eval(&block) if block_given?
+        
+        app.current_path ||= self.destination_path
         result = app.render_template(source_file, locs, opts)
 
         puts "== Render End: #{source_file} (#{(Time.now - start_time).round(2)}s)" if app.logging?

data/lib/middleman-core/step_definitions/middleman_steps.rb

@@ -9,9 +9,9 @@ Then /^the file "([^\"]*)" is removed$/ do |path|
 end
 
 Then /^the file "([^\"]*)" did change$/ do |path|
-  @server_inst.files.did_change(path)
+  @server_inst.files.did_change(@server_inst.root_path + path)
 end
 
 Then /^the file "([^\"]*)" did delete$/ do |path|
-  @server_inst.files.did_delete(path)
+  @server_inst.files.did_delete(@server_inst.root_path + path)
 end

data/lib/middleman-core/templates/extension/gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   # The version of middleman-core your extension depends on
-  s.add_runtime_dependency("middleman-core", [">= 3.0.0.beta.2"])
+  s.add_runtime_dependency("middleman-core", [">= <%= ::Middleman::VERSION %>"])
   
   # Additional dependencies
   # s.add_runtime_dependency("gem-name", "gem-version")

data/lib/middleman-core/templates/extension/lib/lib.rb

@@ -41,7 +41,7 @@ end
 
 # Register extensions which can be activated
 # Make sure we have the version of Middleman we expect
-# ::Middleman::Extensions.register(:extension_name, ">= 3.0.0.beta.2") do
+# ::Middleman::Extensions.register(:extension_name) do
 #   
 #   # Return the extension module
 #   ::MyExtension

data/lib/middleman-core/util.rb

@@ -1,8 +1,12 @@
 # Using Thor's indifferent hash access
 require "thor"
 
+# Core Pathname library used for traversal
+require "pathname"
+
 module Middleman
   module Util
+    
     # Recursively convert a normal Hash into a HashWithIndifferentAccess
     #
     # @private

data/lib/middleman-core/version.rb

@@ -1,13 +1,5 @@
-# Using for version parsing
-require "rubygems"
-
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '3.0.0.beta.3' unless const_defined?(:VERSION)
-  
-  # Parsed version for RubyGems
-  # @private
-  # @return [String]
-  GEM_VERSION = ::Gem::Version.create(VERSION) unless const_defined?(:GEM_VERSION)
+  VERSION = '3.0.0.rc.1' unless const_defined?(:VERSION)
 end

data/middleman-core.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_path = "lib"
   
   # Core
-  s.add_dependency("bundler", ["~> 1.0"])
+  s.add_dependency("bundler", ["~> 1.1"])
   s.add_dependency("rack", ["~> 1.4.0"])
   s.add_dependency("tilt", ["~> 1.3.1"])
   
@@ -27,16 +27,12 @@ Gem::Specification.new do |s|
   s.add_dependency("rack-test", ["~> 0.6.1"])
   
   # CLI
-  s.add_dependency("thor", ["~> 0.14.0"])
+  s.add_dependency("thor", ["~> 0.14.3"])
   
   # Helpers
-  s.add_dependency("activesupport", ["~> 3.2.0"])
-  s.add_dependency("padrino-helpers", ["~> 0.10.6"])
+  s.add_dependency("activesupport", ["~> 3.2.4"])
   
   # Watcher
   s.add_dependency("listen", ["~> 0.4.2"])
-  
-  # i18n
-  s.add_dependency("i18n", ["~> 0.6.0"])
 end
 

metadata

@@ -1,165 +1,171 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: middleman-core
-version: !ruby/object:Gem::Version
-  version: 3.0.0.beta.3
+version: !ruby/object:Gem::Version 
+  hash: 15424119
   prerelease: 6
+  segments: 
+  - 3
+  - 0
+  - 0
+  - rc
+  - 1
+  version: 3.0.0.rc.1
 platform: ruby
-authors:
+authors: 
 - Thomas Reynolds
 - Ben Hollis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-21 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &70093414906640 !ruby/object:Gem::Requirement
+
+date: 2012-06-06 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 1
+        version: "1.1"
+  version_requirements: *id001
+  name: bundler
   prerelease: false
-  version_requirements: *70093414906640
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: &70093414906120 !ruby/object:Gem::Requirement
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        - 0
         version: 1.4.0
-  type: :runtime
+  version_requirements: *id002
+  name: rack
   prerelease: false
-  version_requirements: *70093414906120
-- !ruby/object:Gem::Dependency
-  name: tilt
-  requirement: &70093414905640 !ruby/object:Gem::Requirement
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 3
+        - 1
         version: 1.3.1
-  type: :runtime
+  version_requirements: *id003
+  name: tilt
   prerelease: false
-  version_requirements: *70093414905640
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: &70093414905160 !ruby/object:Gem::Requirement
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 6
+        - 1
         version: 0.6.1
-  type: :runtime
+  version_requirements: *id004
+  name: rack-test
   prerelease: false
-  version_requirements: *70093414905160
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: &70093414904680 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.14.0
   type: :runtime
-  prerelease: false
-  version_requirements: *70093414904680
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &70093414904200 !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.0
-  type: :runtime
+      - !ruby/object:Gem::Version 
+        hash: 33
+        segments: 
+        - 0
+        - 14
+        - 3
+        version: 0.14.3
+  version_requirements: *id005
+  name: thor
   prerelease: false
-  version_requirements: *70093414904200
-- !ruby/object:Gem::Dependency
-  name: padrino-helpers
-  requirement: &70093414903720 !ruby/object:Gem::Requirement
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.10.6
-  type: :runtime
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 2
+        - 4
+        version: 3.2.4
+  version_requirements: *id006
+  name: activesupport
   prerelease: false
-  version_requirements: *70093414903720
-- !ruby/object:Gem::Dependency
-  name: listen
-  requirement: &70093414903240 !ruby/object:Gem::Requirement
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 4
+        - 2
         version: 0.4.2
-  type: :runtime
+  version_requirements: *id007
+  name: listen
   prerelease: false
-  version_requirements: *70093414903240
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: &70093414902760 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.0
   type: :runtime
-  prerelease: false
-  version_requirements: *70093414902760
-description: A static site generator. Provides dozens of templating languages (Haml,
-  Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache
-  busting, Yaml data (and more) an easy part of your development cycle.
-email:
+description: A static site generator. Provides dozens of templating languages (Haml, Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache busting, Yaml data (and more) an easy part of your development cycle.
+email: 
 - me@tdreyno.com
 - ben@benhollis.net
-executables:
+executables: 
 - middleman
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gemtest
 - Rakefile
 - bin/middleman
 - features/3rd_party_cli.feature
-- features/asset_host.feature
 - features/auto_layout.feature
-- features/automatic_image_sizes.feature
 - features/builder.feature
 - features/chained_templates.feature
 - features/clean_build.feature
 - features/cli_extension.feature
 - features/cli_init.feature
-- features/content_for.feature
 - features/current_page_request_path_backwards.feature
 - features/custom_layout_engines.feature
 - features/custom_layouts.feature
 - features/data.feature
-- features/directory_index.feature
 - features/dynamic_pages.feature
 - features/extensionless_text_files.feature
 - features/feature_params.feature
-- features/former_padrino_helpers.feature
 - features/front-matter.feature
 - features/frontmatter_page_settings.feature
-- features/helpers_auto_javascript_include_tag.feature
-- features/helpers_auto_stylesheet_link_tag.feature
 - features/helpers_external.feature
-- features/helpers_lorem.feature
-- features/helpers_page_classes.feature
-- features/helpers_relative_link_to.feature
-- features/i18n_builder.feature
-- features/i18n_preview.feature
 - features/ignore.feature
 - features/implied_extensions.feature
-- features/instance_vars.feature
 - features/mount_rack.feature
-- features/nested_layouts.feature
-- features/partials.feature
 - features/preview_changes.feature
 - features/request_params.feature
 - features/sitemap_traversal.feature
@@ -168,31 +174,6 @@ files:
 - features/support/env.rb
 - features/unicode_filenames.feature
 - features/wildcard_page_helper.feature
-- fixtures/asset-host-app/config.rb
-- fixtures/asset-host-app/source/.htaccess
-- fixtures/asset-host-app/source/asset_host.html.erb
-- fixtures/asset-host-app/source/images/blank.gif
-- fixtures/auto-css-app/config.rb
-- fixtures/auto-css-app/source/auto-css.html.erb
-- fixtures/auto-css-app/source/auto-css/auto-css.html.erb
-- fixtures/auto-css-app/source/auto-css/index.html.erb
-- fixtures/auto-css-app/source/auto-css/sub/auto-css.html.erb
-- fixtures/auto-css-app/source/stylesheets/auto-css.css
-- fixtures/auto-css-app/source/stylesheets/auto-css/auto-css.css
-- fixtures/auto-css-app/source/stylesheets/auto-css/index.css
-- fixtures/auto-css-app/source/stylesheets/auto-css/sub/auto-css.css
-- fixtures/auto-js-app/config.rb
-- fixtures/auto-js-app/source/auto-js.html.erb
-- fixtures/auto-js-app/source/auto-js/auto-js.html.erb
-- fixtures/auto-js-app/source/auto-js/index.html.erb
-- fixtures/auto-js-app/source/auto-js/sub/auto-js.html.erb
-- fixtures/auto-js-app/source/javascripts/auto-js.js
-- fixtures/auto-js-app/source/javascripts/auto-js/auto-js.js
-- fixtures/auto-js-app/source/javascripts/auto-js/index.js
-- fixtures/auto-js-app/source/javascripts/auto-js/sub/auto-js.js
-- fixtures/automatic-image-size-app/config.rb
-- fixtures/automatic-image-size-app/source/auto-image-sizes.html.erb
-- fixtures/automatic-image-size-app/source/images/blank.gif
 - fixtures/basic-data-app/config.rb
 - fixtures/basic-data-app/data/test.yml
 - fixtures/basic-data-app/data/test2.json
@@ -215,13 +196,8 @@ files:
 - fixtures/clean-app/source/should_be_ignored2.html
 - fixtures/clean-app/source/should_be_ignored3.html
 - fixtures/clean-app/source/static.html
-- fixtures/clean-dir-app/config.rb
-- fixtures/clean-dir-app/source/about.html
 - fixtures/clean-nested-app/config.rb
 - fixtures/clean-nested-app/source/about.html
-- fixtures/content-for-app/config.rb
-- fixtures/content-for-app/source/content_for_erb.html.erb
-- fixtures/content-for-app/source/layouts/content_for.erb
 - fixtures/csspie/config.rb
 - fixtures/csspie/source/stylesheets/PIE.htc
 - fixtures/current-page-app/config.rb
@@ -240,11 +216,6 @@ files:
 - fixtures/different-engine-layout/config.rb
 - fixtures/different-engine-layout/source/index.html.str
 - fixtures/different-engine-layout/source/layout.erb
-- fixtures/different-engine-partial/config.rb
-- fixtures/different-engine-partial/source/index.html.erb
-- fixtures/different-engine-partial/source/layouts/layout.erb
-- fixtures/different-engine-partial/source/shared/_footer.str
-- fixtures/different-engine-partial/source/shared/_header.erb
 - fixtures/dynamic-pages-app/config.rb
 - fixtures/dynamic-pages-app/source/real.html
 - fixtures/dynamic-pages-app/source/real/index.html.erb
@@ -279,30 +250,22 @@ files:
 - fixtures/frontmatter-app/source/front-matter-2.php.erb
 - fixtures/frontmatter-app/source/front-matter-auto.erb
 - fixtures/frontmatter-app/source/front-matter-change.html.erb
-- fixtures/frontmatter-app/source/front-matter.html.erb
+- fixtures/frontmatter-app/source/front-matter-encoding.html.erb
+- fixtures/frontmatter-app/source/front-matter-line-2.html.erb
 - fixtures/frontmatter-app/source/json-front-matter-2.php.erb
 - fixtures/frontmatter-app/source/json-front-matter-auto.erb
+- fixtures/frontmatter-app/source/json-front-matter-encoding.html.erb
+- fixtures/frontmatter-app/source/json-front-matter-line-2.html.erb
 - fixtures/frontmatter-app/source/json-front-matter.html.erb
 - fixtures/frontmatter-settings-app/config.rb
 - fixtures/frontmatter-settings-app/source/alternate_layout.html.erb
 - fixtures/frontmatter-settings-app/source/ignored.html.erb
 - fixtures/frontmatter-settings-app/source/layouts/alternate.erb
-- fixtures/frontmatter-settings-app/source/no_index.html.erb
 - fixtures/generator-test/config.rb
 - fixtures/generator-test/source/index.html.erb
 - fixtures/glob-app/config.rb
 - fixtures/glob-app/source/index.html.erb
 - fixtures/glob-app/source/stylesheets/site.css.str
-- fixtures/i18n-alt-root-app/locales/en.yml
-- fixtures/i18n-alt-root-app/locales/es.yml
-- fixtures/i18n-alt-root-app/source/lang_data/hello.html.erb
-- fixtures/i18n-alt-root-app/source/lang_data/index.html.erb
-- fixtures/i18n-alt-root-app/source/layout.erb
-- fixtures/i18n-test-app/locales/en.yml
-- fixtures/i18n-test-app/locales/es.yml
-- fixtures/i18n-test-app/source/layout.erb
-- fixtures/i18n-test-app/source/localizable/hello.html.erb
-- fixtures/i18n-test-app/source/localizable/index.html.erb
 - fixtures/ignore-app/source/about.html.erb
 - fixtures/ignore-app/source/images/icon/messages.png
 - fixtures/ignore-app/source/images/pic.png
@@ -320,11 +283,6 @@ files:
 - fixtures/indexable-app/source/needs_index.html
 - fixtures/indexable-app/source/regular/index.html
 - fixtures/indexable-app/source/wildcard_leave_me_alone.html
-- fixtures/instance-vars-app/config.rb
-- fixtures/instance-vars-app/source/_vartial.erb
-- fixtures/instance-vars-app/source/instance-var-set.html.erb
-- fixtures/instance-vars-app/source/layout.erb
-- fixtures/instance-vars-app/source/no-instance-var.html.erb
 - fixtures/large-build-app/config.rb
 - fixtures/large-build-app/source/.htaccess
 - fixtures/large-build-app/source/_partial.erb
@@ -341,8 +299,6 @@ files:
 - fixtures/large-build-app/source/spaces in file.html.erb
 - fixtures/large-build-app/source/static.html
 - fixtures/large-build-app/source/stylesheets/static.css
-- fixtures/lorem-app/config.rb
-- fixtures/lorem-app/source/lorem.html.erb
 - fixtures/manual-layout-missing/config.rb
 - fixtures/manual-layout-missing/source/index.html.erb
 - fixtures/manual-layout-override/config.rb
@@ -356,34 +312,8 @@ files:
 - fixtures/multiple-layouts/source/index.html.erb
 - fixtures/multiple-layouts/source/layout.erb
 - fixtures/multiple-layouts/source/layout.str
-- fixtures/nested-layout-app/config.rb
-- fixtures/nested-layout-app/source/data-one.html.erb
-- fixtures/nested-layout-app/source/data-two.html.erb
-- fixtures/nested-layout-app/source/index.html.erb
-- fixtures/nested-layout-app/source/layouts/inner.erb
-- fixtures/nested-layout-app/source/layouts/master.erb
-- fixtures/nested-layout-app/source/layouts/outer.erb
 - fixtures/no-layout/config.rb
 - fixtures/no-layout/source/index.html.erb
-- fixtures/padrino-helpers-app/config.rb
-- fixtures/padrino-helpers-app/source/former_padrino_test.html.erb
-- fixtures/page-classes-app/config.rb
-- fixtures/page-classes-app/source/page-classes.html.erb
-- fixtures/page-classes-app/source/sub1/page-classes.html.erb
-- fixtures/page-classes-app/source/sub1/sub2/page-classes.html.erb
-- fixtures/partials-app/config.rb
-- fixtures/partials-app/source/_locals.erb
-- fixtures/partials-app/source/_main.erb
-- fixtures/partials-app/source/_main.str
-- fixtures/partials-app/source/index.html.erb
-- fixtures/partials-app/source/locals.html.erb
-- fixtures/partials-app/source/second.html.str
-- fixtures/partials-app/source/shared/_footer.erb
-- fixtures/partials-app/source/shared/_header.erb
-- fixtures/partials-app/source/shared/snippet.erb
-- fixtures/partials-app/source/sub/_local.erb
-- fixtures/partials-app/source/sub/index.html.erb
-- fixtures/partials-app/source/using_snippet.html.erb
 - fixtures/plain-app/index.html
 - fixtures/preview-app/config.rb
 - fixtures/preview-app/source/content.html.erb
@@ -408,19 +338,13 @@ files:
 - fixtures/traversal-app/source/sub/sub2/index.html.erb
 - fixtures/traversal-app/source/sub/sub3/deep.html.erb
 - fixtures/unicode-filenames-app/config.rb
-- fixtures/unicode-filenames-app/source/snowmen-rule-☃.html
+- "fixtures/unicode-filenames-app/source/snowmen-rule-\xE2\x98\x83.html"
 - fixtures/wildcard-app/config.rb
 - fixtures/wildcard-app/source/admin/index.html.erb
 - fixtures/wildcard-app/source/admin/page.html.erb
 - fixtures/wildcard-app/source/index.html.erb
 - fixtures/wildcard-app/source/layouts/admin.erb
 - fixtures/wildcard-app/source/layouts/layout.erb
-- fixtures/wildcard-directory-index-app/config.rb
-- fixtures/wildcard-directory-index-app/source/admin/index.html.erb
-- fixtures/wildcard-directory-index-app/source/admin/page.html.erb
-- fixtures/wildcard-directory-index-app/source/index.html.erb
-- fixtures/wildcard-directory-index-app/source/layouts/admin.erb
-- fixtures/wildcard-directory-index-app/source/layouts/layout.erb
 - lib/middleman-core.rb
 - lib/middleman-core/application.rb
 - lib/middleman-core/cli.rb
@@ -430,27 +354,27 @@ files:
 - lib/middleman-core/cli/init.rb
 - lib/middleman-core/cli/server.rb
 - lib/middleman-core/core_extensions.rb
-- lib/middleman-core/core_extensions/assets.rb
 - lib/middleman-core/core_extensions/builder.rb
 - lib/middleman-core/core_extensions/data.rb
-- lib/middleman-core/core_extensions/default_helpers.rb
 - lib/middleman-core/core_extensions/extensions.rb
 - lib/middleman-core/core_extensions/external_helpers.rb
 - lib/middleman-core/core_extensions/file_watcher.rb
 - lib/middleman-core/core_extensions/front_matter.rb
-- lib/middleman-core/core_extensions/i18n.rb
 - lib/middleman-core/core_extensions/rendering.rb
 - lib/middleman-core/core_extensions/request.rb
 - lib/middleman-core/core_extensions/routing.rb
 - lib/middleman-core/core_extensions/show_exceptions.rb
 - lib/middleman-core/extensions.rb
-- lib/middleman-core/extensions/asset_host.rb
-- lib/middleman-core/extensions/automatic_image_sizes.rb
-- lib/middleman-core/extensions/automatic_image_sizes/fastimage.rb
-- lib/middleman-core/extensions/directory_indexes.rb
-- lib/middleman-core/extensions/lorem.rb
 - lib/middleman-core/preview_server.rb
+- lib/middleman-core/renderers/coffee_script.rb
 - lib/middleman-core/renderers/erb.rb
+- lib/middleman-core/renderers/haml.rb
+- lib/middleman-core/renderers/less.rb
+- lib/middleman-core/renderers/liquid.rb
+- lib/middleman-core/renderers/markdown.rb
+- lib/middleman-core/renderers/redcarpet.rb
+- lib/middleman-core/renderers/sass.rb
+- lib/middleman-core/renderers/slim.rb
 - lib/middleman-core/sitemap.rb
 - lib/middleman-core/sitemap/extensions/ignores.rb
 - lib/middleman-core/sitemap/extensions/on_disk.rb
@@ -586,70 +510,63 @@ files:
 - lib/middleman-core/vendor/hooks-0.2.0/test/test_helper.rb
 - lib/middleman-core/version.rb
 - middleman-core.gemspec
+has_rdoc: true
 homepage: http://middlemanapp.com
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 740733060429309626
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Hand-crafted frontend development
-test_files:
+test_files: 
 - features/3rd_party_cli.feature
-- features/asset_host.feature
 - features/auto_layout.feature
-- features/automatic_image_sizes.feature
 - features/builder.feature
 - features/chained_templates.feature
 - features/clean_build.feature
 - features/cli_extension.feature
 - features/cli_init.feature
-- features/content_for.feature
 - features/current_page_request_path_backwards.feature
 - features/custom_layout_engines.feature
 - features/custom_layouts.feature
 - features/data.feature
-- features/directory_index.feature
 - features/dynamic_pages.feature
 - features/extensionless_text_files.feature
 - features/feature_params.feature
-- features/former_padrino_helpers.feature
 - features/front-matter.feature
 - features/frontmatter_page_settings.feature
-- features/helpers_auto_javascript_include_tag.feature
-- features/helpers_auto_stylesheet_link_tag.feature
 - features/helpers_external.feature
-- features/helpers_lorem.feature
-- features/helpers_page_classes.feature
-- features/helpers_relative_link_to.feature
-- features/i18n_builder.feature
-- features/i18n_preview.feature
 - features/ignore.feature
 - features/implied_extensions.feature
-- features/instance_vars.feature
 - features/mount_rack.feature
-- features/nested_layouts.feature
-- features/partials.feature
 - features/preview_changes.feature
 - features/request_params.feature
 - features/sitemap_traversal.feature
@@ -658,31 +575,6 @@ test_files:
 - features/support/env.rb
 - features/unicode_filenames.feature
 - features/wildcard_page_helper.feature
-- fixtures/asset-host-app/config.rb
-- fixtures/asset-host-app/source/.htaccess
-- fixtures/asset-host-app/source/asset_host.html.erb
-- fixtures/asset-host-app/source/images/blank.gif
-- fixtures/auto-css-app/config.rb
-- fixtures/auto-css-app/source/auto-css.html.erb
-- fixtures/auto-css-app/source/auto-css/auto-css.html.erb
-- fixtures/auto-css-app/source/auto-css/index.html.erb
-- fixtures/auto-css-app/source/auto-css/sub/auto-css.html.erb
-- fixtures/auto-css-app/source/stylesheets/auto-css.css
-- fixtures/auto-css-app/source/stylesheets/auto-css/auto-css.css
-- fixtures/auto-css-app/source/stylesheets/auto-css/index.css
-- fixtures/auto-css-app/source/stylesheets/auto-css/sub/auto-css.css
-- fixtures/auto-js-app/config.rb
-- fixtures/auto-js-app/source/auto-js.html.erb
-- fixtures/auto-js-app/source/auto-js/auto-js.html.erb
-- fixtures/auto-js-app/source/auto-js/index.html.erb
-- fixtures/auto-js-app/source/auto-js/sub/auto-js.html.erb
-- fixtures/auto-js-app/source/javascripts/auto-js.js
-- fixtures/auto-js-app/source/javascripts/auto-js/auto-js.js
-- fixtures/auto-js-app/source/javascripts/auto-js/index.js
-- fixtures/auto-js-app/source/javascripts/auto-js/sub/auto-js.js
-- fixtures/automatic-image-size-app/config.rb
-- fixtures/automatic-image-size-app/source/auto-image-sizes.html.erb
-- fixtures/automatic-image-size-app/source/images/blank.gif
 - fixtures/basic-data-app/config.rb
 - fixtures/basic-data-app/data/test.yml
 - fixtures/basic-data-app/data/test2.json
@@ -705,13 +597,8 @@ test_files:
 - fixtures/clean-app/source/should_be_ignored2.html
 - fixtures/clean-app/source/should_be_ignored3.html
 - fixtures/clean-app/source/static.html
-- fixtures/clean-dir-app/config.rb
-- fixtures/clean-dir-app/source/about.html
 - fixtures/clean-nested-app/config.rb
 - fixtures/clean-nested-app/source/about.html
-- fixtures/content-for-app/config.rb
-- fixtures/content-for-app/source/content_for_erb.html.erb
-- fixtures/content-for-app/source/layouts/content_for.erb
 - fixtures/csspie/config.rb
 - fixtures/csspie/source/stylesheets/PIE.htc
 - fixtures/current-page-app/config.rb
@@ -730,11 +617,6 @@ test_files:
 - fixtures/different-engine-layout/config.rb
 - fixtures/different-engine-layout/source/index.html.str
 - fixtures/different-engine-layout/source/layout.erb
-- fixtures/different-engine-partial/config.rb
-- fixtures/different-engine-partial/source/index.html.erb
-- fixtures/different-engine-partial/source/layouts/layout.erb
-- fixtures/different-engine-partial/source/shared/_footer.str
-- fixtures/different-engine-partial/source/shared/_header.erb
 - fixtures/dynamic-pages-app/config.rb
 - fixtures/dynamic-pages-app/source/real.html
 - fixtures/dynamic-pages-app/source/real/index.html.erb
@@ -769,30 +651,22 @@ test_files:
 - fixtures/frontmatter-app/source/front-matter-2.php.erb
 - fixtures/frontmatter-app/source/front-matter-auto.erb
 - fixtures/frontmatter-app/source/front-matter-change.html.erb
-- fixtures/frontmatter-app/source/front-matter.html.erb
+- fixtures/frontmatter-app/source/front-matter-encoding.html.erb
+- fixtures/frontmatter-app/source/front-matter-line-2.html.erb
 - fixtures/frontmatter-app/source/json-front-matter-2.php.erb
 - fixtures/frontmatter-app/source/json-front-matter-auto.erb
+- fixtures/frontmatter-app/source/json-front-matter-encoding.html.erb
+- fixtures/frontmatter-app/source/json-front-matter-line-2.html.erb
 - fixtures/frontmatter-app/source/json-front-matter.html.erb
 - fixtures/frontmatter-settings-app/config.rb
 - fixtures/frontmatter-settings-app/source/alternate_layout.html.erb
 - fixtures/frontmatter-settings-app/source/ignored.html.erb
 - fixtures/frontmatter-settings-app/source/layouts/alternate.erb
-- fixtures/frontmatter-settings-app/source/no_index.html.erb
 - fixtures/generator-test/config.rb
 - fixtures/generator-test/source/index.html.erb
 - fixtures/glob-app/config.rb
 - fixtures/glob-app/source/index.html.erb
 - fixtures/glob-app/source/stylesheets/site.css.str
-- fixtures/i18n-alt-root-app/locales/en.yml
-- fixtures/i18n-alt-root-app/locales/es.yml
-- fixtures/i18n-alt-root-app/source/lang_data/hello.html.erb
-- fixtures/i18n-alt-root-app/source/lang_data/index.html.erb
-- fixtures/i18n-alt-root-app/source/layout.erb
-- fixtures/i18n-test-app/locales/en.yml
-- fixtures/i18n-test-app/locales/es.yml
-- fixtures/i18n-test-app/source/layout.erb
-- fixtures/i18n-test-app/source/localizable/hello.html.erb
-- fixtures/i18n-test-app/source/localizable/index.html.erb
 - fixtures/ignore-app/source/about.html.erb
 - fixtures/ignore-app/source/images/icon/messages.png
 - fixtures/ignore-app/source/images/pic.png
@@ -810,11 +684,6 @@ test_files:
 - fixtures/indexable-app/source/needs_index.html
 - fixtures/indexable-app/source/regular/index.html
 - fixtures/indexable-app/source/wildcard_leave_me_alone.html
-- fixtures/instance-vars-app/config.rb
-- fixtures/instance-vars-app/source/_vartial.erb
-- fixtures/instance-vars-app/source/instance-var-set.html.erb
-- fixtures/instance-vars-app/source/layout.erb
-- fixtures/instance-vars-app/source/no-instance-var.html.erb
 - fixtures/large-build-app/config.rb
 - fixtures/large-build-app/source/.htaccess
 - fixtures/large-build-app/source/_partial.erb
@@ -831,8 +700,6 @@ test_files:
 - fixtures/large-build-app/source/spaces in file.html.erb
 - fixtures/large-build-app/source/static.html
 - fixtures/large-build-app/source/stylesheets/static.css
-- fixtures/lorem-app/config.rb
-- fixtures/lorem-app/source/lorem.html.erb
 - fixtures/manual-layout-missing/config.rb
 - fixtures/manual-layout-missing/source/index.html.erb
 - fixtures/manual-layout-override/config.rb
@@ -846,34 +713,8 @@ test_files:
 - fixtures/multiple-layouts/source/index.html.erb
 - fixtures/multiple-layouts/source/layout.erb
 - fixtures/multiple-layouts/source/layout.str
-- fixtures/nested-layout-app/config.rb
-- fixtures/nested-layout-app/source/data-one.html.erb
-- fixtures/nested-layout-app/source/data-two.html.erb
-- fixtures/nested-layout-app/source/index.html.erb
-- fixtures/nested-layout-app/source/layouts/inner.erb
-- fixtures/nested-layout-app/source/layouts/master.erb
-- fixtures/nested-layout-app/source/layouts/outer.erb
 - fixtures/no-layout/config.rb
 - fixtures/no-layout/source/index.html.erb
-- fixtures/padrino-helpers-app/config.rb
-- fixtures/padrino-helpers-app/source/former_padrino_test.html.erb
-- fixtures/page-classes-app/config.rb
-- fixtures/page-classes-app/source/page-classes.html.erb
-- fixtures/page-classes-app/source/sub1/page-classes.html.erb
-- fixtures/page-classes-app/source/sub1/sub2/page-classes.html.erb
-- fixtures/partials-app/config.rb
-- fixtures/partials-app/source/_locals.erb
-- fixtures/partials-app/source/_main.erb
-- fixtures/partials-app/source/_main.str
-- fixtures/partials-app/source/index.html.erb
-- fixtures/partials-app/source/locals.html.erb
-- fixtures/partials-app/source/second.html.str
-- fixtures/partials-app/source/shared/_footer.erb
-- fixtures/partials-app/source/shared/_header.erb
-- fixtures/partials-app/source/shared/snippet.erb
-- fixtures/partials-app/source/sub/_local.erb
-- fixtures/partials-app/source/sub/index.html.erb
-- fixtures/partials-app/source/using_snippet.html.erb
 - fixtures/plain-app/index.html
 - fixtures/preview-app/config.rb
 - fixtures/preview-app/source/content.html.erb
@@ -898,17 +739,10 @@ test_files:
 - fixtures/traversal-app/source/sub/sub2/index.html.erb
 - fixtures/traversal-app/source/sub/sub3/deep.html.erb
 - fixtures/unicode-filenames-app/config.rb
-- fixtures/unicode-filenames-app/source/snowmen-rule-☃.html
+- "fixtures/unicode-filenames-app/source/snowmen-rule-\xE2\x98\x83.html"
 - fixtures/wildcard-app/config.rb
 - fixtures/wildcard-app/source/admin/index.html.erb
 - fixtures/wildcard-app/source/admin/page.html.erb
 - fixtures/wildcard-app/source/index.html.erb
 - fixtures/wildcard-app/source/layouts/admin.erb
 - fixtures/wildcard-app/source/layouts/layout.erb
-- fixtures/wildcard-directory-index-app/config.rb
-- fixtures/wildcard-directory-index-app/source/admin/index.html.erb
-- fixtures/wildcard-directory-index-app/source/admin/page.html.erb
-- fixtures/wildcard-directory-index-app/source/index.html.erb
-- fixtures/wildcard-directory-index-app/source/layouts/admin.erb
-- fixtures/wildcard-directory-index-app/source/layouts/layout.erb
-has_rdoc: