middleman 2.0.0.beta6 → 2.0.0.rc1

data/CHANGELOG

@@ -1,6 +1,8 @@
 2.0.0
 =====
 
+- Use sinatra before/after hooks for Blog and FrontMatter
+- Converted a lot of Middleman::Server in CoreExtensions
 - Combine views/ and public/ into a single source/ folder.
 - Support YAML front-matter
 - Blog-aware

data/features/data.feature

@@ -0,0 +1,7 @@
+Feature: Local Data API
+  In order to abstract content from structure
+
+  Scenario: Rendering html
+    Given the Server is running
+    When I go to "/data.html"
+    Then I should see "One:Two"

data/features/front-matter.feature

@@ -0,0 +1,7 @@
+Feature: YAML Front Matter
+  In order to specific options and data inline
+
+  Scenario: Rendering html
+    Given the Server is running
+    When I go to "/front-matter.html"
+    Then I should see "<h1>This is the title</h1>"

data/features/helpers_page_classes.feature

@@ -3,15 +3,15 @@ Feature: Built-in page_classes view helper
   
   Scenario: Viewing the root path
     Given the Server is running
-    When I go to "/page-class.html"
-    Then I should see "page-class"
+    When I go to "/page-classes.html"
+    Then I should see "page-classes"
 
   Scenario: Viewing a tier-1 path
     Given the Server is running
-    When I go to "/sub1/page-class.html"
-    Then I should see "sub1 sub1_page-class"
+    When I go to "/sub1/page-classes.html"
+    Then I should see "sub1 sub1_page-classes"
 
   Scenario: Viewing a tier-2 path
     Given the Server is running
-    When I go to "/sub1/sub2/page-class.html"
-    Then I should see "sub1 sub1_sub2 sub1_sub2_page-class"
+    When I go to "/sub1/sub2/page-classes.html"
+    Then I should see "sub1 sub1_sub2 sub1_sub2_page-classes"

data/fixtures/test-app/config.rb

@@ -3,41 +3,28 @@ with_layout false do
   page "/inline-js.html"
   page "/inline-coffeescript.html"
   page "/slim.html"
-end
+  page "/data.html"
+  page "/page-classes.html"
+  page "/sub1/page-classes.html"
+  page "/sub1/sub2/page-classes.html"
 
-get "/page-class.html" do
-  haml :"page-classes.html", :layout => false
-end
-
-get "/sub1/page-class.html" do
-  haml :"page-classes.html", :layout => false
-end
-
-get "/sub1/sub2/page-class.html" do
-  haml :"page-classes.html", :layout => false
-end
-
-%w{
-	/auto-css.html
-	/auto-css
-	/auto-css/
-	/auto-css/auto-css.html
-	/auto-css/sub/auto-css.html
-}.each do |path|
-	get path do
-		haml :"auto-css.html", :layout => false
-	end
-end
-
-%w{
-	/auto-js.html
-	/auto-js
-	/auto-js/
-	/auto-js/auto-js.html
-	/auto-js/sub/auto-js.html
-}.each do |path|
-	get path do
-		haml :"auto-js.html", :layout => false
-	end
-end
+  %w{
+    /auto-css.html
+    /auto-css
+    /auto-css/
+    /auto-css/auto-css.html
+    /auto-css/sub/auto-css.html
+  }.each do |path|
+    page path
+  end
 
+  %w{
+    /auto-js.html
+    /auto-js
+    /auto-js/
+    /auto-js/auto-js.html
+    /auto-js/sub/auto-js.html
+  }.each do |path|
+    page path
+  end
+end

data/fixtures/test-app/data/test.yml

@@ -0,0 +1,4 @@
+-
+  title: "One"
+-
+  title: "Two"

data/fixtures/test-app/source/auto-css/auto-css.html.haml

@@ -0,0 +1 @@
+= auto_stylesheet_link_tag

data/fixtures/test-app/source/auto-css/index.html.haml

@@ -0,0 +1 @@
+= auto_stylesheet_link_tag

data/fixtures/test-app/source/auto-css/sub/auto-css.html.haml

@@ -0,0 +1 @@
+= auto_stylesheet_link_tag

data/fixtures/test-app/source/auto-js/auto-js.html.haml

@@ -0,0 +1 @@
+= auto_javascript_include_tag

data/fixtures/test-app/source/auto-js/index.html.haml

@@ -0,0 +1 @@
+= auto_javascript_include_tag

data/fixtures/test-app/source/auto-js/sub/auto-js.html.haml

@@ -0,0 +1 @@
+= auto_javascript_include_tag

data/fixtures/test-app/source/data.html.erb

@@ -0,0 +1 @@
+<%= data.test.map { |r| r.title }.join(":") %>

data/fixtures/test-app/source/front-matter.html.slim

@@ -0,0 +1,6 @@
+---
+layout: false
+title: This is the title
+---
+
+h1= data.page.title

data/fixtures/test-app/source/sub1/page-classes.html.haml

@@ -0,0 +1 @@
+= page_classes

data/fixtures/test-app/source/sub1/sub2/page-classes.html.haml

@@ -0,0 +1 @@
+= page_classes

data/lib/middleman.rb

@@ -71,7 +71,77 @@ module Middleman
     autoload :Markdown, "middleman/renderers/markdown"
     autoload :CoffeeScript, "middleman/renderers/coffee_script"
   end
+  
+  module CoreExtensions
+    # Custom Feature API
+    autoload :Features,      "middleman/core_extensions/features"
+  
+    # Asset Path Pipeline
+    autoload :Assets,        "middleman/core_extensions/assets"
+  
+    # DefaultHelpers are the built-in dynamic template helpers.
+    autoload :DefaultHelpers, "middleman/core_extensions/default_helpers"
+  
+    # Data looks at the data/ folder for YAML files and makes them available
+    # to dynamic requests.
+    autoload :Data,           "middleman/core_extensions/data"
+    
+    # Parse YAML from templates
+    autoload :FrontMatter,    "middleman/core_extensions/front_matter"
+    
+    # Extended version of Padrino's rendering
+    autoload :Rendering,      "middleman/core_extensions/rendering"
+  
+    # Pass custom options to views
+    autoload :Routing,        "middleman/core_extensions/routing"
+  end
+
+  module Features
+    # RelativeAssets allow any asset path in dynamic templates to be either
+    # relative to the root of the project or use an absolute URL.
+    autoload :RelativeAssets,      "middleman/features/relative_assets"
+
+    # 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.
+    autoload :AssetHost,           "middleman/features/asset_host"
+
+    # CacheBuster adds a query string to assets in dynamic templates to avoid
+    # browser caches failing to update to your new content.
+    autoload :CacheBuster,         "middleman/features/cache_buster"
+
+    # AutomaticImageSizes inspects the images used in your dynamic templates and
+    # automatically adds width and height attributes to their HTML elements.
+    autoload :AutomaticImageSizes, "middleman/features/automatic_image_sizes"
 
-  # Features API
-  autoload :Features, "middleman/features"
+    # UglyHaml enables the non-indented output format from Haml templates. Useful
+    # for somewhat obfuscating the output and hiding the fact that you're using Haml.
+    autoload :UglyHaml,            "middleman/features/ugly_haml"
+
+    # MinifyCss uses the YUI compressor to shrink CSS files
+    autoload :MinifyCss,           "middleman/features/minify_css"
+
+    # MinifyJavascript uses the YUI compressor to shrink JS files
+    autoload :MinifyJavascript,    "middleman/features/minify_javascript"
+
+    # CodeRay is a syntax highlighter.
+    autoload :CodeRay,             "middleman/features/code_ray"
+
+    # Lorem provides a handful of helpful prototyping methods to generate words,
+    # paragraphs, fake images, names and email addresses.
+    autoload :Lorem,               "middleman/features/lorem"
+
+    # Treat project as a blog
+    autoload :Blog,                "middleman/features/blog"
+
+    # Proxy web services requests in dev mode only
+    autoload :Proxy,               "middleman/features/proxy"
+
+    # Automatically resize images for mobile devises
+    # autoload :TinySrc,             "middleman/features/tiny_src"
+
+    # LiveReload will auto-reload browsers with the live reload extension installed after changes
+    # Currently disabled and untested.
+    # autoload :LiveReload,          "middleman/features/live_reload"
+  end
 end

data/lib/middleman/core_extensions/assets.rb

@@ -0,0 +1,57 @@
+module Middleman::CoreExtensions::Assets
+  class << self
+    def registered(app)
+      # Disable Padrino cache buster until explicitly enabled
+      app.set :asset_stamp, false
+      
+      app.extend ClassMethods
+      
+      app.helpers Helpers
+      
+      app.register_asset_handler :base do |path, prefix, request|
+        path.include?("://") ? path : File.join(app.http_prefix || "/", prefix, path)
+      end
+    end
+    alias :included :registered
+  end
+  
+  module ClassMethods    
+    def register_asset_handler(handler_name, &block)
+      @asset_handler_map   ||= []
+      @asset_handler_stack ||= []
+      
+      if block_given?
+        @asset_handler_stack << block
+        @asset_handler_map   << handler_name
+      end
+    end
+    
+    def asset_handler_get_url(path, prefix="", request=nil)
+      @asset_handler_map   ||= []
+      @asset_handler_stack ||= []
+      
+      @asset_handler_stack.last.call(path, prefix, request)
+    end
+    
+    def before_asset_handler(position, *args)
+      @asset_handler_map   ||= []
+      @asset_handler_stack ||= []
+      
+      current_index = @asset_handler_map.index(position)
+      return nil unless current_index
+
+      previous = current_index - 1
+      if (previous >= 0) && (previous < @asset_handler_map.length)
+        @asset_handler_stack[previous].call(*args)
+      else
+        nil
+      end
+    end
+  end
+  
+  module Helpers
+    def asset_url(path, prefix="")
+      self.class.asset_handler_get_url(path, prefix, request)
+    end
+  end
+end

data/lib/middleman/{features → core_extensions}/data.rb

@@ -2,18 +2,19 @@ require "yaml"
 require "httparty"
 require "thor"
 
-module Middleman::Features::Data
+module Middleman::CoreExtensions::Data
   class << self
     def registered(app)
+      app.set :data_dir, "data"
       app.extend ClassMethods
-      app.helpers Middleman::Features::Data::Helpers
+      app.helpers Helpers
     end
     alias :included :registered
   end
   
   module Helpers
     def data
-      @@data ||= Middleman::Features::Data::DataObject.new(self)
+      @@data ||= DataObject.new(self)
     end
   end
   
@@ -33,7 +34,7 @@ module Middleman::Features::Data
       elsif @@remote_sources.has_key?(path.to_s)
         response = HTTParty.get(@@remote_sources[path.to_s]).parsed_response
       else
-        file_path = File.join(@app.class.root, "data", "#{path}.yml")      
+        file_path = File.join(@app.class.root, @app.class.data_dir, "#{path}.yml")
         if File.exists? file_path
           response = YAML.load_file(file_path)
         end
@@ -82,11 +83,11 @@ module Middleman::Features::Data
     #
     #     data.my_json
     def data_source(name, url)
-      Middleman::Features::Data::DataObject.add_source(name, url)
+      DataObject.add_source(name, url)
     end
     
     def data_content(name, content)
-      Middleman::Features::Data::DataObject.data_content(name, content)
+      DataObject.data_content(name, content)
     end
   end
 end

data/lib/middleman/{features → core_extensions}/default_helpers.rb

@@ -1,7 +1,13 @@
-module Middleman::Features::DefaultHelpers
+require "padrino-helpers"
+
+module Middleman::CoreExtensions::DefaultHelpers
   class << self
     def registered(app)
-      app.helpers Middleman::Features::DefaultHelpers::Helpers
+      # Use Padrino Helpers
+      app.register Padrino::Helpers
+      
+      # Middleman Helpers
+      app.helpers Helpers
     end
     alias :included :registered
   end
@@ -50,10 +56,6 @@ module Middleman::Features::DefaultHelpers
       classes.join(' ')
     end
     
-    def asset_url(path, prefix="")
-      Middleman::Assets.get_url(path, prefix, request)
-    end
-    
     # Padrino's asset handling needs to pass through ours
     def asset_path(kind, source)
        return source if source =~ /^http/

data/lib/middleman/core_extensions/features.rb

@@ -0,0 +1,96 @@
+# Middleman provides an extension API which allows you to hook into the
+# lifecycle of a page request, or static build, and manipulate the output.
+# Internal to Middleman, these extensions are called "features," but we use
+# the exact same API as is made available to the public.
+#
+# A Middleman extension looks like this:
+#
+#     module MyExtension
+#       class << self
+#         def registered(app)
+#           # My Code
+#         end
+#       end
+#     end
+#
+# In your `config.rb`, you must load your extension (if it is not defined in
+# that file) and call `activate`.
+#
+#     require "my_extension"
+#     activate MyExtension
+#
+# This will call the `registered` method in your extension and provide you
+# with the `app` parameter which is a Middleman::Server context. From here
+# you can choose to respond to requests for certain paths or simply attach
+# Rack middleware to the stack.
+#
+# The built-in features cover a wide range of functions. Some provide helper
+# methods to use in your views. Some modify the output on-the-fly. And some
+# apply computationally-intensive changes to your final build files.
+
+module Middleman::CoreExtensions::Features
+  
+  # The Feature API is itself a Feature. Mind blowing!
+  class << self
+    def registered(app)
+      app.set :default_extensions, []
+      app.extend ClassMethods
+    end
+    alias :included :registered
+  end
+
+  module ClassMethods
+    # This method is available in the project's `config.rb`.
+    # It takes a underscore-separated symbol, finds the appropriate
+    # feature module and includes it.
+    #
+    #     activate :lorem
+    #
+    # Alternatively, you can pass in a Middleman feature module directly.
+    #
+    #     activate MyFeatureModule
+    def activate(feature)
+      feature = feature.to_s if feature.is_a? Symbol
+
+      if feature.is_a? String
+        feature = feature.camelize
+        feature = Middleman::Features.const_get(feature)
+      end
+
+      register feature
+    end
+
+    # Deprecated API. Please use `activate` instead.
+    def enable(feature_name)
+      $stderr.puts "Warning: Feature activation has been renamed from enable to activate"
+      activate(feature_name)
+      super(feature_name)
+    end
+    
+    # Add a block/proc to be run after features have been setup
+    def after_feature_init(&block)
+      @run_after_features ||= []
+      @run_after_features << block
+    end
+    
+    # Load features before starting server
+    def new
+      # Check for and evaluate local configuration
+      local_config = File.join(self.root, "config.rb")
+      if File.exists? local_config
+        $stderr.puts "== Reading:  Local config" if logging?
+        class_eval File.read(local_config)
+        set :app_file, File.expand_path(local_config)
+      end
+      
+      # Add in defaults
+      default_extensions.each do |ext|
+        activate ext
+      end
+      
+      @run_after_features.each { |block| class_eval(&block) }
+  
+      super
+    end
+  end
+end