jekyll-assets 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1486650f4f5b1efb09c5b1702d8f052e6b736a87
-  data.tar.gz: aac54191d17adae04afea7a41662310f160a50f8
+  metadata.gz: bf03f1b3026830cb23f34e9b0a81488df68fd46f
+  data.tar.gz: 3a5d3c9cef7200210cd60c9f91f0f22b360af288
 SHA512:
-  metadata.gz: aac486f0eb18fd587fc992e542b26d27fc0438998dbe397be8c23936d948d684f2825a3f495327a16fd6dd0d2b090d1ee96e8dd71c57af34428eeac3c84d45ff
-  data.tar.gz: b92ff5a3abc206ca4612a8154c9ecbf3268c5c33ed6919abe9c3f898a1ef1de0bea20a83aabf2e45dcab64dd7ff1013574569f3480a1843db2f1e3ed4737deaf
+  metadata.gz: 366b58cf0cf02cb41c7a95a6d167fb16d23e1e8d8ffdb6a89561dcfb68d1d823ea622bdb6255fa8955289655983a500d56be68734cd977bf5e2bdd43ac1f16e2
+  data.tar.gz: f4d412a6a92d0c4cd39b604e81a2afcc78090ff4be70c82e961564edd71906c172e1dc649d2fc92d744d12444885b9a03c18b965f36c23240f1388ee51a88dc4

data/.gitignore

@@ -18,3 +18,7 @@ tmp
 tags
 .sass-cache
 .ruby-version
+
+# Vim
+*.swp
+*.swo

data/.rspec

@@ -1 +1 @@
---require ./lib/jekyll-assets --color --format documentation
+--color --format documentation

data/Gemfile

@@ -1,24 +1,20 @@
 source "https://rubygems.org"
 
-gem "compass"
-gem "bourbon"
-gem "neat"
-gem "bootstrap-sass", "~> 3.2"
-gem "font-awesome-sass", "~> 4.2"
-
-# compass fails with SASS than 3.3+
-# https://github.com/chriseppstein/compass/issues/1513
-gem "sass", "~> 3.2.13"
+group :development do
+  gem "rubocop"
+  gem "rake"
+  gem "rspec"
 
-gem "rubocop", "~> 0.26.0"
-gem "rake"
-gem "rspec"
+  gem "guard-rspec"
 
-gem "coveralls", :require => false
-gem "simplecov", :require => false
+  gem "coveralls", :require => false
+  gem "simplecov", :require => false
 
-group :development do
-  gem "guard-rspec"
+  gem "compass"
+  gem "bourbon"
+  gem "neat"
+  gem "bootstrap-sass", "~> 3.2"
+  gem "font-awesome-sass", "~> 4.2"
 end
 
 # Specify your gem's dependencies in jekyll-assets.gemspec

data/HISTORY.md

@@ -1,6 +1,14 @@
 ### master (unreleased)
 
 
+### 0.14.0 (2015-03-09)
+
+* Add support for resizing image assets. See #130. (Thanks @zmbush)
+* Respect `_autoprefixer.yml` along with `autoprefixer.yml` configs.
+  See #128. (Thanks @zmbush)
+* Fix issue with files being ignored when same content. See #112.
+
+
 ### 0.13.0 (2015-02-01)
 
 * Respect Jekyll config's `baseurl` when auto-guessing baseurl. See #125.

data/README.md

@@ -1,10 +1,10 @@
 # Jekyll::AssetsPlugin
 
-[![Gem Version](https://badge.fury.io/rb/jekyll-assets.png)](http://badge.fury.io/rb/jekyll-assets)
-[![Build Status](https://secure.travis-ci.org/ixti/jekyll-assets.png)](http://travis-ci.org/ixti/jekyll-assets)
-[![Dependency Status](https://gemnasium.com/ixti/jekyll-assets.png)](https://gemnasium.com/ixti/jekyll-assets)
-[![Code Climate](https://codeclimate.com/github/ixti/jekyll-assets.png)](https://codeclimate.com/github/ixti/jekyll-assets)
-[![Coverage Status](https://coveralls.io/repos/ixti/jekyll-assets/badge.png)](https://coveralls.io/r/ixti/jekyll-assets)
+[![Gem Version](https://badge.fury.io/rb/jekyll-assets.svg)](http://badge.fury.io/rb/jekyll-assets)
+[![Build Status](https://travis-ci.org/ixti/jekyll-assets.svg?branch=master)](http://travis-ci.org/ixti/jekyll-assets)
+[![Dependency Status](https://gemnasium.com/ixti/jekyll-assets.svg)](https://gemnasium.com/ixti/jekyll-assets)
+[![Code Climate](https://codeclimate.com/github/ixti/jekyll-assets.svg)](https://codeclimate.com/github/ixti/jekyll-assets)
+[![Coverage Status](https://coveralls.io/repos/ixti/jekyll-assets/badge.svg?branch=master)](https://coveralls.io/r/ixti/jekyll-assets?branch=master)
 
 Jekyll plugin, that adds Rails-alike assets pipeline, that means that:
 
@@ -268,6 +268,43 @@ config, then:
      width="50" height="50">
 ```
 
+### Images resizing
+
+The image helper accepts an option param with [resize:dimension] switch.
+If given the image will be resized to the appropriate dimensions.
+
+``` html
+{% image huge-logo.png [resize:50x50] %}
+
+<!-- which will render something like: -->
+<img src="/assets/logo-50x50-68b329da9893e34099c7d8ad5cb9c940.png">
+```
+
+You can also mix auto resizing with dimension guessing
+
+``` html
+{% image huge-logo.png [resize:50x50, autosize] %}
+
+<!-- Will be rendered like: -->
+<img src="/assets/logo-50x50-68b329da9893e34099c7d8ad5cb9c940.png" width="50" height="50">
+```
+
+This feature requires imagemagick to be installed, and the dimension is any
+format that imagemagick understands: [Resize documentation][resize-doc].
+
+More examples:
+``` html
+{% image image.png [resize:400x400] %}  <!-- Fit whole image in these dimensions -->
+{% image image.png [resize:!300x150] %} <!-- Ignore aspect ratio -->
+{% image image.png [resize:200%] %}     <!-- Resize by percentage -->
+{% image image.png [resize:500@] %}     <!-- Resize to specific pixel count -->
+{% image image.png [resize:200x100^] %} <!-- Resize to fill area -->
+{% image image.png [resize:<200x10] %}  <!-- Only enlarge small image -->
+{% image image.png [resize:>200x10] %}  <!-- Only shrink large image -->
+```
+
+[resize-doc]: http://www.imagemagick.org/Usage/resize/#resize
+
 ### Custom Compressors
 
 Sprockets comes with good set of preconfigured compressors, but imagine you are
@@ -648,16 +685,19 @@ write an [e-mail][e-mail]. :D
 
 ## Contributing
 
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+* Fork [jekyll-assets][] on GitHub
+* Make your changes
+* Ensure all tests pass (`bundle exec rake`)
+* Send a pull request
+* If we like them we'll merge them
+* If we've accepted a patch, feel free to ask for commit access!
+
+[jekyll-assets]: https://github.com/ixti/jekyll-assets
 
 
 ## License
 
-Copyright (C) 2012-2013 Aleksey V Zapparov (http://ixti.net/)
+Copyright (C) 2012-2015 Aleksey V Zapparov
 
 The MIT License
 

data/jekyll-assets.gemspec

@@ -22,10 +22,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "jekyll",     "~> 2.0"
-  spec.add_dependency "sass",       "~> 3.2"
-  spec.add_dependency "fastimage",  "~> 1.6"
-  spec.add_dependency "sprockets",  "~> 2.10"
+  spec.add_dependency "jekyll",       "~> 2.0"
+  spec.add_dependency "sass",         "~> 3.2"
+  spec.add_dependency "fastimage",    "~> 1.6"
+  spec.add_dependency "mini_magick",  "~> 4.1"
+  spec.add_dependency "sprockets",    "~> 2.10"
   spec.add_dependency "sprockets-sass"
   spec.add_dependency "sprockets-helpers"
 

data/lib/jekyll/assets_plugin/configuration.rb

@@ -19,6 +19,7 @@ module Jekyll
         :version         => 1
       }.freeze
 
+      # rubocop:disable Metrics/AbcSize
       def initialize(site, config = {})
         @site = site
         @data = OpenStruct.new DEFAULTS.merge(config)
@@ -32,6 +33,7 @@ module Jekyll
         @data.css_compressor  ||= compress.css
         @data.cache           ||= @data.cache_assets
       end
+      # rubocop:enable Metrics/AbcSize
 
       def baseurl
         unless @data.baseurl

data/lib/jekyll/assets_plugin/environment.rb

@@ -10,6 +10,8 @@ require "sprockets-helpers"
 module Jekyll
   module AssetsPlugin
     class Environment < Sprockets::Environment
+      AUTOPREFIXER_CONFIG_FILES = %w(autoprefixer.yml _autoprefixer.yml)
+
       class AssetNotFound < StandardError
         def initialize(path)
           super "Couldn't find file '#{path}'"
@@ -18,6 +20,7 @@ module Jekyll
 
       attr_reader :site
 
+      # rubocop:disable Metrics/AbcSize
       def initialize(site)
         super site.source
 
@@ -25,6 +28,7 @@ module Jekyll
 
         # append asset paths
         site.assets_config.sources.each { |p| append_path p }
+        append_path resize_cache_path
 
         self.js_compressor   = site.assets_config.js_compressor
         self.css_compressor  = site.assets_config.css_compressor
@@ -43,11 +47,16 @@ module Jekyll
         context_class.instance_variable_set :@site, site
         context_class.send :include, Patches::ContextPatch
       end
+      # rubocop:enable Metrics/AbcSize
 
       def cache_path
         Pathname.new(@site.source).join @site.assets_config.cache_path
       end
 
+      def resize_cache_path
+        cache_path.join "resize"
+      end
+
       def find_asset(path, *args)
         super || fail(AssetNotFound, path)
       end
@@ -55,15 +64,22 @@ module Jekyll
       private
 
       def browsers
-        file   = Pathname.new(@site.source).join "autoprefixer.yml"
-        opts   = {}
-        params = file.exist? ? YAML.load_file(file) : {}
-        params = params.reduce({}) do |h, (key, value)|
-          h.update(key.to_sym => value)
-        end
+        config = autoprefixer_config
+        opts   = { :safe => config.delete(:safe) }
 
-        opts[:safe] = true if params.delete(:safe)
-        [params, opts]
+        [config, opts]
+      end
+
+      def autoprefixer_config
+        config_file = AUTOPREFIXER_CONFIG_FILES
+                      .map { |f| Pathname.new(@site.source).join f }
+                      .find(&:exist?)
+
+        return {} unless config_file
+
+        YAML.load_file(config_file).reduce({}) do |h, (k, v)|
+          h.update(k.to_sym => v)
+        end
       end
 
       def install_autoprefixer!

data/lib/jekyll/assets_plugin/patches/asset_patch.rb

@@ -1,5 +1,6 @@
 # 3rd-party
 require "sprockets"
+require "mini_magick"
 
 module Jekyll
   module AssetsPlugin
@@ -59,6 +60,39 @@ module Jekyll
           def gzip?
             site.assets_config.gzip.include? content_type
           end
+
+          def extname
+            @extname ||= File.extname(pathname)
+          end
+
+          def basename
+            @basename ||= File.basename(pathname, extname)
+          end
+
+          def resize_outdir
+            site.assets.resize_cache_path
+          end
+
+          def ensure_resize_directory!
+            FileUtils.mkdir_p resize_outdir
+          end
+
+          def do_resize(dimensions)
+            name = "#{basename}-#{dimensions}#{extname}".gsub(/%/, "P")
+            img = MiniMagick::Image.read(to_s, extname)
+            img.resize dimensions
+            img.write "#{resize_outdir}/#{name}"
+
+            [name, site.assets[name]]
+          end
+
+          def resize(dimensions)
+            ensure_resize_directory!
+
+            @outfiles ||= {}
+
+            @outfiles[dimensions] ||= do_resize(dimensions)
+          end
         end
       end
     end

data/lib/jekyll/assets_plugin/patches/context_patch.rb

@@ -14,10 +14,14 @@ module Jekyll
         end
 
         def asset_path(pathname, *args)
-          return "" if pathname.to_s.strip.empty?
-          asset = resolve(pathname.to_s[/^[^#?]+/]).to_s
+          pathname = pathname.to_s.strip
+
+          return "" if pathname.empty?
+
+          asset = resolve(pathname[/^[^#?]+/]).to_s
           jekyll_assets << asset
-          (site.asset_path asset, *args) + (pathname.to_s[/[#?].+/] || "")
+
+          site.asset_path(asset, *args) + (pathname[/[#?].+/] || "")
         rescue Sprockets::FileNotFound
           raise Environment::AssetNotFound, pathname
         end

data/lib/jekyll/assets_plugin/patches/processed_asset_patch.rb

@@ -31,8 +31,7 @@ module Jekyll
 
           context.jekyll_assets.each do |path|
             @jekyll_assets << path
-            environment.find_asset(path)
-              .jekyll_assets.each { |p| @jekyll_assets << p }
+            @jekyll_assets += environment.find_asset(path).jekyll_assets
           end
 
           __orig_build_dependency_paths environment, context
@@ -41,8 +40,8 @@ module Jekyll
         def __wrap_init_with(environment, coder)
           __orig_init_with environment, coder
 
-          @jekyll_assets = Set.new coder["jekyll_assets"]
-            .map { |p| expand_root_path(p) }
+          jekyll_assets = coder["jekyll_assets"].map { |p| expand_root_path(p) }
+          @jekyll_assets = Set.new jekyll_assets
         end
 
         def __wrap_encode_with(coder)

data/lib/jekyll/assets_plugin/patches/site_patch.rb

@@ -29,7 +29,7 @@ module Jekyll
         end
 
         def asset_files
-          @asset_files ||= []
+          @asset_files ||= Set.new
         end
 
         def asset_path(pathname, *args)
@@ -51,13 +51,7 @@ module Jekyll
         end
 
         def __wrap_write
-          static_files.push(*asset_files).uniq! do |asset|
-            case hash = asset.hash
-            when Fixnum then hash
-            else Digest::MD5.new.update(hash.to_s).hash
-            end
-          end
-
+          static_files.push(*asset_files)
           __orig_write
         end
       end

data/lib/jekyll/assets_plugin/renderer.rb

@@ -28,14 +28,20 @@ module Jekyll
 
         @path     = match["path"]
         @attrs    = match["attrs"].strip
-        @options  = match["options"].to_s.split(",")
+        @options  = match["options"].to_s.split(",").map(&:strip)
 
         @attrs    = " #{@attrs}" unless @attrs.empty?
+
+        resize!
+      end
+
+      def asset
+        @asset ||= site.assets[path]
       end
 
       def render_asset
         fail "Can't render remote asset: #{path}" if remote?
-        site.assets[path].to_s
+        asset.to_s
       end
 
       def render_asset_path
@@ -58,18 +64,19 @@ module Jekyll
 
       private
 
+      # rubocop:disable Metrics/AbcSize
       def render_tag(template, extension = "")
         return format(template, :path => path, :attrs => attrs) if remote?
 
         path << extension if extension.to_s != File.extname(path)
 
-        asset = site.assets[path]
         tags  = (site.assets_config.debug ? asset.to_a : [asset]).map do |a|
           format template, :path => AssetPath.new(a).to_s, :attrs => attrs
         end
 
         tags.join "\n"
       end
+      # rubocop:enable Metrics/AbcSize
 
       def autosize!
         return unless autosize?
@@ -91,6 +98,22 @@ module Jekyll
         end
       end
 
+      def make_resize_directory!
+        FileUtils.mkdir_p site.assets.resize_cache_path
+      end
+
+      def resize!
+        return unless resize?
+
+        dimensions = options.grep(/resize/)[-1].split(":")[1]
+
+        @path, @asset = asset.resize(dimensions)
+      end
+
+      def resize?
+        options.grep(/resize:/).length > 0
+      end
+
       def remote?
         path =~ URI_RE
       end

data/lib/jekyll/assets_plugin/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module AssetsPlugin
-    VERSION = "0.13.0"
+    VERSION = "0.14.0"
   end
 end

data/spec/fixtures/_posts/2015-02-02-duplicates.md

@@ -0,0 +1,8 @@
+---
+layout: default
+title:  There's nothing wrong with a duplicate
+---
+
+https://github.com/ixti/jekyll-assets/issues/112#issuecomment-71850380
+
+{% image noise.png %} is {% image noize.png %}

data/spec/lib/jekyll/assets_plugin/configuration_spec.rb

@@ -59,7 +59,6 @@ RSpec.describe Jekyll::AssetsPlugin::Configuration do
       subject { config.debug }
       it { is_expected.to be false }
     end
-
   end
 
   it "overrides specified options and leave defaults for missing" do

data/spec/lib/jekyll/assets_plugin/patches/site_patch_spec.rb

@@ -128,6 +128,14 @@ RSpec.describe Jekyll::AssetsPlugin::Patches::SitePatch do
     expect(@dest.join "assets", "app.css").to exist
   end
 
+  it "does not ignores files with duplicate contents" do
+    @site.assets_config.cachebust = :none
+    @site.process
+
+    expect(@dest.join "assets", "noise.png").to exist
+    expect(@dest.join "assets", "noize.png").to exist
+  end
+
   context "with cache" do
     def site
       Jekyll::Site.new(Jekyll.configuration({
@@ -163,7 +171,6 @@ RSpec.describe Jekyll::AssetsPlugin::Patches::SitePatch do
 
       expect(@dest.join "assets", "app.css.gz").to_not exist
     end
-
   end
 
   it "is included into Jekyll::Site" do

data/spec/lib/jekyll/assets_plugin/renderer_spec.rb

@@ -244,6 +244,19 @@ RSpec.describe Jekyll::AssetsPlugin::Renderer do
         it { is_expected.to match(/^<img #{attr_src}>$/) }
       end
     end
+
+    context "with [resize:*] helper option" do
+      let(:params)    { "noise.png [resize:10x10]" }
+      let(:attr_src)  { 'src="/assets/noise-10x10-[^.]+\.png"' }
+      it { is_expected.to match(/^<img #{attr_src}>$/) }
+    end
+
+    context "with [resize:*] and [autosize] helpers" do
+      let(:params)    { "noise.png [resize:10x10, autosize]" }
+      let(:attr_src)  { 'src="/assets/noise-10x10-[^.]+\.png"' }
+      let(:attr_size) { 'width="10" height="10"' }
+      it { is_expected.to match(/^<img #{attr_src} #{attr_size}>$/) }
+    end
   end
 
   describe "#render_asset" do

data/spec/spec_helper.rb

@@ -9,6 +9,8 @@ SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
 
 SimpleCov.start
 
+require_relative "../lib/jekyll-assets"
+
 require "jekyll"
 require "liquid"
 require "sprockets"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-assets
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Aleksey V Zapparov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-01 00:00:00.000000000 Z
+date: 2015-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: mini_magick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
@@ -165,6 +179,7 @@ files:
 - spec/fixtures/_assets/fonts/vapor.woff
 - spec/fixtures/_assets/lib/relative.css.scss
 - spec/fixtures/_assets/noise.png
+- spec/fixtures/_assets/noize.png
 - spec/fixtures/_assets/should_be_blank.css.erb
 - spec/fixtures/_assets/should_fail.css.erb
 - spec/fixtures/_assets/vapor.css.scss
@@ -178,6 +193,7 @@ files:
 - spec/fixtures/_config.yml
 - spec/fixtures/_layouts/default.html
 - spec/fixtures/_posts/2012-10-19-hello-world.md
+- spec/fixtures/_posts/2015-02-02-duplicates.md
 - spec/fixtures/index.html
 - spec/lib/jekyll-assets/bootstrap_spec.rb
 - spec/lib/jekyll-assets/bourbon_spec.rb
@@ -215,7 +231,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: jekyll-assets-0.13.0
+summary: jekyll-assets-0.14.0
 test_files:
 - spec/fixtures/.gitignore
 - spec/fixtures/_assets/alert.js
@@ -229,6 +245,7 @@ test_files:
 - spec/fixtures/_assets/fonts/vapor.woff
 - spec/fixtures/_assets/lib/relative.css.scss
 - spec/fixtures/_assets/noise.png
+- spec/fixtures/_assets/noize.png
 - spec/fixtures/_assets/should_be_blank.css.erb
 - spec/fixtures/_assets/should_fail.css.erb
 - spec/fixtures/_assets/vapor.css.scss
@@ -242,6 +259,7 @@ test_files:
 - spec/fixtures/_config.yml
 - spec/fixtures/_layouts/default.html
 - spec/fixtures/_posts/2012-10-19-hello-world.md
+- spec/fixtures/_posts/2015-02-02-duplicates.md
 - spec/fixtures/index.html
 - spec/lib/jekyll-assets/bootstrap_spec.rb
 - spec/lib/jekyll-assets/bourbon_spec.rb