jekyll-responsive_image 0.11.3 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de6842e6420c29f43a76dfb02a2aa5237427ae38
-  data.tar.gz: fea958c837dd1622c8cff391d48a8ba26c8b358f
+  metadata.gz: f1a977d6f85c94a62c44f642c1c5db654858934c
+  data.tar.gz: ef3148da73fb5d20263355e5e11fe1b8b1b2c1de
 SHA512:
-  metadata.gz: df011c8636d0bdaecc37bf1500de02d402647b7a5b6be3e8b6954e9cf5d904f5869d415db17266b6277c7044cca5280a0c640624c77b218850e6844989ddbc83
-  data.tar.gz: bfde5df5e56dc9b0214314b9f9a9c2d166fe397f4e51d1328e251b499d0a7beafc0f25309f51d927aab673d8dda454c9b4f3ed3a7ea1793b78fa6b05bb37839d
+  metadata.gz: 65376dfb2c03ddd25ca527dba6a222821fd4b2ec4b19877fa6b9c4cb3cb74e605c0bdeb951fbe6fd26dcea006d84992e6ab04a1b6e7456667bcc45751836735a
+  data.tar.gz: c47166b22a9acc36d355f700c49cf42ba115284470ce3365cf914ce188cdcff8522a621fa6f91e9adeeb647d13fc865b59b46a17bd38fcd890330c8460aa321f

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 bundler_args: --without debug
 script: bundle exec rake features_with_coveralls
 rvm:
+  - 2.2.0
   - 2.1.0
   - 2.0.0
   - 1.9.3

data/Gemfile

@@ -3,7 +3,8 @@ gemspec
 
 group :development do
   gem 'rake'
-  gem 'cucumber', '~> 1.3'
+  gem 'cucumber', '~> 2.1'
+  gem 'test-unit', '~> 3.1'
 
   gem 'coveralls', :require => false
 end

data/README.md

@@ -3,7 +3,7 @@
 Jekyll Responsive Images is a [Jekyll](http://jekyllrb.com/) plugin and utility for automatically resizing images. Its intended use is for sites which want to display responsive images using something like [`srcset`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/Img#Specifications) or [Imager.js](https://github.com/BBC-News/Imager.js/).
 
 [![Build Status](https://travis-ci.org/wildlyinaccurate/jekyll-responsive-image.svg?branch=master)](https://travis-ci.org/wildlyinaccurate/jekyll-responsive-image)
-[![Coverage Status](https://img.shields.io/coveralls/wildlyinaccurate/jekyll-responsive-images.svg)](https://coveralls.io/r/wildlyinaccurate/jekyll-responsive-images)
+[![Coverage Status](https://coveralls.io/repos/wildlyinaccurate/jekyll-responsive-images/badge.svg?branch=master&service=github)](https://coveralls.io/github/wildlyinaccurate/jekyll-responsive-images?branch=master)
 [![Dependency Status](https://gemnasium.com/wildlyinaccurate/jekyll-responsive-images.svg)](https://gemnasium.com/wildlyinaccurate/jekyll-responsive-images)
 
 ## Installation
@@ -46,7 +46,8 @@ responsive_image:
       quality: 90
 
   # [Optional, Default: assets/resized/%{filename}-%{width}x%{height}.%{extension}]
-  # The template used when generating filenames for resized images.
+  # The template used when generating filenames for resized images. Must be a
+  # relative path.
   #
   # Parameters available are:
   #   %{basename}    Basename of the file (assets/some-file.jpg => some-file.jpg)

data/jekyll-responsive_image.gemspec

@@ -22,6 +22,12 @@ Gem::Specification.new do |spec|
   spec.executables  = []
   spec.require_path = 'lib'
 
-  spec.add_runtime_dependency 'jekyll', ['>= 2.0', '< 4.0']
+  if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0')
+    max_jekyll_version = '3.0'
+  else
+    max_jekyll_version = '4.0'
+  end
+
+  spec.add_runtime_dependency 'jekyll', ['>= 2.0', "< #{max_jekyll_version}"]
   spec.add_runtime_dependency 'rmagick'
 end

data/lib/jekyll/responsive_image.rb

@@ -9,6 +9,7 @@ require 'jekyll/responsive_image/defaults'
 require 'jekyll/responsive_image/utils'
 require 'jekyll/responsive_image/image_processor'
 require 'jekyll/responsive_image/resize_handler'
+require 'jekyll/responsive_image/common'
 require 'jekyll/responsive_image/tag'
 require 'jekyll/responsive_image/block'
 

data/lib/jekyll/responsive_image/block.rb

@@ -1,9 +1,10 @@
 module Jekyll
   class ResponsiveImage
     class Block < Liquid::Block
+      include Jekyll::ResponsiveImage::Common
+
       def render(context)
-        config = ResponsiveImage.defaults.dup
-        config.merge!(context.registers[:site].config['responsive_image'])
+        config = make_config(context.registers[:site])
 
         attributes = YAML.load(super)
         image_template = attributes['template'] || config['template']

data/lib/jekyll/responsive_image/common.rb

@@ -0,0 +1,17 @@
+module Jekyll
+  class ResponsiveImage
+    module Common
+      include Jekyll::ResponsiveImage::Utils
+
+      def make_config(site)
+        config = ResponsiveImage.defaults.dup.merge(site.config['responsive_image']).merge(:site_dest => site.dest)
+
+        # Not very nice, but this is needed to create a clean path to add to keep_files
+        output_dir = format_output_path(config['output_path_format'], '*', '*', '*')
+        site.config['keep_files'] << output_dir unless site.config['keep_files'].include?(output_dir)
+
+        config
+      end
+    end
+  end
+end

data/lib/jekyll/responsive_image/resize_handler.rb

@@ -28,17 +28,17 @@ module Jekyll
             f.quality = size['quality'] || config['default_quality']
           end
 
+          # Ensure the generated file is copied to the _site directory
+          site_dest_filepath = File.expand_path(filepath, config[:site_dest])
+          ensure_output_dir_exists!(File.dirname(site_dest_filepath))
+          FileUtils.copy(filepath, site_dest_filepath)
+
           i.destroy!
         end
 
         resized
       end
 
-      def format_output_path(format, path, width, height)
-        params = symbolize_keys(image_hash(path, width, height))
-        format % params
-      end
-
       def needs_resizing?(img, width)
         img.columns > width
       end

data/lib/jekyll/responsive_image/tag.rb

@@ -1,6 +1,8 @@
 module Jekyll
   class ResponsiveImage
     class Tag < Liquid::Tag
+      include Jekyll::ResponsiveImage::Common
+
       def initialize(tag_name, markup, tokens)
         super
 
@@ -13,8 +15,7 @@ module Jekyll
       end
 
       def render(context)
-        config = ResponsiveImage.defaults.dup
-        config.merge!(context.registers[:site].config['responsive_image'])
+        config = make_config(context.registers[:site])
 
         image = ImageProcessor.process(@attributes['path'], config)
         @attributes['original'] = image[:original]

data/lib/jekyll/responsive_image/utils.rb

@@ -9,6 +9,11 @@ module Jekyll
         result
       end
 
+      def format_output_path(format, path, width, height)
+        params = symbolize_keys(image_hash(path, width, height))
+        format % params
+      end
+
       # Build a hash containing image information
       def image_hash(path, width, height)
         {

data/lib/jekyll/responsive_image/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   class ResponsiveImage
-    VERSION = '0.11.3'.freeze
+    VERSION = '0.12.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-responsive_image
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.12.0
 platform: ruby
 authors:
 - Joseph Wynn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -71,6 +71,7 @@ files:
 - jekyll-responsive_image.gemspec
 - lib/jekyll/responsive_image.rb
 - lib/jekyll/responsive_image/block.rb
+- lib/jekyll/responsive_image/common.rb
 - lib/jekyll/responsive_image/defaults.rb
 - lib/jekyll/responsive_image/image_processor.rb
 - lib/jekyll/responsive_image/resize_handler.rb
@@ -97,8 +98,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Responsive images for Jekyll via srcset
-test_files: []
+test_files:
+- features/fixtures/_includes/custom-template.html
+- features/fixtures/_includes/responsive-image.html
+- features/fixtures/assets/test.png
+- features/responsive-image-block.feature
+- features/responsive-image-tag.feature
+- features/step_definitions/jekyll_steps.rb
+- features/support/env.rb
+- features/support/hooks.rb