jekyll-assets 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03eb71fd5a47c2e0e6751282a641078cf0073323
-  data.tar.gz: fe08b59368965a3972b499351cbe582604d07041
+  metadata.gz: e7573064d37c19cca2f804d107adb47c71f242be
+  data.tar.gz: a0f730bae06638cdcd539dbea963c9da1e06d481
 SHA512:
-  metadata.gz: ab6aedd38ebadf43e71fecd4548c254afdc7143c45dcc85f32fa2e86b6295a62eab8bcb828546dfb6d97328e07acc16a899fd0cad1d8b01b18ab7d8823717854
-  data.tar.gz: d1b30bbebba9a6cfe9a77a7ef563088e0d168d1d83d83a4b097f9ba46b017f77229c919c98cd592ebcb54a17062529e0af414267e0a1d9317f0d704782d472b1
+  metadata.gz: 114f38166acfaeb87c0759bedc1db1e3f74cae7e9db6f89705770a5bf060ed5eec11cc6de78dfae69b016fccc676f1e42223d32479ff20538bed5d8550f4e77a
+  data.tar.gz: d84348b7a34237abc041c106e7bff9f684f592854c70b08aea694b841f5ea8470a5e4146acab4bccabbd42f71c9b6cc6cbc7b5eb1403d6d003b29cbc38d698fc

data/README.md

@@ -13,6 +13,10 @@ 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
@@ -28,6 +32,8 @@ 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.
+
 ```yaml
 assets:
   compress:
@@ -52,6 +58,10 @@ assets:
     - _assets/js
 ```
 
+### 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.
+
 ### Digesting
 
 * Disable digesting by default in development.

data/lib/jekyll/assets/config.rb

@@ -5,6 +5,12 @@
 module Jekyll
   module Assets
     module Config
+      DefaultSources = %W(
+        _assets/css _assets/stylesheets
+        _assets/images _assets/img _assets/fonts
+        _assets/javascripts _assets/js
+      )
+
       Development = {
         "skip_baseurl_with_cdn" => false,
         "skip_prefix_with_cdn"  => false,
@@ -15,13 +21,7 @@ module Jekyll
         "compress"  => {
           "css"     => false,
           "js"      => false
-        },
-
-        "sources"   => [
-          "_assets/css", "_assets/stylesheets",
-          "_assets/images", "_assets/img", "_assets/fonts",
-          "_assets/javascripts", "_assets/js"
-        ]
+        }
       }
 
       #
@@ -36,15 +36,23 @@ module Jekyll
 
       #
 
+      def self.merge_sources(jekyll, config)
+        config["sources"] = (DefaultSources + (config["sources"] ||= [])).map do |val|
+          jekyll.in_source_dir(val)
+        end
+      end
+
+      #
+
       def self.defaults
         %W(development test).include?(Jekyll.env) ? Development : Production
       end
 
       #
 
-      def self.merge(nhash, ohash = defaults)
-        ohash.merge(nhash) do |key, oval, nval|
-          oval.is_a?(Hash) && nval.is_a?(Hash) ? merge(nval, oval) : nval
+      def self.merge(new_hash, old_hash = defaults)
+        old_hash.merge(new_hash) do |key, old_val, new_val|
+          old_val.is_a?(Hash) && new_val.is_a?(Hash) ? merge(new_val, old_val) : new_val
         end
       end
     end

data/lib/jekyll/assets/hooks/configuration.rb

@@ -3,5 +3,8 @@
 # Encoding: utf-8
 
 Jekyll::Assets::Hook.register :env, :init, :early do
-  jekyll.config.store("assets", Jekyll::Assets::Config.merge(asset_config))
+  jekyll.config["assets"] = Jekyll::Assets::Config.merge(asset_config)
+  Jekyll::Assets::Config.merge_sources(
+    jekyll, asset_config
+  )
 end

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

@@ -74,7 +74,7 @@ module Jekyll
         #   because of a single asset change.
 
         def render(context)
-          @args.parse_liquid!(context)
+          args = Parser.parse_liquid(@args, context)
           site = context.registers[:site]
           page = context.registers.fetch(:page, {})
           sprockets = site.sprockets
@@ -82,7 +82,7 @@ module Jekyll
 
           asset = find_asset(sprockets)
           add_as_jekyll_dependency(site, sprockets, page, asset)
-          process_tag(sprockets, asset)
+          process_tag(args, sprockets, asset)
         rescue => e
           capture_and_out_error \
             site, e
@@ -98,30 +98,30 @@ module Jekyll
         #
 
         private
-        def process_tag(sprockets, asset)
+        def process_tag(args, sprockets, asset)
           sprockets.used.add(asset) unless @tag == "asset_source"
-          Defaults.set_defaults_for!(@tag, @args ||= {}, asset)
-          build_html(sprockets, asset)
+          Defaults.set_defaults_for!(@tag, args ||= {}, asset)
+          build_html(args, sprockets, asset)
         end
 
         #
 
         private
-        def build_html(sprockets, asset, path = get_path(sprockets, asset))
+        def build_html(args, sprockets, asset, path = get_path(sprockets, asset))
           if @tag == "asset_path"
             return path
 
           elsif @tag == "asset" || @tag == "asset_source"
             return asset.to_s
 
-          elsif @args.has_key?(:data) && @args[:data].has_key?(:uri)
+          elsif args.has_key?(:data) && args[:data].has_key?(:uri)
             return Tags[@tag] % [
-              asset.data_uri, @args.to_html
+              asset.data_uri, Parser.to_html(args)
             ]
 
           else
             return Tags[@tag] % [
-              path, @args.to_html
+              path, Parser.to_html(args)
             ]
           end
         end

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

@@ -61,17 +61,43 @@ module Jekyll
             set_accept
           end
 
-          #
+          # TODO: In 3.0 this needs to be removed and put on the class,
+          #   but because we need to work around the way that Liquid currently
+          #   works it needs to remain.
 
           def parse_liquid!(context)
-            return @args unless context.is_a?(::Liquid::Context)
-            @args = _parse_liquid(@args, context)
+            @args = self.class.parse_liquid(@args, context)
           end
 
           #
 
+          def self.parse_liquid(hash, context)
+            hash = hash.to_h if hash.is_a?(self)
+            return hash unless context.is_a?(::Liquid::Context)
+            liquid = context.registers[:site].liquid_renderer.file( \
+              "(jekyll:assets)")
+
+            hash.inject({}) do |hash_, (key, val)|
+              val = liquid.parse(val).render(context) if val.is_a?(String)
+              val = parse_liquid(val, context) if val.is_a?(Hash)
+              hash_.update(
+                key => val
+              )
+            end
+          end
+
+          # TODO: In 3.0 this needs to be put on the class, but because
+          #  we need to work around the way that Liquid currently works in
+          #  2.0.1 it needs to stay.
+
           def to_html
-            @args.fetch(:html, {}).map do |key, val|
+            self.class.to_html(@args)
+          end
+
+          #
+
+          def self.to_html(hash)
+            hash.fetch(:html, {}).map do |key, val|
               %Q{ #{key}="#{val}"}
             end. \
             join
@@ -166,24 +192,6 @@ module Jekyll
           def from_shellwords
             Shellwords.shellwords(@raw_args)
           end
-
-          #
-
-          def _parse_liquid(hash, context)
-            lqd = context.registers[:site].liquid_renderer. \
-              file(raw_args)
-
-            hash.inject({}) do |hsh, (key, val)|
-              if val.is_a?(Hash) || val.is_a?(String)
-                val = val.is_a?(Hash) ? _parse_liquid(val, context) : \
-                  lqd.parse(val).render!(context)
-              end
-
-              hsh.update(
-                key => val
-              )
-            end
-          end
         end
       end
     end

data/lib/jekyll/assets/version.rb

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

metadata

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