middleman 2.0.0.rc97 → 2.0.0.rc98

data/lib/middleman.rb

@@ -77,6 +77,9 @@ module Middleman
   end
   
   module CoreExtensions
+    # Add Builder callbacks
+    autoload :Builder,       "middleman/core_extensions/builder"
+    
     # Add Rack::Builder.map support
     autoload :RackMap,       "middleman/core_extensions/rack_map"
     

data/lib/middleman/base.rb

@@ -29,6 +29,9 @@ module Middleman::Base
 
       app.set :views, "source"
 
+      # Add Builder Callbacks
+      app.register Middleman::CoreExtensions::Builder
+      
       # Add Rack::Builder.map to Sinatra
       app.register Middleman::CoreExtensions::RackMap
 
@@ -101,7 +104,10 @@ module Middleman::Base
             true
           end
         else
-          $stderr.puts "File not found: #{request_path}"
+          if !%w(favicon.ico).include?(request_path)
+            $stderr.puts "File not found: #{request_path}"
+          end
+          
           status 404
           false
         end
@@ -121,27 +127,6 @@ module Middleman::Base
       super(option, value, &nil)
     end
     
-    def build_reroute(&block)
-      @build_rerouters ||= []
-      @build_rerouters << block
-    end
-    
-    def reroute_builder(desination, request_path)
-      @build_rerouters ||= []
-      
-      result = [desination, request_path]
-      
-      @build_rerouters.each do |block|
-        output = block.call(desination, request_path)
-        if output
-          result = output
-          break
-        end
-      end
-      
-      result
-    end
-    
     def before_processing(&block)
       @before_processes ||= []
       @before_processes << block

data/lib/middleman/builder.rb

@@ -5,7 +5,7 @@ require 'rack/test'
 SHARED_SERVER = Middleman.server
 SHARED_SERVER.set :environment, :build
 
-module Middleman
+module Middleman  
   module ThorActions
     def tilt_template(source, *args, &block)
       config = args.last.is_a?(Hash) ? args.pop : {}
@@ -76,6 +76,10 @@ module Middleman
       @@hooks.each do |name, proc|
         instance_eval(&proc)
       end
+      
+      SHARED_SERVER.after_build_callbacks.each do |name, proc|
+        instance_eval(&proc)
+      end
     end
   end
   

data/lib/middleman/cli.rb

@@ -18,6 +18,7 @@ module Middleman
     method_option "css_dir", :default => "stylesheets", :desc => 'The path to the css files'
     method_option "js_dir", :default => "javascripts", :desc => 'The path to the javascript files'
     method_option "images_dir", :default => "images", :desc => 'The path to the image files'
+    method_option "rack", :type => :boolean, :default => false, :desc => 'Include a config.ru file'
     def init(name)
       key = options[:template].to_sym
       unless Middleman::Templates.registered_templates.has_key?(key)

data/lib/middleman/core_extensions/builder.rb

@@ -0,0 +1,41 @@
+module Middleman::CoreExtensions::Builder
+  class << self
+    def registered(app)
+      app.extend ClassMethods
+    end
+  end
+  
+  module ClassMethods
+    # Add a block/proc to be run after features have been setup
+    def after_build(&block)
+      @run_after_build ||= []
+      @run_after_build << block
+    end
+
+    def after_build_callbacks
+      @run_after_build ||= []
+      @run_after_build
+    end
+    
+    def build_reroute(&block)
+      @build_rerouters ||= []
+      @build_rerouters << block
+    end
+    
+    def reroute_builder(desination, request_path)
+      @build_rerouters ||= []
+      
+      result = [desination, request_path]
+      
+      @build_rerouters.each do |block|
+        output = block.call(desination, request_path)
+        if output
+          result = output
+          break
+        end
+      end
+      
+      result
+    end
+  end
+end

data/lib/middleman/core_extensions/compass.rb

@@ -11,7 +11,7 @@ module Middleman::CoreExtensions::Compass
       rescue LoadError
       end
 
-      app.after_feature_init do
+      app.after_configuration do
         # Support a stand-alone compass config file
         # Many options are overwritten by Middleman, but the config is a good
         # place to add:

data/lib/middleman/core_extensions/features.rb

@@ -64,7 +64,7 @@ module Middleman::CoreExtensions::Features
     end
     
     # Add a block/proc to be run after features have been setup
-    def after_feature_init(&block)
+    def after_configuration(&block)
       @run_after_features ||= []
       @run_after_features << block
     end

data/lib/middleman/core_extensions/front_matter.rb

@@ -8,7 +8,8 @@ module Middleman::CoreExtensions::FrontMatter
       
       ::Tilt::register RDiscountTemplate, 'markdown', 'mkd', 'md'
       ::Tilt::register RedcarpetTemplate, 'markdown', 'mkd', 'md'
-      app.set :markdown_engine, RDiscountTemplate
+      ::Tilt::register MarukuTemplate, 'markdown', 'mkd', 'md'
+      app.set :markdown_engine, MarukuTemplate
       
       ::Tilt::register RedClothTemplate,  'textile'
       ::Tilt.prefer(RedClothTemplate)
@@ -22,7 +23,7 @@ module Middleman::CoreExtensions::FrontMatter
       ::Tilt::register HamlTemplate,      'haml'
       ::Tilt.prefer(HamlTemplate)
       
-      app.after_feature_init do
+      app.after_configuration do
         app.before_processing do
           request_path = request.path_info.gsub("%20", " ")
           result = resolve_template(request_path, :raise_exceptions => false)
@@ -86,7 +87,9 @@ module Middleman::CoreExtensions::FrontMatter
   class RedcarpetTemplate < ::Tilt::RedcarpetTemplate
     include Middleman::CoreExtensions::FrontMatter::YamlAware
   end
-  
+  class MarukuTemplate < ::Tilt::MarukuTemplate
+    include Middleman::CoreExtensions::FrontMatter::YamlAware
+  end
   class RedClothTemplate < ::Tilt::RedClothTemplate
     include Middleman::CoreExtensions::FrontMatter::YamlAware
   end

data/lib/middleman/features/blog.rb

@@ -1,5 +1,3 @@
-require "rdiscount"
-
 module Middleman
   module Features
     module Blog
@@ -8,7 +6,7 @@ module Middleman
           # Include helpers
           app.helpers Middleman::Features::Blog::Helpers
 
-          app.after_feature_init do
+          app.after_configuration do
             if !app.settings.respond_to? :blog_permalink
               app.set :blog_permalink, ":year/:month/:day/:title.html"
             end

data/lib/middleman/renderers/markdown.rb

@@ -1,8 +1,8 @@
 module Middleman::Renderers::Markdown
   class << self
     def registered(app)
-      app.set :markdown_engine, ::Tilt::RDiscountTemplate
-      app.after_feature_init do
+      app.set :markdown_engine, ::Tilt::MarukuTemplate
+      app.after_configuration do
         ::Tilt.prefer(app.settings.markdown_engine)
       end
     end

data/lib/middleman/templates/default.rb

@@ -5,7 +5,9 @@ class Middleman::Templates::Default < Middleman::Templates::Base
   
   def build_scaffold
     template "shared/config.tt", File.join(location, "config.rb")
-    template "shared/config.ru", File.join(location, "config.ru")
+    if options[:rack]
+      template "shared/config.ru", File.join(location, "config.ru")
+    end
     copy_file "default/source/index.html.erb", File.join(location, "source/index.html.erb")
     copy_file "default/source/layout.erb", File.join(location, "source/layout.erb")
     empty_directory File.join(location, "source", options[:css_dir])

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "2.0.0.rc97"
+  VERSION = "2.0.0.rc98"
 end

data/middleman.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("thin", ["~> 1.2.11"])
   s.add_runtime_dependency("thor", ["~> 0.14.0"])
   s.add_runtime_dependency("tilt", ["~> 1.3.1"])
-  s.add_runtime_dependency("rdiscount", ["~> 1.6.8"])
+  s.add_runtime_dependency("maruku", ["~> 0.6.0"])
   s.add_runtime_dependency("sinatra", ["~> 1.2.6"])
   s.add_runtime_dependency("padrino-core", ["~> 0.10.1"])
   s.add_runtime_dependency("padrino-helpers", ["~> 0.10.1"])
@@ -29,15 +29,13 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("slim", ["~> 0.9.0"])
   s.add_runtime_dependency("haml", ["~> 3.1.0"])
   s.add_runtime_dependency("sass", ["~> 3.1.5", '< 3.1.6'])
-  s.add_runtime_dependency("coffee-script", ["~> 2.2.0"])
   s.add_runtime_dependency("compass", ["~> 0.11.3"])
   s.add_runtime_dependency("coffee-script", ["~> 2.2.0"])
-  s.add_runtime_dependency("sprockets", ["2.0.0.beta.12"])
+  s.add_runtime_dependency("sprockets", ["2.0.0.beta.13"])
   s.add_runtime_dependency("httparty", ["~> 0.7.8"])
   s.add_runtime_dependency("guard", ["~> 0.5.1"])
   s.add_runtime_dependency("guard-livereload", ["~> 0.2.1"])
   s.add_development_dependency("coffee-filter", ["~> 0.1.1"])
-  # s.add_development_dependency("jquery-rails", ["~> 1.0.12"])
   s.add_development_dependency("cucumber", ["~> 1.0.2"])
   s.add_development_dependency("rake", ["0.8.7"])
   s.add_development_dependency("rspec", ["~> 2.6.0"])

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  hash: 15424151
+  hash: 15424145
   prerelease: 6
   segments: 
   - 2
   - 0
   - 0
   - rc
-  - 97
-  version: 2.0.0.rc97
+  - 98
+  version: 2.0.0.rc98
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-04 00:00:00 Z
+date: 2011-08-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -84,19 +84,19 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rdiscount
+  name: maruku
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 7
         segments: 
-        - 1
+        - 0
         - 6
-        - 8
-        version: 1.6.8
+        - 0
+        version: 0.6.0
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -235,26 +235,10 @@ dependencies:
         version: 3.1.6
   type: :runtime
   version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: coffee-script
-  prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
-        - 0
-        version: 2.2.0
-  type: :runtime
-  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: compass
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -266,11 +250,11 @@ dependencies:
         - 3
         version: 0.11.3
   type: :runtime
-  version_requirements: *id015
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: coffee-script
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -282,29 +266,29 @@ dependencies:
         - 0
         version: 2.2.0
   type: :runtime
-  version_requirements: *id016
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: sprockets
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 62196475
+        hash: 62196473
         segments: 
         - 2
         - 0
         - 0
         - beta
-        - 12
-        version: 2.0.0.beta.12
+        - 13
+        version: 2.0.0.beta.13
   type: :runtime
-  version_requirements: *id017
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
   name: httparty
   prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -316,11 +300,11 @@ dependencies:
         - 8
         version: 0.7.8
   type: :runtime
-  version_requirements: *id018
+  version_requirements: *id017
 - !ruby/object:Gem::Dependency 
   name: guard
   prerelease: false
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -332,11 +316,11 @@ dependencies:
         - 1
         version: 0.5.1
   type: :runtime
-  version_requirements: *id019
+  version_requirements: *id018
 - !ruby/object:Gem::Dependency 
   name: guard-livereload
   prerelease: false
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -348,11 +332,11 @@ dependencies:
         - 1
         version: 0.2.1
   type: :runtime
-  version_requirements: *id020
+  version_requirements: *id019
 - !ruby/object:Gem::Dependency 
   name: coffee-filter
   prerelease: false
-  requirement: &id021 !ruby/object:Gem::Requirement 
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -364,11 +348,11 @@ dependencies:
         - 1
         version: 0.1.1
   type: :development
-  version_requirements: *id021
+  version_requirements: *id020
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id022 !ruby/object:Gem::Requirement 
+  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -380,11 +364,11 @@ dependencies:
         - 2
         version: 1.0.2
   type: :development
-  version_requirements: *id022
+  version_requirements: *id021
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id023 !ruby/object:Gem::Requirement 
+  requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -396,11 +380,11 @@ dependencies:
         - 7
         version: 0.8.7
   type: :development
-  version_requirements: *id023
+  version_requirements: *id022
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id024 !ruby/object:Gem::Requirement 
+  requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -412,7 +396,7 @@ dependencies:
         - 0
         version: 2.6.0
   type: :development
-  version_requirements: *id024
+  version_requirements: *id023
 description: 
 email: 
 - me@tdreyno.com
@@ -543,6 +527,7 @@ files:
 - lib/middleman/cli.rb
 - lib/middleman/config.ru
 - lib/middleman/core_extensions/assets.rb
+- lib/middleman/core_extensions/builder.rb
 - lib/middleman/core_extensions/compass.rb
 - lib/middleman/core_extensions/data.rb
 - lib/middleman/core_extensions/default_helpers.rb