RubyGems - middleman-more - Versions diffs - 3.0.0.beta.1 → 3.0.0.beta.2 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (76) hide show

data/fixtures/asset-hash-host-app/config.rb ADDED Viewed

@@ -0,0 +1,6 @@
+activate :asset_hash
+activate :directory_indexes
+activate :asset_host
+set :asset_host, 'http://middlemanapp.com'

data/fixtures/asset-hash-host-app/source/images/100px.gif ADDED Viewed

Binary file

data/fixtures/asset-hash-host-app/source/images/100px.jpg ADDED Viewed

Binary file

data/fixtures/asset-hash-host-app/source/images/100px.png ADDED Viewed

Binary file

data/fixtures/asset-hash-host-app/source/index.html.erb ADDED Viewed

@@ -0,0 +1,6 @@
+<% content_for :head do %>
+  <title>The Middleman!</title>
+<% end %>
+<h2>Image url:</h2>
+<%= image_tag('100px.jpg') %>

data/fixtures/asset-hash-host-app/source/layout.erb ADDED Viewed

@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <%= stylesheet_link_tag "site" %>
+    <%= yield_content :head %>
+  </head>
+  <body class="<%= page_classes %>">
+    <div id="main" role="main">
+      <%= yield %>
+    </div>
+  </body>
+</html>

data/fixtures/asset-hash-host-app/source/other.html.erb ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ <h2>Image url:</h2>
2	+ <img src="<%= image_path('100px.jpg') %>">

data/fixtures/asset-hash-host-app/source/stylesheets/site.css.scss ADDED Viewed

@@ -0,0 +1,4 @@
+#main {
+  padding: 50px;
+  background-image: image-url('100px.jpg');
+}

data/fixtures/asset-hash-host-app/source/subdir/index.html.erb ADDED Viewed

@@ -0,0 +1,6 @@
+<% content_for :head do %>
+  <title>The Middleman!</title>
+<% end %>
+<h2>Image url:</h2>
+<%= image_tag('100px.jpg') %>

data/fixtures/cache-buster-app/source/cache-buster.html.erb CHANGED Viewed

@@ -1,2 +1,3 @@
 <%= stylesheet_link_tag "site.css" %>
-<%= javascript_include_tag "empty-with-include.js" %>
+<%= javascript_include_tag "empty-with-include.js" %>
+<%= image_tag "blank.gif" %>

data/fixtures/compass-sprites-app/config.rb ADDED Viewed

File without changes

data/fixtures/compass-sprites-app/source/images/icon/arrow_down.png ADDED Viewed

Binary file

data/fixtures/compass-sprites-app/source/images/icon/arrow_left.png ADDED Viewed

Binary file

data/fixtures/compass-sprites-app/source/images/icon/arrow_right.png ADDED Viewed

Binary file

data/fixtures/compass-sprites-app/source/images/icon/arrow_up.png ADDED Viewed

Binary file

data/fixtures/compass-sprites-app/source/stylesheets/site.css.scss ADDED Viewed

@@ -0,0 +1,3 @@
+@import "compass";
+@import "icon/*.png";
+@include all-icon-sprites;

data/fixtures/gzip-app/config.rb ADDED Viewed

	@@ -0,0 +1 @@
1	+ activate :gzip

data/fixtures/gzip-app/source/index.html ADDED Viewed

File without changes

data/fixtures/gzip-app/source/javascripts/test.js ADDED Viewed

	@@ -0,0 +1 @@
1	+ function test_function() {}

data/fixtures/gzip-app/source/stylesheets/test.css ADDED Viewed

	@@ -0,0 +1 @@
1	+ test_selector {}

data/fixtures/minify-css-app/source/inline-css.html.haml ADDED Viewed

@@ -0,0 +1,5 @@
+:css
+  body {
+    test: style;
+    good: deal;
+  }

data/fixtures/minify-css-app/source/more-css/site.css ADDED Viewed

@@ -0,0 +1,3 @@
+body {
+  display: block;
+}

data/fixtures/minify-css-app/source/stylesheets/site.css.sass CHANGED Viewed

@@ -1 +1,5 @@
-@import "compass/reset"
+@import "compass/reset"
+@media handheld, only screen and (device-width: 768px)
+  body
+    display: block

data/fixtures/minify-js-app/config.rb CHANGED Viewed

	@@ -1 +1 @@
1	- require "coffee-filter"
1	+ require "coffee-filter"

data/fixtures/minify-js-app/source/inline-js.html.haml CHANGED Viewed

@@ -4,4 +4,25 @@
     should();
     all.be();
     on = { one: line };
-  })();
+  })();
+%script
+  :plain
+    ;(function() {
+      this;
+      should();
+      too();
+    })();
+%script(type="text/javascript")
+  :plain
+    //<!--
+    ;(function() {
+      one;
+      line();
+      here();
+    })();
+    //-->
+%script(type="text/html")
+  I'm a jQuery {{template}}.

data/fixtures/minify-js-app/source/more-js/other.js ADDED Viewed

@@ -0,0 +1,8 @@
+var race;
+var __slice = Array.prototype.slice;
+race = function() {
+  var runners, winner;
+  winner = arguments[0], runners = 2 <= arguments.length ? __slice.call(arguments, 1) : [];
+  return print(winner, runners);
+};

data/fixtures/passthrough-app/config.rb CHANGED Viewed

@@ -4,14 +4,14 @@ module ::PassThrough
   end
 end
-set :js_compressor, ::PassThrough
-set :css_compressor, ::PassThrough
 activate :minify_javascript
 activate :minify_css
+set :js_compressor, ::PassThrough
+set :css_compressor, ::PassThrough
 with_layout false do
   page "/inline-css.html"
   page "/inline-js.html"
   page "/inline-coffeescript.html"
-end
+end

data/fixtures/passthrough-app/source/inline-css.html.haml CHANGED Viewed

@@ -1,4 +1,5 @@
-:sass
-  body
-    test: style
-    good: deal
+%style(type="text/css")
+  :sass
+    body
+      test: style
+      good: deal

data/fixtures/passthrough-app/source/inline-js.html.haml CHANGED Viewed

@@ -4,4 +4,25 @@
     should();
     all.be();
     on = { one: line };
-  })();
+  })();
+%script
+  :plain
+    ;(function() {
+      this;
+      should();
+      too();
+    })();
+%script(type="text/javascript")
+  :plain
+    //<!--
+    ;(function() {
+      one;
+      line();
+      here();
+    })();
+    //-->
+%script(type="text/html")
+  I'm a jQuery {{template}}.

data/fixtures/relative-assets-app/config.rb CHANGED Viewed

	@@ -0,0 +1 @@
1	+ # activate :relative_assets

data/fixtures/relative-assets-app/source/relative_image.html.erb CHANGED Viewed

@@ -1 +1,8 @@
-<%= image_tag "blank.gif" %>
+<html>
+  <head>
+    <%= stylesheet_link_tag :relative_assets %>
+  </head>
+  <body>
+    <%= image_tag "blank.gif" %>
+  </body>
+</html>

data/fixtures/sprockets-app/source/library/js/vendored_include.js ADDED Viewed

	@@ -0,0 +1 @@
1	+ //= require "vendored_js"

data/fixtures/sprockets-app/vendor/assets/javascripts/vendored_js.js ADDED Viewed

	@@ -0,0 +1 @@
1	+ var vendored_js_included = true;

data/lib/middleman-more.rb CHANGED Viewed

@@ -16,6 +16,7 @@ module Middleman
     autoload :Slim,         "middleman-more/renderers/slim"
   end
+  # Core (automatic) extensions
   module CoreExtensions
     # Compass framework for Sass
     autoload :Compass,      "middleman-more/core_extensions/compass"
@@ -23,7 +24,8 @@ module Middleman
     # Sprockets 2
     autoload :Sprockets,    "middleman-more/core_extensions/sprockets"
   end
+  # User-activatable extensions
   module Extensions
     # RelativeAssets allow any asset path in dynamic templates to be either
     # relative to the root of the project or use an absolute URL.
@@ -33,25 +35,33 @@ module Middleman
     # browser caches failing to update to your new content.
     autoload :CacheBuster,         "middleman-more/extensions/cache_buster"
+    # AssetHash appends a hash of the file contents to the assets filename
+    # to avoid browser caches failing to update to your new content.
+    autoload :AssetHash,           "middleman-more/extensions/asset_hash"
     # MinifyCss uses the YUI compressor to shrink CSS files
     autoload :MinifyCss,           "middleman-more/extensions/minify_css"
     # MinifyJavascript uses the YUI compressor to shrink JS files
     autoload :MinifyJavascript,    "middleman-more/extensions/minify_javascript"
+    # GZIP assets and pages during build
+    autoload :Gzip,    "middleman-more/extensions/gzip"
   end
+  # Setup renderers
   require "coffee_script"
-  Base.register Middleman::Renderers::Haml
-  Base.register Middleman::Renderers::Sass
-  Base.register Middleman::Renderers::Markdown
-  Base.register Middleman::Renderers::Liquid
-  Base.register Middleman::Renderers::Slim
+  Application.register Middleman::Renderers::Haml
+  Application.register Middleman::Renderers::Sass
+  Application.register Middleman::Renderers::Markdown
+  Application.register Middleman::Renderers::Liquid
+  Application.register Middleman::Renderers::Slim
   # Compass framework
-  Base.register Middleman::CoreExtensions::Compass
+  Application.register Middleman::CoreExtensions::Compass
   # Sprockets asset handling
-  Base.register Middleman::CoreExtensions::Sprockets
+  Application.register Middleman::CoreExtensions::Sprockets
   # Register the optional extensions
   Extensions.register(:cache_buster) {
@@ -62,4 +72,8 @@ module Middleman
     ::Middleman::Extensions::MinifyJavascript }
   Extensions.register(:relative_assets) {
     ::Middleman::Extensions::RelativeAssets }
-end
+  Extensions.register(:gzip) {
+    ::Middleman::Extensions::Gzip }
+  Extensions.register(:asset_hash) {
+    ::Middleman::Extensions::AssetHash }
+end

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

@@ -16,40 +16,27 @@ module Middleman::CoreExtensions::Compass
       app.after_configuration do
         ::Compass.configuration do |config|
-          config.project_path    = root
+          config.project_path    = source_dir
           config.environment     = :development
           config.cache_path      = File.join(root, ".sass-cache")
-          config.sass_dir        = File.join(source, css_dir)
-          config.css_dir         = File.join(source, css_dir)
-          config.javascripts_dir = File.join(source, js_dir)
-          config.fonts_dir       = File.join(source, fonts_dir)
-          config.images_dir      = File.join(source, images_dir)
+          config.sass_dir        = css_dir
+          config.css_dir         = css_dir
+          config.javascripts_dir = js_dir
+          config.fonts_dir       = fonts_dir
+          config.images_dir      = images_dir
+          config.http_path       = http_prefix
-          config.http_images_path = if respond_to? :http_images_path
-            http_images_path
-          else
-            File.join(http_prefix, images_dir)
-          end
-          config.http_stylesheets_path = if respond_to? :http_css_path
-            http_css_path
-          else
-            File.join(http_prefix, css_dir)
-          end
-          config.http_javascripts_path = if respond_to? :http_js_path
-            http_js_path
-          else
-            File.join(http_prefix, js_dir)
-          end
+          # Correctly support HTTP paths with generated sprites
+          # if config.respond_to? :http_generated_images_path
+          #   config.http_generated_images_path = if app.respond_to? :http_generated_images_path
+          #     app.http_generated_images_path
+          #   else
+          #     File.join(app.http_prefix || "/", app.images_dir)
+          #   end
+          # end
-          config.http_fonts_path = if respond_to? :http_fonts_path
-            http_fonts_path
-          else
-            File.join(http_prefix, fonts_dir)
-          end
           config.asset_cache_buster :none
+          config.relative_assets = false
           config.output_style = :nested
           if respond_to?(:asset_host) && asset_host.is_a?(Proc)
@@ -57,15 +44,12 @@ module Middleman::CoreExtensions::Compass
           end
         end
-        # Change paths when in build mode. Required for relative paths
-        configure :build do
-          ::Compass.configuration do |config|
-            config.environment = :production
-            config.css_dir    = File.join(build_dir, css_dir)
-            config.images_dir = File.join(build_dir, images_dir)
-            config.fonts_dir  = File.join(build_dir, fonts_dir)
-          end
-        end
+        # if build?
+        #   ::Compass.configuration do |config|
+        #     config.environment  = :production
+        #     config.project_path = File.join(root, build_dir)
+        #   end
+        # end
         run_hook :compass_config, ::Compass.configuration
         run_hook :after_compass_config

data/lib/middleman-more/core_extensions/sprockets.rb CHANGED Viewed

@@ -3,92 +3,57 @@ require "sprockets"
 # Sprockets extension
 module Middleman::CoreExtensions::Sprockets
   # Setup extension
   class << self
     # Once registered
     def registered(app)
-      # Default compression to off
-      app.set :js_compressor, false
-      app.set :css_compressor, false
-      # Cut off every extension after .js (which sprockets eats up)
-      app.build_reroute do |destination, request_path|
-        if !request_path.match(/\.js\./i)
-          false
-        else
-          [
-            destination.gsub(/\.js(\..*)$/, ".js"),
-            request_path.gsub(/\.js(\..*)$/, ".js")
-          ]
-        end
-      end
+      # Add class methods to context
+      app.send :include, InstanceMethods
       # Once Middleman is setup
       app.ready do
-        # Create sprockets env for JS
-        js_env = Middleman::CoreExtensions::Sprockets::JavascriptEnvironment.new(self)
-        # Add any gems with vendor/assets/javascripts to paths
-        vendor_dir = File.join("vendor", "assets", "javascripts")
-        gems_with_js = ::Middleman.rubygems_latest_specs.select do |spec|
-          ::Middleman.spec_has_file?(spec, vendor_dir)
-        end.each do |spec|
-          js_env.append_path File.join(spec.full_gem_path, vendor_dir)
-        end
+        # Add any gems with (vendor|app|.)/assets/javascripts to paths
+        # also add similar directories from project root (like in rails)
+        root_paths = [%w{ app }, %w{ assets }, %w{ vendor }, %w{ app assets }, %w{ vendor assets }, %w{ lib }, %w{ lib assets }]
+        try_paths  = root_paths.map {|rp| File.join(rp, 'javascripts') } +
+                     root_paths.map {|rp| File.join(rp, 'stylesheets') }
-        # Add any gems with app/assets/javascripts to paths
-        app_dir = File.join("app", "assets", "javascripts")
-        gems_with_js = ::Middleman.rubygems_latest_specs.select do |spec|
-          ::Middleman.spec_has_file?(spec, app_dir)
-        end.each do |spec|
-          js_env.append_path File.join(spec.full_gem_path, app_dir)
-        end
-        # Intercept requests to /javascripts and pass to sprockets
-        map "/#{js_dir}" do
-          run js_env
+        ([root] + ::Middleman.rubygems_latest_specs.map(&:full_gem_path)).each do |root_path|
+          try_paths.map {|p| File.join(root_path, p) }.
+            select {|p| File.directory?(p) }.
+            each {|path| sprockets.append_path(path) }
         end
         # Setup Sprockets Sass options
         sass.each { |k, v| ::Sprockets::Sass.options[k] = v }
-        # Create sprockets env for CSS
-        css_env = Middleman::CoreExtensions::Sprockets::StylesheetEnvironment.new(self)
-        # Add any gems with vendor/assets/stylesheets to paths
-        vendor_dir = File.join("vendor", "assets", "stylesheets")
-        gems_with_css = ::Middleman.rubygems_latest_specs.select do |spec|
-          ::Middleman.spec_has_file?(spec, vendor_dir)
-        end.each do |spec|
-          css_env.append_path File.join(spec.full_gem_path, vendor_dir)
-        end
-        # Add any gems with app/assets/stylesheets to paths
-        app_dir = File.join("app", "assets", "stylesheets")
-        gems_with_css = ::Middleman.rubygems_latest_specs.select do |spec|
-          ::Middleman.spec_has_file?(spec, app_dir)
-        end.each do |spec|
-          css_env.append_path File.join(spec.full_gem_path, app_dir)
-        end
-        # Intercept requests to /stylesheets and pass to sprockets
-        map("/#{css_dir}") do
-          run css_env
-        end
+        # Intercept requests to /javascripts and /stylesheets and pass to sprockets
+        our_sprockets = sprockets
+        map("/#{js_dir}")  { run our_sprockets }
+        map("/#{css_dir}") { run our_sprockets }
       end
     end
     alias :included :registered
   end
+  module InstanceMethods
+    # @return [Middleman::CoreExtensions::Sprockets::MiddlemanSprocketsEnvironment]
+    def sprockets
+      @sprockets ||= MiddlemanSprocketsEnvironment.new(self)
+    end
+  end
   # Generic Middleman Sprockets env
-  class MiddlemanEnvironment < ::Sprockets::Environment
+  class MiddlemanSprocketsEnvironment < ::Sprockets::Environment
     # Setup
     def initialize(app)
       @app = app
       super app.source_dir
+      digest = Digest::SHA1
       # Make the app context available to Sprockets
       context_class.send(:define_method, :app) { app }
       context_class.class_eval do
@@ -100,76 +65,29 @@ module Middleman::CoreExtensions::Sprockets
           end
         end
       end
+      # Remove compressors, we handle these with middleware
+      unregister_bundle_processor 'application/javascript', :js_compressor
+      unregister_bundle_processor 'text/css', :css_compressor
+      # configure search paths
+      append_path app.js_dir
+      append_path app.css_dir
     end
     # During development, don't use the asset cache
     def find_asset(path, options = {})
       expire_index! if @app.development?
       super
     end
-  end
-  # Javascript specific environment
-  class JavascriptEnvironment < MiddlemanEnvironment
-    # Init
-    def initialize(app)
-      super
-      expire_index!
-      # Remove old compressor
-      unregister_bundle_processor 'application/javascript', :js_compressor
-      # Register compressor from config
-      register_bundle_processor 'application/javascript', :js_compressor do |context, data|
-        if context.pathname.to_s =~ /\.min\./
-          data
-        else
-          app.js_compressor.compress(data)
-        end
-      end if app.js_compressor
-      # configure search paths
-      append_path app.js_dir
-    end
     # Clear cache on error
     def javascript_exception_response(exception)
       expire_index!
       super(exception)
     end
-  end
-  # CSS specific environment
-  class StylesheetEnvironment < MiddlemanEnvironment
-    # Init
-    def initialize(app)
-      super
-      expire_index!
-      # Remove old compressor
-      unregister_bundle_processor 'text/css', :css_compressor
-      # Register compressor from config
-      register_bundle_processor 'text/css', :css_compressor do |context, data|
-        if context.pathname.to_s =~ /\.min\./
-          data
-        else
-          app.css_compressor.compress(data)
-        end
-      end if app.css_compressor
-      # configure search paths
-      append_path app.css_dir
-    end
     # Clear cache on error
-    def css_exception_response(exception)
-      expire_index!
-      super(exception)
-    end
+    alias :css_exception_response :javascript_exception_response
   end
-end
+end