middleman-more 3.1.0.beta.1 → 3.1.0.beta.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a1df77f4d11379ce20fec027e19c1bdbe25ebe5f
+  data.tar.gz: 23137fa1344a5ce4a2fd3b2b2b487d9fef92664d
+SHA512:
+  metadata.gz: 549c6712e66858016fddceedf9aadce140159a6258098535a69f15beddcc7cf79d579413549ed329a1ac270a3d089cef0d10002b2927b435a2706b4e429076cf
+  data.tar.gz: 156fbf13a8828514215da7688a96d72edd4bc7b7ad53c747563aa3ded4fa64460bccfe917c3b50158a4b9aa8ac5981b9e0a9f9b0bc19222d41f9910a3baca014

data/features/asset_hash.feature

@@ -57,13 +57,13 @@ Feature: Assets get a file hash appended to their and references to them are upd
   Scenario: Enabling an asset host still produces hashed files and references  
     Given the Server is running at "asset-hash-host-app"
     When I go to "/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-171eb3c0.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-54baaf3a.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
     When I go to "/subdir/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-171eb3c0.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-54baaf3a.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
     When I go to "/other/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-171eb3c0.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-54baaf3a.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
     # Asset helpers don't appear to work from Compass right now
     # When I go to "/stylesheets/site-e5a31a3e.css"

data/features/asset_host.feature

@@ -1,7 +1,56 @@
 Feature: Alternate between multiple asset hosts
   In order to speed up page loading
-    
-  Scenario: Rendering html with the feature enabled
-    Given the Server is running at "asset-host-app"
+  
+  Scenario: Set single host globally
+    Given a fixture app "asset-host-app"
+    And a file named "config.rb" with:
+      """
+      activate :asset_host
+      set :asset_host, "http://assets1.example.com"
+      """
+    And the Server is running
     When I go to "/asset_host.html"
+    Then I should see "http://assets1"
+    When I go to "/stylesheets/asset_host.css"
+    Then I should see "http://assets1"
+
+  Scenario: Set proc host globally
+    Given a fixture app "asset-host-app"
+    And a file named "config.rb" with:
+      """
+      activate :asset_host
+      set :asset_host do |asset|
+        "http://assets%d.example.com" % (asset.hash % 4)
+      end
+      """
+    And the Server is running
+    When I go to "/asset_host.html"
+    Then I should see "http://assets"
+    When I go to "/stylesheets/asset_host.css"
+    Then I should see "http://assets"
+
+  Scenario: Set single host with inline-option
+    Given a fixture app "asset-host-app"
+    And a file named "config.rb" with:
+      """
+      activate :asset_host, :host => "http://assets1.example.com"
+      """
+    And the Server is running
+    When I go to "/asset_host.html"
+    Then I should see "http://assets1"
+    When I go to "/stylesheets/asset_host.css"
+    Then I should see "http://assets1"
+
+  Scenario: Set proc host with inline-option
+    Given a fixture app "asset-host-app"
+    And a file named "config.rb" with:
+      """
+      activate :asset_host, :host => Proc.new { |asset|
+        "http://assets%d.example.com" % (asset.hash % 4)
+      }
+      """
+    And the Server is running
+    When I go to "/asset_host.html"
+    Then I should see "http://assets"
+    When I go to "/stylesheets/asset_host.css"
     Then I should see "http://assets"

data/features/minify_javascript.feature

@@ -133,14 +133,14 @@ Feature: Minify Javascript
     Then I should see:
     """
     <script>
-      (function(){this,should(),all.be(),on={one:line}})();
+      (function(){should(),all.be(),on={one:line}})();
     </script>
     <script>
-      (function(){this,should(),too()})();
+      (function(){should(),too()})();
     </script>
     <script type='text/javascript'>
       //<!--
-    (function(){one,line(),here()})();
+    (function(){line(),here()})();
       //-->
     </script>
     <script type='text/html'>

data/fixtures/asset-host-app/config.rb

@@ -1,6 +0,0 @@
-set :layout, false
-
-activate :asset_host
-set :asset_host do |asset|
-  "http://assets%d.example.com" % (asset.hash % 4)
-end

data/lib/middleman-more/core_extensions/compass.rb

@@ -1,92 +1,75 @@
-module Middleman
-  module CoreExtensions
-
-    # Forward the settings on config.rb and the result of registered
-    # extensions to Compass
-    module Compass
-
-      # Extension registered
-      class << self
-
-        # Once registered
-        def registered(app)
-          # Require the library
-          require "compass"
-
-          # Hooks to manually update the compass config after we're
-          # done with it
-          app.define_hook :compass_config
-
-          # Location of SASS/SCSS files external to source directory.
-          # @return [Array]
-          #   config[:sass_assets_paths] = ["#{root}/assets/sass/", "/path/2/external/sass/repository/"]
-          app.config.define_setting :sass_assets_paths, [], 'Paths to extra SASS/SCSS files'
-
-          app.after_configuration do
-            ::Compass.configuration do |compass_config|
-              compass_config.project_path    = source_dir
-              compass_config.environment     = :development
-              compass_config.cache_path      = config[:sass_cache_path]
-              compass_config.sass_dir        = config[:css_dir]
-              compass_config.css_dir         = config[:css_dir]
-              compass_config.javascripts_dir = config[:js_dir]
-              compass_config.fonts_dir       = config[:fonts_dir]
-              compass_config.images_dir      = config[:images_dir]
-              compass_config.http_path       = config[:http_prefix]
-
-              config[:sass_assets_paths].each do |path|
-                compass_config.add_import_path path
-              end
-
-              # Disable this initially, the cache_buster extension will
-              # re-enable it if requested.
-              compass_config.asset_cache_buster :none
-
-              # Disable this initially, the relative_assets extension will
-
-              compass_config.relative_assets = false
-
-              # Default output style
-              compass_config.output_style = :nested
-
-              # No line-comments in test mode (changing paths mess with sha1)
-              compass_config.line_comments = false if ENV["TEST"]
-
-              if config.defines_setting?(:asset_host) && config[:asset_host].is_a?(Proc)
-                compass_config.asset_host(&config[:asset_host])
-              end
-            end
-
-            # Call hook
-            run_hook :compass_config, ::Compass.configuration
-
-            # Tell Tilt to use it as well (for inline sass blocks)
-            ::Tilt.register 'sass', CompassSassTemplate
-            ::Tilt.prefer(CompassSassTemplate)
-
-            # Tell Tilt to use it as well (for inline scss blocks)
-            ::Tilt.register 'scss', CompassScssTemplate
-            ::Tilt.prefer(CompassScssTemplate)
-          end
-        end
-        alias :included :registered
-      end
+class Middleman::CoreExtensions::Compass < ::Middleman::Extension
 
-    end
+  def initialize(app, options_hash={}, &block)
+    super
+
+    # Require the library
+    require "compass"
 
-    # A Compass Sass template for Tilt, adding our options in
-    class CompassSassTemplate < ::Middleman::Renderers::Sass::SassPlusCSSFilenameTemplate
-      def sass_options
-        super.merge(::Compass.configuration.to_sass_engine_options)
+    # Hooks to manually update the compass config after we're
+    # done with it
+    app.define_hook :compass_config
+
+    # Location of SASS/SCSS files external to source directory.
+    # @return [Array]
+    #   config[:sass_assets_paths] = ["#{root}/assets/sass/", "/path/2/external/sass/repository/"]
+    app.config.define_setting :sass_assets_paths, [], 'Paths to extra SASS/SCSS files'
+  end
+
+  def after_configuration
+    ::Compass.configuration do |compass_config|
+      compass_config.project_path    = app.source_dir
+      compass_config.environment     = :development
+      compass_config.cache_path      = app.config[:sass_cache_path]
+      compass_config.sass_dir        = app.config[:css_dir]
+      compass_config.css_dir         = app.config[:css_dir]
+      compass_config.javascripts_dir = app.config[:js_dir]
+      compass_config.fonts_dir       = app.config[:fonts_dir]
+      compass_config.images_dir      = app.config[:images_dir]
+      compass_config.http_path       = app.config[:http_prefix]
+
+      app.config[:sass_assets_paths].each do |path|
+        compass_config.add_import_path path
       end
+
+      # Disable this initially, the cache_buster extension will
+      # re-enable it if requested.
+      compass_config.asset_cache_buster :none
+
+      # Disable this initially, the relative_assets extension will
+
+      compass_config.relative_assets = false
+
+      # Default output style
+      compass_config.output_style = :nested
+
+      # No line-comments in test mode (changing paths mess with sha1)
+      compass_config.line_comments = false if ENV["TEST"]
     end
 
-    # A Compass Scss template for Tilt, adding our options in
-    class CompassScssTemplate < ::Middleman::Renderers::Sass::ScssPlusCSSFilenameTemplate
-      def sass_options
-        super.merge(::Compass.configuration.to_sass_engine_options)
-      end
+    # Call hook
+    app.run_hook :compass_config, ::Compass.configuration
+
+    # Tell Tilt to use it as well (for inline sass blocks)
+    ::Tilt.register 'sass', CompassSassTemplate
+    ::Tilt.prefer(CompassSassTemplate)
+
+    # Tell Tilt to use it as well (for inline scss blocks)
+    ::Tilt.register 'scss', CompassScssTemplate
+    ::Tilt.prefer(CompassScssTemplate)
+  end
+
+  # A Compass Sass template for Tilt, adding our options in
+  class CompassSassTemplate < ::Middleman::Renderers::Sass::SassPlusCSSFilenameTemplate
+    def sass_options
+      super.merge(::Compass.configuration.to_sass_engine_options)
     end
+  end
 
+  # A Compass Scss template for Tilt, adding our options in
+  class CompassScssTemplate < ::Middleman::Renderers::Sass::ScssPlusCSSFilenameTemplate
+    def sass_options
+      super.merge(::Compass.configuration.to_sass_engine_options)
+    end
   end
-end
+end