middleman 2.0.0.rc3 → 2.0.0.rc4

data/lib/middleman/builder.rb

@@ -1,8 +1,9 @@
-require 'middleman/server'
 require "thor"
 require "thor/group"
 require 'rack/test'
 
+SHARED_SERVER = Middleman.server
+
 module Middleman  
   module ThorActions
     def tilt_template(source, *args, &block)
@@ -12,11 +13,11 @@ module Middleman
       source  = File.expand_path(find_in_source_paths(source.to_s))
       context = instance_eval('binding')
 
-      @@rack_test ||= ::Rack::Test::Session.new(::Rack::MockSession.new(Middleman::Server))
+      @@rack_test ||= ::Rack::Test::Session.new(::Rack::MockSession.new(SHARED_SERVER))
 
       create_file destination, nil, config do
         # The default render just requests the page over Rack and writes the response
-        request_path = destination.sub(/^#{Middleman::Server.build_dir}/, "")
+        request_path = destination.sub(/^#{SHARED_SERVER.build_dir}/, "")
         @@rack_test.get(request_path)
         @@rack_test.last_response.body
       end
@@ -32,22 +33,22 @@ module Middleman
     def initialize(*args)
       super
       
-      Middleman::Server.new
+      SHARED_SERVER.new
       
       if options.has_key?("relative") && options["relative"]
-        Middleman::Server.activate :relative_assets
+        SHARED_SERVER.activate :relative_assets
       end
     end
     
     
     def source_paths
       @source_paths ||= [
-        Middleman::Server.root
+        SHARED_SERVER.root
       ]
     end
     
     def build_all_files
-      action Directory.new(self, Middleman::Server.views, Middleman::Server.build_dir, { :force => true })
+      action Directory.new(self, SHARED_SERVER.views, SHARED_SERVER.build_dir, { :force => true })
     end
     
     @@hooks = {}
@@ -85,15 +86,15 @@ module Middleman
       lookup = File.join(lookup, '*')
       
       results = Dir[lookup].sort do |a, b|
-        simple_a = a.gsub(Middleman::Server.root + "/", '').gsub(Middleman::Server.views + "/", '') 
-        simple_b = b.gsub(Middleman::Server.root + "/", '').gsub(Middleman::Server.views + "/", '')
+        simple_a = a.gsub(SHARED_SERVER.root + "/", '').gsub(SHARED_SERVER.views + "/", '') 
+        simple_b = b.gsub(SHARED_SERVER.root + "/", '').gsub(SHARED_SERVER.views + "/", '')
         
         a_dir = simple_a.split("/").first
         b_dir = simple_b.split("/").first
         
-        if a_dir == Middleman::Server.images_dir
+        if a_dir == SHARED_SERVER.images_dir
           -1
-        elsif b_dir == Middleman::Server.images_dir
+        elsif b_dir == SHARED_SERVER.images_dir
           1
         else
           0
@@ -109,7 +110,7 @@ module Middleman
         next if file_source.include?('layout') && !file_source.include?('.css')
         
         # Skip partials prefixed with an underscore
-        next unless file_source.gsub(Middleman::Server.root, '').split('/').select { |p| p[0,1] == '_' }.empty?
+        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, '.'))

data/lib/middleman/config.ru

@@ -1,2 +1,2 @@
 require 'middleman'
-run Middleman::Server
+run Middleman.server

data/lib/middleman/core_extensions/compass.rb

@@ -14,7 +14,8 @@ module Middleman::CoreExtensions::Compass
       app.after_feature_init do
         views_root = File.basename(app.views)
         ::Compass.configuration do |config|
-          config.cache            = false # For sassc files
+          # config.cache            = false # For sassc files
+          config.cache_path            = File.join(app.root, ".sass-cache")
           config.project_path          = app.root
           config.sass_dir              = File.join(views_root, app.css_dir)
           config.output_style          = :nested
@@ -27,14 +28,15 @@ module Middleman::CoreExtensions::Compass
 
           config.add_import_path(config.sass_dir)
         end
-
-        # configure :build do
-        #   build_root = File.basename(self.build_dir)
-        #   ::Compass.configuration do |config|
-        #     config.css_dir    = File.join(build_root, self.css_dir)
-        #     config.images_dir = File.join(build_root, self.images_dir)
-        #   end
-        # end
+        
+        # Required for relative paths
+        configure :build do
+           build_root = File.basename(self.build_dir)
+           ::Compass.configuration do |config|
+             config.css_dir    = File.join(build_root, self.css_dir)
+             config.images_dir = File.join(build_root, self.images_dir)
+           end
+         end
         
         app.execute_after_compass_init!
         

data/lib/middleman/core_extensions/features.rb

@@ -50,22 +50,18 @@ module Middleman::CoreExtensions::Features
     #
     #     activate MyFeatureModule
     def activate(feature)
-      feature = feature.to_s if feature.is_a? Symbol
+      if feature.is_a? Symbol
+        feature = feature.to_s 
+      end
 
       if feature.is_a? String
         feature = feature.camelize
         feature = Middleman::Features.const_get(feature)
       end
-
+      
+      $stderr.puts "== Activating:  #{feature}" if logging?
       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)
@@ -73,6 +69,10 @@ module Middleman::CoreExtensions::Features
       @run_after_features << block
     end
     
+    def run_after_features
+      @run_after_features || []
+    end
+    
     # Load features before starting server
     def new
       # Check for and evaluate local configuration
@@ -88,8 +88,14 @@ module Middleman::CoreExtensions::Features
         activate ext
       end
       
-      @run_after_features.each { |block| class_eval(&block) }
-  
+      run_after_features.each { |block| class_eval(&block) }
+      
+      if logging?
+        extensions.each do |ext|
+          $stderr.puts "== Extension: #{ext}"
+        end
+      end
+      
       super
     end
   end

data/lib/middleman/core_extensions/front_matter.rb

@@ -22,31 +22,31 @@ module Middleman::CoreExtensions::FrontMatter
       ::Tilt::register HamlTemplate,      'haml'
       ::Tilt.prefer(HamlTemplate)
       
-      app.before do
-        result = resolve_template(request.path_info, :raise_exceptions => false)
-      
-        if result && Tilt.mappings.has_key?(result[1].to_s)
-          extensionless_path, template_engine = result
-          full_file_path = "#{extensionless_path}.#{template_engine}"
-          system_path = File.join(settings.views, full_file_path)
-          data, content = app.parse_front_matter(File.read(system_path))
+      app.after_feature_init do
+        app.before do
+          result = resolve_template(request.path_info, :raise_exceptions => false)
+          
+          if result && Tilt.mappings.has_key?(result[1].to_s)
+            extensionless_path, template_engine = result
+            full_file_path = "#{extensionless_path}.#{template_engine}"
+            system_path = File.join(settings.views, full_file_path)
+            data, content = app.parse_front_matter(File.read(system_path))
     
-          request['custom_options'] = {}
-          %w(layout layout_engine).each do |opt|
-            if data.has_key?(opt)
-              request['custom_options'][opt.to_sym] = data.delete(opt)
+            request['custom_options'] = {}
+            %w(layout layout_engine).each do |opt|
+              if data.has_key?(opt)
+                request['custom_options'][opt.to_sym] = data.delete(opt)
+              end
             end
-          end
     
-          # Forward remaining data to helpers
-          app.data_content("page", data)
+            # Forward remaining data to helpers
+            app.data_content("page", data)
+          end
         end
       end
     end
     alias :included :registered
-  end
-  
-  module ClassMethods
+    
     def parse_front_matter(content)
       yaml_regex = /^(---\s*\n.*?\n?)^(---\s*$\n?)/m
       if content =~ yaml_regex
@@ -55,7 +55,7 @@ module Middleman::CoreExtensions::FrontMatter
         rescue => e
           puts "YAML Exception: #{e.message}"
         end
-        
+
         content = content.split(yaml_regex).last
       end
 
@@ -64,9 +64,15 @@ module Middleman::CoreExtensions::FrontMatter
     end
   end
   
+  module ClassMethods
+    def parse_front_matter(content)
+      Middleman::CoreExtensions::FrontMatter.parse_front_matter(content)
+    end
+  end
+  
   module YamlAware
     def prepare
-      options, @data = Middleman::Server.parse_front_matter(@data)
+      options, @data = Middleman::CoreExtensions::FrontMatter.parse_front_matter(@data)
       super
     end
   end

data/lib/middleman/core_extensions/rack_map.rb

@@ -25,8 +25,9 @@ module Middleman::CoreExtensions::RackMap
       builder.use ::Rack::Head
       middleware.each { |c,a,b| builder.use(c, *a, &b) }
       maps.each { |p,b| builder.map(p, &b) }
+      app = self
       builder.map "/" do
-        run Middleman::Server.new!(*args, &bk)
+        run app.new!(*args, &bk)
       end
       builder
     end

data/lib/middleman/core_extensions/sprockets.rb

@@ -17,7 +17,10 @@ module Middleman::CoreExtensions::Sprockets
 
   class MiddlemanEnvironment < Sprockets::Environment
     def initialize(app)
-      super File.expand_path(app.views)
+      full_path = app.views
+      full_path = File.join(app.root, app.views) unless app.views.include?(app.root)
+      
+      super File.expand_path(full_path)
     end
   end
     
@@ -31,8 +34,7 @@ module Middleman::CoreExtensions::Sprockets
       self.js_compressor = app.settings.js_compressor
 
       # configure search paths
-      javascripts_path = File.join(File.expand_path(app.views), app.js_dir)
-      append_path javascripts_path
+      append_path app.js_dir
     end
   end
   

data/lib/middleman/features/blog.rb

@@ -63,8 +63,8 @@ module Middleman
                   data["raw"].match(/(.{1,#{app.settings.blog_summary_length}}.*?)(\n|\Z)/m).to_s
                 end
 
-                engine = RDiscount.new(sum)
-                data["summary"] = engine.to_html
+                engine = app.settings.markdown_engine.new { sum }
+                data["summary"] = engine.render
                 data
               end.sort { |a, b| b["date"] <=> a["date"] }
 

data/lib/middleman/renderers/sass.rb

@@ -11,22 +11,24 @@ module Middleman::Renderers::Sass
   end
   
   class SassPlusCSSFilenameTemplate < ::Tilt::SassTemplate
-    def sass_options
-      return super if basename.nil?
-
-      location_of_sass_file = if Middleman::Server.build?
-        File.join(Middleman::Server.root, Middleman::Server.build_dir)
+    def sass_options_with_scope(scope)
+      return sass_options if basename.nil?
+    
+      location_of_sass_file = if scope.build?
+        File.join(scope.root, scope.build_dir)
       else
-        Middleman::Server.views
+        scope.views
       end
-
+    
       parts = basename.split('.')
       parts.pop
-      css_filename = File.join(location_of_sass_file, Middleman::Server.css_dir, parts.join("."))
-      super.merge(Middleman::Server.settings.sass).merge(:css_filename => css_filename)
+      css_filename = File.join(location_of_sass_file, scope.css_dir, parts.join("."))
+      sass_options.merge(scope.settings.sass).merge(:css_filename => css_filename)
     end
 
     def evaluate(scope, locals, &block)
+      @engine = ::Sass::Engine.new(data, sass_options_with_scope(scope.class))
+        
       begin
         super
       rescue Sass::SyntaxError => e
@@ -38,7 +40,7 @@ module Middleman::Renderers::Sass
   ::Tilt.prefer(SassPlusCSSFilenameTemplate)
 
   class ScssPlusCSSFilenameTemplate < SassPlusCSSFilenameTemplate
-    def sass_options
+    def sass_options_with_scope(scope)
       super.merge(:syntax => :scss)
     end
   end
@@ -49,13 +51,13 @@ end
 # Use sass settings in Haml filters
 # Other, tilt-based filters (like those used in Slim) will
 # work automatically.
-module Middleman::Renderers::Haml
-  module Sass
-    include ::Haml::Filters::Base
-
-    def render(text)
-      sass_options = Middleman::Server.settings.sass
-      ::Sass::Engine.new(text, sass_options).render
-    end
-  end
-end
+# module Middleman::Renderers::Haml
+#   module Sass
+#     include ::Haml::Filters::Base
+# 
+#     def render(text)
+#       sass_options = scope.settings.sass
+#       ::Sass::Engine.new(text, sass_options).render
+#     end
+#   end
+# end

data/lib/middleman/templates/default/config.ru

@@ -1,4 +1,4 @@
 require 'rubygems'
 require 'middleman'
 
-run Middleman::Server
+run Middleman.server

data/lib/middleman/templates/html5/config.ru

@@ -1,4 +1,4 @@
 require 'rubygems'
 require 'middleman'
 
-run Middleman::Server
+run Middleman.server

data/lib/middleman/templates/xhtml/config.ru

@@ -1,4 +1,4 @@
 require 'rubygems'
 require 'middleman'
 
-run Middleman::Server
+run Middleman.server

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "2.0.0.rc3"
+  VERSION = "2.0.0.rc4"
 end

data/middleman.gemspec

@@ -30,10 +30,11 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("slim", ["~> 0.9.4"])
   s.add_runtime_dependency("haml", ["~> 3.1.0"])
   s.add_runtime_dependency("sass", ["~> 3.1.0"])
+  s.add_runtime_dependency("coffee-script", ["~> 2.2.0"])
   s.add_runtime_dependency("compass", ["~> 0.11.3"])
   s.add_runtime_dependency("sprockets", ["2.0.0.beta.10"])
   s.add_runtime_dependency("httparty", ["~> 0.7.0"])
-  s.add_development_dependency("spork", ["~> 0.9.0.rc8"])
+  s.add_development_dependency("coffee-filter", ["~> 0.1.1"])
   s.add_development_dependency("cucumber", ["~> 0.10.0"])
   s.add_development_dependency("rake", ["0.8.7"])
   s.add_development_dependency("rspec", [">= 0"])

metadata

@@ -2,7 +2,7 @@
 name: middleman
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 2.0.0.rc3
+  version: 2.0.0.rc4
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-11 00:00:00 -07:00
+date: 2011-07-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -146,93 +146,104 @@ dependencies:
   type: :runtime
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: compass
+  name: coffee-script
   prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.11.3
+        version: 2.2.0
   type: :runtime
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: sprockets
+  name: compass
   prerelease: false
   requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.11.3
+  type: :runtime
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  name: sprockets
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
         version: 2.0.0.beta.10
   type: :runtime
-  version_requirements: *id014
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: httparty
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 0.7.0
   type: :runtime
-  version_requirements: *id015
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
-  name: spork
+  name: coffee-filter
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.0.rc8
+        version: 0.1.1
   type: :development
-  version_requirements: *id016
+  version_requirements: *id017
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 0.10.0
   type: :development
-  version_requirements: *id017
+  version_requirements: *id018
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
         version: 0.8.7
   type: :development
-  version_requirements: *id018
+  version_requirements: *id019
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
-  version_requirements: *id019
+  version_requirements: *id020
 - !ruby/object:Gem::Dependency 
   name: rocco
   prerelease: false
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
-  version_requirements: *id020
+  version_requirements: *id021
 description: 
 email: 
 - tdreyno@gmail.com
@@ -257,7 +268,10 @@ files:
 - bin/mm-build
 - bin/mm-init
 - bin/mm-server
+- features/asset_host.feature
+- features/automatic_image_sizes.feature
 - features/builder.feature
+- features/cache_buster.feature
 - features/coffee-script.feature
 - features/data.feature
 - features/front-matter.feature
@@ -269,6 +283,7 @@ files:
 - features/minify_javascript.feature
 - features/padrino_helpers.feature
 - features/page_alias_and_layouts.feature
+- features/relative_assets.feature
 - features/scss-support.feature
 - features/slim.feature
 - features/sprockets.feature
@@ -279,10 +294,6 @@ files:
 - features/step_definitions/page_layout_steps.rb
 - features/support/env.rb
 - features/tiny_src.feature
-- features/w_asset_host.feature
-- features/x_automatic_image_sizes.feature
-- 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
@@ -300,7 +311,7 @@ files:
 - fixtures/test-app/source/custom-layout-dir/index.html.haml
 - fixtures/test-app/source/custom-layout.html.haml
 - fixtures/test-app/source/data.html.erb
-- fixtures/test-app/source/front-matter.html.slim
+- fixtures/test-app/source/front-matter.html.erb
 - fixtures/test-app/source/images/blank.gif
 - fixtures/test-app/source/index.html.haml
 - fixtures/test-app/source/inline-coffeescript.html.haml
@@ -335,6 +346,7 @@ files:
 - fixtures/test-app/source/sub1/sub2/page-classes.html.haml
 - fixtures/test-app/source/tiny_src.html.haml
 - lib/middleman.rb
+- lib/middleman/base.rb
 - lib/middleman/builder.rb
 - lib/middleman/config.ru
 - lib/middleman/core_extensions/assets.rb
@@ -352,7 +364,6 @@ files:
 - lib/middleman/features/automatic_image_sizes/fastimage.rb
 - lib/middleman/features/blog.rb
 - lib/middleman/features/cache_buster.rb
-- lib/middleman/features/live_reload.rb
 - lib/middleman/features/lorem.rb
 - lib/middleman/features/minify_css.rb
 - lib/middleman/features/minify_javascript.rb
@@ -364,7 +375,6 @@ files:
 - lib/middleman/renderers/markdown.rb
 - lib/middleman/renderers/sass.rb
 - lib/middleman/renderers/slim.rb
-- lib/middleman/server.rb
 - lib/middleman/templates.rb
 - lib/middleman/templates/compass.rb
 - lib/middleman/templates/default.rb
@@ -431,7 +441,10 @@ signing_key:
 specification_version: 3
 summary: A static site generator based on Sinatra. Providing Haml, Sass, Compass, CoffeeScript and including minification, compression and cache busting.
 test_files: 
+- features/asset_host.feature
+- features/automatic_image_sizes.feature
 - features/builder.feature
+- features/cache_buster.feature
 - features/coffee-script.feature
 - features/data.feature
 - features/front-matter.feature
@@ -443,6 +456,7 @@ test_files:
 - features/minify_javascript.feature
 - features/padrino_helpers.feature
 - features/page_alias_and_layouts.feature
+- features/relative_assets.feature
 - features/scss-support.feature
 - features/slim.feature
 - features/sprockets.feature
@@ -453,10 +467,6 @@ test_files:
 - features/step_definitions/page_layout_steps.rb
 - features/support/env.rb
 - features/tiny_src.feature
-- features/w_asset_host.feature
-- features/x_automatic_image_sizes.feature
-- 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
@@ -474,7 +484,7 @@ test_files:
 - fixtures/test-app/source/custom-layout-dir/index.html.haml
 - fixtures/test-app/source/custom-layout.html.haml
 - fixtures/test-app/source/data.html.erb
-- fixtures/test-app/source/front-matter.html.slim
+- fixtures/test-app/source/front-matter.html.erb
 - fixtures/test-app/source/images/blank.gif
 - fixtures/test-app/source/index.html.haml
 - fixtures/test-app/source/inline-coffeescript.html.haml