middleman-core 3.0.11 → 3.0.12.pre.1

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

@@ -65,7 +65,9 @@ module Middleman::Cli
       action GlobAction.new(self, opts)
 
       if @had_errors && !@debugging
-        self.shell.say "There were errors during this build, re-run with --verbose to see the full exception."
+        cmd = "middleman build --verbose"
+        cmd = "bundle exec '#{cmd}'" if defined?(Bundler)
+        self.shell.say "There were errors during this build, re-run with `#{cmd}` to see the full exception."
       end
 
       exit(1) if @had_errors
@@ -231,7 +233,7 @@ module Middleman::Cli
 
       paths = ::Middleman::Util.all_files_under(@destination)
       @cleaning_queue += paths.select do |path|
-        !path.to_s.match(/\/\./) || path.to_s.match(/\.htaccess|\.htpasswd/)
+        path.to_s !~ /\/\./ || path.to_s =~ /\.(htaccess|htpasswd)/
       end
     end
 

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

@@ -25,11 +25,11 @@ module Middleman
         # parsing config.rb
         def initialize
           self.files.changed DataStore.matcher do |file|
-            self.data.touch_file(file) if file.match(%r{^#{self.data_dir}\/})
+            self.data.touch_file(file) if file.start_with?("#{self.data_dir}/")
           end
 
           self.files.deleted DataStore.matcher do |file|
-            self.data.remove_file(file) if file.match(%r{^#{self.data_dir}\/})
+            self.data.remove_file(file) if file.start_with?("#{self.data_dir}/")
           end
 
           super

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

@@ -145,7 +145,8 @@ module Middleman
         # @param [Pathname] path
         # @return [Boolean]
         def ignored?(path)
-          IGNORE_LIST.any? { |r| path.to_s.match(r) }
+          path = path.to_s
+          IGNORE_LIST.any? { |r| path =~ r }
         end
 
         # Notify callbacks for a file given an array of callbacks

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

@@ -1,3 +1,5 @@
+require 'pathname'
+
 # Extensions namespace
 module Middleman::CoreExtensions
 
@@ -70,8 +72,9 @@ module Middleman::CoreExtensions
         @cache.delete(path)
       end
 
-      YAML_ERRORS = [ Exception, ArgumentError ]
+      YAML_ERRORS = [ StandardError ]
 
+      # https://github.com/tenderlove/psych/issues/23
       if defined?(Psych) && defined?(Psych::SyntaxError)
         YAML_ERRORS << Psych::SyntaxError
       end
@@ -127,7 +130,12 @@ module Middleman::CoreExtensions
       # @param [String] path
       # @return [Array<Thor::CoreExt::HashWithIndifferentAccess, String>]
       def frontmatter_and_content(path)
-        full_path = File.expand_path(File.join(@app.source_dir, path))
+        full_path = if Pathname(path).relative?
+          File.join(@app.source_dir, path)
+        else
+          path
+        end
+        
         data = {}
         content = nil
 
@@ -155,7 +163,7 @@ module Middleman::CoreExtensions
       end
 
       def normalize_path(path)
-        path.sub(@app.source_dir, "").sub(/^\//, "")
+        path.sub(%r{^#{@app.source_dir}\/}, "")
       end
 
       # Update the main sitemap resource list

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

@@ -19,6 +19,9 @@ module Middleman
           # Include methods
           app.send :include, InstanceMethods
 
+          app.define_hook :before_render
+          app.define_hook :after_render
+
           # Activate custom renderers
           require "middleman-core/renderers/erb"
           app.register Middleman::Renderers::ERb
@@ -243,13 +246,27 @@ module Middleman
           options = opts.merge(options_for_ext(extension))
           options[:outvar] ||= '@_out_buf'
 
+          template_class = Tilt[path]
+          # Allow hooks to manipulate the template before render
+          self.class.callbacks_for_hook(:before_render).each do |callback|
+            newbody = callback.call(body, path, locs, template_class)
+            body = newbody if newbody # Allow the callback to return nil to skip it
+          end
+
           # Read compiled template from disk or cache
           template = cache.fetch(:compiled_template, options, body) do
             ::Tilt.new(path, 1, options) { body }
           end
 
           # Render using Tilt
-          template.render(context, locs, &block)
+          content = template.render(context, locs, &block)
+
+          # Allow hooks to manipulate the result after render
+          self.class.callbacks_for_hook(:after_render).each do |callback|
+            content = callback.call(content, path, locs, template_class)
+          end
+
+          return content
         ensure
           # Reset stored buffer
           @_out_buf = _buf_was
@@ -402,7 +419,7 @@ module Middleman
           # Find the path by searching or using the cache
           request_path = request_path.to_s
           cache.fetch(:resolve_template, request_path, options) do
-            relative_path = request_path.sub(%r{^/}, "")
+            relative_path = Util.strip_leading_slash(request_path)
             on_disk_path  = File.expand_path(relative_path, self.source_dir)
 
             # By default, any engine will do

data/lib/middleman-core/preview_server.rb

@@ -185,7 +185,7 @@ module Middleman
 
         paths.any? do |path|
           match_against.any? do |matcher|
-            path.match(matcher)
+            path =~ matcher
           end
         end
       end

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

@@ -11,25 +11,29 @@ module Middleman
       class << self
         # Once registered
         def registered(app)
-          app.before_configuration do
-            template_extensions :coffee => :js
-          end
-
           # Tell Tilt to use it as well (for inline scss blocks)
           ::Tilt.register 'coffee', DebuggingCoffeeScriptTemplate
           ::Tilt.prefer(DebuggingCoffeeScriptTemplate)
+
+          app.before_configuration do
+            template_extensions :coffee => :js
+            DebuggingCoffeeScriptTemplate.middleman_app = self
+          end
         end
         alias :included :registered
       end
 
       # A Template for Tilt which outputs debug messages
       class DebuggingCoffeeScriptTemplate < ::Tilt::CoffeeScriptTemplate
+        # Make the current Middleman app accessible to the template
+        cattr_accessor :middleman_app
+
         # Add exception messaging
         # @param [Class] context
         # @param [Hash] locals
         # @return [String]
         def evaluate(context, locals, &block)
-          return super if context.build?
+          return super if middleman_app.build?
 
           begin
             super

data/lib/middleman-core/sitemap.rb

@@ -25,18 +25,18 @@ module Middleman
         # Setup callbacks which can exclude paths from the sitemap
         app.set :ignored_sitemap_matchers, {
           # dotfiles and folders in the root
-          :root_dotfiles => proc { |file| file.match(%r{^\.}) },
+          :root_dotfiles => proc { |file| file.start_with?('.') },
 
           # Files starting with an dot, but not .htaccess
           :source_dotfiles => proc { |file|
-            file.match(%r{/\.}) && !file.match(%r{/\.htaccess|\.htpasswd})
+            file =~ %r{/\.} && file !~ %r{/\.(htaccess|htpasswd)}
           },
 
           # Files starting with an underscore, but not a double-underscore
-          :partials => proc { |file| file.match(%r{/_}) && !file.match(%r{/__}) },
+          :partials => proc { |file| file =~ %r{/_} && file !~ %r{/__} },
 
           :layout => proc { |file|
-            file.match(%r{^source/layout\.}) || file.match(%r{^source/layouts/})
+            file.start_with?('source/layout.') || file.start_with?('source/layouts/')
           }
         }
 
@@ -70,6 +70,7 @@ module Middleman
       # Get the resource object for the current path
       # @return [Middleman::Sitemap::Resource]
       def current_resource
+        return nil unless current_path
         sitemap.find_resource_by_destination_path(current_path)
       end
 

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

@@ -108,7 +108,7 @@ module Middleman
         blank_metadata = { :options => {}, :locals => {}, :page => {}, :blocks => [] }
 
         provides_metadata.inject(blank_metadata) do |result, (callback, matcher)|
-          next result if !matcher.nil? && !source_file.match(matcher)
+          next result if matcher && !source_file.match(matcher)
 
           metadata = callback.call(source_file)
 
@@ -146,9 +146,9 @@ module Middleman
         @_cached_metadata[request_path] = provides_metadata_for_path.inject(blank_metadata) do |result, (callback, matcher)|
           case matcher
           when Regexp
-            next result unless request_path.match(matcher)
+            next result unless request_path =~ matcher
           when String
-            next result unless File.fnmatch("/" + matcher.sub(%r{^/}, ''), "/#{request_path}")
+            next result unless File.fnmatch("/" + Util.strip_leading_slash(matcher), "/#{request_path}")
           end
 
           metadata = callback.call(request_path)

data/lib/middleman-core/util.rb

@@ -10,6 +10,9 @@ require "thor"
 # Core Pathname library used for traversal
 require "pathname"
 
+require "tilt"
+require "rack/mime"
+
 module Middleman
 
   module Util
@@ -20,11 +23,19 @@ module Middleman
     # @return [Boolean]
     def self.binary?(filename)
       ext = File.extname(filename)
+      return true if ext == '.svgz'
       return false if Tilt.registered?(ext.sub('.',''))
 
       ext = ".#{ext}" unless ext.to_s[0] == ?.
       mime = ::Rack::Mime.mime_type(ext, nil) 
-      return false unless mime
+      unless mime
+        binary_bytes = [0, 1, 2, 3, 4, 5, 6, 11, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 28, 29, 30, 31]
+        s = File.read(filename, 4096) || ''        
+        s.each_byte do |c|
+          return true if binary_bytes.include?(c)          
+        end
+        return false
+      end
       return false if mime.start_with?('text/')
       return false if mime.include?('xml')
       return false if mime.include?('json')
@@ -76,7 +87,13 @@ module Middleman
     # @return [String]
     def self.normalize_path(path)
       # The tr call works around a bug in Ruby's Unicode handling
-      path.sub(/^\//, "").tr('','')
+      path.sub(%r{^/}, "").tr('','')
+    end
+
+    # This is a separate method from normalize_path in case we
+    # change how we normalize paths
+    def self.strip_leading_slash(path)
+      path.sub(%r{^/}, "")
     end
 
     # Extract the text of a Rack response as a string.

data/lib/middleman-core/version.rb

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

data/middleman-core-x86-mingw32.gemspec

@@ -33,6 +33,6 @@ Gem::Specification.new do |s|
   s.add_dependency("activesupport", ["~> 3.2.6"])
   
   # Watcher
-  s.add_dependency("listen", ["~> 0.5.2"])
-  s.add_dependency("wdm", ["~> 0.0.3"]) # Windows
+  s.add_dependency("listen", ["~> 0.7.2"])
+  s.add_dependency("wdm", ["~> 0.1.0"]) # Windows
 end

data/middleman-core.gemspec

@@ -1,6 +1,5 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "middleman-core/version"
+require File.expand_path("../lib/middleman-core/version", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "middleman-core"
@@ -33,7 +32,7 @@ Gem::Specification.new do |s|
   s.add_dependency("activesupport", ["~> 3.2.6"])
   
   # Watcher
-  s.add_dependency("listen", ["~> 0.5.2"])
-  s.add_dependency("rb-fsevent", ["~> 0.9.1"]) # Linux
-  s.add_dependency("rb-inotify", ["~> 0.8.8"]) # OS X
+  s.add_dependency("listen", ["~> 0.7.2"])
+  s.add_dependency("rb-fsevent", ["~> 0.9.3"]) # OS X
+  # s.add_dependency("rb-inotify", ["~> 0.9.0"]) # Linux
 end

data/spec/middleman-core/binary_spec.rb

@@ -0,0 +1,15 @@
+require 'middleman-core/util'
+
+describe "Middleman::Util#binary?" do
+  %w(plain.txt unicode.txt unicode).each do |file|
+    it "recognizes #{file} as not binary" do
+      Middleman::Util.binary?(File.join(File.dirname(__FILE__), "binary_spec/#{file}")).should be_false
+    end
+  end
+
+  %w(middleman.png middleman stars.svgz).each do |file|
+    it "recognizes #{file} as binary" do
+      Middleman::Util.binary?(File.join(File.dirname(__FILE__), "binary_spec/#{file}")).should be_true
+    end
+  end
+end

data/spec/middleman-core/binary_spec/plain.txt

@@ -0,0 +1 @@
+Some plain text

data/spec/middleman-core/binary_spec/unicode

@@ -0,0 +1 @@
+明日がある。

data/spec/middleman-core/binary_spec/unicode.txt

@@ -0,0 +1 @@
+明日がある。

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 3.0.11
-  prerelease: 
+  version: 3.0.12.pre.1
+  prerelease: 7
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000 Z
+date: 2013-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -115,7 +115,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -123,7 +123,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
@@ -131,7 +131,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -139,23 +139,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.1
-- !ruby/object:Gem::Dependency
-  name: rb-inotify
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.8
+        version: 0.9.3
 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.
@@ -591,6 +575,15 @@ files:
 - lib/middleman/rack.rb
 - middleman-core-x86-mingw32.gemspec
 - middleman-core.gemspec
+- spec/middleman-core/binary_spec.rb
+- spec/middleman-core/binary_spec/middleman
+- spec/middleman-core/binary_spec/middleman.png
+- spec/middleman-core/binary_spec/plain.txt
+- spec/middleman-core/binary_spec/stars.svgz
+- spec/middleman-core/binary_spec/unicode
+- spec/middleman-core/binary_spec/unicode.txt
+- spec/middleman-core/sitemap_spec.rb
+- spec/spec_helper.rb
 homepage: http://middlemanapp.com
 licenses:
 - MIT
@@ -606,19 +599,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 714789105575917864
+      hash: -3461050941848331354
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 714789105575917864
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Hand-crafted frontend development