jekyll-assets 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7573064d37c19cca2f804d107adb47c71f242be
-  data.tar.gz: a0f730bae06638cdcd539dbea963c9da1e06d481
+  metadata.gz: aea26a562f8bf6434a8abef51619c84fea8c2fa3
+  data.tar.gz: a67c580d10fa19e002fd0dac3dec76c314c67d10
 SHA512:
-  metadata.gz: 114f38166acfaeb87c0759bedc1db1e3f74cae7e9db6f89705770a5bf060ed5eec11cc6de78dfae69b016fccc676f1e42223d32479ff20538bed5d8550f4e77a
-  data.tar.gz: d84348b7a34237abc041c106e7bff9f684f592854c70b08aea694b841f5ea8470a5e4146acab4bccabbd42f71c9b6cc6cbc7b5eb1403d6d003b29cbc38d698fc
+  metadata.gz: da2c7db920e0a4ad9fe9b452d3e4c56e9aed74b0550046785ec3261730b3e8b304161ff469d55924651105cdfd33d27ac59d2f9998050730d87a1c0b3fe98369
+  data.tar.gz: 3f7108135a09f18d5f63cbb4ea8038301fb3fa2919f1a8e790a1a2f14adf6ef75f24f9f06be43d6f070049d4fd801739b625dade9d0b75ce7bb867e429e16ec3

data/README.md

@@ -13,10 +13,6 @@ Jekyll 3 assets is an asset pipeline using Sprockets 3 to build especially
 for Jekyll 3.  It utilizes new features of both Sprockets and Jekyll to achieve
 a clean and extensible assets platform for Jekyll.
 
-## Having trouble with our documentation?
-
-If you do not understand something in our documentation please feel free to file a ticket and it will be explained and the documentation updated, however... if you have already figured out the problem please feel free to submit a pull request with clarification in the documentation and we'll happily work with you on updating it.
-
 ## Using Jekyll Assets with Jekyll
 
 When you are using a Gemfile and bundler you need to do nothing special to get
@@ -32,7 +28,11 @@ gems:
 
 ## Configuration
 
-A lot of our configuration transforms based on the `JEKYLL_ENV` variable set in your environment.  Such as digesting and whether or not to enable the CDN.  Some of them can be explictly overriden but a few cannot right now.  You should set your `JEKYLL_ENV=development` on your development machine and `JEKYLL_ENV=production` when building to push.
+A lot of our configuration transforms based on the `JEKYLL_ENV` variable
+set in your environment.  Such as digesting and whether or not to enable the
+CDN.  Some of them can be explicitly overridden but a few cannot right now.
+You should set your `JEKYLL_ENV=development` on your development
+machine and `JEKYLL_ENV=production` when building to push.
 
 ```yaml
 assets:
@@ -56,11 +56,21 @@ assets:
     - _assets/fonts
     - _assets/img
     - _assets/js
+  features:
+    automatic_image_size: true | false | default: true
+    automatic_image_alt : true | false | default: true
 ```
 
 ### Sources
 
-The listed resources in the example are all defaults. It should be noted that we append your sources instead of replace our resources with yours.  So if you add "_assets/folder" then we will append that to our sources and both will work.
+The listed resources in the example are all defaults. It should be noted
+that we append your sources instead of replace our resources with yours.  So
+if you add "_assets/folder" then we will append that to our sources and
+both will work.
+
+***NOTE: if you use our `_assets` base folder container as a base folder for
+your sprockets, we will not append our sources, we will only use that
+folder as the sole source (base folder.)***
 
 ### Digesting
 
@@ -232,3 +242,11 @@ that point rather than trying to fight it.***
 They're dead, in the way that they were, use Hooks, they require less
 patching and give more flexibility to us because we can trigger them every
 time we have a new environment not just occasionally.
+
+## Having trouble with our documentation?
+
+If you do not understand something in our documentation please feel
+free to file a ticket and it will be explained and the documentation updated,
+however... if you have already figured out the problem please feel free to
+submit a pull request with clarification in the documentation and we'll
+happily work with you on updating it.

data/lib/jekyll/assets/config.rb

@@ -21,6 +21,11 @@ module Jekyll
         "compress"  => {
           "css"     => false,
           "js"      => false
+        },
+
+        "features" => {
+          "automatic_img_alt"  => true,
+          "automatic_img_size" => true
         }
       }
 
@@ -37,6 +42,7 @@ module Jekyll
       #
 
       def self.merge_sources(jekyll, config)
+        return if config["sources"] && config["sources"].grep(/\A\s*_assets\/?\s*\Z/).size > 0
         config["sources"] = (DefaultSources + (config["sources"] ||= [])).map do |val|
           jekyll.in_source_dir(val)
         end

data/lib/jekyll/assets/liquid/tag.rb

@@ -100,7 +100,7 @@ module Jekyll
         private
         def process_tag(args, sprockets, asset)
           sprockets.used.add(asset) unless @tag == "asset_source"
-          Defaults.set_defaults_for!(@tag, args ||= {}, asset)
+          Defaults.set_defaults_for!(@tag, args ||= {}, asset, sprockets)
           build_html(args, sprockets, asset)
         end
 

data/lib/jekyll/assets/liquid/tag/defaults.rb

@@ -5,10 +5,13 @@ module Jekyll
         module Defaults
           require_relative "defaults/image"
 
+          # TODO: In 3.0 env needs to be enforced, right now it's not
+          #   because it's maintain 2.0 API.
+
           module_function
-          def set_defaults_for!(tag, args, asset)
+          def set_defaults_for!(tag, args, asset, env = nil)
             constants.select { |const| const_get(const).is_for?(tag) }.each do |const|
-              const_get(const).new(args, asset).set!
+              const_get(const).new(args, asset, env).set!
             end
           end
         end

data/lib/jekyll/assets/liquid/tag/defaults/image.rb

@@ -1,3 +1,7 @@
+# Frozen-string-literal: true
+# Copyright: 2012-2015 - MIT License
+# Encoding: utf-8
+
 module Jekyll
   module Assets
     module Liquid
@@ -8,10 +12,12 @@ module Jekyll
               tag == "img" || tag == "image"
             end
 
-            #
+            # TODO: In 3.0 env needs to be enforced if this is not changed,
+            #   for now it's not enforced to maintain the 2.0 API.
 
-            def initialize(args, asset)
+            def initialize(args, asset, env = nil)
               @asset = asset
+              @env   =   env
               @args  =  args
             end
 
@@ -22,26 +28,30 @@ module Jekyll
               set_img_alt
             end
 
-            #
+            # TODO: 3.0 - Remove the `!@env`
 
             private
             def set_img_alt
-              @args[:html] ||= {}
-              if !@args[:html].has_key?("alt")
-                then @args[:html]["alt"] = @asset.logical_path
+              if !@env || @env.asset_config["features"]["automatic_img_alt"]
+                @args[:html] ||= {}
+                if !@args[:html].has_key?("alt")
+                  then @args[:html]["alt"] = @asset.logical_path
+                end
               end
             end
 
-            #
+            # TODO: 3.0 - Remove the `!@env`
 
             private
             def set_img_dimensions
-              dimensions = FastImage.new(@asset.filename).size
-              return unless dimensions
-              @args[:html] ||= {}
+              if !@env || @env.asset_config["features"]["automatic_img_size"]
+                dimensions = FastImage.new(@asset.filename).size
+                return unless dimensions
+                @args[:html] ||= {}
 
-              @args[:html][ "width"] ||= dimensions.first
-              @args[:html]["height"] ||= dimensions. last
+                @args[:html][ "width"] ||= dimensions.first
+                @args[:html]["height"] ||= dimensions. last
+              end
             end
           end
         end

data/lib/jekyll/assets/version.rb

@@ -4,6 +4,6 @@
 
 module Jekyll
   module Assets
-    VERSION="2.0.1"
+    VERSION="2.0.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-assets
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Jordon Bedwell
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-19 00:00:00.000000000 Z
+date: 2015-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets