middleman-core 3.3.9 → 3.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acd03e6a3cb9c67f0ac5c926e2f4250d4cd25087
-  data.tar.gz: ce484d4bb814b019c1504d1949d550b0e5096e73
+  metadata.gz: 51f7c09a1eedee6dc4c8d2713418134b37911600
+  data.tar.gz: a364a4e6a03a63a4b087606f844d551a987c7aa2
 SHA512:
-  metadata.gz: 7e7b7dc0319b62cc5b9de4b4fc843e65b3c06840741ef7ef8dbea9ad5ee2dc1ac48431c2e3fc28ac309ccfa83741d853f514ddd9e76e714afa5ad5b58c8ca1f2
-  data.tar.gz: 2734a2888c4619db6cd35eb1d278509f18671ac4dd6073934e7a8c67fa87c1eb4636c6082f427fdff28e7642f63a2509c04c6ce99d444640d30fd0542c498665
+  metadata.gz: 6da1d3c7f92ea229de1baba5fdf12c4fe272c61549ad6f89cc52c0007cfd4ad2ff7926ce8cbd254c08b40082b1cc9106aaf22f9c6669136dad50f0a25641e166
+  data.tar.gz: 16a4cc624110b0b6eb0efb61f4b282e2827fc36e4d85e10198b3dc4c0d0a7ef57d50709acbccc83eefea39c2eef63bc6879aa389d577dd286bd6a62c889fb979

data/lib/middleman-core/core_extensions/front_matter.rb

@@ -64,7 +64,7 @@ module Middleman::CoreExtensions
         data = app.extensions[:frontmatter].data(source_file).first
 
         if proxy?
-          url_data = app.extensions[:frontmatter].data( File.join( app.source_dir, url ).chomp('/') ).first
+          url_data = app.extensions[:frontmatter].data(File.join(app.source_dir, url).chomp('/')).first
           data     = data.deep_merge(url_data)
         end
 

data/lib/middleman-core/extensions.rb

@@ -23,7 +23,7 @@ module Middleman
         # If we've already got a matching extension that passed the
         # version check, bail out.
         return if registered.key?(name.to_sym) &&
-        !registered[name.to_sym].is_a?(String)
+                  !registered[name.to_sym].is_a?(String)
 
         registered[name.to_sym] = if block_given?
           block

data/lib/middleman-core/renderers/kramdown.rb

@@ -31,7 +31,7 @@ module Middleman
           mail_addr = el.attr['href'].sub(/\Amailto:/, '')
           href = obfuscate('mailto') << ':' << obfuscate(mail_addr)
           content = obfuscate(content) if content == mail_addr
-          return %Q(<a href="#{href}">#{content}</a>)
+          return %(<a href="#{href}">#{content}</a>)
         end
 
         attr = el.attr.dup

data/lib/middleman-core/renderers/redcarpet.rb

@@ -1,4 +1,5 @@
 require 'redcarpet'
+require 'active_support/core_ext/module/attribute_accessors'
 
 module Middleman
   module Renderers
@@ -61,7 +62,7 @@ module Middleman
           middleman_app.image_tag(link, title: title, alt: alt_text)
         else
           link_string = link.dup
-          link_string << %Q("#{title}") if title && title.length > 0 && title != alt_text
+          link_string << %("#{title}") if title && title.length > 0 && title != alt_text
           "![#{alt_text}](#{link_string})"
         end
       end
@@ -74,7 +75,7 @@ module Middleman
           middleman_app.link_to(content, link, attributes)
         else
           link_string = link.dup
-          link_string << %Q("#{title}") if title && title.length > 0 && title != alt_text
+          link_string << %("#{title}") if title && title.length > 0 && title != alt_text
           "[#{content}](#{link_string})"
         end
       end

data/lib/middleman-core/renderers/slim.rb

@@ -28,7 +28,7 @@ module Middleman
           end
 
           # Setup Slim options to work with partials
-          ::Slim::Engine.set_default_options(
+          ::Slim::Engine.set_options(
             buffer: '@_out_buf',
             use_html_safe: true,
             generator: ::Temple::Generators::RailsOutputBuffer,
@@ -42,7 +42,7 @@ module Middleman
 
             ::Slim::Embedded::SassEngine.disable_option_validator!
             %w(sass scss markdown).each do |engine|
-              ::Slim::Embedded.default_options[engine.to_sym] = context_hack
+              ::Slim::Embedded.options[engine.to_sym] = context_hack
             end
           end
         end

data/lib/middleman-core/sitemap/extensions/ignores.rb

@@ -21,9 +21,9 @@ module Middleman
           # @return [Boolean]
           def ignored?
             @app.ignore_manager.ignored?(path) ||
-            (!proxy? &&
-              @app.ignore_manager.ignored?(source_file.sub("#{@app.source_dir}/", ''))
-            )
+              (!proxy? &&
+                @app.ignore_manager.ignored?(source_file.sub("#{@app.source_dir}/", ''))
+              )
           end
         end
 

data/lib/middleman-core/sitemap/extensions/proxies.rb

@@ -53,7 +53,7 @@ module Middleman
             proxy_resource
           end
 
-          # rubocop:disable AccessorMethodName
+          # rubocop:disable Style/AccessorMethodName
           def get_source_file
             if proxy?
               proxied_to_resource.source_file
@@ -61,16 +61,15 @@ module Middleman
               super
             end
           end
+          # rubocop:enable Style/AccessorMethodName
 
           def content_type
             mime_type = super
             return mime_type if mime_type
 
-            if proxy?
-              proxied_to_resource.content_type
-            else
-              nil
-            end
+            return proxied_to_resource.content_type if proxy?
+
+            nil
           end
         end
 

data/lib/middleman-core/sitemap/extensions/redirects.rb

@@ -66,9 +66,11 @@ module Middleman
             super(store, path)
           end
 
+          # rubocop:disable Style/AccessorMethodName
           def get_source_file
             nil
           end
+          # rubocop:enable Style/AccessorMethodName
 
           def template?
             true

data/lib/middleman-core/templates/shared/config.tt

@@ -24,7 +24,7 @@
 #   page "/admin/*"
 # end
 
-# Proxy pages (http://middlemanapp.com/basics/dynamic-pages/)
+# Proxy pages (https://middlemanapp.com/advanced/dynamic_pages/)
 # proxy "/this-page-has-no-template.html", "/template-file.html", :locals => {
 #  :which_fake_page => "Rendering a fake page with a local variable" }
 

data/lib/middleman-core/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '3.3.9' unless const_defined?(:VERSION)
+  VERSION = '3.3.10' unless const_defined?(:VERSION)
 end

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

@@ -36,7 +36,6 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
 
   # The helpers
   helpers do
-
     # Make all block content html_safe
     # rubocop:disable Semicolon
     def content_tag(name, content=nil, options=nil, &block)

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

@@ -226,12 +226,12 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
 
       if lang_suffix
         super(suffixed_partial_name, maybe_static) ||
-        super(File.join(locals_dir, suffixed_partial_name), maybe_static) ||
-        super(partials_path, try_static) ||
-        super
+          super(File.join(locals_dir, suffixed_partial_name), maybe_static) ||
+          super(partials_path, try_static) ||
+          super
       else
         super(partials_path, try_static) ||
-        super
+          super
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 3.3.9
+  version: 3.3.10
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-18 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler