middleman-dragonfly_thumbnailer 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6216d396bafb0fec01531ae16a4325f365513170
-  data.tar.gz: d250b657cbeac393f6c893a44f35a00cb81067d3
+SHA256:
+  metadata.gz: f96776dc93da5d1a775e45b604c8fb5e8a611c4912e2f22bc59ab241d6e639d3
+  data.tar.gz: 9e7fe35a6ea838cb7e2a3365b19644f84633d091842cbc544003f99cb4695088
 SHA512:
-  metadata.gz: d86765e90f8f67d8cffc2cef54173d0767f1518ec779306ca454346758d9c23c51d096f037946cfa8acdccd2a87d6b8cb37eb1c9965b797d0230991067097eef
-  data.tar.gz: be95146ec4174fb9b3f8a0e61684db03b2c87e996c74409ecbfabda2e64027d2563b24a57ae4713c54448975f40f51ef29531038938baac8d1f7639571424e70
+  metadata.gz: 076b3ef978712deca27292e7ce558970b3628173c8dddce08729852cbdcb1b6939b25465aabb452de2de8f5689cc0f4ecf4be2c996bc09a926cb13c640c4c41c
+  data.tar.gz: 6f5dd8221b1cdae51bd8af6f5a545aff70fcf883f82484c3970294807c15ba73edbe781c7de0e964fea8d9d1abac3e6cb202efe1e1620b053ae74c08efbf8b6f

data/README.md

@@ -25,12 +25,13 @@ Just add the following to your config.rb file:
 ## Usage
 
     <%= thumb_tag 'image.png', '100x100#', class: 'thumbnail' %>
+    <%= thumb_tag 'image.gif', '100x100#', format: 'jpg', frame: 1, class: 'thumbnail' %>
 
-The second argument is a geometry string which specifies the dimensions and options such as aspect ratio and cropping. Have a look at http://markevans.github.io/dragonfly/imagemagick/ for examples of what you can do.
+The second argument is a geometry string which specifies the dimensions and options such as aspect ratio and cropping. You can also change the output format and choose the frame for GIFs. Have a look at https://markevans.github.io/dragonfly/imagemagick for examples of what you can do. Any other options will be passed to the image_tag helper.
 
 When running Middleman in development, thumbnails will be generated on the fly and encoded in data URLs.
 
-During a build, the thumbnails will be saved next to original image in a sub directory named from the geometry string, so the thumbnail for `images/image.png` will be saved as `images/100x100/image.png`.
+During a build, the thumbnails will be saved next to original image in a sub directory named using the geometry string, so the thumbnail for `images/image.png` will be saved as `images/100x100/image.png`.
 
 ## Contributing
 
@@ -42,4 +43,4 @@ During a build, the thumbnails will be saved next to original image in a sub dir
 
 ## License
 
-Copyright (c) 2014 Andrew White. MIT Licensed, see LICENSE.txt for details.
+Copyright (c) 2018 Andrew White. MIT Licensed, see LICENSE.txt for details.

data/lib/middleman/dragonfly_thumbnailer/extension.rb

@@ -1,13 +1,11 @@
+require 'middleman-core/logger'
 require 'dragonfly'
 
 module Middleman
   module DragonflyThumbnailer
     class Extension < Middleman::Extension
-      attr_accessor :images
-
       def initialize(app, options_hash = {}, &block)
         super
-        @images = []
         configure_dragonfly
       end
 
@@ -26,38 +24,54 @@ module Middleman
                   build_path(image))
       end
 
-      def thumb(path, geometry)
+      def thumb(path, geometry, image_options = {})
         absolute_path = absolute_source_path path
         return unless File.exist?(absolute_path)
 
         image = ::Dragonfly.app.fetch_file(absolute_path)
         image.meta['original_path'] = path
         image.meta['geometry'] = geometry
-        image = image.thumb(geometry)
-        images << image
-        image
-      end
+        image = image.thumb(geometry, image_options)
 
-      def after_build(builder)
-        images.each do |image|
-          builder.say_status :create, build_path(image)
-          path = absolute_build_path(image)
-          image.to_file(path).close
+        if app.build?
+          persist_file(image)
+          build_path(image)
+        else
+          image.b64_data
         end
       end
 
+      def extract_image_options(options)
+        image_options = {
+          'format' => options.delete(:format),
+          'frame'  => options.delete(:frame)
+        }.delete_if { |_k, v| v.nil? }
+
+        return options, image_options
+      end
+
+      def persist_file(image)
+        path = absolute_build_path(image)
+        image.to_file(path).close
+      end
+
       helpers do
         def thumb_tag(path, geometry, options = {})
-          image = extensions[:dragonfly_thumbnailer].thumb(path, geometry)
-          return unless image
+          extension = extensions[:dragonfly_thumbnailer]
+
+          options, image_options = extension.extract_image_options(options)
+          url = extension.thumb(path, geometry, image_options)
+
+          image_tag(url, options) if url
+        end
+
+        def thumb_path(path, geometry, options = {})
+          extension = extensions[:dragonfly_thumbnailer]
 
-          if environment == :development
-            url = image.b64_data
-          else
-            url = extensions[:dragonfly_thumbnailer].build_path(image)
-          end
+          _options, image_options = extension.extract_image_options(options)
+          url = extension.thumb(path, geometry, image_options)
 
-          image_tag(url, options)
+          image_path(url) if url
         end
       end
 

data/lib/middleman/dragonfly_thumbnailer/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module DragonflyThumbnailer
-    VERSION = '1.0.2'
+    VERSION = '1.1.0'
   end
 end

data/middleman-dragonfly_thumbnailer.gemspec

@@ -7,7 +7,6 @@ Gem::Specification.new do |spec|
   spec.name          = 'middleman-dragonfly_thumbnailer'
   spec.version       = Middleman::DragonflyThumbnailer::VERSION
   spec.authors       = ['Andrew White']
-  spec.email         = ['andrew@vohm.com']
   spec.summary       = 'Thumbnail generation with Dragonfly'
   spec.description   = "Middleman Dragonfly Thumbnailer is a Middleman extension that lets you easily create thumbnails using Dragonfly's thumb processor."
   spec.homepage      = 'https://github.com/scarypine/middleman-dragonfly_thumbnailer'
@@ -21,6 +20,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake'
 
-  spec.add_runtime_dependency('middleman-core', ['~> 3.2'])
+  spec.add_runtime_dependency('middleman-core', ['>= 3.2'])
   spec.add_runtime_dependency('dragonfly', ['>= 1.0.0'])
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-dragonfly_thumbnailer
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Andrew White
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2018-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,14 +42,14 @@ dependencies:
   name: middleman-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
@@ -68,8 +68,7 @@ dependencies:
         version: 1.0.0
 description: Middleman Dragonfly Thumbnailer is a Middleman extension that lets you
   easily create thumbnails using Dragonfly's thumb processor.
-email:
-- andrew@vohm.com
+email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -103,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Thumbnail generation with Dragonfly