middleman-core 3.3.2 → 3.3.3

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

@@ -1,6 +1,5 @@
 # The Cache Buster extension
 class Middleman::Extensions::CacheBuster < ::Middleman::Extension
-
   def initialize(app, options_hash={}, &block)
     super
 

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

@@ -35,7 +35,7 @@ class Middleman::Extensions::Gzip < ::Middleman::Extension
 
     # Farm out gzip tasks to threads and put the results in in_queue
     out_queue = Queue.new
-    threads = num_threads.times.map do
+    num_threads.times.each do
       Thread.new do
         while path = in_queue.pop
           out_queue << gzip_file(path.to_s)

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

@@ -94,11 +94,11 @@ class Middleman::Extensions::Lorem < ::Middleman::Extension
       # Get a placeholder date
       # @param [String] fmt
       # @return [String]
-      def date(fmt = '%a %b %d, %Y')
+      def date(fmt='%a %b %d, %Y')
         y = rand(20) + 1990
         m = rand(12) + 1
         d = rand(31) + 1
-        Time.local(y,m,d).strftime(fmt)
+        Time.local(y, m, d).strftime(fmt)
       end
 
       # Get a placeholder name
@@ -125,16 +125,16 @@ class Middleman::Extensions::Lorem < ::Middleman::Extension
       # Via http://www.kevadamson.com/talking-of-design/article/140-alternative-characters-to-lorem-ipsum
       # @return [String]
       def tweet
-        tweets = [ 'Far away, in a forest next to a river beneath the mountains, there lived a small purple otter called Philip. Philip likes sausages. The End.',
-                   'He liked the quality sausages from Marks & Spencer but due to the recession he had been forced to shop in a less desirable supermarket. End.',
-                   'He awoke one day to find his pile of sausages missing. Roger the greedy boar with human eyes, had skateboarded into the forest & eaten them!']
+        tweets = ['Far away, in a forest next to a river beneath the mountains, there lived a small purple otter called Philip. Philip likes sausages. The End.',
+                  'He liked the quality sausages from Marks & Spencer but due to the recession he had been forced to shop in a less desirable supermarket. End.',
+                  'He awoke one day to find his pile of sausages missing. Roger the greedy boar with human eyes, had skateboarded into the forest & eaten them!']
         tweets[rand(tweets.size)]
       end
 
       # Get a placeholder email address
       # @return [String]
       def email
-        delimiters = [ '_', '-', '' ]
+        delimiters = ['_', '-', '']
         domains = %w(gmail.com yahoo.com hotmail.com email.com live.com me.com mac.com aol.com fastmail.com mail.com)
         username = name.gsub(/[^\w]/, delimiters[rand(delimiters.size)])
         "#{username}@#{domains[rand(domains.size)]}".downcase
@@ -147,7 +147,7 @@ class Middleman::Extensions::Lorem < ::Middleman::Extension
       def image(size, options={})
         domain           = options[:domain] || 'http://placehold.it'
         src              = "#{domain}/#{size}"
-        hex              = %w[a b c d e f 0 1 2 3 4 5 6 7 8 9]
+        hex              = %w(a b c d e f 0 1 2 3 4 5 6 7 8 9)
         background_color = options[:background_color]
         color            = options[:color]
 
@@ -159,7 +159,7 @@ class Middleman::Extensions::Lorem < ::Middleman::Extension
         src << "/#{background_color.sub(/^#/, '')}" if background_color
         src << '/ccc' if background_color.nil? && color
         src << "/#{color.sub(/^#/, '')}" if color
-        src << "&text=#{Rack::Utils::escape(options[:text])}" if options[:text]
+        src << "&text=#{Rack::Utils.escape(options[:text])}" if options[:text]
 
         src
       end

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

@@ -14,15 +14,15 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
     chosen_compressor = app.config[:css_compressor] || options[:compressor] || SassCompressor
 
     # Setup Rack middleware to minify CSS
-    app.use Rack, :compressor => chosen_compressor,
-                  :ignore     => Array(options[:ignore]) + [/\.min\./],
-                  :inline     => options[:inline]
+    app.use Rack, compressor: chosen_compressor,
+                  ignore: Array(options[:ignore]) + [/\.min\./],
+                  inline: options[:inline]
   end
 
   class SassCompressor
-    def self.compress(style, options = {})
+    def self.compress(style, options={})
       root_node = ::Sass::SCSS::CssParser.new(style, 'middleman-css-input', 1).parse
-      root_node.options = { :style => :compressed }
+      root_node.options = options.merge(style: :compressed)
       root_node.render.strip
     end
   end
@@ -49,7 +49,7 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
 
       if inline_html_content?(env['PATH_INFO'])
         minified = ::Middleman::Util.extract_response_text(response)
-        minified.gsub!(INLINE_CSS_REGEX) do |match|
+        minified.gsub!(INLINE_CSS_REGEX) do
           $1 << @compressor.compress($2) << $3
         end
 
@@ -65,13 +65,14 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
       [status, headers, response]
     end
 
-  private
+    private
+
     def inline_html_content?(path)
       (path.end_with?('.html') || path.end_with?('.php')) && @inline
     end
 
     def standalone_css_content?(path)
-      path.end_with?('.css') && @ignore.none? {|ignore| Middleman::Util.path_match(ignore, path) }
+      path.end_with?('.css') && @ignore.none? { |ignore| Middleman::Util.path_match(ignore, path) }
     end
   end
 end

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

@@ -17,14 +17,13 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
     end
 
     # Setup Rack middleware to minify CSS
-    app.use Rack, :compressor => chosen_compressor,
-                  :ignore     => Array(options[:ignore]) + [/\.min\./],
-                  :inline     => options[:inline]
+    app.use Rack, compressor: chosen_compressor,
+                  ignore: Array(options[:ignore]) + [/\.min\./],
+                  inline: options[:inline]
   end
 
   # Rack middleware to look for JS and compress it
   class Rack
-
     # Init
     # @param [Class] app
     # @param [Hash] options
@@ -51,7 +50,7 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
 
           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) }
+        elsif path.end_with?('.js') && @ignore.none? { |ignore| Middleman::Util.path_match(ignore, path) }
           uncompressed_source = ::Middleman::Util.extract_response_text(response)
           minified = @compressor.compress(uncompressed_source)
 
@@ -65,7 +64,7 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
       [status, headers, response]
     end
 
-  private
+    private
 
     def minify_inline_content(uncompressed_source)
       uncompressed_source.gsub(/(<script[^>]*>\s*(?:\/\/(?:(?:<!--)|(?:<!\[CDATA\[))\n)?)(.*?)((?:(?:\n\s*)?\/\/(?:(?:-->)|(?:\]\]>)))?\s*<\/script>)/m) do |match|

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

@@ -1,6 +1,5 @@
 # Relative Assets extension
 class Middleman::Extensions::RelativeAssets < ::Middleman::Extension
-
   def initialize(app, options_hash={}, &block)
     super
 

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

@@ -1,15 +1,14 @@
 # SMACSS
 class Middleman::Templates::Smacss < Middleman::Templates::Base
-
   class_option 'css_dir',
-    :default => 'stylesheets',
-    :desc    => 'The path to the css files'
+               default: 'stylesheets',
+               desc: 'The path to the css files'
   class_option 'js_dir',
-    :default => 'javascripts',
-    :desc    => 'The path to the javascript files'
+               default: 'javascripts',
+               desc: 'The path to the javascript files'
   class_option 'images_dir',
-    :default => 'images',
-    :desc    => 'The path to the image files'
+               default: 'images',
+               desc: 'The path to the image files'
 
   # Template files are relative to this file
   # @return [String]

data/middleman-core.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.add_dependency("thor", [">= 0.15.2", "< 2.0"])
 
   # Helpers
-  s.add_dependency("activesupport", ["~> 4.0.1"])
+  s.add_dependency("activesupport", ["~> 4.1.0"])
   s.add_dependency("padrino-helpers", ["~> 0.12.1"])
 
   # Watcher

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.3
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2014-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,14 +134,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: padrino-helpers
   requirement: !ruby/object:Gem::Requirement
@@ -1234,7 +1234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Hand-crafted frontend development