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

data/lib/middleman-more/extensions/minify_javascript.rb

@@ -1,94 +1,83 @@
-# Extension namespace
-module Middleman
-  module Extensions
+# Minify Javascript Extension
+class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
+  option :compressor, nil, 'Set the JS compressor to use.'
+  option :inline, false, 'Whether to minify JS inline within HTML files'
+  option :ignore, [], 'Patterns to avoid minifying'
 
-    # Minify Javascript Extension
-    module MinifyJavascript
+  def initialize(app, options_hash={}, &block)
+    super
 
-      # Setup extension
-      class << self
-
-        # Once registered
-        def registered(app, options={})
-          app.config.define_setting :js_compressor, nil, 'Set the JS compressor to use. Deprecated in favor of the :compressor option when activating :minify_js'
-
-          ignore = Array(options[:ignore]) << /\.min\./
-          inline = options[:inline] || false
-
-          # Once config is parsed
-          app.after_configuration do
-            chosen_compressor = js_compressor || options[:compressor] || begin
-              require 'uglifier'
-              ::Uglifier.new
-            end
-
-            # Setup Rack middlware to minify JS
-            use Rack, :compressor => chosen_compressor,
-                      :ignore     => ignore,
-                      :inline     => inline
-          end
-        end
-        alias :included :registered
-      end
-
-      # Rack middleware to look for JS and compress it
-      class Rack
+    app.config.define_setting :js_compressor, nil, 'Set the JS compressor to use. Deprecated in favor of the :compressor option when activating :minify_js'
+  end
 
-        # Init
-        # @param [Class] app
-        # @param [Hash] options
-        def initialize(app, options={})
-          @app = app
-          @compressor = options[:compressor]
-          @ignore = options[:ignore]
-          @inline = options[:inline]
-        end
+  def after_configuration
+    chosen_compressor = app.config[:js_compressor] || options[:compressor] || begin
+      require 'uglifier'
+      ::Uglifier.new
+    end
 
-        # Rack interface
-        # @param [Rack::Environmemt] env
-        # @return [Array]
-        def call(env)
-          status, headers, response = @app.call(env)
+    # Setup Rack middleware to minify CSS
+    app.use Rack, :compressor => chosen_compressor,
+                  :ignore     => Array(options[:ignore]) + [/\.min\./],
+                  :inline     => options[:inline]
+  end
 
-          path = env["PATH_INFO"]
+  # Rack middleware to look for JS and compress it
+  class Rack
+
+    # Init
+    # @param [Class] app
+    # @param [Hash] options
+    def initialize(app, options={})
+      @app = app
+      @compressor = options[:compressor]
+      @ignore = options[:ignore]
+      @inline = options[:inline]
+    end
 
-          begin
-            if (path.end_with?('.html') || path.end_with?('.php')) && @inline
-              uncompressed_source = ::Middleman::Util.extract_response_text(response)
+    # Rack interface
+    # @param [Rack::Environmemt] env
+    # @return [Array]
+    def call(env)
+      status, headers, response = @app.call(env)
 
-              minified = uncompressed_source.gsub(/(<script[^>]*>\s*(?:\/\/(?:(?:<!--)|(?:<!\[CDATA\[))\n)?)(.*?)((?:(?:\n\s*)?\/\/(?:(?:-->)|(?:\]\]>)))?\s*<\/script>)/m) do |match|
-                first = $1
-                javascript = $2
-                last = $3
+      path = env["PATH_INFO"]
 
-                # Only compress script tags that contain JavaScript (as opposed
-                # to something like jQuery templates, identified with a "text/html"
-                # type.
-                if first =~ /<script>/ || first.include?('text/javascript')
-                  minified_js = @compressor.compress(javascript)
+      begin
+        if (path.end_with?('.html') || path.end_with?('.php')) && @inline
+          uncompressed_source = ::Middleman::Util.extract_response_text(response)
 
-                  first << minified_js << last
-                else
-                  match
-                end
-              end
+          minified = uncompressed_source.gsub(/(<script[^>]*>\s*(?:\/\/(?:(?:<!--)|(?:<!\[CDATA\[))\n)?)(.*?)((?:(?:\n\s*)?\/\/(?:(?:-->)|(?:\]\]>)))?\s*<\/script>)/m) do |match|
+            first = $1
+            javascript = $2
+            last = $3
 
-              headers["Content-Length"] = ::Rack::Utils.bytesize(minified).to_s
-              response = [minified]
-            elsif path.end_with?('.js') && @ignore.none? {|ignore| Middleman::Util.path_match(ignore, path) }
-              uncompressed_source = ::Middleman::Util.extract_response_text(response)
-              minified_js = @compressor.compress(uncompressed_source)
+            # Only compress script tags that contain JavaScript (as opposed
+            # to something like jQuery templates, identified with a "text/html"
+            # type.
+            if first =~ /<script>/ || first.include?('text/javascript')
+              minified_js = @compressor.compress(javascript)
 
-              headers["Content-Length"] = ::Rack::Utils.bytesize(minified_js).to_s
-              response = [minified_js]
+              first << minified_js << last
+            else
+              match
             end
-          rescue ExecJS::ProgramError => e
-            warn "WARNING: Couldn't compress JavaScript in #{path}: #{e.message}"
           end
 
-          [status, headers, response]
+          headers["Content-Length"] = ::Rack::Utils.bytesize(minified).to_s
+          response = [minified]
+        elsif path.end_with?('.js') && @ignore.none? {|ignore| Middleman::Util.path_match(ignore, path) }
+          uncompressed_source = ::Middleman::Util.extract_response_text(response)
+          minified_js = @compressor.compress(uncompressed_source)
+
+          headers["Content-Length"] = ::Rack::Utils.bytesize(minified_js).to_s
+          response = [minified_js]
         end
+      rescue ExecJS::ProgramError => e
+        warn "WARNING: Couldn't compress JavaScript in #{path}: #{e.message}"
       end
+
+      [status, headers, response]
     end
   end
 end

data/lib/middleman-more/extensions/relative_assets.rb

@@ -1,44 +1,28 @@
-# Extension namespace
-module Middleman
-  module Extensions
+# Relative Assets extension
+class Middleman::Extensions::RelativeAssets < ::Middleman::Extension
 
-    # Relative Assets extension
-    module RelativeAssets
+  def initialize(app, options_hash={}, &block)
+    super
 
-      # Setup extension
-      class << self
-
-        # Once registered
-        def registered(app)
-          # Tell compass to use relative assets
-          app.compass_config do |config|
-            config.relative_assets = true
-          end
-
-          # Include instance methods
-          app.send :include, InstanceMethods
-        end
-
-        alias :included :registered
-      end
-
-      # Relative Assets instance method
-      module InstanceMethods
-
-        # asset_url override for relative assets
-        # @param [String] path
-        # @param [String] prefix
-        # @return [String]
-        def asset_url(path, prefix="")
-          path = super(path, prefix)
+    # After compass is setup, make it use the registered cache buster
+    app.compass_config do |config|
+      config.relative_assets = true
+    end
+  end
 
-          if path.include?("//") || !current_resource
-            path
-          else
-            current_dir = Pathname('/' + current_resource.destination_path)
-            Pathname(path).relative_path_from(current_dir.dirname).to_s
-          end
-        end
+  helpers do
+    # asset_url override for relative assets
+    # @param [String] path
+    # @param [String] prefix
+    # @return [String]
+    def asset_url(path, prefix="")
+      path = super(path, prefix)
+
+      if path.include?("//") || !current_resource
+        path
+      else
+        current_dir = Pathname('/' + current_resource.destination_path)
+        Pathname(path).relative_path_from(current_dir.dirname).to_s
       end
     end
   end

data/lib/middleman-more.rb

@@ -21,9 +21,8 @@ module Middleman
 
         # Setup default helpers
         require "middleman-more/core_extensions/default_helpers"
-        Middleman::Application.register Middleman::CoreExtensions::DefaultHelpers
+        Middleman::CoreExtensions::DefaultHelpers.new(app)
 
-        # i18n
         require "i18n"
         app.after_configuration do
           # This is for making the tests work - since the tests
@@ -32,16 +31,14 @@ module Middleman
           # exist anymore.
           ::I18n.load_path.delete_if {|path| path =~ %r{tmp/aruba}}
           ::I18n.reload!
-        end
+        end if ENV["TEST"]
 
-        Middleman::Extensions.register(:i18n) do
-          require "middleman-more/core_extensions/i18n"
-          Middleman::CoreExtensions::Internationalization
-        end
+        require "middleman-more/core_extensions/i18n"
+        Middleman::CoreExtensions::Internationalization.register(:i18n)
 
         # Compass framework
         require "middleman-more/core_extensions/compass"
-        Middleman::Application.register Middleman::CoreExtensions::Compass
+        Middleman::CoreExtensions::Compass.new(app)
 
         ###
         # Setup Optional Extensions
@@ -49,69 +46,51 @@ module Middleman
 
         # CacheBuster adds a query string to assets in dynamic templates to
         # avoid browser caches failing to update to your new content.
-        Middleman::Extensions.register(:cache_buster) do
-          require "middleman-more/extensions/cache_buster"
-          Middleman::Extensions::CacheBuster
-        end
+        require "middleman-more/extensions/cache_buster"
+        Middleman::Extensions::CacheBuster.register
 
         # MinifyCss compresses CSS
-        Middleman::Extensions.register(:minify_css) do
-          require "middleman-more/extensions/minify_css"
-          Middleman::Extensions::MinifyCss
-        end
+        require "middleman-more/extensions/minify_css"
+        Middleman::Extensions::MinifyCss.register
 
         # MinifyJavascript compresses JS
-        Middleman::Extensions.register(:minify_javascript) do
-          require "middleman-more/extensions/minify_javascript"
-          Middleman::Extensions::MinifyJavascript
-        end
+        require "middleman-more/extensions/minify_javascript"
+        Middleman::Extensions::MinifyJavascript.register
 
         # RelativeAssets allow any asset path in dynamic templates to be either
         # relative to the root of the project or use an absolute URL.
-        Middleman::Extensions.register(:relative_assets) do
-          require "middleman-more/extensions/relative_assets"
-          Middleman::Extensions::RelativeAssets
-        end
+        require "middleman-more/extensions/relative_assets"
+        Middleman::Extensions::RelativeAssets.register
 
         # GZIP assets and pages during build
-        Middleman::Extensions.register(:gzip) do
-          require "middleman-more/extensions/gzip"
-          Middleman::Extensions::Gzip
-        end
+        require "middleman-more/extensions/gzip"
+        Middleman::Extensions::Gzip.register
 
         # AssetHash appends a hash of the file contents to the assets filename
         # to avoid browser caches failing to update to your new content.
-        Middleman::Extensions.register(:asset_hash) do
-          require "middleman-more/extensions/asset_hash"
-          Middleman::Extensions::AssetHash::Extension
-        end
+        require "middleman-more/extensions/asset_hash"
+        Middleman::Extensions::AssetHash.register
 
         # 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.
-        Middleman::Extensions.register(:asset_host) do
-          require "middleman-more/extensions/asset_host"
-          Middleman::Extensions::AssetHost
-        end
+        require "middleman-more/extensions/asset_host"
+        Middleman::Extensions::AssetHost.register
 
         # Provide Apache-style index.html files for directories
-        Middleman::Extensions.register(:directory_indexes) do
-          require "middleman-more/extensions/directory_indexes"
-          Middleman::Extensions::DirectoryIndexes
-        end
+        require "middleman-more/extensions/directory_indexes"
+        Middleman::Extensions::DirectoryIndexes.register
 
         # Lorem provides a handful of helpful prototyping methods to generate
         # words, paragraphs, fake images, names and email addresses.
         require "middleman-more/extensions/lorem"
-        Middleman::Application.register Middleman::Extensions::Lorem
+        Middleman::Extensions::Lorem.new(app)
 
         # AutomaticImageSizes inspects the images used in your dynamic templates
         # and automatically adds width and height attributes to their HTML
         # elements.
-        Middleman::Extensions.register(:automatic_image_sizes) do
-          require "middleman-more/extensions/automatic_image_sizes"
-          Middleman::Extensions::AutomaticImageSizes
-        end
+        require "middleman-more/extensions/automatic_image_sizes"
+        Middleman::Extensions::AutomaticImageSizes.register
       end
     end
   end

data/middleman-more.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency("middleman-core", Middleman::VERSION)
-  s.add_dependency("uglifier", ["~> 1.3.0"])
+  s.add_dependency("uglifier", ["~> 2.0.1"])
   s.add_dependency("haml", [">= 3.1.6"])
   s.add_dependency("sass", [">= 3.1.20"])
   s.add_dependency("compass", [">= 0.12.2"])
@@ -25,5 +25,5 @@ Gem::Specification.new do |s|
   s.add_dependency("execjs", ["~> 1.4.0"])
   s.add_dependency("kramdown", ["~> 1.0.0"])
   s.add_dependency("i18n", ["~> 0.6.4"])
-  s.add_dependency("padrino-helpers", ["0.10.7"])
+  s.add_dependency("padrino-helpers", ["0.11.1"])
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-more
 version: !ruby/object:Gem::Version
-  version: 3.1.0.beta.1
-  prerelease: 6
+  version: 3.1.0.beta.2
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,92 +9,81 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-14 00:00:00.000000000 Z
+date: 2013-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0.beta.1
+        version: 3.1.0.beta.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0.beta.1
+        version: 3.1.0.beta.2
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.6
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.20
 - !ruby/object:Gem::Dependency
   name: compass
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.12.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -103,7 +91,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -111,7 +98,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -119,7 +105,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -127,7 +112,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -135,7 +119,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -143,7 +126,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -151,7 +133,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -159,19 +140,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-helpers
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.7
+        version: 0.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.7
+        version: 0.11.1
 description: A static site generator. Provides dozens of templating languages (Haml,
   Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache
   busting, Yaml data (and more) an easy part of your development cycle.
@@ -188,7 +167,6 @@ files:
 - Rakefile
 - features/asset_hash.feature
 - features/asset_host.feature
-- features/asset_host_compass.feature
 - features/automatic_image_sizes.feature
 - features/cache_buster.feature
 - features/clean_build.feature
@@ -642,35 +620,30 @@ files:
 homepage: http://middlemanapp.com
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1915495170693894069
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Hand-crafted frontend development
 test_files:
 - features/asset_hash.feature
 - features/asset_host.feature
-- features/asset_host_compass.feature
 - features/automatic_image_sizes.feature
 - features/cache_buster.feature
 - features/clean_build.feature

data/features/asset_host_compass.feature

@@ -1,7 +0,0 @@
-Feature: Alternate between multiple asset hosts
-  In order to speed up page loading
-  
-  Scenario: Rendering css with the feature enabled
-    Given the Server is running at "asset-host-app"
-    When I go to "/stylesheets/asset_host.css"
-    Then I should see "http://assets"