middleman-core 3.0.7 → 3.0.8.pre.1

data/features/front-matter.feature

@@ -11,6 +11,16 @@ Feature: YAML Front Matter
     Then I should see "<?php"
     Then I should not see "---"
 
+  Scenario: Rendering raw (template-less) (yaml)
+    Given the Server is running at "frontmatter-app"
+    When I go to "/raw-front-matter.html"
+    Then I should see "<h1><%= data.page.title %></h1>"
+    Then I should not see "---"
+    When I go to "/raw-front-matter.php"
+    Then I should see '<?php echo "sup"; ?>'
+    Then I should see "<?php"
+    Then I should not see "---"
+
   Scenario: YAML not on first line, no encoding
     Given the Server is running at "frontmatter-app"
     When I go to "/front-matter-line-2.html"

data/fixtures/frontmatter-app/source/raw-front-matter.html

@@ -0,0 +1,6 @@
+---
+layout: false
+title: This is the title
+---
+
+<h1><%= data.page.title %></h1>

data/fixtures/frontmatter-app/source/raw-front-matter.php

@@ -0,0 +1,6 @@
+---
+layout: false
+title: This is the title
+---
+
+<?php echo "sup"; ?>

data/lib/middleman-core/cli/build.rb

@@ -117,16 +117,20 @@ module Middleman::Cli
         build_dir = self.class.shared_instance.build_dir
         output_file = File.join(build_dir, resource.destination_path)
 
-        begin
-          response = self.class.shared_rack.get(URI.escape(resource.destination_path))
-
-          if response.status == 200
-            create_file(output_file, response.body)
-          else
-            handle_error(output_file, response.body)
+        if resource.binary?
+          copy_file(resource.source_file, output_file)
+        else
+          begin
+            response = self.class.shared_rack.get(URI.escape(resource.destination_path))
+
+            if response.status == 200
+              create_file(output_file, response.body)
+            else
+              handle_error(output_file, response.body)
+            end
+          rescue => e
+            handle_error(output_file, "#{e}\n#{e.backtrace.join("\n")}", e)
           end
-        rescue => e
-          handle_error(output_file, "#{e}\n#{e.backtrace.join("\n")}", e)
         end
 
         output_file

data/lib/middleman-core/core_extensions/file_watcher.rb

@@ -88,6 +88,7 @@ module Middleman
         # @param [Pathname] path The file that changed
         # @return [void]
         def did_change(path)
+          path = Pathname(path)
           return if ignored?(path)
           logger.debug "== File Change: #{path}"
           @known_paths << path
@@ -99,6 +100,7 @@ module Middleman
         # @param [Pathname] path The file that was deleted
         # @return [void]
         def did_delete(path)
+          path = Pathname(path)
           return if ignored?(path)
           logger.debug "== File Deletion: #{path}"
           @known_paths.delete(path)

data/lib/middleman-core/core_extensions/request.rb

@@ -242,10 +242,10 @@ module Middleman
           # Return 404 if not in sitemap
           return not_found(res, request_path) unless resource && !resource.ignored?
 
-          current_path = resource.destination_path
+          # If this path is a binary file, send it immediately
+          return send_file(resource.source_file, env, res) if resource.binary?
 
-          # If this path is a static file, send it immediately
-          return send_file(resource.source_file, env, res) unless resource.template?
+          current_path = resource.destination_path
 
           # Set a HTTP content type based on the request's extensions
           content_type(res, resource.mime_type)

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

@@ -111,7 +111,9 @@ module Middleman
       # Render this resource
       # @return [String]
       def render(opts={}, locs={}, &block)
-        return File.open(source_file).read unless template?
+        if !template?
+          return app.template_data_for_file(source_file)
+        end
 
         relative_source = Pathname(source_file).relative_path_from(Pathname(app.root))
 
@@ -144,6 +146,14 @@ module Middleman
         end
         File.join(app.respond_to?(:http_prefix) ? app.http_prefix : '/', url_path)
       end
+
+      # Whether the source file is binary.
+      #
+      # @retrun [Boolean]
+      def binary?
+        s = (File.read(source_file, File.stat(source_file).blksize) || "").split(//)
+        ((s.size - s.grep(" ".."~").size) / s.size.to_f) > 0.30
+      end
     end
   end
 end

data/lib/middleman-core/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '3.0.7' unless const_defined?(:VERSION)
+  VERSION = '3.0.8.pre.1' unless const_defined?(:VERSION)
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 3.0.7
-  prerelease: 
+  version: 3.0.8.pre.1
+  prerelease: 6
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-17 00:00:00.000000000 Z
+date: 2013-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -295,6 +295,8 @@ files:
 - 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-app/source/raw-front-matter.html
+- fixtures/frontmatter-app/source/raw-front-matter.php
 - fixtures/frontmatter-settings-app/config.rb
 - fixtures/frontmatter-settings-app/source/alternate_layout.html.erb
 - fixtures/frontmatter-settings-app/source/ignored.html.erb
@@ -597,16 +599,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1408914751343926382
+      hash: -677048081599026784
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 1408914751343926382
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -737,6 +736,8 @@ test_files:
 - 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-app/source/raw-front-matter.html
+- fixtures/frontmatter-app/source/raw-front-matter.php
 - fixtures/frontmatter-settings-app/config.rb
 - fixtures/frontmatter-settings-app/source/alternate_layout.html.erb
 - fixtures/frontmatter-settings-app/source/ignored.html.erb