middleman 2.0.9.pre.2-x86-mingw32 → 2.0.9.pre.3-x86-mingw32

data/CHANGELOG

@@ -1,3 +1,12 @@
+2.0.9
+=====
+- Added --glob option to build which only builds matching files
+- Allow data/ files to be in JSON format as well
+- Enabled Liquid {% include %} tag
+- RubyInstaller-specific gem
+- Allow access to data/ in config.rb
+- Add mobile html5boilerplate template
+
 2.0.8
 =====
 - Support accessing variables and data objects in ERb Sprockets files (library.js.coffee.erb)

data/features/builder.feature

@@ -17,6 +17,12 @@ Feature: Builder
     Then "images/Child folder/regular_file(example).txt" should exist at "test-app"
     And cleanup built app at "test-app"
     
+  Scenario: Build glob
+    Given a built app at "glob-app" with flags "--glob '**/*.sass'"
+    Then "stylesheets/site.css" should exist at "glob-app" and include "html"
+    Then "index.html" should not exist at "glob-app"
+    And cleanup built app at "glob-app"
+    
   # Scenario: Force relative assets
   #   Given a built app at "relative-app" with flags "--relative"
   #   Then "stylesheets/relative_assets.css" should exist at "relative-app" and include "../"

data/features/data.feature

@@ -6,7 +6,22 @@ Feature: Local Data API
     When I go to "/data.html"
     Then I should see "One:Two"
   
+  Scenario: Rendering json
+    Given the Server is running at "test-app"
+    When I go to "/data3.html"
+    Then I should see "One:Two"
+  
   Scenario: Rendering liquid
     Given the Server is running at "test-app"
     When I go to "/data2.html"
-    Then I should see "OneTwo"
+    Then I should see "OneTwo"
+    
+  Scenario: Using data in config.rb
+    Given the Server is running at "data-app"
+    When I go to "/test1.html"
+    Then I should see "Welcome"
+    
+  Scenario: Using data2 in config.rb
+    Given the Server is running at "data-app"
+    When I go to "/test2.html"
+    Then I should see "Welcome"

data/features/fonts.feature

@@ -0,0 +1,11 @@
+Feature: Web Fonts
+
+  Scenario: Checking built folder for content
+    Given a built app at "fonts-app"
+    Then "stylesheets/fonts.css" should exist at "fonts-app" and include "/fonts/StMarie-Thin.otf"
+    And cleanup built app at "fonts-app"
+    
+  Scenario: Rendering scss
+    Given the Server is running at "fonts-app"
+    When I go to "/stylesheets/fonts.css"
+    Then I should see "/fonts/StMarie-Thin.otf"

data/features/relative_assets.feature

@@ -20,7 +20,7 @@ Feature: Relative Assets
     When I go to "/stylesheets/relative_assets.css"
     Then I should see "url('../images/blank.gif"
     
-  Scenario: Rendering html with the feature disabled
+  Scenario: Rendering html with the feature enabled
     Given "relative_assets" feature is "enabled"
     And the Server is running at "test-app"
     When I go to "/relative_image.html"
@@ -41,4 +41,10 @@ Feature: Relative Assets
     When I go to "/relative_image.html"
     Then I should not see "/images/blank.gif"
     Then I should not see "/img/blank.gif"
-    And I should see "img/blank.gif"
+    And I should see "img/blank.gif"
+    
+  Scenario: Rendering scss with the feature enabled
+    Given "relative_assets" feature is "enabled"
+    And the Server is running at "fonts-app"
+    When I go to "/stylesheets/fonts.css"
+    Then I should see "url('../fonts/StMarie"

data/features/step_definitions/middleman_steps.rb

@@ -1,9 +1,16 @@
+Given /^a clean server$/ do
+  @server = Middleman.server
+  @server.set :show_exceptions, false
+end
+
 Given /^"([^\"]*)" feature is "([^\"]*)"$/ do |feature, state|
-  @server ||= Middleman.server
+  @server = Middleman.server
   @server.set :show_exceptions, false
+  
   if state == "enabled"
     @server.activate(feature.to_sym)
-  end
+  end  
+  
   @server.set :environment, @current_env || :development
 end
 

data/fixtures/data-app/config.rb

@@ -0,0 +1,3 @@
+data.pages.each do |p|
+  page p.from, :proxy => p.to
+end

data/fixtures/data-app/data/pages.yml

@@ -0,0 +1,6 @@
+-
+  from: "/test1.html"
+  to:   "/index.html"
+-
+  from: "/test2.html"
+  to:   "/index.html"

data/fixtures/data-app/source/index.html.haml

@@ -0,0 +1 @@
+%h1 Welcome

data/fixtures/data-app/source/layout.haml

@@ -0,0 +1,3 @@
+%html
+  %body
+    = yield

data/fixtures/fonts-app/source/stylesheets/fonts.css.sass

@@ -0,0 +1,3 @@
+@import "compass"
+
++font-face("St Marie", font-files("StMarie-Thin.otf", opentype))

data/fixtures/glob-app/config.rb

@@ -0,0 +1 @@
+page "/index.html", :layout => false

data/fixtures/glob-app/source/index.html.haml

@@ -0,0 +1,6 @@
+%h1 Welcome
+
+:markdown
+  ## H2
+  
+  Paragraph

data/fixtures/glob-app/source/stylesheets/site.css.sass

@@ -0,0 +1 @@
+@import "compass/reset"

data/fixtures/test-app/config.rb

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

data/fixtures/test-app/data/test2.json

@@ -0,0 +1,4 @@
+[
+  { "title": "One" },
+  { "title": "Two" }
+]

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

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

data/lib/middleman/base.rb

@@ -1,3 +1,5 @@
+# require 'sinatra/synchrony'
+
 require "i18n"
   
 require "active_support"
@@ -6,7 +8,9 @@ require "active_support/core_ext/class/attribute_accessors"
 
 module Middleman::Base
   class << self
-    def registered(app)      
+    def registered(app)
+      # app.register ::Sinatra::Synchrony
+      
       app.extend ClassMethods
       app.send :include, InstanceMethods
       
@@ -25,7 +29,6 @@ module Middleman::Base
       app.set :js_dir,      "javascripts" # Where to look for javascript files
       app.set :css_dir,     "stylesheets" # Where to look for CSS files
       app.set :images_dir,  "images"      # Where to look for images
-      app.set :fonts_dir,   "fonts"       # Where to look for fonts
 
       app.set :build_dir,   "build"       # Which folder are builds output to
       app.set :http_prefix, nil           # During build, add a prefix for absolute paths
@@ -96,7 +99,9 @@ module Middleman::Base
 
           # Return static files
           if !::Tilt.mappings.has_key?(template_engine.to_s)
-            content_type mime_type(File.extname(request_path)), :charset => 'utf-8'
+            matched_mime = mime_type(File.extname(request_path))
+            matched_mime = "application/octet-stream" if matched_mime.nil?
+            content_type matched_mime, :charset => 'utf-8'
             status 200
             send_file File.join(settings.views, request_path)
             false

data/lib/middleman/builder.rb

@@ -5,14 +5,14 @@ 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 : {}
       destination = args.first || source
       
       # source  = File.expand_path(find_in_source_paths(source.to_s))
-      context = instance_eval('binding')
+      # context = instance_eval('binding')
       
       request_path = destination.sub(/^#{SHARED_SERVER.build_dir}/, "")
       
@@ -35,15 +35,16 @@ module Middleman
     include Middleman::ThorActions
     
     def self.shared_rack
-      @shared_rack ||= begin  
+      @shared_rack ||= begin
         mock = ::Rack::MockSession.new(SHARED_SERVER)
         sess = ::Rack::Test::Session.new(mock)
-        sess.get("/")
+        response = sess.get("__middleman__")
         sess
       end
     end
     
     class_option :relative, :type => :boolean, :aliases => "-r", :default => false, :desc => 'Override the config.rb file and force relative urls'
+    class_option :glob, :type => :string, :aliases => "-g", :default => nil, :desc => 'Build a subset of the project'
     
     def initialize(*args)
       super
@@ -62,10 +63,14 @@ module Middleman
     def build_all_files
       self.class.shared_rack
       
-      action Directory.new(self, SHARED_SERVER.views, SHARED_SERVER.build_dir, { :force => true })
+      if options.has_key?("glob")
+        action GlobAction.new(self, SHARED_SERVER.views, SHARED_SERVER.build_dir, { :force => true, :glob => options["glob"] })
+      else      
+        action DirectoryAction.new(self, SHARED_SERVER.views, SHARED_SERVER.build_dir, { :force => true })
       
-      SHARED_SERVER.proxied_paths.each do |url, proxy|
-        tilt_template(url.gsub(/^\//, "#{SHARED_SERVER.build_dir}/"), { :force => true })
+        SHARED_SERVER.proxied_paths.each do |url, proxy|
+          tilt_template(url.gsub(/^\//, "#{SHARED_SERVER.build_dir}/"), { :force => true })
+        end
       end
     end
     
@@ -75,6 +80,8 @@ module Middleman
     end
     
     def run_hooks
+      return if options.has_key?("glob")
+      
       @@hooks.each do |name, proc|
         instance_eval(&proc)
       end
@@ -85,7 +92,7 @@ module Middleman
     end
   end
   
-  class Directory < ::Thor::Actions::EmptyDirectory
+  class BaseAction < ::Thor::Actions::EmptyDirectory
     attr_reader :source
 
     def initialize(base, source, destination=nil, config={}, &block)
@@ -95,14 +102,58 @@ module Middleman
     end
 
     def invoke!
-      base.empty_directory given_destination, config
       execute!
     end
 
     def revoke!
       execute!
     end
+    
+  protected
+    def handle_path(file_source)
+      # Skip partials prefixed with an underscore
+      return unless file_source.gsub(SHARED_SERVER.root, '').split('/').select { |p| p[0,1] == '_' }.empty?
+      
+      file_extension = File.extname(file_source)
+      file_destination = File.join(given_destination, file_source.gsub(source, '.'))
+      file_destination.gsub!('/./', '/')
+      
+      handled_by_tilt = ::Tilt.mappings.has_key?(file_extension.gsub(/^\./, ""))
+      if handled_by_tilt
+        file_destination.gsub!(file_extension, "")
+      end
+      
+      destination = base.tilt_template(file_source, file_destination, config, &@block)
+    end
+  end
+  
+  class GlobAction < BaseAction
 
+  protected
+    def execute!
+      Dir[File.join(source, @config[:glob])].each do |path|
+        file_name = path.gsub(SHARED_SERVER.views + "/", "")
+        if file_name == "layouts"
+          false
+        elsif file_name.include?("layout.") && file_name.split(".").length == 2
+          false
+        else
+          next if File.directory?(path)
+
+          handle_path(path)
+
+          true
+        end
+      end
+    end
+  end
+  
+  class DirectoryAction < BaseAction
+    def invoke!
+      base.empty_directory given_destination, config
+      super
+    end
+    
   protected
     def handle_directory(lookup, &block)
       lookup = File.join(lookup, '*')
@@ -131,19 +182,7 @@ module Middleman
           next
         end
         
-        # Skip partials prefixed with an underscore
-        next unless file_source.gsub(SHARED_SERVER.root, '').split('/').select { |p| p[0,1] == '_' }.empty?
-        
-        file_extension = File.extname(file_source)
-        file_destination = File.join(given_destination, file_source.gsub(source, '.'))
-        file_destination.gsub!('/./', '/')
-        
-        handled_by_tilt = ::Tilt.mappings.has_key?(file_extension.gsub(/^\./, ""))
-        if handled_by_tilt
-          file_destination.gsub!(file_extension, "")
-        end
-        
-        destination = base.tilt_template(file_source, file_destination, config, &@block)
+        handle_path(file_source)
       end
     end
 

data/lib/middleman/cli.rb

@@ -49,7 +49,8 @@ module Middleman
     end
 
     desc "build", "Builds the static site for deployment"
-    method_option "relative", :type => :boolean, :aliases => "-r", :default => false, :desc => 'Override the config.rb file and force relative urls'
+    method_option :relative, :type => :boolean, :aliases => "-r", :default => false, :desc => 'Override the config.rb file and force relative urls'
+    method_option :glob, :type => :string, :aliases => "-g", :default => nil, :desc => 'Build a subset of the project'
     def build
       v1_check
       thor_group = Middleman::Builder.new([], options).invoke_all

data/lib/middleman/core_extensions/assets.rb

@@ -15,7 +15,7 @@ module Middleman::CoreExtensions::Assets
     alias :included :registered
   end
   
-  module ClassMethods    
+  module ClassMethods
     def register_asset_handler(handler_name, &block)
       @asset_handler_map   ||= []
       @asset_handler_stack ||= []

data/lib/middleman/core_extensions/compass.rb

@@ -1,6 +1,9 @@
 module Middleman::CoreExtensions::Compass
   class << self
     def registered(app)
+      # Where to look for fonts
+      app.set :fonts_dir, "fonts"
+    
       app.extend ClassMethods
         
       require "compass"
@@ -56,8 +59,8 @@ module Middleman::CoreExtensions::Compass
             File.join(app.http_prefix || "/", app.js_dir)
           end
 
-          config.http_javascripts_path = if app.respond_to? :http_fonts_path
-            app.http_js_path
+          config.http_fonts_path = if app.respond_to? :http_fonts_path
+            app.http_fonts_path
           else
             File.join(app.http_prefix || "/", app.fonts_dir)
           end
@@ -76,6 +79,7 @@ module Middleman::CoreExtensions::Compass
             build_root = File.basename(self.build_dir)
             config.css_dir     = File.join(build_root, self.css_dir)
             config.images_dir  = File.join(build_root, self.images_dir)
+            config.fonts_dir   = File.join(build_root, self.fonts_dir)
           end
         end
         

data/lib/middleman/core_extensions/data.rb

@@ -1,4 +1,5 @@
 require "yaml"
+require "active_support/json"
 require "thor"
 
 module Middleman::CoreExtensions::Data
@@ -35,9 +36,19 @@ module Middleman::CoreExtensions::Data
       else
         file_path = File.join(@app.root, @app.data_dir, "#{path}.yml")
         if File.exists? file_path
-          response = YAML.load_file(file_path)
+          response = YAML.load_file(file_path) 
+        else
+          file_path = File.join(@app.root, @app.data_dir, "#{path}.yaml")
+          if File.exists? file_path
+            response = YAML.load_file(file_path)
+          else
+            file_path = File.join(@app.root, @app.data_dir, "#{path}.json")
+            response = ActiveSupport::JSON.decode(File.read(file_path)) if File.exists? file_path
+          end
         end
       end
+      
+      response
     end
     
     def method_missing(path)
@@ -64,9 +75,15 @@ module Middleman::CoreExtensions::Data
         data[k] = data_for_path(k)
       end
       
-      yaml_path = File.join(@app.root, @app.data_dir, "*.yml")
+      yaml_path = File.join(@app.root, @app.data_dir, "*.{yaml,yml}")
       Dir[yaml_path].each do |f|
-        p = f.split("/").last.gsub(".yml", "")
+        p = f.split("/").last.gsub(".yml", "").gsub(".yaml", "")
+        data[p] = data_for_path(p)
+      end
+      
+      json_path = File.join(@app.root, @app.data_dir, "*.json")
+      Dir[json_path].each do |f|
+        p = f.split("/").last.gsub(".json", "")
         data[p] = data_for_path(p)
       end
       

data/lib/middleman/templates/html5.rb

@@ -1,6 +1,7 @@
 class Middleman::Templates::Html5 < Middleman::Templates::Base
   class_option :css_dir, :default => "css"
   class_option :js_dir, :default => "js"
+  class_option :images_dir, :default => "img"
 
   def self.source_root
     File.dirname(__FILE__)