middleman-core 3.0.4 → 3.0.5

data/bin/middleman

@@ -1,12 +1,5 @@
 #!/usr/bin/env ruby
 
-# Add our lib/ directory to the path
-libdir = File.expand_path(File.join(File.dirname(File.dirname(__FILE__)), "lib"))
-$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
-
-moredir = File.expand_path(File.join(File.dirname(File.dirname(libdir)), "middleman-more", "lib", "middleman-more"))
-$LOAD_PATH.unshift(moredir) unless $LOAD_PATH.include?(moredir)
-
 require 'middleman-core/profiling'
 if ARGV.include? '--profile'
   Middleman::Profiling.profiler = Middleman::Profiling::RubyProfProfiler.new

data/lib/middleman-core/application.rb

@@ -183,11 +183,7 @@ module Middleman
       # Evaluate a passed block if given
       instance_exec(&block) if block_given?
 
-      # Build expanded source path once paths have been parsed
-      path = root.dup
-      source_path = ENV["MM_SOURCE"] || self.source
-      path = File.join(root, source_path) unless source_path.empty?
-      set :source_dir, path
+      set :source, ENV["MM_SOURCE"] if ENV["MM_SOURCE"]
 
       super
     end
@@ -216,6 +212,13 @@ module Middleman
       self
     end
 
+    # The full path to the source directory
+    #
+    # @return [String]
+    def source_dir
+      File.join(root, source)
+    end
+
     delegate :logger, :instrument, :to => ::Middleman::Util
 
     # Work around this bug: http://bugs.ruby-lang.org/issues/4521
@@ -232,12 +235,18 @@ module Middleman
     # @param [String] path Request path
     # @return [String] Path with index file if necessary
     def full_path(path)
-      cache.fetch(:full_path, path) do
-        parts = path ? path.split('/') : []
-        if parts.last.nil? || parts.last.split('.').length == 1
-          path = File.join(path, index_file)
-        end
-        "/" + path.sub(%r{^/}, '')
+      resource = sitemap.find_resource_by_destination_path(path)
+
+      if !resource
+        # Try it with /index.html at the end
+        indexed_path = File.join(path.sub(%r{/$}, ''), index_file)
+        resource = sitemap.find_resource_by_destination_path(indexed_path)
+      end
+
+      if resource
+        '/' + resource.destination_path
+      else
+        '/' + Middleman::Util.normalize_path(path)
       end
     end
 

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

@@ -99,10 +99,7 @@ module Middleman::Cli
       #
       # @return [Rack::Test::Session]
       def shared_rack
-        @_shared_rack ||= begin
-          mock = ::Rack::MockSession.new(shared_server.to_rack_app)
-          ::Rack::Test::Session.new(mock)
-        end
+        @_shared_rack ||= ::Rack::Test::Session.new(shared_server.to_rack_app)
       end
 
       # Set the root path to the Middleman::Application's root
@@ -242,6 +239,7 @@ module Middleman::Cli
 
       # Double-check for compass sprites
       @app.files.find_new_files((Pathname(@app.source_dir) + @app.images_dir).relative_path_from(@app.root_path))
+      @app.sitemap.ensure_resource_list_updated!
 
       # Sort paths to be built by the above order. This is primarily so Compass can
       # find files in the build folder when it needs to generate sprites for the

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

@@ -28,10 +28,18 @@ module Middleman::Cli
       :type    => :boolean,
       :default => false,
       :desc    => 'Include a config.ru file'
-    method_option "bundler",
+    method_option "skip-gemfile",
       :type    => :boolean,
       :default => false,
-      :desc    => 'Create a Gemfile and use Bundler to manage gems'
+      :desc    => "Don't create a Gemfile"
+    method_option "skip-bundle",
+      :type    => :boolean,
+      :default => false,
+      :desc    => "Don't run bundle install"
+    method_option "skip-git",
+      :type    => :boolean,
+      :default => false,
+      :desc    => 'Skip Git ignores and keeps'
     # The init task
     # @param [String] name
     def init(name)

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

@@ -11,7 +11,7 @@ module Middleman
         /^\.sass-cache\//,
         /^\.git\//,
         /^\.gitignore$/,
-        /^\.DS_Store$/,
+        /\.DS_Store/,
         /^build\//,
         /^\.rbenv-.*$/,
         /^Gemfile$/,
@@ -116,17 +116,14 @@ module Middleman
             path = Pathname(path)
             return unless path.exist?
 
-            glob = (path + "**/*").to_s
+            glob = (path + "**").to_s
             subset = @known_paths.select { |p| p.fnmatch(glob) }
 
             ::Middleman::Util.all_files_under(path).each do |filepath|
-              if only_new
-                next if subset.include?(filepath)
-              else
-                subset.delete(filepath)
-              end
+              next if only_new && subset.include?(filepath)
 
-              self.did_change(filepath)
+              subset.delete(filepath)
+              did_change(filepath)
             end
 
             subset.each(&method(:did_delete)) unless only_new

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

@@ -37,7 +37,6 @@ module Middleman
         # @private
         def reset!
           @app = nil
-          @prototype = nil
         end
 
         # The shared Rack instance being build
@@ -94,7 +93,8 @@ module Middleman
         # @private
         # @return [Rack::Builder]
         def prototype
-          @prototype ||= to_rack_app
+          reset!
+          to_rack_app
         end
 
         # Call prototype, use in config.ru
@@ -227,32 +227,26 @@ module Middleman
           start_time = Time.now
           @current_path = nil
 
-          # Normalize the path and add index if we're looking at a directory
-          original_path = URI.decode(env["PATH_INFO"].dup)
-          if original_path.respond_to? :force_encoding
-            original_path.force_encoding('UTF-8')
+          request_path = URI.decode(env["PATH_INFO"].dup)
+          if request_path.respond_to? :force_encoding
+            request_path.force_encoding('UTF-8')
           end
-          request_path = full_path(original_path)
+          request_path = full_path(request_path)
 
           # Run before callbacks
           run_hook :before
 
-          if original_path != request_path
-            # Get the resource object for this path
-            resource = sitemap.find_resource_by_destination_path(original_path)
-          end
-
-          # Get the resource object for this full path
-          resource ||= sitemap.find_resource_by_destination_path(request_path)
+          # Get the resource object for this path
+          resource = sitemap.find_resource_by_destination_path(request_path)
 
           # Return 404 if not in sitemap
-          return not_found(res) unless resource && !resource.ignored?
+          return not_found(res, request_path) unless resource && !resource.ignored?
+
+          current_path = resource.destination_path
 
           # If this path is a static file, send it immediately
           return send_file(resource.source_file, env, res) unless resource.template?
 
-          current_path = request_path.dup
-
           # Set a HTTP content type based on the request's extensions
           content_type(res, resource.mime_type)
 
@@ -272,7 +266,7 @@ module Middleman
           end
 
           # End the request
-          logger.debug "== Finishing Request: #{request_path} (#{(Time.now - start_time).round(2)}s)"
+          logger.debug "== Finishing Request: #{current_path} (#{(Time.now - start_time).round(2)}s)"
           halt res.finish
         end
 
@@ -289,9 +283,9 @@ module Middleman
         end
 
         # Halt request and return 404
-        def not_found(res)
+        def not_found(res, path)
           res.status == 404
-          res.write "<html><body><h1>File Not Found</h1><p>#{@request_path}</p></body>"
+          res.write "<html><body><h1>File Not Found</h1><p>#{path}</p></body>"
           res.finish
         end
 

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

@@ -64,7 +64,10 @@ module Middleman
           end
 
           # Normalized path
-          url = full_path(url)
+          url = '/' + Middleman::Util.normalize_path(url)
+          if url.end_with?('/') || File.directory?(File.join(source_dir, url))
+            url = File.join(url, index_file)
+          end
 
           # Setup proxy
           if opts.has_key?(:proxy)

data/lib/middleman-core/preview_server.rb

@@ -145,7 +145,6 @@ module Middleman
       # @param [Middleman::Application] app
       # @return [void]
       def mount_instance
-        @app = new_app
         @webrick ||= setup_webrick(
           @options[:host]  || "0.0.0.0",
           @options[:debug] || false

data/lib/middleman-core/sitemap/extensions/on_disk.rb

@@ -14,7 +14,6 @@ module Middleman
         def initialize(sitemap)
           @sitemap = sitemap
           @app     = @sitemap.app
-
           @file_paths_on_disk = Set.new
 
           scoped_self = self
@@ -22,17 +21,18 @@ module Middleman
 
           # Register file change callback
           @app.files.changed do |file|
-            scoped_self.touch_file(file, !scoped_self.waiting_for_ready)
+            scoped_self.touch_file(file)
           end
 
           # Register file delete callback
           @app.files.deleted do |file|
-            scoped_self.remove_file(file, !scoped_self.waiting_for_ready)
+            scoped_self.remove_file(file)
           end
 
           @app.ready do
             scoped_self.waiting_for_ready = false
-            scoped_self.sitemap.rebuild_resource_list!(:on_disk_ready)
+            # Make sure the sitemap is ready for the first request
+            sitemap.ensure_resource_list_updated!
           end
         end
 
@@ -55,7 +55,13 @@ module Middleman
           # in case one of the other manipulators
           # (like asset_hash) cares about the contents of this file,
           # whether or not it belongs in the sitemap (like a partial)
-          @sitemap.rebuild_resource_list!(:touched_file) if rebuild
+          @sitemap.rebuild_resource_list!(:touched_file)
+
+          unless waiting_for_ready || @app.build?
+            # Force sitemap rebuild so the next request is ready to go.
+            # Skip this during build because the builder will control sitemap refresh.
+            @sitemap.ensure_resource_list_updated!
+          end
         end
 
         # Remove a file from the store
@@ -63,7 +69,12 @@ module Middleman
         # @return [void]
         def remove_file(file, rebuild=true)
           if @file_paths_on_disk.delete?(file)
-            @sitemap.rebuild_resource_list!(:removed_file) if rebuild
+            @sitemap.rebuild_resource_list!(:removed_file)
+            unless waiting_for_ready || @app.build?
+              # Force sitemap rebuild so the next request is ready to go.
+              # Skip this during build because the builder will control sitemap refresh.
+              @sitemap.ensure_resource_list_updated!
+            end
           end
         end
 

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

@@ -23,41 +23,32 @@ module Middleman
         @app   = app
         @resources = []
         @_cached_metadata = {}
-        @_lookup_cache = { :path => {}, :destination_path => {} }
         @resource_list_manipulators = []
+        @needs_sitemap_rebuild = true
+        reset_lookup_cache!
 
         # Register classes which can manipulate the main site map list
-        register_resource_list_manipulator(:on_disk, Middleman::Sitemap::Extensions::OnDisk.new(self),  false)
+        register_resource_list_manipulator(:on_disk, Middleman::Sitemap::Extensions::OnDisk.new(self))
 
         # Proxies
-        register_resource_list_manipulator(:proxies, @app.proxy_manager, false)
+        register_resource_list_manipulator(:proxies, @app.proxy_manager)
       end
 
-      # Register a klass which can manipulate the main site map list
+      # Register a klass which can manipulate the main site map list. Best to register
+      # these in a before_configuration or after_configuration hook.
+      #
       # @param [Symbol] name Name of the manipulator for debugging
       # @param [Class, Module] inst Abstract namespace which can update the resource list
-      # @param [Boolean] immediately_rebuild Whether the resource list should be immediately recalculated
       # @return [void]
-      def register_resource_list_manipulator(name, inst, immediately_rebuild=true)
+      def register_resource_list_manipulator(name, inst, unused=true)
         @resource_list_manipulators << [name, inst]
-        rebuild_resource_list!(:registered_new) if immediately_rebuild
+        rebuild_resource_list!(:registered_new)
       end
 
       # Rebuild the list of resources from scratch, using registed manipulators
       # @return [void]
       def rebuild_resource_list!(reason=nil)
-        @resources = @resource_list_manipulators.inject([]) do |result, (_, inst)|
-          newres = inst.manipulate_resource_list(result)
-
-          # Reset lookup cache
-          @_lookup_cache = { :path => {}, :destination_path => {} }
-          newres.each do |resource|
-            @_lookup_cache[:path][resource.path] = resource
-            @_lookup_cache[:destination_path][resource.destination_path] = resource
-          end
-
-          newres
-        end
+        @needs_sitemap_rebuild = true
       end
 
       # Find a resource given its original path
@@ -65,7 +56,8 @@ module Middleman
       # @return [Middleman::Sitemap::Resource]
       def find_resource_by_path(request_path)
         request_path = ::Middleman::Util.normalize_path(request_path)
-        @_lookup_cache[:path][request_path]
+        ensure_resource_list_updated!
+        @_lookup_by_path[request_path]
       end
 
       # Find a resource given its destination path
@@ -73,13 +65,15 @@ module Middleman
       # @return [Middleman::Sitemap::Resource]
       def find_resource_by_destination_path(request_path)
         request_path = ::Middleman::Util.normalize_path(request_path)
-        @_lookup_cache[:destination_path][request_path]
+        ensure_resource_list_updated!
+        @_lookup_by_destination_path[request_path]
       end
 
       # Get the array of all resources
       # @param [Boolean] include_ignored Whether to include ignored resources
       # @return [Array<Middleman::Sitemap::Resource>]
       def resources(include_ignored=false)
+        ensure_resource_list_updated!
         if include_ignored
           @resources
         else
@@ -214,6 +208,36 @@ module Middleman
 
         path
       end
+
+      # Actually update the resource list, assuming anything has called
+      # rebuild_resource_list! since the last time it was run. This is
+      # very expensive!
+      def ensure_resource_list_updated!
+        return unless @needs_sitemap_rebuild
+        @needs_sitemap_rebuild = false
+
+        @app.logger.debug "== Rebuilding resource list"
+
+        @resources = @resource_list_manipulators.inject([]) do |result, (_, inst)|
+          newres = inst.manipulate_resource_list(result)
+
+          # Reset lookup cache
+          reset_lookup_cache!
+          newres.each do |resource|
+            @_lookup_by_path[resource.path] = resource
+            @_lookup_by_destination_path[resource.destination_path] = resource
+          end
+
+          newres
+        end
+      end
+
+      private
+
+      def reset_lookup_cache!
+        @_lookup_by_path = {}
+        @_lookup_by_destination_path = {}
+      end
     end
   end
 end

data/lib/middleman-core/templates.rb

@@ -50,23 +50,28 @@ module Middleman::Templates
       template "shared/config.ru", File.join(location, "config.ru")
     end
 
+    class_option :'skip-bundle', :type => :boolean, :default => false
+    class_option :'skip-gemfile', :type => :boolean, :default => false
+
     # Write a Bundler Gemfile file for project
     # @return [void]
     def generate_bundler!
+      return if options[:'skip-gemfile']
       template "shared/Gemfile.tt", File.join(location, "Gemfile")
 
+      return if options[:'skip-bundle']
       inside(location) do
         ::Middleman::Cli::Bundle.new.invoke(:bundle)
       end unless ENV["TEST"]
     end
 
     # Output a .gitignore file
-    class_option :git, :type => :boolean, :default => true
+    class_option :'skip-git', :type => :boolean, :default => false
 
     # Write a .gitignore file for project
     # @return [void]
     def generate_gitignore!
-      return unless options[:git]
+      return if options[:'skip-git']
       copy_file "shared/gitignore", File.join(location, ".gitignore")
     end
   end

data/lib/middleman-core/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '3.0.4' unless const_defined?(:VERSION)
+  VERSION = '3.0.5' 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.0"])
+  s.add_dependency("listen", ["~> 0.5.2"])
   s.add_dependency("wdm", ["~> 0.0.3"]) # Windows
 end

data/middleman-core.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.add_dependency("activesupport", ["~> 3.2.6"])
   
   # Watcher
-  s.add_dependency("listen", ["~> 0.5.0"])
+  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
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-13 00:00:00.000000000 Z
+date: 2012-09-24 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.0
+        version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -123,7 +123,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
@@ -585,7 +585,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1143395816558407601
+      hash: -2720475402935195824
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -594,10 +594,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1143395816558407601
+      hash: -2720475402935195824
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Hand-crafted frontend development