jekyll-assets 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 166cb1e3cc6725c829dfa2cf6936fa6598c4f2c3
-  data.tar.gz: a6b7fefe00f1039dcfcd749ac54a9eb23057f78a
+  metadata.gz: ffaf188e4bc35cd2ba432d73e96d25586c655070
+  data.tar.gz: bbf744bd06c57413e959396644ad61bff01f7683
 SHA512:
-  metadata.gz: ed52bd661c49400d4c5f88d2b88e92869dd2588c56a0e904be5e3c22796c12e47da27f2012f729ffd7b1f5101c81ac47b91064a7206a39b28d2c2cb0a1e2d21b
-  data.tar.gz: e4eda01d82b244ea60c5185c8394ae36c71d2e348f891e0226e4097968d8f84a12f4e206f427d9aaa37ace4076dd408bd6f3673964011ae2a18ae125364f98fd
+  metadata.gz: 8ea009a04a48763d160daf5f1f592ef3e497214f1387017b887e712db3bcbe82a2b5e1b663b8a4e6bfb74a882e56f406b93668fe7afa9a62142ce513bec7c53e
+  data.tar.gz: 704ca0157f9120f200f972375f104a65137c6673de3f22f866f7f975790677a27a9dc52b4e6be3a0d53a233452ae91b3e8c05c054b03708aa5d60c05833dd83b

data/.rubocop.yml

@@ -1,78 +1,43 @@
-# Avoid long parameter lists
-ParameterLists:
-  Max: 3
-  CountKeywordArgs: true
+inherit_from: .rubocop_todo.yml
 
-MethodLength:
-  CountComments: false
-  Max: 15
+## Styles ######################################################################
 
-ClassLength:
-  CountComments: false
-  Max: 100
+Style/AlignParameters:
+  EnforcedStyle: with_fixed_indentation
 
-CyclomaticComplexity:
-  Max: 6
+Style/BracesAroundHashParameters:
+  Enabled: false
 
-EmptyLineBetweenDefs:
+Style/EmptyLineBetweenDefs:
   AllowAdjacentOneLineDefs: true
 
-BlockNesting:
-  Max: 3
+Style/Encoding:
+  EnforcedStyle: when_needed
 
-HashSyntax:
+Style/HashSyntax:
   EnforcedStyle: hash_rockets
 
-StringLiterals:
-  EnforcedStyle: double_quotes
-
-AlignParameters:
-  EnforcedStyle: with_fixed_indentation
-
-IndentHash:
+Style/IndentHash:
   EnforcedStyle: consistent
 
-PercentLiteralDelimiters:
-  PreferredDelimiters:
-    '%':  ()
-    '%i': ()
-    '%q': ()
-    '%Q': ()
-    '%r': '{}'
-    '%s': ()
-    '%w': '[]'
-    '%W': '[]'
-    '%x': ()
-
-Encoding:
-  Enabled: false
-
-BracesAroundHashParameters:
+# New lambda syntax is as ugly to me as new syntax of Hash.
+Style/Lambda:
   Enabled: false
 
-Documentation:
-  Enabled: false
-
-# Not all trivial readers/writers can be defined with attr_* methods
-TrivialAccessors:
-  Enabled: false
-
-# New lambda syntax is UGLY, don't enforce it
-Lambda:
-  Enabled: false
-
-# Ridiculous (and IMHO useless) restriction, that makes impossible aligning
-# code like this:
+# A bit useless restriction, that makes impossible aligning code like this:
 #
-#   redis.hset    :k1, now
-#   redis.hincrby :k2, 123
+#   redis do |conn|
+#     conn.hset    :k1, now
+#     conn.hincrby :k2, 123
+#   end
 SingleSpaceBeforeFirstArg:
   Enabled: false
 
-AllCops:
-  Include:
-    - Gemfile
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
 
-# TODO: Rename all files and modules :D
-FileName:
-  Enabled: false
+## Metrics #####################################################################
+
+Metrics/MethodLength:
+  CountComments: false
+  Max: 15

data/.rubocop_todo.yml

@@ -0,0 +1,10 @@
+# This configuration was generated by `rubocop --auto-gen-config`
+# on 2014-09-20 21:12:28 +0200 using RuboCop version 0.26.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 17
+Style/Documentation:
+  Enabled: false

data/.travis.yml

@@ -4,9 +4,3 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.2
-
-gemfile:
-  - Gemfile
-  - gemfiles/Gemfile.bootstrap-pre-3.2
-  - gemfiles/Gemfile.fontawesome-pre-4.2
-  - gemfiles/Gemfile.jekyll-1.0

data/Gemfile

@@ -10,7 +10,7 @@ gem "font-awesome-sass", "~> 4.2"
 # https://github.com/chriseppstein/compass/issues/1513
 gem "sass", "~> 3.2.13"
 
-gem "rubocop", "~> 0.24.0"
+gem "rubocop", "~> 0.26.0"
 gem "rake"
 gem "rspec"
 

data/Guardfile

@@ -1,8 +1,7 @@
 notification :off
 
-guard 'rspec' do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
+guard "rspec" do
+  watch(/^spec\/.+_spec\.rb$/)
+  watch(/^lib\/(.+)\.rb$/)     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch("spec/spec_helper.rb") { "spec" }
 end
-

data/HISTORY.md

@@ -1,6 +1,13 @@
 ### master (unreleased)
 
 
+### 0.10.1 (2014-10-13)
+
+* Fix regression in assets finder (#104), appeared after introducing tag
+  attributes (#52). To specify asset path containing spaces, wrap it into
+  single or doube qotes: `{% javascript_tag "my app.js" async %}`.
+
+
 ### 0.10.0 (2014-09-14)
 
 * Drop support of `bootstrap-sass < 3.2`, `font-awesome-sass < 4.2`

data/jekyll-assets.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = Jekyll::AssetsPlugin::VERSION
   spec.homepage      = "http://ixti.github.com/jekyll-assets"
   spec.authors       = ["Aleksey V Zapparov"]
-  spec.email         = %w[ixti@member.fsf.org]
+  spec.email         = %w(ixti@member.fsf.org)
   spec.license       = "MIT"
   spec.summary       = "jekyll-assets-#{Jekyll::AssetsPlugin::VERSION}"
   spec.description   = <<-DESC

data/lib/jekyll-assets/bootstrap.rb

@@ -2,6 +2,6 @@ require "sprockets"
 
 gemspec = Gem::Specification.find_by_name "bootstrap-sass"
 
-%w[images fonts javascripts stylesheets].each do |asset|
+%w(images fonts javascripts stylesheets).each do |asset|
   Sprockets.append_path File.join(gemspec.gem_dir, "assets", asset)
 end

data/lib/jekyll-assets/font-awesome.rb

@@ -1,7 +1,8 @@
+# rubocop: disable Style/FileName
 require "sprockets"
 
 gemspec = Gem::Specification.find_by_name "font-awesome-sass"
 
-%w[fonts stylesheets].each do |asset|
+%w(fonts stylesheets).each do |asset|
   Sprockets.append_path File.join(gemspec.gem_dir, "assets", asset)
 end

data/lib/jekyll/assets_plugin/configuration.rb

@@ -6,14 +6,14 @@ module Jekyll
     class Configuration
       DEFAULTS = {
         :dirname        => "assets",
-        :sources        => %w[_assets/javascripts
+        :sources        => %w(_assets/javascripts
                               _assets/stylesheets
-                              _assets/images],
+                              _assets/images),
         :js_compressor  => nil,
         :css_compressor => nil,
         :cachebust      => :hard,
         :cache          => false,
-        :gzip           => %w[text/css application/javascript],
+        :gzip           => %w(text/css application/javascript),
         :debug          => false,
         :version        => 1
       }.freeze

data/lib/jekyll/assets_plugin/filters.rb

@@ -4,7 +4,7 @@ require "jekyll/assets_plugin/renderer"
 module Jekyll
   module AssetsPlugin
     module Filters
-      %w[asset asset_path image javascript stylesheet].each do |name|
+      %w(asset asset_path image javascript stylesheet).each do |name|
         module_eval <<-RUBY, __FILE__, __LINE__
         def #{name} path                    # def stylesheet logical_path
           r = Renderer.new @context, path   #   r = Renderer.new @context, path

data/lib/jekyll/assets_plugin/renderer.rb

@@ -6,23 +6,29 @@ module Jekyll
       IMAGE      = '<img src="%{path}"%{attrs}>'
 
       URI_RE     = %r{^(?:[^:]+:)?//(?:[^./]+\.)+[^./]+/}
+      PARAMS_RE  = / (?: "(?<path>[^"]+)" | '(?<path>[^']+)' | (?<path>[^ ]+) )
+                     (?<attrs>.*)
+                   /x
 
-      def initialize(context, logical_path)
-        @site   = context.registers[:site]
-        @path   = logical_path.strip
+      attr_reader :site, :path, :attrs
 
-        @path, _, @attrs = @path.partition(" ") if @path[" "]
-        @attrs.prepend(" ") if @attrs
+      def initialize(context, params)
+        @site = context.registers[:site]
+
+        match = params.strip.match PARAMS_RE
+
+        @path  = match["path"]
+        @attrs = match["attrs"]
       end
 
       def render_asset
-        fail "Can't render remote asset: #{@path}" if remote?
-        @site.assets[@path].to_s
+        fail "Can't render remote asset: #{path}" if remote?
+        site.assets[path].to_s
       end
 
       def render_asset_path
-        return @path if remote?
-        @site.asset_path @path
+        return path if remote?
+        site.asset_path path
       end
 
       def render_javascript
@@ -40,20 +46,20 @@ module Jekyll
       private
 
       def render_tag(template, extension = "")
-        return format(template, :path => @path, :attrs => @attrs) if remote?
+        return format(template, :path => path, :attrs => attrs) if remote?
 
-        @path << extension if extension.to_s != File.extname(@path)
+        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
+        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
 
       def remote?
-        @path =~ URI_RE
+        path =~ URI_RE
       end
     end
   end

data/lib/jekyll/assets_plugin/tag.rb

@@ -14,6 +14,6 @@ module Jekyll
   end
 end
 
-%w[asset asset_path image javascript stylesheet].each do |tag|
+%w(asset asset_path image javascript stylesheet).each do |tag|
   Liquid::Template.register_tag tag, Jekyll::AssetsPlugin::Tag
 end

data/lib/jekyll/assets_plugin/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module AssetsPlugin
-    VERSION = "0.10.0"
+    VERSION = "0.10.1"
   end
 end

data/spec/lib/jekyll-assets/font-awesome_spec.rb

@@ -1,3 +1,5 @@
+# rubocop: disable Style/FileName
+
 require "spec_helper"
 require "jekyll-assets/font-awesome"
 

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

@@ -36,7 +36,7 @@ RSpec.describe Jekyll::AssetsPlugin::Configuration do
 
     context "gzip" do
       subject { config.gzip }
-      it { is_expected.to match_array %w[text/css application/javascript] }
+      it { is_expected.to match_array %w(text/css application/javascript) }
     end
 
     context "cache_assets?" do
@@ -58,12 +58,12 @@ RSpec.describe Jekyll::AssetsPlugin::Configuration do
 
   it "overrides specified options and leave defaults for missing" do
     config = described_class.new({
-      :sources        => %w[abc],
+      :sources        => %w(abc),
       :css_compressor => "sass"
     })
 
     expect(config.dirname).to eq "assets"
-    expect(config.sources).to eq %w[abc]
+    expect(config.sources).to eq %w(abc)
     expect(config.js_compressor).to be_nil
     expect(config.css_compressor).to be  :sass
   end

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

@@ -8,7 +8,7 @@ RSpec.describe Jekyll::AssetsPlugin::Patches::SitePatch do
       "source"  => fixtures_path.to_s,
       "dirname" => "foobar",
       "assets"  => {
-        "sources" => %w[foobar _assets]
+        "sources" => %w(foobar _assets)
       }
     })
   end

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

@@ -4,6 +4,8 @@ require "ostruct"
 require "spec_helper"
 
 RSpec.describe Jekyll::AssetsPlugin::Renderer do
+  let(:assets_config) { Hash.new }
+
   let(:site) do
     Jekyll::Site.new Jekyll.configuration({
       "source"      => fixtures_path.to_s,
@@ -12,12 +14,85 @@ RSpec.describe Jekyll::AssetsPlugin::Renderer do
     })
   end
 
-  let(:renderer) do
-    context = OpenStruct.new(:registers => { :site => site })
-    described_class.new context, asset
+  let(:params)   { "app" }
+  let(:context)  { OpenStruct.new(:registers => { :site => site }) }
+  let(:renderer) { described_class.new context, params }
+
+  describe "#path" do
+    subject { renderer.path }
+
+    context "with logical path only" do
+      context "when logical path contains no spaces" do
+        let(:params) { "app" }
+        it { is_expected.to eq "app" }
+      end
+
+      context "when logical path contains spaces and double quoted" do
+        let(:params) { '"my app"' }
+        it { is_expected.to eq "my app" }
+      end
+
+      context "when logical path contains spaces and single quoted" do
+        let(:params) { "'my app'" }
+        it { is_expected.to eq "my app" }
+      end
+    end
+
+    context "with logical path and params" do
+      context "when logical path contains no spaces" do
+        let(:params) { 'app foo bar="baz"' }
+        it { is_expected.to eq "app" }
+      end
+
+      context "when logical path contains spaces and double quoted" do
+        let(:params) { '"my app" foo bar="baz"' }
+        it { is_expected.to eq "my app" }
+      end
+
+      context "when logical path contains spaces and single quoted" do
+        let(:params) { %q('my app' foo bar="baz") }
+        it { is_expected.to eq "my app" }
+      end
+    end
   end
 
-  let(:asset) { "app" }
+  describe "#attrs" do
+    subject { renderer.attrs }
+
+    context "with logical path only" do
+      context "when logical path contains no spaces" do
+        let(:params) { "app" }
+        it { is_expected.to eq "" }
+      end
+
+      context "when logical path contains spaces and double quoted" do
+        let(:params) { '"my app"' }
+        it { is_expected.to eq "" }
+      end
+
+      context "when logical path contains spaces and single quoted" do
+        let(:params) { "'my app'" }
+        it { is_expected.to eq "" }
+      end
+    end
+
+    context "with logical path and params" do
+      context "when logical path contains no spaces" do
+        let(:params) { 'app foo bar="baz"' }
+        it { is_expected.to eq ' foo bar="baz"' }
+      end
+
+      context "when logical path contains spaces and double quoted" do
+        let(:params) { '"my app" foo bar="baz"' }
+        it { is_expected.to eq ' foo bar="baz"' }
+      end
+
+      context "when logical path contains spaces and single quoted" do
+        let(:params) { %q('my app' foo bar="baz") }
+        it { is_expected.to eq ' foo bar="baz"' }
+      end
+    end
+  end
 
   describe "#render_javascript" do
     subject { renderer.render_javascript }
@@ -27,12 +102,12 @@ RSpec.describe Jekyll::AssetsPlugin::Renderer do
       it { is_expected.to match(/^(\s*<script src="[^"]+"><\/script>\s*){3}$/) }
 
       context "and URI given" do
-        let(:asset) { "http://example.com/app.js" }
-        it { is_expected.to match(/^<script src="#{asset}"><\/script>$/) }
+        let(:params) { "http://example.com/app.js" }
+        it { is_expected.to match(/^<script src="#{params}"><\/script>$/) }
       end
 
       context "and path contains attributes" do
-        let(:asset) { "app data-test=true" }
+        let(:params) { "app data-test=true" }
         it { is_expected.to include "data-test=true" }
       end
     end
@@ -42,12 +117,12 @@ RSpec.describe Jekyll::AssetsPlugin::Renderer do
       it { is_expected.to match(/^(\s*<script src="[^"]+"><\/script>\s*){1}$/) }
 
       context "and URI given" do
-        let(:asset) { "http://example.com/app.js" }
-        it { is_expected.to match(/^<script src="#{asset}"><\/script>$/) }
+        let(:params) { "http://example.com/app.js" }
+        it { is_expected.to match(/^<script src="#{params}"><\/script>$/) }
       end
 
       context "and path contains attributes" do
-        let(:asset) { "app data-test=true" }
+        let(:params) { "app data-test=true" }
         it { is_expected.to include "data-test=true" }
       end
     end
@@ -55,33 +130,34 @@ RSpec.describe Jekyll::AssetsPlugin::Renderer do
 
   describe "#render_stylesheet" do
     subject { renderer.render_stylesheet }
+    let(:tag_prefix) { '<link rel="stylesheet"' }
 
     context "when debug mode enabled" do
       let(:assets_config) { Hash[:debug, true] }
-      it { is_expected.to match(/^(\s*<link rel="stylesheet" [^>]+>\s*){3}$/) }
+      it { is_expected.to match(/^(\s*#{tag_prefix} [^>]+>\s*){3}$/) }
 
       context "and URI given" do
-        let(:asset) { "http://example.com/style.css" }
-        it { is_expected.to match(/^<link rel="stylesheet" href="#{asset}">$/) }
+        let(:params) { "http://example.com/style.css" }
+        it { is_expected.to match(/^#{tag_prefix} href="#{params}">$/) }
       end
 
       context "and path contains attributes" do
-        let(:asset) { "app data-test=true" }
+        let(:params) { "app data-test=true" }
         it { is_expected.to include "data-test=true" }
       end
     end
 
     context "when debug mode disabled" do
       let(:assets_config) { Hash[:debug, false] }
-      it { is_expected.to match(/^(\s*<link rel="stylesheet" [^>]+>\s*){1}$/) }
+      it { is_expected.to match(/^(\s*#{tag_prefix} [^>]+>\s*){1}$/) }
 
       context "and URI given" do
-        let(:asset) { "http://example.com/style.css" }
-        it { is_expected.to match(/^<link rel="stylesheet" href="#{asset}">$/) }
+        let(:params) { "http://example.com/style.css" }
+        it { is_expected.to match(/^#{tag_prefix} href="#{params}">$/) }
       end
 
       context "and path contains attributes" do
-        let(:asset) { "app data-test=true" }
+        let(:params) { "app data-test=true" }
         it { is_expected.to include "data-test=true" }
       end
     end
@@ -90,19 +166,19 @@ RSpec.describe Jekyll::AssetsPlugin::Renderer do
   describe "#render_image" do
     subject { renderer.render_image }
 
-    let(:asset) { "noise.png" }
+    let(:params) { "noise.png" }
 
     context "when debug mode enabled" do
       let(:assets_config) { Hash[:debug, true] }
       it { is_expected.to match(%r{^<img src="/assets/noise-[^.]+\.png">$}) }
 
       context "and URI given" do
-        let(:asset) { "http://example.com/style.css" }
-        it { is_expected.to match(/^<img src="#{asset}">$/) }
+        let(:params) { "http://example.com/style.css" }
+        it { is_expected.to match(/^<img src="#{params}">$/) }
       end
 
       context "and path contains attributes" do
-        let(:asset) { "noise.png data-test=true" }
+        let(:params) { "noise.png data-test=true" }
         it { is_expected.to include "data-test=true" }
       end
     end
@@ -112,12 +188,12 @@ RSpec.describe Jekyll::AssetsPlugin::Renderer do
       it { is_expected.to match(%r{^<img src="/assets/noise-[^.]+\.png">$}) }
 
       context "and URI given" do
-        let(:asset) { "http://example.com/style.css" }
-        it { is_expected.to match(/^<img src="#{asset}">$/) }
+        let(:params) { "http://example.com/style.css" }
+        it { is_expected.to match(/^<img src="#{params}">$/) }
       end
 
       context "and path contains attributes" do
-        let(:asset) { "noise.png data-test=true" }
+        let(:params) { "noise.png data-test=true" }
         it { is_expected.to include "data-test=true" }
       end
     end
@@ -125,15 +201,15 @@ RSpec.describe Jekyll::AssetsPlugin::Renderer do
 
   describe "#render_asset" do
     subject { renderer.render_asset }
-    let(:asset) { "alert.js" }
+    let(:params) { "alert.js" }
 
     context "when debug mode enabled" do
       let(:assets_config) { Hash[:debug, true] }
       it { is_expected.to eq "alert('test');\n" }
 
       context "and URI given" do
-        let(:asset) { "http://example.com/style.css" }
-        it { expect { subject }.to raise_error(/#{asset}/) }
+        let(:params) { "http://example.com/style.css" }
+        it { expect { subject }.to raise_error(/#{params}/) }
       end
     end
 
@@ -142,8 +218,8 @@ RSpec.describe Jekyll::AssetsPlugin::Renderer do
       it { is_expected.to eq "alert('test');\n" }
 
       context "and URI given" do
-        let(:asset) { "http://example.com/style.css" }
-        it { expect { subject }.to raise_error(/#{asset}/) }
+        let(:params) { "http://example.com/style.css" }
+        it { expect { subject }.to raise_error(/#{params}/) }
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-assets
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Aleksey V Zapparov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-14 00:00:00.000000000 Z
+date: 2014-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -107,6 +107,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - ".yardopts"
 - Gemfile
@@ -199,7 +200,7 @@ rubyforge_project:
 rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
-summary: jekyll-assets-0.10.0
+summary: jekyll-assets-0.10.1
 test_files:
 - spec/fixtures/.gitignore
 - spec/fixtures/_assets/alert.js