middleman-core 3.3.10 → 3.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51f7c09a1eedee6dc4c8d2713418134b37911600
-  data.tar.gz: a364a4e6a03a63a4b087606f844d551a987c7aa2
+  metadata.gz: 4bdee941102d480e0efde57121a8f4158b053579
+  data.tar.gz: 4d51251656f7a673ebe12fa3c3a43ab97a885f1b
 SHA512:
-  metadata.gz: 6da1d3c7f92ea229de1baba5fdf12c4fe272c61549ad6f89cc52c0007cfd4ad2ff7926ce8cbd254c08b40082b1cc9106aaf22f9c6669136dad50f0a25641e166
-  data.tar.gz: 16a4cc624110b0b6eb0efb61f4b282e2827fc36e4d85e10198b3dc4c0d0a7ef57d50709acbccc83eefea39c2eef63bc6879aa389d577dd286bd6a62c889fb979
+  metadata.gz: 3645d04948555d0cc894ab7ce41b05c854a1b2e2b9c140fc087aca9d159004743a25ed4e684281cc5b99026eab36c6cf643bea374216e1b79c4392dbd657bb51
+  data.tar.gz: 7568e90823fbfa99c5baf7aaf0ee51beb6191c0e0921ac998e5d1ff021a577fd2594e40daccd18ed8e6722cb1856358cff1046e337329bddda4cd3bdc6096bd6

data/features/console.feature

@@ -0,0 +1,10 @@
+Feature: Console
+
+  Scenario: Enter and exit the console
+    Given I run `middleman console` interactively
+    When I type "puts 'Hello from the console.'"
+    And I type "exit"
+    Then it should pass with:
+    """
+    Hello from the console.
+    """

data/features/helpers_link_to.feature

@@ -5,6 +5,24 @@ Feature: link_to helper
     When I go to "/link_to_erb.html"
     Then I should see "erb <s>with html tags</s>"
 
+  Scenario: link_to works with absolute URLs (where the relative part matches a local path)
+    Given a fixture app "link-to-app"
+    And a file named "config.rb" with:
+    """
+    set :relative_links, true
+    """
+    And a file named "source/test.html.erb" with:
+    """
+    Hello
+    """
+    And a file named "source/link_to_absolute.html.erb" with:
+    """
+    <%= link_to "test", "http://google.com/test.html" %>
+    """
+    And the Server is running at "link-to-app"
+    When I go to "/link_to_absolute.html"
+    Then I should see '<a href="http://google.com/test.html">test</a>'
+
   Scenario: link_to works with blocks (slim)
     Given the Server is running at "link-to-app"
     When I go to "/link_to_slim.html"

data/features/image_srcset_paths.feature

@@ -0,0 +1,7 @@
+Feature: Support srcset property as params for image_tag helper
+  This lets you specify responsive image sizes
+
+  Scenario: Rendering an image with the feature enabled
+    Given the Server is running at "image-srcset-paths-app"
+    When I go to "/image-srcset-paths.html"
+    Then I should see '//example.com/remote-image.jpg 2x, /images/blank_3x.jpg 3x'

data/features/markdown_kramdown_in_haml.feature

@@ -33,9 +33,10 @@ Feature: Markdown support in Haml (Kramdown)
       :markdown
         [A link](/link_target.html)
 
-        ![image](blank.gif)
+        ![image](blank.gif){: srcset="image_2x.jpg 2x"}
       """
     Given the Server is running at "markdown-in-haml-app"
     When I go to "/link_and_image/"
     Then I should see "/link_target/"
+    Then I should see "/images/image_2x.jpg 2x"
     Then I should see 'src="/images/blank.gif"'

data/fixtures/image-srcset-paths-app/image-srcset-paths.html.erb

@@ -0,0 +1 @@
+<%= image_tag 'blank.jpg', srcset: '//example.com/remote-image.jpg 2x, blank_3x.jpg 3x, http://example.com/remoteimage.jpg 4x' %>

data/fixtures/large-build-app/config.rb

@@ -1,3 +1,5 @@
 with_layout false do
   page "/spaces in file.html"
 end
+
+config[:port] = 5555

data/lib/middleman-core/application.rb

@@ -67,6 +67,14 @@ module Middleman
     end
     delegate :root_path, to: :"self.class"
 
+    # Which host preview should start on.
+    # @return [Fixnum]
+    config.define_setting :host, '0.0.0.0', 'The preview server host'
+
+    # Which port preview should start on.
+    # @return [Fixnum]
+    config.define_setting :port, 4567, 'The preview server port'
+
     # Name of the source directory
     # @return [String]
     config.define_setting :source,      'source', 'Name of the source directory'

data/lib/middleman-core/cli/build.rb

@@ -178,7 +178,7 @@ module Middleman::Cli
     # @return [void]
     def execute!
       # Sort order, images, fonts, js/css and finally everything else.
-      sort_order = %w(.png .jpeg .jpg .gif .bmp .svg .svgz .ico .webp .woff .otf .ttf .eot .js .css)
+      sort_order = %w(.png .jpeg .jpg .gif .bmp .svg .svgz .ico .webp .woff .woff2 .otf .ttf .eot .js .css)
 
       # Pre-request CSS to give Compass a chance to build sprites
       logger.debug '== Prerendering CSS'

data/lib/middleman-core/cli/console.rb

@@ -34,10 +34,19 @@ module Middleman::Cli
 
       # TODO: get file watcher / reload! working in console
 
+      interact_with @app
+    end
+
+    private
+
+    # Start an interactive console in the context of the provided object.
+    # @param [Object] context
+    # @return [void]
+    def interact_with(context)
       IRB.setup nil
       IRB.conf[:MAIN_CONTEXT] = IRB::Irb.new.context
       require 'irb/ext/multi-irb'
-      IRB.irb nil, @app
+      IRB.irb nil, context
     end
   end
 end

data/lib/middleman-core/cli/server.rb

@@ -14,11 +14,9 @@ module Middleman::Cli
     method_option :host,
                   type: :string,
                   aliases: '-h',
-                  default: '0.0.0.0',
                   desc: 'Bind to HOST address'
     method_option :port,
                   aliases: '-p',
-                  default: '4567',
                   desc: 'The port Middleman will listen on'
     method_option :verbose,
                   type: :boolean,

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

@@ -4,6 +4,7 @@ require 'rack/file'
 require 'rack/lint'
 require 'rack/head'
 
+require 'middleman-core/application'
 require 'middleman-core/util'
 
 module Middleman

data/lib/middleman-core/preview_server.rb

@@ -5,8 +5,6 @@ require 'middleman-core/logger'
 # rubocop:disable GlobalVars
 module Middleman
   module PreviewServer
-    DEFAULT_PORT = 4567
-
     class << self
       attr_reader :app, :host, :port
       delegate :logger, to: :app
@@ -15,8 +13,6 @@ module Middleman
       # @return [void]
       def start(opts={})
         @options = opts
-        @host = @options[:host] || '0.0.0.0'
-        @port = @options[:port] || DEFAULT_PORT
 
         mount_instance(new_app)
         logger.info "== The Middleman is standing watch at http://#{host}:#{port}"
@@ -92,6 +88,7 @@ module Middleman
 
       def new_app
         opts = @options.dup
+
         server = ::Middleman::Application.server
 
         # Add in the meta pages application
@@ -107,7 +104,14 @@ module Middleman
           )
 
           config[:environment] = opts[:environment].to_sym if opts[:environment]
+          config[:host] = opts[:host] if opts[:host]
+          config[:port] = opts[:port] if opts[:port]
         end
+
+        @host = @app.config[:host]
+        @port = @app.config[:port]
+
+        @app
       end
 
       def start_file_watcher

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

@@ -9,7 +9,9 @@ module Middleman
           tail = parts.pop
           is_index = (tail == app.index_file)
 
-          return nil if is_index && parts.length < 1
+          if parts.empty?
+            return is_index ? nil : store.find_resource_by_path(app.index_file)
+          end
 
           test_expr = parts.join('\\/')
           # A makeshift for eponymous reverse-lookup

data/lib/middleman-core/templates/html5/source/.htaccess

@@ -21,7 +21,7 @@
 <IfModule mod_headers.c>
   Header set X-UA-Compatible "IE=Edge,chrome=1"
   # mod_headers can't match by content-type, but we don't want to send this header on *everything*...
-  <FilesMatch "\.(js|css|gif|png|jpe?g|pdf|xml|oga|ogg|m4a|ogv|mp4|m4v|webm|svg|svgz|eot|ttf|otf|woff|ico|webp|appcache|manifest|htc|crx|oex|xpi|safariextz|vcf)$" >
+  <FilesMatch "\.(js|css|gif|png|jpe?g|pdf|xml|oga|ogg|m4a|ogv|mp4|m4v|webm|svg|svgz|eot|ttf|otf|woff|woff2|ico|webp|appcache|manifest|htc|crx|oex|xpi|safariextz|vcf)$" >
     Header unset X-UA-Compatible
   </FilesMatch>
 </IfModule>
@@ -70,7 +70,7 @@
 # subdomains like "subdomain.example.com".
 
 <IfModule mod_headers.c>
-  <FilesMatch "\.(ttf|ttc|otf|eot|woff|font.css)$">
+  <FilesMatch "\.(ttf|ttc|otf|eot|woff|woff2|font.css)$">
     Header set Access-Control-Allow-Origin "*"
   </FilesMatch>
 </IfModule>
@@ -107,6 +107,7 @@ AddType application/vnd.ms-fontobject  eot
 AddType application/x-font-ttf         ttf ttc
 AddType font/opentype                  otf
 AddType application/x-font-woff        woff
+AddType application/font-woff2         woff2
 
 # Assorted types
 AddType image/x-icon                        ico
@@ -238,6 +239,7 @@ AddType text/vtt                            vtt
   ExpiresByType application/x-font-ttf    "access plus 1 month"
   ExpiresByType font/opentype             "access plus 1 month"
   ExpiresByType application/x-font-woff   "access plus 1 month"
+  ExpiresByType application/font-woff2    "access plus 1 month"
   ExpiresByType image/svg+xml             "access plus 1 month"
   ExpiresByType application/vnd.ms-fontobject "access plus 1 month"
 

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

@@ -11,4 +11,4 @@ gem "middleman-livereload", "~> 3.1.0"
 gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw]
 
 # Windows does not come with time zone data
-gem "tzinfo-data", platforms: [:mswin, :mingw]
+gem "tzinfo-data", platforms: [:mswin, :mingw, :jruby]

data/lib/middleman-core/util.rb

@@ -169,14 +169,14 @@ module Middleman
         if path_or_resource.is_a?(::Middleman::Sitemap::Resource)
           resource = path_or_resource
           resource_url = url
-        elsif this_resource && uri.path
+        elsif this_resource && uri.path && !uri.host
           # Handle relative urls
           url_path = Pathname(uri.path)
           current_source_dir = Pathname('/' + this_resource.path).dirname
           url_path = current_source_dir.join(url_path) if url_path.relative?
           resource = app.sitemap.find_resource_by_path(url_path.to_s)
           resource_url = resource.url if resource
-        elsif options[:find_resource] && uri.path
+        elsif options[:find_resource] && uri.path && !uri.host
           resource = app.sitemap.find_resource_by_path(uri.path)
           resource_url = resource.url if resource
         end

data/lib/middleman-core/version.rb

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

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

@@ -255,5 +255,18 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
       url = url_for(url, options)
       super
     end
+    
+    # Modified Padrino image_tag so that it finds the paths for srcset
+    # using asset_path for the images listed in the srcset param
+    def image_tag(path, params={})
+      params.symbolize_keys!
+      
+      if params.key?(:srcset)
+        images = params[:srcset].split(',').map {|size| (size.include?('//') ? size : asset_url("images/#{size.strip}")) }
+        params[:srcset] = images.join(', ')
+      end
+
+      super(path, params)
+    end
   end
 end

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

@@ -1,7 +1,7 @@
 require 'middleman-core/util'
 
 class Middleman::Extensions::AssetHash < ::Middleman::Extension
-  option :exts, %w(.jpg .jpeg .png .gif .webp .js .css .otf .woff .eot .ttf .svg .svgz), 'List of extensions that get asset hashes appended to them.'
+  option :exts, %w(.jpg .jpeg .png .gif .webp .js .css .otf .woff .woff2 .eot .ttf .svg .svgz), 'List of extensions that get asset hashes appended to them.'
   option :ignore, [], 'Patterns to avoid adding asset hashes to'
 
   def initialize(app, options_hash={}, &block)

data/lib/middleman/rack.rb

@@ -2,3 +2,4 @@ require 'middleman-core/load_paths'
 ::Middleman.setup_load_paths
 
 require 'middleman-core'
+require 'middleman-core/application'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 3.3.10
+  version: 3.3.11
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -224,6 +224,7 @@ files:
 - features/cli_init.feature
 - features/coffee-script.feature
 - features/compass-sprites.feature
+- features/console.feature
 - features/content_for.feature
 - features/content_type.feature
 - features/current_page_request_path_backwards.feature
@@ -257,6 +258,7 @@ files:
 - features/i18n_preview.feature
 - features/ignore.feature
 - features/ignore_already_minified.feature
+- features/image_srcset_paths.feature
 - features/implied_extensions.feature
 - features/instance_vars.feature
 - features/layouts_dir.feature
@@ -624,6 +626,8 @@ files:
 - fixtures/ignore-app/source/plain.html
 - fixtures/ignore-app/source/reports/another.html
 - fixtures/ignore-app/source/reports/index.html
+- fixtures/image-srcset-paths-app/image-srcset-paths.html.erb
+- fixtures/image-srcset-paths-app/images/blank.gif
 - fixtures/implied-extensions-app/config.rb
 - fixtures/implied-extensions-app/source/index.erb
 - fixtures/indexable-app/config.rb
@@ -917,6 +921,7 @@ files:
 - fixtures/stylus-preview-app/source/stylesheets/main2.css.styl
 - fixtures/stylus-preview-app/source/stylesheets/plain.css.styl
 - fixtures/traversal-app/config.rb
+- fixtures/traversal-app/source/.htaccess
 - fixtures/traversal-app/source/directory-indexed.html.erb
 - fixtures/traversal-app/source/directory-indexed/sibling.html.erb
 - fixtures/traversal-app/source/directory-indexed/sibling2.html.erb
@@ -1273,7 +1278,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Hand-crafted frontend development
@@ -1295,6 +1300,7 @@ test_files:
 - features/cli_init.feature
 - features/coffee-script.feature
 - features/compass-sprites.feature
+- features/console.feature
 - features/content_for.feature
 - features/content_type.feature
 - features/current_page_request_path_backwards.feature
@@ -1328,6 +1334,7 @@ test_files:
 - features/i18n_preview.feature
 - features/ignore.feature
 - features/ignore_already_minified.feature
+- features/image_srcset_paths.feature
 - features/implied_extensions.feature
 - features/instance_vars.feature
 - features/layouts_dir.feature
@@ -1695,6 +1702,8 @@ test_files:
 - fixtures/ignore-app/source/plain.html
 - fixtures/ignore-app/source/reports/another.html
 - fixtures/ignore-app/source/reports/index.html
+- fixtures/image-srcset-paths-app/image-srcset-paths.html.erb
+- fixtures/image-srcset-paths-app/images/blank.gif
 - fixtures/implied-extensions-app/config.rb
 - fixtures/implied-extensions-app/source/index.erb
 - fixtures/indexable-app/config.rb
@@ -1988,6 +1997,7 @@ test_files:
 - fixtures/stylus-preview-app/source/stylesheets/main2.css.styl
 - fixtures/stylus-preview-app/source/stylesheets/plain.css.styl
 - fixtures/traversal-app/config.rb
+- fixtures/traversal-app/source/.htaccess
 - fixtures/traversal-app/source/directory-indexed.html.erb
 - fixtures/traversal-app/source/directory-indexed/sibling.html.erb
 - fixtures/traversal-app/source/directory-indexed/sibling2.html.erb