middleman 2.0.0.beta6 → 2.0.0.rc1

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "2.0.0.beta6"
+  VERSION = "2.0.0.rc1"
 end

metadata

@@ -2,7 +2,7 @@
 name: middleman
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 2.0.0.beta6
+  version: 2.0.0.rc1
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-01 00:00:00 -07:00
+date: 2011-07-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -281,6 +281,8 @@ files:
 - bin/mm-server
 - features/builder.feature
 - features/coffee-script.feature
+- features/data.feature
+- features/front-matter.feature
 - features/generator.feature
 - features/helpers_auto_javascript_include_tag.feature
 - features/helpers_auto_stylesheet_link_tag.feature
@@ -303,15 +305,23 @@ files:
 - features/y_cache_buster.feature
 - features/z_relative_assets.feature
 - fixtures/test-app/config.rb
+- fixtures/test-app/data/test.yml
 - fixtures/test-app/source/_partial.haml
 - fixtures/test-app/source/asset_host.html.haml
 - fixtures/test-app/source/auto-css.html.haml
+- fixtures/test-app/source/auto-css/auto-css.html.haml
+- fixtures/test-app/source/auto-css/index.html.haml
+- fixtures/test-app/source/auto-css/sub/auto-css.html.haml
 - fixtures/test-app/source/auto-image-sizes.html.haml
 - fixtures/test-app/source/auto-js.html.haml
+- fixtures/test-app/source/auto-js/auto-js.html.haml
+- fixtures/test-app/source/auto-js/index.html.haml
+- fixtures/test-app/source/auto-js/sub/auto-js.html.haml
 - fixtures/test-app/source/cache-buster.html.haml
 - fixtures/test-app/source/custom-layout-dir/index.html.haml
 - fixtures/test-app/source/custom-layout.html.haml
-- fixtures/test-app/source/front-matter.html.erb
+- fixtures/test-app/source/data.html.erb
+- fixtures/test-app/source/front-matter.html.slim
 - fixtures/test-app/source/images/blank.gif
 - fixtures/test-app/source/index.html.haml
 - fixtures/test-app/source/inline-coffeescript.html.haml
@@ -340,21 +350,25 @@ files:
 - fixtures/test-app/source/stylesheets/site.css.sass
 - fixtures/test-app/source/stylesheets/site_scss.css.scss
 - fixtures/test-app/source/stylesheets/static.css
+- fixtures/test-app/source/sub1/page-classes.html.haml
+- fixtures/test-app/source/sub1/sub2/page-classes.html.haml
 - fixtures/test-app/source/tiny_src.html.haml
 - lib/middleman.rb
-- lib/middleman/assets.rb
 - lib/middleman/builder.rb
 - lib/middleman/config.ru
-- lib/middleman/features.rb
+- lib/middleman/core_extensions/assets.rb
+- lib/middleman/core_extensions/data.rb
+- lib/middleman/core_extensions/default_helpers.rb
+- lib/middleman/core_extensions/features.rb
+- lib/middleman/core_extensions/front_matter.rb
+- lib/middleman/core_extensions/rendering.rb
+- lib/middleman/core_extensions/routing.rb
 - lib/middleman/features/asset_host.rb
 - lib/middleman/features/automatic_image_sizes.rb
 - lib/middleman/features/automatic_image_sizes/fastimage.rb
 - lib/middleman/features/blog.rb
 - lib/middleman/features/cache_buster.rb
 - lib/middleman/features/code_ray.rb
-- lib/middleman/features/data.rb
-- lib/middleman/features/default_helpers.rb
-- lib/middleman/features/front_matter.rb
 - lib/middleman/features/live_reload.rb
 - lib/middleman/features/lorem.rb
 - lib/middleman/features/minify_css.rb
@@ -438,6 +452,8 @@ summary: A static site generator based on Sinatra. Providing Haml, Sass, Compass
 test_files: 
 - features/builder.feature
 - features/coffee-script.feature
+- features/data.feature
+- features/front-matter.feature
 - features/generator.feature
 - features/helpers_auto_javascript_include_tag.feature
 - features/helpers_auto_stylesheet_link_tag.feature
@@ -460,15 +476,23 @@ test_files:
 - features/y_cache_buster.feature
 - features/z_relative_assets.feature
 - fixtures/test-app/config.rb
+- fixtures/test-app/data/test.yml
 - fixtures/test-app/source/_partial.haml
 - fixtures/test-app/source/asset_host.html.haml
 - fixtures/test-app/source/auto-css.html.haml
+- fixtures/test-app/source/auto-css/auto-css.html.haml
+- fixtures/test-app/source/auto-css/index.html.haml
+- fixtures/test-app/source/auto-css/sub/auto-css.html.haml
 - fixtures/test-app/source/auto-image-sizes.html.haml
 - fixtures/test-app/source/auto-js.html.haml
+- fixtures/test-app/source/auto-js/auto-js.html.haml
+- fixtures/test-app/source/auto-js/index.html.haml
+- fixtures/test-app/source/auto-js/sub/auto-js.html.haml
 - fixtures/test-app/source/cache-buster.html.haml
 - fixtures/test-app/source/custom-layout-dir/index.html.haml
 - fixtures/test-app/source/custom-layout.html.haml
-- fixtures/test-app/source/front-matter.html.erb
+- fixtures/test-app/source/data.html.erb
+- fixtures/test-app/source/front-matter.html.slim
 - fixtures/test-app/source/images/blank.gif
 - fixtures/test-app/source/index.html.haml
 - fixtures/test-app/source/inline-coffeescript.html.haml
@@ -497,4 +521,6 @@ test_files:
 - fixtures/test-app/source/stylesheets/site.css.sass
 - fixtures/test-app/source/stylesheets/site_scss.css.scss
 - fixtures/test-app/source/stylesheets/static.css
+- fixtures/test-app/source/sub1/page-classes.html.haml
+- fixtures/test-app/source/sub1/sub2/page-classes.html.haml
 - fixtures/test-app/source/tiny_src.html.haml

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

@@ -1,7 +0,0 @@
----
-layout: false
-title: No title
----
-
-<%= data.page.title %>
-<%= data.page.inspect %>

data/lib/middleman/assets.rb

@@ -1,33 +0,0 @@
-module Middleman
-  module Assets
-    @@asset_handler_map   = []
-    @@asset_handler_stack = []
-    
-    def self.register(handler_name, &block)
-      if block_given?
-        @@asset_handler_stack << block
-        @@asset_handler_map   << handler_name
-      end
-    end
-    
-    def self.get_url(path, prefix="", request=nil)
-      @@asset_handler_stack.last.call(path, prefix, request)
-    end
-    
-    def self.before(position, *args)
-      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
-end
-
-Middleman::Assets.register :base do |path, prefix, request|
-  path.include?("://") ? path : File.join(Middleman::Server.http_prefix || "/", prefix, path)
-end

data/lib/middleman/features.rb

@@ -1,126 +0,0 @@
-# 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::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"
-
-  # DefaultHelpers are the built-in dynamic template helpers.
-  autoload :DefaultHelpers,      "middleman/features/default_helpers"
-
-  # 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"
-
-  # 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"
-
-  # Data looks at the data/ folder for YAML files and makes them available
-  # to dynamic requests.
-  autoload :Data,                "middleman/features/data"
-
-  # Parse YAML metadata from templates
-  autoload :FrontMatter,         "middleman/features/front_matter"
-  
-  # 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"
-
-  # The Feature API is itself a Feature. Mind blowing!
-  class << self
-    def registered(app)
-      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
-  end
-end

data/lib/middleman/features/front_matter.rb

@@ -1,60 +0,0 @@
-require "yaml"
-require "tilt"
-
-module Middleman::Features::FrontMatter
-  class << self
-    def registered(app)
-      app.extend ClassMethods
-      
-      ::Tilt::register RDiscountTemplate, 'markdown', 'mkd', 'md'
-      ::Tilt::register RedClothTemplate,  'textile'
-      ::Tilt::register ERBTemplate,       'erb', 'rhtml'
-      ::Tilt::register ErubisTemplate,    'erb', 'rhtml', 'erubis'
-    end
-    alias :included :registered
-  end
-  
-  module ClassMethods
-    def parse_front_matter(content)
-      yaml_regex = /^(---\s*\n.*?\n?)^(---\s*$\n?)/m
-      if content =~ yaml_regex
-        begin
-          data = YAML.load($1)
-        rescue => e
-          puts "YAML Exception: #{e.message}"
-        end
-        
-        content = content.split(yaml_regex).last
-      end
-
-      data ||= {}
-      [data, content]
-    end
-  end
-  
-  module YamlAware
-    def prepare
-      options, @data = Middleman::Server.parse_front_matter(@data)
-      super
-    end
-  end
-
-  # MARKDOWN
-  class RDiscountTemplate < ::Tilt::RDiscountTemplate
-    include Middleman::Features::FrontMatter::YamlAware
-  end
-  
-  # TEXTILE
-  class RedClothTemplate < ::Tilt::RedClothTemplate
-    include Middleman::Features::FrontMatter::YamlAware
-  end
-
-  # ERb
-  class ERBTemplate < ::Tilt::ERBTemplate
-    include Middleman::Features::FrontMatter::YamlAware
-  end
-  
-  class ErubisTemplate < ::Tilt::ErubisTemplate
-    include Middleman::Features::FrontMatter::YamlAware
-  end
-end