jekyll-responsive_image 0.18.0 → 1.0.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 662862471c2e0e1b2b48d91dc8fc67eaafe18788
-  data.tar.gz: aa73b3d89812798ce573bce3cd6ee8ec760e5874
+  metadata.gz: 035cab45912f4a42f03cd84441d67ca8b7ceb470
+  data.tar.gz: c9bdbe1866f8d64087c6d3d5e93403365469c547
 SHA512:
-  metadata.gz: e723ddcb6bc6aad03adb71de1c6c699f3f38cb5757b3dd36b9b8b6b10f860b1bb564ec10c08aa1622e44fe6cf107d0ef3b54482cd3c2649cbe4294b09c5cb8c9
-  data.tar.gz: 10abe87130f9cd74f36349da4ce9fc5c31a758b078624e8accc6e68f794d42f0813d1045c77b0c6f313f749afb189703c7d5115a91b8c56d612f8af29b793d37
+  metadata.gz: 28a085761f120c5f0d9e667cc931d1f51bbacd99fa85a3b6184b2363bdcc564c47c1feafb1b079e8a85b1214d4967f14f92da7dcac7696438324b560544b31ea
+  data.tar.gz: 3f4bea2b3ffaad9f0783f309f1850fd655810ce062a2d5e5de4252dfbd5cbd310d4242c6a98bcf9174548349a47920f0177b32235767e8afcc8fa1c2c76ca00c

data/lib/jekyll/responsive_image/block.rb

@@ -1,33 +1,20 @@
-module Jekyll
-  class ResponsiveImage
-    class Block < Liquid::Block
-      include Jekyll::ResponsiveImage::Common
 
-      def render(context)
-        attributes = YAML.load(super)
 
-        cache_key = attributes.to_s
-        result = attributes['cache'] ? RenderCache.get(cache_key) : nil
 
-        if result.nil?
-          site = context.registers[:site]
-          config = make_config(site)
 
-          image_template = attributes['template'] || config['template']
 
-          image = ImageProcessor.process(attributes['path'], config)
-          attributes['original'] = image[:original]
-          attributes['resized'] = image[:resized]
 
-          partial = File.read(image_template)
-          template = Liquid::Template.parse(partial)
 
-          result = template.render!(attributes.merge(site.site_payload))
 
-          RenderCache.set(cache_key, result)
-        end
 
-        result
+module Jekyll
+  class ResponsiveImage
+    class Block < Liquid::Block
+      include Jekyll::ResponsiveImage::Common
+
+      def render(context)
+        attributes = YAML.load(super)
+        render_responsive_image(context, attributes)
       end
     end
   end

data/lib/jekyll/responsive_image/common.rb

@@ -4,15 +4,42 @@ module Jekyll
       include Jekyll::ResponsiveImage::Utils
 
       def make_config(site)
-        config = ResponsiveImage.defaults.dup.merge(site.config['responsive_image']).merge(:site_dest => site.dest)
+        ResponsiveImage.defaults.dup
+                       .merge(site.config['responsive_image'])
+                       .merge(:site_source => site.source, :site_dest => site.dest)
+      end
+
+      def keep_resized_image!(site, image)
+        keep_dir = File.dirname(image['path'])
+        site.config['keep_files'] << keep_dir unless site.config['keep_files'].include?(keep_dir)
+      end
+
+      def render_responsive_image(context, attributes)
+        cache_key = attributes.to_s
+        result = attributes['cache'] ? RenderCache.get(cache_key) : nil
+
+        if result.nil?
+          site = context.registers[:site]
+          config = make_config(site)
+
+          source_image_path = site.in_source_dir(attributes['path'].to_s)
+          image = ImageProcessor.process(source_image_path, config)
+          attributes['original'] = image[:original]
+          attributes['resized'] = image[:resized]
+
+          attributes['resized'].each { |resized| keep_resized_image!(site, resized) }
+
+          image_template = site.in_source_dir(attributes['template'] || config['template'])
+          partial = File.read(image_template)
+          template = Liquid::Template.parse(partial)
+
+          result = template.render!(attributes.merge(site.site_payload))
 
-        # 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'], config['base_path'], '*', '*', '*')
-        output_dir = "#{File.dirname(output_dir)}/*"
 
-        site.config['keep_files'] << output_dir unless site.config['keep_files'].include?(output_dir)
+          RenderCache.set(cache_key, result)
+        end
 
-        config
+        result
       end
     end
   end

data/lib/jekyll/responsive_image/extra_image_generator.rb

@@ -7,7 +7,10 @@ module Jekyll
         config = make_config(site)
 
         config['extra_images'].each do |pathspec|
-          Dir.glob(pathspec) { |path| ImageProcessor.process(path, config) }
+          Dir.glob(site.in_source_dir(pathspec)) do |path|
+            result = ImageProcessor.process(path, config)
+            result[:resized].each { |image| keep_resized_image!(site, image) }
+          end
         end
       end
     end

data/lib/jekyll/responsive_image/image_processor.rb

@@ -4,7 +4,7 @@ module Jekyll
       include ResponsiveImage::Utils
 
       def process(image_path, config)
-        raise SyntaxError.new("Invalid image path specified: #{image_path}") unless File.exist?(image_path.to_s)
+        raise SyntaxError.new("Invalid image path specified: #{image_path}") unless File.file?(image_path)
 
         resize_handler = ResizeHandler.new
         img = Magick::Image::read(image_path).first

data/lib/jekyll/responsive_image/resize_handler.rb

@@ -17,22 +17,24 @@ module Jekyll
           filepath = format_output_path(config['output_path_format'], config['base_path'], image_path, width, height)
           resized.push(image_hash(config['base_path'], filepath, width, height))
 
+          site_source_filepath = File.expand_path(filepath, config[:site_source])
+          site_dest_filepath = File.expand_path(filepath, config[:site_dest])
+
           # Don't resize images more than once
-          next if File.exist?(filepath)
+          next if File.exist?(site_source_filepath)
 
-          ensure_output_dir_exists!(File.dirname(filepath))
+          ensure_output_dir_exists!(File.dirname(site_source_filepath))
+          ensure_output_dir_exists!(File.dirname(site_dest_filepath))
 
           Jekyll.logger.info "Generating #{filepath}"
 
           i = img.scale(ratio)
-          i.write(filepath) do |f|
+          i.write(site_source_filepath) do |f|
             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)
+          FileUtils.copy_file(site_source_filepath, site_dest_filepath)
 
           i.destroy!
         end

data/lib/jekyll/responsive_image/tag.rb

@@ -15,28 +15,7 @@ module Jekyll
       end
 
       def render(context)
-        cache_key = @attributes.to_s
-        result = @attributes['cache'] ? RenderCache.get(cache_key) : nil
-
-        if result.nil?
-          site = context.registers[:site]
-          config = make_config(site)
-
-          image = ImageProcessor.process(@attributes['path'], config)
-          @attributes['original'] = image[:original]
-          @attributes['resized'] = image[:resized]
-
-          image_template = @attributes['template'] || config['template']
-
-          partial = File.read(image_template)
-          template = Liquid::Template.parse(partial)
-
-          result = template.render!(@attributes.merge(site.site_payload))
-
-          RenderCache.set(cache_key, result)
-        end
-
-        result
+        render_responsive_image(context, @attributes)
       end
     end
   end

data/lib/jekyll/responsive_image/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   class ResponsiveImage
-    VERSION = '0.18.0'.freeze
+    VERSION = '1.0.0.pre'.freeze
   end
 end

metadata

@@ -1,53 +1,53 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-responsive_image
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 1.0.0.pre
 platform: ruby
 authors:
 - Joseph Wynn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-02 00:00:00.000000000 Z
+date: 2016-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
 description: "\n    Jekyll Responsive Images is a Jekyll plugin and utility for automatically
@@ -80,17 +80,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Responsive images for Jekyll via srcset