middleman-more 3.0.0 → 3.0.1.pre

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

@@ -3,8 +3,8 @@ require 'stringio'
 require 'find'
 
 module Middleman::Extensions
-  
-  # This extension Gzips assets and pages when building. 
+
+  # This extension Gzips assets and pages when building.
   # Gzipped assets and pages can be served directly by Apache or
   # Nginx with the proper configuration, and pre-zipping means that we
   # can use a more agressive compression level at no CPU cost per request.
@@ -21,13 +21,13 @@ module Middleman::Extensions
         exts = options[:exts] || %w(.js .css .html .htm)
 
         app.after_build do |builder|
-          
+
           paths = ::Middleman::Util.all_files_under(self.class.inst.build_dir)
           paths.each do |path|
             next unless exts.include? path.extname
-            
+
             output_filename, old_size, new_size = Middleman::Extensions::Gzip.gzip_file(path.to_s)
- 
+
             if output_filename
               size_change_word = (old_size - new_size) > 0 ? 'smaller' : 'larger'
               builder.say_status :gzip, "#{output_filename} (#{number_to_human_size((old_size - new_size).abs)} #{size_change_word})"
@@ -35,7 +35,7 @@ module Middleman::Extensions
           end
         end
       end
-        
+
       alias :included :registered
     end
 
@@ -64,7 +64,7 @@ module Middleman::Extensions
 
       old_size = File.size(path)
       new_size = File.size(output_filename)
-      
+
       [output_filename, old_size, new_size]
     end
   end

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

@@ -1,22 +1,22 @@
 # Extension namespace
 module Middleman
   module Extensions
-  
+
     # Lorem helper
     module Lorem
-    
+
       # Setup extension
       class << self
-      
+
         # Once registered
         def registered(app)
           # Include methods
           app.send :include, InstanceMethods
         end
-      
+
         alias :included :registered
       end
-  
+
       # Lorem extension instance methods
       module InstanceMethods
         # Access to the Lorem object
@@ -24,7 +24,7 @@ module Middleman
         def lorem
           @_lorem ||= LoremObject.new
         end
-      
+
         # Return a placeholder image using placekitten.com
         #
         # @param [String] size
@@ -39,7 +39,7 @@ module Middleman
       # Adapted from Frank:
       # https://github.com/blahed/frank/
       # Copyright (c) 2010 Travis Dunn
-      # 
+      #
       #   Permission is hereby granted, free of charge, to any person
       #   obtaining a copy of this software and associated documentation
       #   files (the "Software"), to deal in the Software without
@@ -48,10 +48,10 @@ module Middleman
       #   copies of the Software, and to permit persons to whom the
       #   Software is furnished to do so, subject to the following
       #   conditions:
-      # 
+      #
       #   The above copyright notice and this permission notice shall be
       #   included in all copies or substantial portions of the Software.
-      # 
+      #
       #   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
       #   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
       #   OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -194,4 +194,4 @@ module Middleman
       end
     end
   end
-end
+end

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

@@ -1,13 +1,13 @@
 # Extensions namespace
 module Middleman
   module Extensions
-  
-    # Minify CSS Extension 
+
+    # Minify CSS Extension
     module MinifyCss
-    
+
       # Setup extension
       class << self
-      
+
         # Once registered
         def registered(app, options={})
           app.set :css_compressor, false
@@ -29,7 +29,7 @@ module Middleman
         end
         alias :included :registered
       end
-    
+
       # Rack middleware to look for CSS and compress it
       class Rack
 

data/lib/middleman-more/extensions/minify_css/rainpress.rb

@@ -25,7 +25,7 @@ class Rainpress
       :comments => true,
       :newlines => true,
       :spaces   => true,
-      :colors   => true,
+      :colors   => false,
       :misc     => true
     }
     @opts.merge! opts
@@ -165,4 +165,4 @@ class Rainpress
     end
   end
 
-end
+end

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

@@ -1,13 +1,13 @@
 # Extension namespace
 module Middleman
   module Extensions
-  
+
     # Minify Javascript Extension
     module MinifyJavascript
-    
+
       # Setup extension
       class << self
-      
+
         # Once registered
         def registered(app, options={})
           app.set :js_compressor, false
@@ -21,9 +21,9 @@ module Middleman
               require 'uglifier'
               ::Uglifier.new
             end
-          
+
             # Setup Rack middlware to minify JS
-            use Rack, :compressor => chosen_compressor, 
+            use Rack, :compressor => chosen_compressor,
                       :ignore     => ignore,
                       :inline     => inline
           end
@@ -33,7 +33,7 @@ module Middleman
 
       # Rack middleware to look for JS and compress it
       class Rack
-      
+
         # Init
         # @param [Class] app
         # @param [Hash] options
@@ -84,7 +84,7 @@ module Middleman
             end
           rescue ExecJS::ProgramError => e
             warn "WARNING: Couldn't compress JavaScript in #{path}: #{e.message}"
-          end 
+          end
 
           [status, headers, response]
         end

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

@@ -1,30 +1,30 @@
 # Extension namespace
 module Middleman
   module Extensions
-  
+
     # Relative Assets extension
     module RelativeAssets
-    
+
       # 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
@@ -35,8 +35,8 @@ module Middleman
           if path.include?("//")
             path
           else
-            current_dir = Pathname('/' + current_resource.destination_path).dirname
-            Pathname(path).relative_path_from(current_dir)
+            current_dir = Pathname('/' + current_resource.destination_path)
+            Pathname(path).relative_path_from(current_dir.dirname)
           end
         end
       end

data/lib/middleman-more/templates/smacss.rb

@@ -0,0 +1,30 @@
+# SMACSS
+class Middleman::Templates::Smacss < Middleman::Templates::Base
+
+  class_option "css_dir",
+    :default => "stylesheets",
+    :desc    => 'The path to the css files'
+  class_option "js_dir",
+    :default => "javascripts",
+    :desc    => 'The path to the javascript files'
+  class_option "images_dir",
+    :default => "images",
+    :desc    => 'The path to the image files'
+    
+  # Template files are relative to this file
+  # @return [String]
+  def self.source_root
+    File.dirname(__FILE__)
+  end
+
+  # Output the files
+  # @return [void]
+  def build_scaffold!
+    template "shared/config.tt", File.join(location, "config.rb")
+    directory "smacss/source", File.join(location, "source")
+    empty_directory File.join(location, "source")
+  end
+end
+
+# Register the template
+Middleman::Templates.register(:smacss, Middleman::Templates::Smacss)

data/lib/middleman-more/templates/smacss/source/_footer.haml

@@ -0,0 +1 @@
+%footer © 2012

data/lib/middleman-more/templates/smacss/source/index.html.haml

@@ -0,0 +1 @@
+%h1 Middleman

data/lib/middleman-more/templates/smacss/source/layouts/layout.haml

@@ -0,0 +1,13 @@
+!!! 5
+%html
+  %head
+    %title Middleman
+    %meta{:charset => "utf-8"}
+    %meta{:content => "Middleman", :name => "description"}
+    %meta{:content => "on", "http-equiv" => "cleartype"}
+    %meta{:content => "IE=edge,chrome=1", "http-equiv" => "X-UA-Compatible"}
+    %link{:href => "stylesheets/style.css", :rel => "stylesheet"}
+
+  %body
+    = yield
+    = render_partial 'footer'

data/lib/middleman-more/templates/smacss/source/stylesheets/_1.base.scss

@@ -0,0 +1,2 @@
+/* Base
+================================================== */

data/lib/middleman-more/templates/smacss/source/stylesheets/_2.layout.scss

@@ -0,0 +1,2 @@
+/* Layout
+================================================== */

data/lib/middleman-more/templates/smacss/source/stylesheets/_3.states.scss

@@ -0,0 +1,2 @@
+/* States
+================================================== */

data/lib/middleman-more/templates/smacss/source/stylesheets/_4.themes.scss

@@ -0,0 +1,2 @@
+/* Themes
+================================================== */

data/lib/middleman-more/templates/smacss/source/stylesheets/modules/_btn.scss

@@ -0,0 +1,2 @@
+/* Buttons
+================================================== */

data/lib/middleman-more/templates/smacss/source/stylesheets/style.css.scss

@@ -0,0 +1,7 @@
+@import
+  "0.site-settings",
+  "1.base",
+  "2.layout",
+  "3.states",
+  "4.themes",
+  "modules/btn";

data/lib/middleman_extension.rb

@@ -1 +1 @@
-require "middleman-more"
+require "middleman-more"

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: middleman-more
 version: !ruby/object:Gem::Version
-  version: 3.0.0
-  prerelease: 
+  version: 3.0.1.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-09 00:00:00.000000000 Z
+date: 2012-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.0.1.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.0.1.pre
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
@@ -198,6 +198,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .cane
+- .cane-exclusions.yml
 - .gemtest
 - Rakefile
 - features/asset_hash.feature
@@ -234,6 +236,8 @@ files:
 - features/nested_layouts.feature
 - features/partials.feature
 - features/relative_assets.feature
+- features/sass-assets-paths.feature
+- features/sass_cache_path.feature
 - features/sass_partials.feature
 - features/scss-support.feature
 - features/sitemap_traversal.feature
@@ -386,6 +390,7 @@ files:
 - fixtures/markdown-app/source/autolink.html.markdown
 - fixtures/markdown-app/source/fenced_code_blocks.html.markdown
 - fixtures/markdown-app/source/hard_wrap.html.markdown
+- fixtures/markdown-app/source/images/blank.gif
 - fixtures/markdown-app/source/index.html.markdown
 - fixtures/markdown-app/source/no_intra_emphasis.html.markdown
 - fixtures/markdown-app/source/smarty_pants.html.markdown
@@ -396,6 +401,7 @@ files:
 - fixtures/markdown-app/source/with_toc_data.html.markdown
 - fixtures/minify-css-app/source/inline-css.html.haml
 - fixtures/minify-css-app/source/more-css/site.css
+- fixtures/minify-css-app/source/stylesheets/report.css
 - fixtures/minify-css-app/source/stylesheets/site.css.sass
 - fixtures/minify-js-app/config.rb
 - fixtures/minify-js-app/source/inline-coffeescript.html.haml
@@ -461,6 +467,15 @@ files:
 - fixtures/relative-assets-app/source/img/blank.gif
 - fixtures/relative-assets-app/source/relative_image.html.erb
 - fixtures/relative-assets-app/source/stylesheets/relative_assets.css.sass
+- fixtures/sass-assets-path-app/assets/stylesheets/_shared-asset.sass
+- fixtures/sass-assets-path-app/assets/stylesheets/_shared-asset.scss
+- fixtures/sass-assets-path-app/config.rb
+- fixtures/sass-assets-path-app/my-vendor/stylesheets/_partial.sass
+- fixtures/sass-assets-path-app/source/stylesheets/plain.css.sass
+- fixtures/sass-cache-path-custom-app/config.rb
+- fixtures/sass-cache-path-custom-app/source/stylesheets/plain.css.sass
+- fixtures/sass-cache-path-default-app/config.rb
+- fixtures/sass-cache-path-default-app/source/stylesheets/plain.css.sass
 - fixtures/scss-app/config.rb
 - fixtures/scss-app/source/stylesheets/layout.css.sass
 - fixtures/scss-app/source/stylesheets/site_scss.css.scss
@@ -587,6 +602,17 @@ files:
 - lib/middleman-more/extensions/minify_css/rainpress.rb
 - lib/middleman-more/extensions/minify_javascript.rb
 - lib/middleman-more/extensions/relative_assets.rb
+- lib/middleman-more/templates/smacss.rb
+- lib/middleman-more/templates/smacss/source/_footer.haml
+- lib/middleman-more/templates/smacss/source/index.html.haml
+- lib/middleman-more/templates/smacss/source/layouts/layout.haml
+- lib/middleman-more/templates/smacss/source/stylesheets/_0.site-settings.scss
+- lib/middleman-more/templates/smacss/source/stylesheets/_1.base.scss
+- lib/middleman-more/templates/smacss/source/stylesheets/_2.layout.scss
+- lib/middleman-more/templates/smacss/source/stylesheets/_3.states.scss
+- lib/middleman-more/templates/smacss/source/stylesheets/_4.themes.scss
+- lib/middleman-more/templates/smacss/source/stylesheets/modules/_btn.scss
+- lib/middleman-more/templates/smacss/source/stylesheets/style.css.scss
 - lib/middleman_extension.rb
 - middleman-more.gemspec
 homepage: http://middlemanapp.com
@@ -604,16 +630,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -34936377537429209
+      hash: -2447366148291236453
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -34936377537429209
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -655,6 +678,8 @@ test_files:
 - features/nested_layouts.feature
 - features/partials.feature
 - features/relative_assets.feature
+- features/sass-assets-paths.feature
+- features/sass_cache_path.feature
 - features/sass_partials.feature
 - features/scss-support.feature
 - features/sitemap_traversal.feature
@@ -807,6 +832,7 @@ test_files:
 - fixtures/markdown-app/source/autolink.html.markdown
 - fixtures/markdown-app/source/fenced_code_blocks.html.markdown
 - fixtures/markdown-app/source/hard_wrap.html.markdown
+- fixtures/markdown-app/source/images/blank.gif
 - fixtures/markdown-app/source/index.html.markdown
 - fixtures/markdown-app/source/no_intra_emphasis.html.markdown
 - fixtures/markdown-app/source/smarty_pants.html.markdown
@@ -817,6 +843,7 @@ test_files:
 - fixtures/markdown-app/source/with_toc_data.html.markdown
 - fixtures/minify-css-app/source/inline-css.html.haml
 - fixtures/minify-css-app/source/more-css/site.css
+- fixtures/minify-css-app/source/stylesheets/report.css
 - fixtures/minify-css-app/source/stylesheets/site.css.sass
 - fixtures/minify-js-app/config.rb
 - fixtures/minify-js-app/source/inline-coffeescript.html.haml
@@ -882,6 +909,15 @@ test_files:
 - fixtures/relative-assets-app/source/img/blank.gif
 - fixtures/relative-assets-app/source/relative_image.html.erb
 - fixtures/relative-assets-app/source/stylesheets/relative_assets.css.sass
+- fixtures/sass-assets-path-app/assets/stylesheets/_shared-asset.sass
+- fixtures/sass-assets-path-app/assets/stylesheets/_shared-asset.scss
+- fixtures/sass-assets-path-app/config.rb
+- fixtures/sass-assets-path-app/my-vendor/stylesheets/_partial.sass
+- fixtures/sass-assets-path-app/source/stylesheets/plain.css.sass
+- fixtures/sass-cache-path-custom-app/config.rb
+- fixtures/sass-cache-path-custom-app/source/stylesheets/plain.css.sass
+- fixtures/sass-cache-path-default-app/config.rb
+- fixtures/sass-cache-path-default-app/source/stylesheets/plain.css.sass
 - fixtures/scss-app/config.rb
 - fixtures/scss-app/source/stylesheets/layout.css.sass
 - fixtures/scss-app/source/stylesheets/site_scss.css.scss