middleman-core 3.0.0.beta.3 → 3.0.0.rc.1

data/fixtures/frontmatter-app/source/json-front-matter-line-2.html.erb

@@ -0,0 +1,7 @@
+<h2> Test</h2>
+;;;
+layout: false,
+title: "This is the title"
+;;;
+
+<h1><%= data.page.title %></h1>

data/fixtures/frontmatter-app/source/json-front-matter.html.erb

@@ -1,6 +1,6 @@
-{{{
+;;;
   "layout": false,
   "title":  "This is the title"
-}}}
+;;;
 
 <h1><%= data.page.title %></h1>

data/fixtures/frontmatter-settings-app/config.rb

@@ -1,4 +1,2 @@
-activate :directory_indexes
-
 # Proxy ignored.html, which should ignore itself through a frontmatter
-page 'proxied.html', :proxy => 'ignored.html'
+page 'proxied.html', :proxy => 'ignored.html'

data/fixtures/indexable-app/config.rb

@@ -1,4 +0,0 @@
-activate :directory_indexes
-page "/leave_me_alone.html", :directory_index => false
-
-page "/wildcard*", :directory_index => false

data/fixtures/traversal-app/config.rb

@@ -1,5 +1,3 @@
-activate :directory_indexes
-
 page "/sub/fake.html", :proxy => "/proxied.html", :ignore => true
 page "/sub/fake2.html", :proxy => "/proxied.html", :ignore => true
 

data/lib/middleman-core/application.rb

@@ -3,6 +3,7 @@ require "tilt"
 
 # Use ActiveSupport JSON
 require "active_support/json"
+require "active_support/core_ext/integer/inflections"
 
 # Simple callback library
 require "middleman-core/vendor/hooks-0.2.0/lib/hooks"
@@ -71,6 +72,11 @@ module Middleman
     # @return [String]
     set :root,        ENV["MM_ROOT"] || Dir.pwd
   
+    # Pathname-addressed root
+    def root_path
+      @_root_path ||= Pathname.new(root)
+    end
+  
     # Name of the source directory
     # @return [String]
     set :source,      "source"
@@ -87,7 +93,7 @@ module Middleman
     # @return [String]
     set :index_file,  "index.html"
 
-    # Location of javascripts within source. Used by Sprockets.
+    # Location of javascripts within source.
     # @return [String]
     set :js_dir,      "javascripts"
   
@@ -111,10 +117,6 @@ module Middleman
     # @return [Boolean]
     set :show_exceptions, true
 
-    # Automatically loaded extensions
-    # @return [Array<Symbol>]
-    set :default_extensions, [ :lorem ]
-
     # Default layout name
     # @return [String, Symbold]
     set :layout, :_auto_layout
@@ -150,54 +152,11 @@ module Middleman
     # Setup external helpers
     register Middleman::CoreExtensions::ExternalHelpers
   
-    # Setup default helpers
-    register Middleman::CoreExtensions::DefaultHelpers
-  
-    # Setup asset path pipeline
-    register Middleman::CoreExtensions::Assets
-  
     # with_layout and page routing
     register Middleman::CoreExtensions::Routing
   
-    # i18n
-    register Middleman::CoreExtensions::I18n
-  
-    # Built-in Extensions
-    
-    # Provide Apache-style index.html files for directories
-    Middleman::Extensions.register(:directory_indexes) do
-      require "middleman-core/extensions/directory_indexes"
-      Middleman::Extensions::DirectoryIndexes 
-    end
-    
-    # Lorem provides a handful of helpful prototyping methods to generate
-    # words, paragraphs, fake images, names and email addresses.
-    Middleman::Extensions.register(:lorem) do
-      require "middleman-core/extensions/lorem"
-      Middleman::Extensions::Lorem 
-    end
-    
-    # AutomaticImageSizes inspects the images used in your dynamic templates
-    # and automatically adds width and height attributes to their HTML
-    # elements.
-    Middleman::Extensions.register(:automatic_image_sizes) do
-      require "middleman-core/extensions/automatic_image_sizes"
-      Middleman::Extensions::AutomaticImageSizes
-    end
-    
-    # AssetHost allows you to setup multiple domains to host your static
-    # assets. Calls to asset paths in dynamic templates will then rotate
-    # through each of the asset servers to better spread the load.
-    Middleman::Extensions.register(:asset_host) do
-      require "middleman-core/extensions/asset_host"
-      Middleman::Extensions::AssetHost 
-    end
-  
     # Initialize the Middleman project
     def initialize(&block)
-      # Current path defaults to nil, used in views.
-      self.current_path = nil
-    
       # Clear the static class cache
       cache.clear
     

data/lib/middleman-core/cli.rb

@@ -3,63 +3,66 @@ require 'thor'
 require "thor/group"
 
 # CLI Module
-module Middleman::Cli
-  
-  # The base task from which everything else etends
-  class Base < Thor
+module Middleman
+
+  module Cli
     
-    desc "version", "Show version"
-    def version
-      require 'middleman-core/version'
-      say "Middleman #{Middleman::VERSION}"
-    end
+    # The base task from which everything else etends
+    class Base < Thor
     
-    # Override the Thor help method to find help for subtasks
-    # @param [Symbol, String, nil] meth
-    # @param [Boolean] subcommand
-    # @return [void]
-    def help(meth = nil, subcommand = false)
-      if meth && !self.respond_to?(meth)
-        klass, task = Thor::Util.find_class_and_task_by_namespace("#{meth}:#{meth}")
-        klass.start(["-h", task].compact, :shell => self.shell)
-      else
-        list = []
-        Thor::Util.thor_classes_in(Middleman::Cli).each do |klass|
-          list += klass.printable_tasks(false)
-        end
-        list.sort!{ |a,b| a[0] <=> b[0] }
+      desc "version", "Show version"
+      def version
+        require 'middleman-core/version'
+        say "Middleman #{Middleman::VERSION}"
+      end
+    
+      # Override the Thor help method to find help for subtasks
+      # @param [Symbol, String, nil] meth
+      # @param [Boolean] subcommand
+      # @return [void]
+      def help(meth = nil, subcommand = false)
+        if meth && !self.respond_to?(meth)
+          klass, task = Thor::Util.find_class_and_task_by_namespace("#{meth}:#{meth}")
+          klass.start(["-h", task].compact, :shell => self.shell)
+        else
+          list = []
+          Thor::Util.thor_classes_in(Middleman::Cli).each do |klass|
+            list += klass.printable_tasks(false)
+          end
+          list.sort!{ |a,b| a[0] <=> b[0] }
         
-        shell.say "Tasks:"
-        shell.print_table(list, :ident => 2, :truncate => true)
-        shell.say
+          shell.say "Tasks:"
+          shell.print_table(list, :ident => 2, :truncate => true)
+          shell.say
+        end
       end
-    end
     
-    # Intercept missing methods and search subtasks for them
-    # @param [Symbol] meth
-    def method_missing(meth, *args)
-      meth = meth.to_s
+      # Intercept missing methods and search subtasks for them
+      # @param [Symbol] meth
+      def method_missing(meth, *args)
+        meth = meth.to_s
       
-      if self.class.map.has_key?(meth)
-        meth = self.class.map[meth]
-      end
+        if self.class.map.has_key?(meth)
+          meth = self.class.map[meth]
+        end
       
-      klass, task = Thor::Util.find_class_and_task_by_namespace("#{meth}:#{meth}")
+        klass, task = Thor::Util.find_class_and_task_by_namespace("#{meth}:#{meth}")
       
-      if klass.nil?
-        tasks_dir = File.join(Dir.pwd, "tasks")
+        if klass.nil?
+          tasks_dir = File.join(Dir.pwd, "tasks")
 
-        if File.exists?(tasks_dir)
-          Dir[File.join(tasks_dir, "**/*_task.rb")].each { |f| require f }
-          klass, task = Thor::Util.find_class_and_task_by_namespace("#{meth}:#{meth}")
+          if File.exists?(tasks_dir)
+            Dir[File.join(tasks_dir, "**/*_task.rb")].each { |f| require f }
+            klass, task = Thor::Util.find_class_and_task_by_namespace("#{meth}:#{meth}")
+          end
         end
-      end
       
-      if klass.nil?
-        super
-      else
-        args.unshift(task) if task
-        klass.start(args, :shell => self.shell)
+        if klass.nil?
+          super
+        else
+          args.unshift(task) if task
+          klass.start(args, :shell => self.shell)
+        end
       end
     end
   end

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

@@ -1,8 +1,4 @@
-# Use Rack::Test for inspecting a running server for output
-require "rack"
-require "rack/test"
-
-require 'find'
+require "middleman-core"
 
 # CLI Module
 module Middleman::Cli
@@ -11,6 +7,8 @@ module Middleman::Cli
   class Build < Thor
     include Thor::Actions
     
+    attr_reader :debugging
+    
     check_unknown_options!
     
     namespace :build
@@ -38,7 +36,16 @@ module Middleman::Cli
         raise Thor::Error, "Error: Could not find a Middleman project config, perhaps you are in the wrong folder?"
       end
       
-      self.class.shared_instance(options["verbose"] || false)
+      # Use Rack::Test for inspecting a running server for output
+      require "rack"
+      require "rack/test"
+
+      require 'find'
+      
+      @debugging = Middleman::Cli::Base.debugging
+      @had_errors = false
+      
+      self.class.shared_instance(options["verbose"])
       
       self.class.shared_rack
 
@@ -48,6 +55,12 @@ module Middleman::Cli
 
       action GlobAction.new(self, opts)
 
+      if @had_errors && !@debugging
+        self.shell.say "There were errors during this build, re-run with --debug to see the full exception."
+      end
+      
+      exit(1) if @had_errors
+
       self.class.shared_instance.run_hook :after_build, self
     end
     
@@ -92,32 +105,42 @@ module Middleman::Cli
       end
     end
     
-    # Ignore following method
-    desc "", "", :hide => true
+    no_tasks {
+      # Render a resource to a file.
+      #
+      # @param [Middleman::Sitemap::Resource] resource
+      # @return [String] The full path of the file that was written
+      def render_to_file(resource)
+        build_dir = self.class.shared_instance.build_dir
+        output_file = File.join(build_dir, resource.destination_path)
+
+        begin
+          response = self.class.shared_rack.get(URI.escape(resource.destination_path))
+
+          if response.status == 200
+            create_file(output_file, response.body)
+          else
+            handle_error(output_file, response.body)
+          end
+        rescue => e
+          handle_error(output_file, "#{e}\n#{e.backtrace.join("\n")}", e)
+        end
+
+        output_file
+      end
     
-    # Render a resource to a file.
-    #
-    # @param [Middleman::Sitemap::Resource] resource
-    # @return [String] The full path of the file that was written
-    def render_to_file(resource)
-      build_dir = self.class.shared_instance.build_dir
-      output_file = File.join(build_dir, resource.destination_path)
-
-      begin
-        response = self.class.shared_rack.get(URI.escape(resource.destination_path))
-
-        if response.status == 200
-          create_file(output_file, response.body, { :force => true })
-        else
-          raise Thor::Error.new response.body
+      def handle_error(file_name, response, e=Thor::Error.new(response))
+        @had_errors = true
+        
+        say_status :error, file_name, :red
+        if self.debugging
+          raise e
+          exit(1)
+        elsif options["verbose"]
+          self.shell.error(response)
         end
-      rescue => e
-        say_status :error, output_file, :red
-        raise Thor::Error.new "#{e}\n#{e.backtrace.join("\n")}"
       end
-
-      output_file
-    end
+    }
   end
   
   # A Thor Action, modular code, which does the majority of the work.
@@ -147,6 +170,7 @@ module Middleman::Cli
     end
 
   protected
+    
     # Remove files which were not built in this cycle
     # @return [void]
     def clean!
@@ -208,7 +232,7 @@ module Middleman::Cli
       puts "== Checking for Compass sprites" if @app.logging?
 
       # Double-check for compass sprites
-      @app.files.find_new_files(File.join(@app.source_dir, @app.images_dir))
+      @app.files.find_new_files(Pathname.new(@app.source_dir) + @app.images_dir)
 
       # 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
@@ -237,3 +261,11 @@ module Middleman::Cli
   # Alias "b" to "build"
   Base.map({ "b" => "build" })
 end
+
+# Quiet down create file
+class ::Thor::Actions::CreateFile
+  def on_conflict_behavior(&block)
+    say_status :create, :green
+    block.call unless pretend?
+  end
+end

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

@@ -12,7 +12,7 @@ module Middleman::Cli
     # Required path for the new project to be generated
     argument :name, :type => :string
 
-    desc "extension NAME [options]", "Create Middleman extension scaffold NAME"
+    desc "extension [options]", "Create Middleman extension scaffold NAME"
     
     # The extension task
     # @param [String] name

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

@@ -1,5 +1,3 @@
-require "middleman-core/preview_server"
-
 # CLI Module
 module Middleman::Cli
   
@@ -34,6 +32,9 @@ module Middleman::Cli
     
     # Start the server
     def server
+      require "middleman-core"
+      require "middleman-core/preview_server"
+      
       if !ENV["MM_ROOT"]
         puts "== Could not find a Middleman project config.rb"
         puts "== Treating directory as a static site to be served"
@@ -50,7 +51,7 @@ module Middleman::Cli
       }
       
       puts "== The Middleman is loading"
-      Middleman::PreviewServer.start(params)
+      ::Middleman::PreviewServer.start(params)
     end
   end
 

data/lib/middleman-core/core_extensions.rb

@@ -10,9 +10,6 @@ require "middleman-core/core_extensions/builder"
 # Custom Feature API
 require "middleman-core/core_extensions/extensions"
 
-# Asset Path Pipeline
-require "middleman-core/core_extensions/assets"
-
 # Data looks at the data/ folder for YAML files and makes them available
 # to dynamic requests.
 require "middleman-core/core_extensions/data"
@@ -23,9 +20,6 @@ require "middleman-core/core_extensions/front_matter"
 # External helpers looks in the helpers/ folder for helper modules
 require "middleman-core/core_extensions/external_helpers"
 
-# DefaultHelpers are the built-in dynamic template helpers.
-require "middleman-core/core_extensions/default_helpers"
-
 # Extended version of Padrino's rendering
 require "middleman-core/core_extensions/rendering"
 
@@ -33,7 +27,4 @@ require "middleman-core/core_extensions/rendering"
 require "middleman-core/core_extensions/routing"
 
 # Catch and show exceptions at the Rack level
-require "middleman-core/core_extensions/show_exceptions"
-
-# i18n
-require "middleman-core/core_extensions/i18n"
+require "middleman-core/core_extensions/show_exceptions"