middleman 2.0.8 → 2.0.9.pre

data/Gemfile

@@ -1,3 +1,3 @@
 source :rubygems
  
-gemspec
+gemspec :name => "middleman"

data/Rakefile

@@ -1,5 +1,5 @@
 require 'bundler'
-Bundler::GemHelper.install_tasks
+Bundler::GemHelper.install_tasks :name => ENV["NAME"] || "middleman"
 
 require 'cucumber/rake/task'
 

data/features/liquid.feature

@@ -0,0 +1,6 @@
+Feature: Support liquid partials
+
+  Scenario: Rendering liquid
+    Given the Server is running at "test-app"
+    When I go to "/liquid_master.html"
+    Then I should see "Greetings"

data/features/step_definitions/asset_host_steps.rb

@@ -1,5 +1,6 @@
 Given /^I am using an asset host$/ do
   @server ||= Middleman.server
+  @server.set :show_exceptions, false
   @server.activate :asset_host
   @server.set :asset_host do |asset|
     "http://assets%d.example.com" % (asset.hash % 4)

data/features/step_definitions/middleman_steps.rb

@@ -1,5 +1,6 @@
 Given /^"([^\"]*)" feature is "([^\"]*)"$/ do |feature, state|
   @server ||= Middleman.server
+  @server.set :show_exceptions, false
   if state == "enabled"
     @server.activate(feature.to_sym)
   end
@@ -8,6 +9,7 @@ end
 
 Given /^"([^\"]*)" is set to "([^\"]*)"$/ do |variable, value|
   @server ||= Middleman.server
+  @server.set :show_exceptions, false
   @server.set variable.to_sym, value
 end
 
@@ -17,6 +19,7 @@ end
 
 Given /^the Server is running at "([^\"]*)"$/ do |app_path|
   @server ||= Middleman.server
+  @server.set :show_exceptions, false
   root = File.dirname(File.dirname(File.dirname(__FILE__)))
   @server.set :root, File.join(root, "fixtures", app_path)
   @browser = Rack::Test::Session.new(Rack::MockSession.new(@server.new))

data/features/step_definitions/page_layout_steps.rb

@@ -1,10 +1,12 @@
 Given /^page "([^\"]*)" has layout "([^\"]*)"$/ do |url, layout|
   @server ||= Middleman.server
+  @server.set :show_exceptions, false
   @server.page(url, :layout => layout.to_sym)
 end
 
 Given /^"([^\"]*)" with_layout block has layout "([^\"]*)"$/ do |url, layout|
   @server ||= Middleman.server
+  @server.set :show_exceptions, false
   @server.with_layout(layout.to_sym) do
     page(url)
   end

data/fixtures/test-app/config.rb

@@ -20,6 +20,7 @@ with_layout false do
   page "/slim.html"
   page "/data.html"
   page "/data2.html"
+  page "/liquid_master.html"
   page "/page-classes.html"
   page "/sub1/page-classes.html"
   page "/sub1/sub2/page-classes.html"

data/fixtures/test-app/source/_liquid_partial.liquid

@@ -0,0 +1 @@
+Greetings

data/fixtures/test-app/source/data2.html.liquid

@@ -1 +1,2 @@
+{{data}}
 {% for item in data.test %}{{item.title}}{% endfor %}

data/fixtures/test-app/source/liquid_master.html.liquid

@@ -0,0 +1 @@
+{% include "liquid_partial" %}

data/lib/middleman.rb

@@ -69,11 +69,12 @@ module Middleman
   
   # Custom Renderers
   module Renderers
-    autoload :Haml, "middleman/renderers/haml"
-    autoload :Sass, "middleman/renderers/sass"
-    autoload :Slim, "middleman/renderers/slim"
-    autoload :Markdown, "middleman/renderers/markdown"
+    autoload :Haml,         "middleman/renderers/haml"
+    autoload :Sass,         "middleman/renderers/sass"
+    autoload :Slim,         "middleman/renderers/slim"
+    autoload :Markdown,     "middleman/renderers/markdown"
     autoload :CoffeeScript, "middleman/renderers/coffee_script"
+    autoload :Liquid,       "middleman/renderers/liquid"
   end
   
   module CoreExtensions

data/lib/middleman/base.rb

@@ -1,11 +1,12 @@
+require "i18n"
+  
+require "active_support"
+require "active_support/json"
+require "active_support/core_ext/class/attribute_accessors"
+
 module Middleman::Base
   class << self
-    def registered(app)
-      # Explicitly require json support
-      require "i18n"
-      require "active_support"
-      require "active_support/json"
-      
+    def registered(app)      
       app.extend ClassMethods
       app.send :include, InstanceMethods
       
@@ -43,6 +44,9 @@ module Middleman::Base
       # Activate custom features
       app.register Middleman::CoreExtensions::Features
       
+      # Activate Yaml Data package
+      app.register Middleman::CoreExtensions::Data
+      
       # Setup custom rendering
       app.register Middleman::CoreExtensions::Rendering
       
@@ -58,9 +62,6 @@ module Middleman::Base
       # Activate built-in helpers
       app.register Middleman::CoreExtensions::DefaultHelpers
       
-      # Activate Yaml Data package
-      app.register Middleman::CoreExtensions::Data
-      
       # with_layout and page routing
       app.register Middleman::CoreExtensions::Routing
       
@@ -86,14 +87,8 @@ module Middleman::Base
       end
 
       # See if Tilt cannot handle this file
-      app.before_processing do
-        if !settings.views.include?(settings.root)
-          settings.set :views, File.join(settings.root, settings.views)
-        end
-
+      app.before_processing(:base) do |result|
         request_path = request.path_info.gsub("%20", " ")
-        result = resolve_template(request_path, :raise_exceptions => false)
-        
         should_be_ignored = !(request["is_proxy"]) && settings.excluded_paths.include?("/#{request_path}")
         
         if result && !should_be_ignored
@@ -132,16 +127,16 @@ module Middleman::Base
       super(option, value, &nil)
     end
     
-    def before_processing(&block)
+    def before_processing(name=:unnamed, idx=-1, &block)
       @before_processes ||= []
-      @before_processes << block
+      @before_processes.insert(idx, [name, block])
     end
     
-    def execute_before_processing!(inst)
+    def execute_before_processing!(inst, resolved_template)
       @before_processes ||= []
       
-      @before_processes.all? do |block|
-        inst.instance_eval(&block)
+      @before_processes.all? do |name, block|
+        inst.instance_exec(resolved_template, &block)
       end
     end
     
@@ -152,14 +147,24 @@ module Middleman::Base
   module InstanceMethods
     # Internal method to look for templates and evaluate them if found
     def process_request(options={})
-      return unless settings.execute_before_processing!(self)
-
+      if !settings.views.include?(settings.root)
+        settings.set :views, File.join(settings.root, settings.views)
+      end  
+      
+      # Normalize the path and add index if we're looking at a directory
+      request.path_info = self.class.path_to_index(request.path)
+      
+      request_path = request.path_info.gsub("%20", " ")
+      found_template = resolve_template(request_path, :raise_exceptions => false)
+      return status(404) unless found_template
+      return unless settings.execute_before_processing!(self, found_template)
+      
       options.merge!(request['custom_options'] || {})
 
       old_layout = settings.layout
       settings.set :layout, options[:layout] if !options[:layout].nil?
 
-      layout = if settings.layout
+      local_layout = if settings.layout
         if options[:layout] == false || request.path_info =~ /\.(css|js)$/
           false
         else
@@ -169,23 +174,24 @@ module Middleman::Base
         false
       end
 
-      render_options = { :layout => layout }
+      render_options = { :layout => local_layout }
       render_options[:layout_engine] = options[:layout_engine] if options.has_key? :layout_engine
-      request_path = request.path_info.gsub("%20", " ")
-      path, engine = resolve_template(request_path)
       
-      locals = {}
-      locals[:data] = data.to_h if engine == :liquid
+      path, engine = found_template
+      locals = request['custom_locals'] || {}
       
-      result = render(engine, path, render_options, locals)
-      settings.set :layout, old_layout
-
-      if result
-        content_type mime_type(File.extname(request_path)), :charset => 'utf-8'
-        status 200
-        body result
-      else
-        status 404
+      begin
+        result = render(engine, path, render_options, locals)
+      
+        if result
+          content_type mime_type(File.extname(request_path)), :charset => 'utf-8'
+          status 200
+          body result
+        end
+      # rescue
+      #   status(404)
+      ensure
+        settings.set :layout, old_layout
       end
     end
   end

data/lib/middleman/builder.rb

@@ -17,7 +17,7 @@ module Middleman
       request_path = destination.sub(/^#{SHARED_SERVER.build_dir}/, "")
       
       begin        
-        destination, request_page = SHARED_SERVER.reroute_builder(destination, request_path)
+        destination, request_path = SHARED_SERVER.reroute_builder(destination, request_path)
         
         request_path.gsub!(/\s/, "%20")
         response = Middleman::Builder.shared_rack.get(request_path)

data/lib/middleman/core_extensions/data.rb

@@ -53,6 +53,9 @@ module Middleman::CoreExtensions::Data
     def to_h
       data = {}
       
+      @@local_sources ||= {}
+      @@callback_sources ||= {}
+      
       (@@local_sources || {}).each do |k, v|
         data[k] = data_for_path(k)
       end

data/lib/middleman/core_extensions/front_matter.rb

@@ -28,10 +28,7 @@ module Middleman::CoreExtensions::FrontMatter
       ::Tilt.prefer(HamlTemplate)
       
       app.after_configuration do
-        app.before_processing do
-          request_path = request.path_info.gsub("%20", " ")
-          result = resolve_template(request_path, :raise_exceptions => false)
-        
+        app.before_processing(:front_matter) do |result|
           if result && Tilt.mappings.has_key?(result[1].to_s)
             extensionless_path, template_engine = result
             full_file_path = "#{extensionless_path}.#{template_engine}"

data/lib/middleman/core_extensions/rendering.rb

@@ -12,6 +12,7 @@ module Middleman::CoreExtensions::Rendering
       app.register Middleman::Renderers::Sass
       app.register Middleman::Renderers::Markdown
       app.register Middleman::Renderers::CoffeeScript
+      app.register Middleman::Renderers::Liquid
     end
     alias :included :registered
   end

data/lib/middleman/core_extensions/routing.rb

@@ -9,12 +9,6 @@ module Middleman::CoreExtensions::Routing
       app.build_reroute do |destination, request_path|
         throw if app.settings.excluded_paths.include?(request_path)
       end
-      
-      # Normalize the path and add index if we're looking at a directory
-      app.before_processing do
-        request.path_info = self.class.path_to_index(request.path)
-        true
-      end
     end
     alias :included :registered
   end
@@ -76,7 +70,7 @@ module Middleman::CoreExtensions::Routing
           settings.ignore(url)
         end
       end
-      
+
       paths_for_url(url).each do |p|
         get(p) do
           if settings.proxied_paths.has_key?(url)

data/lib/middleman/features/directory_indexes.rb

@@ -17,13 +17,13 @@ module Middleman::Features::DirectoryIndexes
         else
           [
             destination.gsub(/#{index_ext.gsub(".", "\\.")}$/, new_index_path),
-            request_path.gsub(/#{index_ext.gsub(".", "\\.")}$/, new_index_path)
+            request_path
           ]
         end
       end
       
       app.before do
-        indexed_path = request.path_info.gsub(/\/$/, "") + "/" + app.settings.index_file        
+        indexed_path = request.path_info.gsub(/\/$/, "") + "/" + app.settings.index_file
         indexed_exists = resolve_template(indexed_path, :raise_exceptions => false)
 
         extensioned_path = request.path_info.gsub(/\/$/, "") + File.extname(app.settings.index_file)

data/lib/middleman/renderers/liquid.rb

@@ -0,0 +1,29 @@
+module Middleman::Renderers::Liquid
+  class << self
+    def registered(app)
+      # Liquid is not included in the default gems,
+      # but we'll support it if necessary.
+      begin
+        require "liquid"
+        
+        app.after_configuration do
+          full_path = app.views
+          full_path = File.join(app.root, app.views) unless app.views.include?(app.root)
+          
+          Liquid::Template.file_system = Liquid::LocalFileSystem.new(full_path)
+            
+          app.before_processing(:liquid) do |result|
+            if result && result[1] == :liquid
+              request['custom_locals'] ||= {}
+              request['custom_locals'][:data] = data.to_h
+            end
+
+            true
+          end
+        end
+      rescue LoadError
+      end
+    end
+    alias :included :registered
+  end
+end

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "2.0.8"
+  VERSION = "2.0.9.pre"
 end

data/middleman.gemspec

@@ -38,7 +38,6 @@ Gem::Specification.new do |s|
 eos
 
   s.add_dependency("rack", ["~> 1.3.0"])
-  # s.add_dependency("eventmachine", ["1.0.0.beta.3"])
   s.add_dependency("thin", ["~> 1.2.11"])
   s.add_dependency("thor", ["~> 0.14.0"])
   s.add_dependency("tilt", ["~> 1.3.1"])
@@ -55,18 +54,16 @@ eos
   s.add_dependency("padrino-core", ["~> 0.10.2"])
   s.add_dependency("padrino-helpers", ["~> 0.10.2"])
   
-  case Config::CONFIG['host_os'].downcase
-  when %r{mswin|mingw}
-    # s.add_runtime_dependency "windows-api", "= 0.4.0"
-    # s.add_runtime_dependency "windows-pr", "= 1.1.2"
-    s.add_dependency("win32-process", ["~> 0.6.5"])
-    s.add_dependency("win32console", ["~> 1.3.0"])
-    s.add_dependency("rb-fchange")
-  when %r{darwin}  
+  # case s.platform.to_s
+  # when %r{mswin|mingw}
+  #   s.add_dependency("eventmachine", ["1.0.0.beta.3"])
+  #   s.add_dependency("win32-process", ["~> 0.6.5"])
+  #   s.add_dependency("win32console", ["~> 1.3.0"])
+  #   s.add_dependency("rb-fchange")
+  # else
     s.add_dependency("rb-fsevent", ["~> 0.4.2"])
-  when %r{linux}
     s.add_dependency("therubyracer", ["~> 0.9.4"])
-  end
+  # end
   
   s.add_dependency("guard", ["~> 0.6.2"])
   s.add_dependency("middleman-livereload", ["~> 0.2.0"])

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: 
+  hash: 961915968
+  prerelease: 6
   segments: 
   - 2
   - 0
-  - 8
-  version: 2.0.8
+  - 9
+  - pre
+  version: 2.0.9.pre
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-06 00:00:00 -07:00
+date: 2011-09-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -292,6 +293,22 @@ dependencies:
   type: :runtime
 - !ruby/object:Gem::Dependency 
   requirement: &id018 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 51
+        segments: 
+        - 0
+        - 9
+        - 4
+        version: 0.9.4
+  version_requirements: *id018
+  name: therubyracer
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -302,12 +319,12 @@ dependencies:
         - 6
         - 2
         version: 0.6.2
-  version_requirements: *id018
+  version_requirements: *id019
   name: guard
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -318,12 +335,12 @@ dependencies:
         - 2
         - 0
         version: 0.2.0
-  version_requirements: *id019
+  version_requirements: *id020
   name: middleman-livereload
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -334,12 +351,12 @@ dependencies:
         - 1
         - 1
         version: 0.1.1
-  version_requirements: *id020
+  version_requirements: *id021
   name: coffee-filter
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id021 !ruby/object:Gem::Requirement 
+  requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -350,12 +367,12 @@ dependencies:
         - 2
         - 0
         version: 2.2.0
-  version_requirements: *id021
+  version_requirements: *id022
   name: liquid
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id022 !ruby/object:Gem::Requirement 
+  requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -366,12 +383,12 @@ dependencies:
         - 0
         - 2
         version: 1.0.2
-  version_requirements: *id022
+  version_requirements: *id023
   name: cucumber
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id023 !ruby/object:Gem::Requirement 
+  requirement: &id024 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -382,12 +399,12 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
-  version_requirements: *id023
+  version_requirements: *id024
   name: rake
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id024 !ruby/object:Gem::Requirement 
+  requirement: &id025 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -398,7 +415,7 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  version_requirements: *id024
+  version_requirements: *id025
   name: rspec
   prerelease: false
   type: :development
@@ -440,6 +457,7 @@ files:
 - features/helpers_auto_javascript_include_tag.feature
 - features/helpers_auto_stylesheet_link_tag.feature
 - features/helpers_page_classes.feature
+- features/liquid.feature
 - features/markdown.feature
 - features/minify_css.feature
 - features/minify_javascript.feature
@@ -472,6 +490,7 @@ files:
 - fixtures/sprockets-app/source/library/javascripts/sprockets_sub.js
 - fixtures/test-app/config.rb
 - fixtures/test-app/data/test.yml
+- fixtures/test-app/source/_liquid_partial.liquid
 - fixtures/test-app/source/_partial.haml
 - fixtures/test-app/source/a_folder/needs_index.html
 - fixtures/test-app/source/asset_host.html.haml
@@ -511,6 +530,7 @@ files:
 - fixtures/test-app/source/javascripts/sprockets_sub.js
 - fixtures/test-app/source/layout.haml
 - fixtures/test-app/source/layouts/custom.haml
+- fixtures/test-app/source/liquid_master.html.liquid
 - fixtures/test-app/source/markdown.html.markdown
 - fixtures/test-app/source/needs_index.html
 - fixtures/test-app/source/padrino_test.html.haml
@@ -567,6 +587,7 @@ files:
 - lib/middleman/guard.rb
 - lib/middleman/renderers/coffee_script.rb
 - lib/middleman/renderers/haml.rb
+- lib/middleman/renderers/liquid.rb
 - lib/middleman/renderers/markdown.rb
 - lib/middleman/renderers/sass.rb
 - lib/middleman/renderers/slim.rb
@@ -641,12 +662,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
@@ -668,6 +691,7 @@ test_files:
 - features/helpers_auto_javascript_include_tag.feature
 - features/helpers_auto_stylesheet_link_tag.feature
 - features/helpers_page_classes.feature
+- features/liquid.feature
 - features/markdown.feature
 - features/minify_css.feature
 - features/minify_javascript.feature
@@ -700,6 +724,7 @@ test_files:
 - fixtures/sprockets-app/source/library/javascripts/sprockets_sub.js
 - fixtures/test-app/config.rb
 - fixtures/test-app/data/test.yml
+- fixtures/test-app/source/_liquid_partial.liquid
 - fixtures/test-app/source/_partial.haml
 - fixtures/test-app/source/a_folder/needs_index.html
 - fixtures/test-app/source/asset_host.html.haml
@@ -739,6 +764,7 @@ test_files:
 - fixtures/test-app/source/javascripts/sprockets_sub.js
 - fixtures/test-app/source/layout.haml
 - fixtures/test-app/source/layouts/custom.haml
+- fixtures/test-app/source/liquid_master.html.liquid
 - fixtures/test-app/source/markdown.html.markdown
 - fixtures/test-app/source/needs_index.html
 - fixtures/test-app/source/padrino_test.html.haml