middleman-core 3.0.0.rc.4 → 3.0.0

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

@@ -206,12 +206,12 @@ module Middleman::Cli
     # @return [void]
     def queue_current_paths
       @cleaning_queue = []
-      Find.find(@destination) do |path|
-        next if path.match(/\/\./) && !path.match(/\.htaccess/)
-        unless path == destination
-          @cleaning_queue << Pathname.new(path)
-        end
-      end if File.exist?(@destination)
+      return unless File.exist?(@destination)
+      
+      paths = ::Middleman::Util.all_files_under(@destination)
+      @cleaning_queue += paths.select do |path|
+        !path.to_s.match(/\/\./) || path.to_s.match(/\.htaccess/)
+      end 
     end
 
     # Actually build the app

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

@@ -10,7 +10,7 @@ module Middleman
         def registered(app)
           # Setup a default helpers paths
           app.set :helpers_dir, "helpers"
-          app.set :helpers_filename_glob, "**/*.rb"
+          app.set :helpers_filename_glob, "**{,/*/**}/*.rb"
           app.set :helpers_filename_to_module_name_proc, Proc.new { |filename|
             basename = File.basename(filename, File.extname(filename))
             basename.camelcase

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

@@ -16,7 +16,8 @@ module Middleman
         /^\.rbenv-.*$/,
         /^Gemfile$/,
         /^Gemfile\.lock$/,
-        /~$/
+        /~$/,
+        /(^|\/)\.?#/
       ]
 
       # Setup extension
@@ -112,9 +113,8 @@ module Middleman
           glob = "#{path}**/*"
           subset = @known_paths.select { |p| p.fnmatch(glob) }
           
-          path.find do |filepath|
+          ::Middleman::Util.all_files_under(path).each do |filepath|
             full_path = path + filepath
-            next if full_path.directory?
             
             if only_new
               next if subset.include?(full_path)
@@ -161,4 +161,4 @@ module Middleman
       end
     end
   end
-end
+end

data/lib/middleman-core/preview_server.rb

@@ -1,3 +1,5 @@
+require "webrick"
+
 module Middleman
   
   WINDOWS = !!(RUBY_PLATFORM =~ /(mingw|bccwin|wince|mswin32)/i) unless const_defined?(:WINDOWS)
@@ -11,8 +13,6 @@ module Middleman
       # Start an instance of Middleman::Application
       # @return [void]
       def start(options={})
-        require "webrick"
-        
         app = ::Middleman::Application.server.inst do
           if options[:environment]
             set :environment, options[:environment].to_sym
@@ -140,8 +140,10 @@ module Middleman
           :AccessLog   => []
         }
         
-        unless is_logging
-          http_opts[:Logger] = ::WEBrick::Log::new(nil, 0)
+        if is_logging
+          http_opts[:Logger] = FilteredWebrickLog.new
+        else
+          http_opts[:Logger] = ::WEBrick::Log.new(nil, 0)
         end
       
         ::WEBrick::HTTPServer.new(http_opts)
@@ -171,5 +173,13 @@ module Middleman
         end
       end
     end
+
+    class FilteredWebrickLog < ::WEBrick::Log
+      def log(level, data)
+        unless data =~ %r{Could not determine content-length of response body.}
+          super(level, data)
+        end
+      end
+    end
   end
 end

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

@@ -31,7 +31,9 @@ module Middleman
         def evaluate(context, locals, &block)
           begin
             super
-          rescue ::ExecJS::RuntimeError=> e
+          rescue ::ExecJS::RuntimeError => e
+            e.to_s
+          rescue => e
             e.to_s
           end
         end

data/lib/middleman-core/util.rb

@@ -74,6 +74,21 @@ module Middleman
         File.fnmatch(matcher.to_s, path)
       end
     end
+    
+    # Get a recusive list of files inside a set of paths.
+    # Works with symlinks.
+    #
+    # @param path A path string or Pathname
+    # @return [Array] An array of filenames
+    def self.all_files_under(*paths)
+      paths.flatten!
+      paths.map! { |p| Pathname(p) }
+      files = paths.select { |p| p.file? }
+      paths.select {|p| p.directory? }.each do |dir|
+        files << all_files_under(dir.children)
+      end
+      files.flatten
+    end
 
     # Simple shared cache implementation
     class Cache

data/lib/middleman-core/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '3.0.0.rc.4' unless const_defined?(:VERSION)
+  VERSION = '3.0.0' 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.0.rc.4
-  prerelease: 6
+  version: 3.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-04 00:00:00.000000000 Z
+date: 2012-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -530,16 +530,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 362783579195130288
+      hash: 3714652259442749458
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 3714652259442749458
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Hand-crafted frontend development