middleman-core 3.0.10.pre.1 → 3.0.11

data/features/builder.feature

@@ -14,6 +14,7 @@ Feature: Builder
       | images/Read me (example).txt                  |
       | images/Child folder/regular_file(example).txt |
       | .htaccess                                     |
+      | .htpasswd                                     |
       | feed.xml                                      |
     Then the following files should not exist:
       | _partial                                      |

data/fixtures/large-build-app/source/.htpasswd

@@ -0,0 +1 @@
+# .htpasswd

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

@@ -231,7 +231,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/)
+        !path.to_s.match(/\/\./) || path.to_s.match(/\.htaccess|\.htpasswd/)
       end
     end
 

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

@@ -29,7 +29,7 @@ module Middleman::Cli
       :type    => :string,
       :default => false,
       :desc    => 'Print instrument messages'
-    method_option "disable-watcher",
+    method_option :disable_watcher,
       :type    => :boolean,
       :default => false,
       :desc    => 'Disable the file change and delete watcher process'
@@ -41,6 +41,10 @@ module Middleman::Cli
       :type    => :string,
       :default => false,
       :desc    => 'Additional paths to auto-reload when files change'
+    method_option :force_polling,
+      :type    => :boolean,
+      :default => false,
+      :desc    => 'Force file watcher into polling mode'
 
     # Start the server
     def server
@@ -60,8 +64,9 @@ module Middleman::Cli
         :environment       => options["environment"],
         :debug             => options["verbose"],
         :instrumenting     => options["instrument"],
-        :"disable-watcher" => options["disable-watcher"],
-        :reload_paths      => options["reload_paths"]
+        :disable_watcher   => options["disable_watcher"],
+        :reload_paths      => options["reload_paths"],
+        :force_polling     => options["force_polling"]
       }
 
       puts "== The Middleman is loading"

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

@@ -128,23 +128,27 @@ module Middleman::CoreExtensions
       # @return [Array<Thor::CoreExt::HashWithIndifferentAccess, String>]
       def frontmatter_and_content(path)
         full_path = File.expand_path(File.join(@app.source_dir, path))
-        content = File.read(full_path)
         data = {}
+        content = nil
 
-        begin
-          if content =~ /\A.*coding:/
-            lines = content.split(/\n/)
-            lines.shift
-            content = lines.join("\n")
-          end
+        if !::Middleman::Util.binary?(full_path)
+          content = File.read(full_path)
+          
+          begin
+            if content =~ /\A.*coding:/
+              lines = content.split(/\n/)
+              lines.shift
+              content = lines.join("\n")
+            end
 
-          if result = parse_yaml_front_matter(content)
-            data, content = result
-          elsif result = parse_json_front_matter(content)
-            data, content = result
+            if result = parse_yaml_front_matter(content)
+              data, content = result
+            elsif result = parse_json_front_matter(content)
+              data, content = result
+            end
+          rescue => e
+            # Probably a binary file, move on
           end
-        rescue => e
-          # Probably a binary file, move on
         end
 
         [::Middleman::Util.recursively_enhance(data).freeze, content]

data/lib/middleman-core/preview_server.rb

@@ -80,14 +80,14 @@ module Middleman
       end
 
       def start_file_watcher
-        return if @options[:"disable-watcher"]
+        return if @options[:disable_watcher]
 
         first_run = !@listener
 
         if first_run
           # Watcher Library
           require "listen"
-          @listener = Listen.to(Dir.pwd, :relative_paths => true)
+          @listener = Listen.to(Dir.pwd, :relative_paths => true, :force_polling => @options[:force_polling])
         end
 
         @listener.change do |modified, added, removed|

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

@@ -14,10 +14,10 @@ module Middleman
           # Default sass options
           app.set :sass, {}
 
-          # Location of SASS .sass_cache directory.
+          # Location of SASS .sass-cache directory.
           # @return [String]
-          #   set :sass_cache_path, "/tmp/middleman-app-name/sass_cache"
-          app.set(:sass_cache_path) { File.join(app.root_path, '.sass_cache') } # runtime compile of path
+          #   set :sass_cache_path, "/tmp/middleman-app-name/sass-cache"
+          app.set(:sass_cache_path) { File.join(app.root_path, '.sass-cache') } # runtime compile of path
 
           app.before_configuration do
             template_extensions :scss => :css,

data/lib/middleman-core/sitemap.rb

@@ -29,7 +29,7 @@ module Middleman
 
           # Files starting with an dot, but not .htaccess
           :source_dotfiles => proc { |file|
-            file.match(%r{/\.}) && !file.match(%r{/\.htaccess})
+            file.match(%r{/\.}) && !file.match(%r{/\.htaccess|\.htpasswd})
           },
 
           # Files starting with an underscore, but not a double-underscore

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

@@ -1,7 +1,5 @@
 require "middleman-core/sitemap/extensions/traversal"
 
-require 'win32/file' if File::ALT_SEPARATOR
-
 module Middleman
 
   # Sitemap namespace
@@ -153,8 +151,7 @@ module Middleman
       #
       # @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
+        ::Middleman::Util.binary?(source_file)
       end
     end
   end

data/lib/middleman-core/templates/shared/config.tt

@@ -3,7 +3,7 @@
 ###
 
 # Susy grids in Compass
-# First: gem install susy --pre
+# First: gem install susy
 # require 'susy'
 
 # Change Compass configuration

data/lib/middleman-core/util.rb

@@ -14,6 +14,24 @@ module Middleman
 
   module Util
 
+    # Whether the source file is binary.
+    #
+    # @param [String] filename The file to check.
+    # @return [Boolean]
+    def self.binary?(filename)
+      ext = File.extname(filename)
+      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
+      return false if mime.start_with?('text/')
+      return false if mime.include?('xml')
+      return false if mime.include?('json')
+      return false if mime.include?('javascript')
+      true
+    end
+
     # The logger
     #
     # @return [Middleman::Logger] The logger

data/lib/middleman-core/version.rb

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

data/middleman-core-x86-mingw32.gemspec

@@ -35,7 +35,4 @@ Gem::Specification.new do |s|
   # Watcher
   s.add_dependency("listen", ["~> 0.5.2"])
   s.add_dependency("wdm", ["~> 0.0.3"]) # Windows
-
-  # Detect binary
-  s.add_dependency('win32-file', '>= 0.5.4')
 end

data/middleman-core.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   
   # Core
   s.add_dependency("bundler", ["~> 1.1"])
-  s.add_dependency("rack", ["1.4.1"])
+  s.add_dependency("rack", ["~> 1.4.1"])
   s.add_dependency("tilt", ["~> 1.3.1"])
   
   # Builder

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 3.0.10.pre.1
-  prerelease: 7
+  version: 3.0.11
+  prerelease: 
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2013-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -33,7 +33,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.1
   type: :runtime
@@ -41,7 +41,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.1
 - !ruby/object:Gem::Dependency
@@ -332,6 +332,7 @@ files:
 - fixtures/instance-vars-app/source/layout.erb
 - fixtures/large-build-app/config.rb
 - fixtures/large-build-app/source/.htaccess
+- fixtures/large-build-app/source/.htpasswd
 - fixtures/large-build-app/source/_partial.erb
 - fixtures/large-build-app/source/feed.xml.builder
 - fixtures/large-build-app/source/images/Child folder/regular_file(example).txt
@@ -605,13 +606,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1006188105979529752
+      hash: 714789105575917864
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 714789105575917864
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -779,6 +783,7 @@ test_files:
 - fixtures/instance-vars-app/source/layout.erb
 - fixtures/large-build-app/config.rb
 - fixtures/large-build-app/source/.htaccess
+- fixtures/large-build-app/source/.htpasswd
 - fixtures/large-build-app/source/_partial.erb
 - fixtures/large-build-app/source/feed.xml.builder
 - fixtures/large-build-app/source/images/Child folder/regular_file(example).txt