middleman-core 3.0.0 → 3.0.1.pre

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

@@ -2,22 +2,22 @@
 module Middleman
   module CoreExtensions
     module Routing
-  
+
       # Setup extension
       class << self
-    
+
         # Once registered
         def registered(app)
           # Include methods
           app.send :include, InstanceMethods
         end
-    
+
         alias :included :registered
       end
-  
+
       # Routing instance methods
       module InstanceMethods
-    
+
         # Takes a block which allows many pages to have the same layout
         #
         #   with_layout :admin do
@@ -29,13 +29,13 @@ module Middleman
         # @return [void]
         def with_layout(layout_name, &block)
           old_layout = layout
-    
+
           set :layout, layout_name
           instance_exec(&block) if block_given?
         ensure
           set :layout, old_layout
         end
-    
+
         # The page method allows the layout to be set on a specific path
         #
         #   page "/about.html", :layout => false
@@ -45,36 +45,36 @@ module Middleman
         # @param [Hash] opts
         # @return [void]
         def page(url, opts={}, &block)
-          
+
           blocks = []
           blocks << block if block_given?
-      
+
           # Default layout
           opts[:layout] = layout if opts[:layout].nil?
 
           # If the url is a regexp
           if url.is_a?(Regexp) || url.include?("*")
-        
+
             # Use the metadata loop for matching against paths at runtime
             sitemap.provides_metadata_for_path url do |url|
               { :options => opts, :blocks => blocks }
             end
-        
+
             return
           end
-      
+
           # Normalized path
           url = full_path(url)
 
           # Setup proxy
           if opts.has_key?(:proxy)
             proxy(url, opts[:proxy])
-        
+
             if opts.has_key?(:ignore) && opts[:ignore]
               ignore(opts[:proxy])
               opts.delete(:ignore)
-            end  
-        
+            end
+
             opts.delete(:proxy)
           else
             if opts.has_key?(:ignore) && opts[:ignore]
@@ -82,7 +82,7 @@ module Middleman
               opts.delete(:ignore)
             end
           end
-      
+
           # Setup a metadata matcher for rendering those options
           sitemap.provides_metadata_for_path url do |url|
             { :options => opts, :blocks => blocks }
@@ -91,4 +91,4 @@ module Middleman
       end
     end
   end
-end
+end

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

@@ -3,7 +3,7 @@ module Middleman::CoreExtensions::RubyEncoding
 
   # Setup extension
   class << self
-    
+
     # Once registerd
     def registered(app)
       app.send :include, InstanceMethods

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

@@ -5,10 +5,10 @@ require 'rack/showexceptions'
 module Middleman
   module CoreExtensions
     module ShowExceptions
-  
+
       # Setup extension
       class << self
-    
+
         # Once registered
         def registered(app)
           # When in dev
@@ -20,12 +20,12 @@ module Middleman
           end
         end
       end
-  
+
       # Custom exception class
       # TODO: Style this ourselves
       class Middleware < ::Rack::ShowExceptions
       end
-      
+
     end
   end
-end
+end

data/lib/middleman-core/extensions.rb

@@ -59,16 +59,16 @@ module Middleman
     # @private
     def load_extensions_in_path
       require "rubygems"
-      
+
       begin
         require "middleman-more"
       rescue LoadError
       end
-      
+
       extensions = rubygems_latest_specs.select do |spec|
         spec_has_file?(spec, EXTENSION_FILE)
       end
-      
+
       extensions.each do |spec|
         require spec.name
       end
@@ -100,4 +100,4 @@ module Middleman
       File.exists?(full_path)
     end
   end
-end
+end

data/lib/middleman-core/load_paths.rb

@@ -0,0 +1,56 @@
+# Core Pathname library used for traversal
+require "pathname"
+
+module Middleman
+
+  class << self
+    def setup_load_paths
+      @_is_setup ||= begin
+
+        # Only look for config.rb if MM_ROOT isn't set
+        if !ENV["MM_ROOT"] && found_path = locate_root
+          ENV["MM_ROOT"] = found_path
+        end
+
+        is_bundler_setup = false
+
+        # If we've found the root, try to setup Bundler
+        if ENV["MM_ROOT"]
+
+          root_gemfile = File.expand_path('Gemfile', ENV["MM_ROOT"])
+          ENV['BUNDLE_GEMFILE'] ||= root_gemfile
+
+          if !File.exists?(ENV['BUNDLE_GEMFILE'])
+            git_gemfile = Pathname.new(__FILE__).expand_path.parent.parent.parent + "Gemfile"
+            ENV['BUNDLE_GEMFILE'] = git_gemfile.to_s
+          end
+
+          if File.exists?(ENV['BUNDLE_GEMFILE'])
+            is_bundler_setup = true
+            require 'bundler/setup'
+          end
+        end
+
+        # Automatically discover extensions in RubyGems
+        require "middleman-core/extensions"
+
+        if is_bundler_setup
+          Bundler.require
+        else
+          ::Middleman.load_extensions_in_path
+        end
+
+        true
+      end
+    end
+
+    # Recursive method to find config.rb
+    def locate_root(cwd = Pathname.new(Dir.pwd))
+      return cwd.to_s if (cwd + 'config.rb').exist?
+      return false if cwd.root?
+      locate_root(cwd.parent)
+    end
+
+  end
+
+end

data/lib/middleman-core/logger.rb

@@ -0,0 +1,29 @@
+# Use the Ruby/Rails logger
+require 'active_support/core_ext/logger'
+require "securerandom"
+
+module Middleman
+
+  # The Middleman Logger
+  class Logger < ::Logger
+
+    # Force output to STDOUT
+    def initialize(log_level=1, is_instrumenting=false, target=STDOUT)
+      super(STDOUT)
+
+      self.level = log_level
+      @instrumenting = is_instrumenting
+
+      if @instrumenting != false
+        ::ActiveSupport::Notifications.subscribe(/\.middleman$/, self)
+      end
+    end
+
+    def call(message, *args)
+      return if @instrumenting.is_a?(String) && @instrumenting != "instrument" && !message.include?(@instrumenting)
+
+      evt = ActiveSupport::Notifications::Event.new(message, *args)
+      self.info "== Instrument (#{evt.name.sub(/.middleman$/, '')}): #{evt.duration}ms"
+    end
+  end
+end

data/lib/middleman-core/preview_server.rb

@@ -1,52 +1,53 @@
 require "webrick"
 
 module Middleman
-  
+
   WINDOWS = !!(RUBY_PLATFORM =~ /(mingw|bccwin|wince|mswin32)/i) unless const_defined?(:WINDOWS)
 
   module PreviewServer
-    
+
     DEFAULT_PORT = 4567
-    
+
     class << self
-      
+      attr_reader :app
+      delegate :logger, :to => :app
+
       # Start an instance of Middleman::Application
       # @return [void]
       def start(options={})
-        app = ::Middleman::Application.server.inst do
+        @app = ::Middleman::Application.server.inst do
           if options[:environment]
             set :environment, options[:environment].to_sym
           end
-          
-          if options[:debug]
-            set :logging, true
-          end
+
+          logger(options[:debug] ? 0 : 1, options[:instrumenting] || false)
         end
 
         port = options[:port] || DEFAULT_PORT
-    
-        puts "== The Middleman is standing watch on port #{port}"
+
+        logger.info "== The Middleman is standing watch on port #{port}"
 
         @webrick ||= setup_webrick(
           options[:host]  || "0.0.0.0",
           port,
           options[:debug] || false
         )
-        
+
         mount_instance(app)
 
         start_file_watcher unless options[:"disable-watcher"]
-        
+
         @initialized ||= false
         unless @initialized
           @initialized = true
-          
+
           register_signal_handlers unless ::Middleman::WINDOWS
-          
+
           # Save the last-used options so it may be re-used when
           # reloading later on.
           @last_options = options
-          
+          ::Middleman::Profiling.report("server_start")
+
           @webrick.start
         end
       end
@@ -54,14 +55,14 @@ module Middleman
       # Detach the current Middleman::Application instance
       # @return [void]
       def stop
-        puts "== The Middleman is shutting down"
+        logger.info "== The Middleman is shutting down"
         if @listener
           @listener.stop
           @listener = nil
         end
         unmount_instance
       end
-    
+
       # Simply stop, then start the server
       # @return [void]
       def reload
@@ -75,17 +76,17 @@ module Middleman
         stop
         @webrick.shutdown
       end
-      
+
     private
-      
+
       def start_file_watcher
         # Watcher Library
         require "listen"
-    
+
         return if @listener
 
         @listener = Listen.to(Dir.pwd, :relative_paths => true)
-      
+
         @listener.change do |modified, added, removed|
           added_and_modified = (modified + added)
 
@@ -98,10 +99,10 @@ module Middleman
 
             # Otherwise forward to Middleman
             added_and_modified.each do |path|
-              @app.files.did_change(@app.root_path + path)
+              @app.files.did_change(path)
             end
           end
-      
+
           unless removed.empty?
             # See if the changed file is config.rb or lib/*.rb
             if needs_to_reload?(removed)
@@ -111,15 +112,15 @@ module Middleman
 
             # Otherwise forward to Middleman
             removed.each do |path|
-              @app.files.did_delete(@app.root_path + path)
+              @app.files.did_delete(path)
             end
           end
         end
-    
+
         # Don't block this thread
         @listener.start(false)
       end
-      
+
       # Trap the interupt signal and shut down smoothly
       # @return [void]
       def register_signal_handlers
@@ -127,28 +128,28 @@ module Middleman
         trap("TERM") { shutdown }
         trap("QUIT") { shutdown }
       end
-      
-      # Initialize webrick 
+
+      # Initialize webrick
       # @return [void]
       def setup_webrick(host, port, is_logging)
         @host = host
         @port = port
-        
+
         http_opts = {
           :BindAddress => @host,
           :Port        => @port,
           :AccessLog   => []
         }
-        
+
         if is_logging
           http_opts[:Logger] = FilteredWebrickLog.new
         else
           http_opts[:Logger] = ::WEBrick::Log.new(nil, 0)
         end
-      
+
         ::WEBrick::HTTPServer.new(http_opts)
       end
-    
+
       # Attach a new Middleman::Application instance
       # @param [Middleman::Application] app
       # @return [void]
@@ -156,7 +157,7 @@ module Middleman
         @app = app
         @webrick.mount "/", ::Rack::Handler::WEBrick, @app.class.to_rack_app
       end
-    
+
       # Detach the current Middleman::Application instance
       # @return [void]
       def unmount_instance

data/lib/middleman-core/profiling.rb

@@ -0,0 +1,58 @@
+module Middleman
+  module Profiling
+
+    # The profiler instance. There can only be one!
+    def self.profiler=(prof)
+      @profiler = prof
+    end
+    def self.profiler
+      @profiler ||= NullProfiler.new
+    end
+
+    # Start the profiler
+    def self.start
+      profiler.start
+    end
+
+    # Stop the profiler and generate a report. Make sure to call start first
+    def self.report(report_name)
+      profiler.report(report_name)
+    end
+
+    # A profiler that does nothing. The default.
+    class NullProfiler
+      def start
+      end
+
+      def report(report_name)
+      end
+    end
+
+    # A profiler that uses ruby-prof
+    class RubyProfProfiler
+      def initialize
+        begin
+          require 'ruby-prof'
+        rescue LoadError
+          raise "To use the --profile option, you must 'gem install ruby-prof' (and include it in your Gemfile if running under bundle exec)"
+        end
+      end
+
+      def start
+        RubyProf.start
+      end
+
+      def report(report_name)
+        result = RubyProf.stop
+
+        printer = RubyProf::GraphHtmlPrinter.new(result)
+        outfile = File.join("profile", report_name)
+        outfile = (outfile + '.html') unless outfile.end_with? '.html'
+        FileUtils.mkdir_p(File.dirname(outfile))
+        File.open(outfile, 'w') do |f|
+          printer.print(f, :min_percent=> 1)
+        end
+      end
+    end
+  end
+end