jekyll-assets 0.8.1 → 0.9.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c9e962a56e2ea05396af2694d5e1b76bd4d7a9b7
+  data.tar.gz: e530fd53d2636b89b33f56b4e6165686b66caefa
+SHA512:
+  metadata.gz: 7793a52b1bcaf8bd80908e23fa4a1bb51a7724c55c44b140505ff1f713b2727db698a3b0aefd6d628bba6825b74c353b889cc9360d3fcbf627abe167a8ee5cc5
+  data.tar.gz: e223e29a12f9d1c2b73b75c8ecc137fb1f4a93bc308d909600d63f1b5ca8b5f70bd3e1f4dec843081a5985ea4b368842879754b02b7022fb8864dbc78dd14508

data/.gitignore

@@ -17,3 +17,4 @@ test/version_tmp
 tmp
 tags
 .sass-cache
+.ruby-version

data/Gemfile

@@ -1,11 +1,21 @@
 source "https://rubygems.org"
 
-gem "rubocop", "~> 0.22.0"
+gem "compass"
+gem "bourbon"
+gem "neat"
+gem "bootstrap-sass"
+gem "font-awesome-sass"
 
-group :test do
-  gem "coveralls", :require => false
-  gem "simplecov", :require => false
-end
+# compass fails with SASS than 3.3+
+# https://github.com/chriseppstein/compass/issues/1513
+gem "sass", "~> 3.2.13"
+
+gem "rubocop", "~> 0.24.0"
+gem "rake"
+gem "rspec"
+
+gem "coveralls", :require => false
+gem "simplecov", :require => false
 
 group :development do
   gem "guard-rspec"

data/HISTORY.md

@@ -1,6 +1,14 @@
 ### master (unreleased)
 
 
+### 0.9.0 (2014-07-19)
+
+* Allow pass remote URIs to image/stylesheet/javascript tags/filters.
+  See #52.
+* Allow pass extra tag attributes to image/stylesheet/javascript tags/filters.
+  See #52.
+
+
 ### 0.8.1 (2014-07-04)
 
 * Fix support of `bootstrap-sass v3.2+`. See #85.

data/Rakefile

@@ -4,6 +4,6 @@ require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new
 
 require "rubocop/rake_task"
-Rubocop::RakeTask.new
+RuboCop::RakeTask.new
 
 task :default => [:spec, :rubocop]

data/jekyll-assets.gemspec

@@ -26,18 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "sprockets", "~> 2.10"
   spec.add_dependency "sprockets-sass"
   spec.add_dependency "sprockets-helpers"
-  spec.add_dependency "sass"
+  spec.add_dependency "sass", "~> 3.2"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "compass"
-  spec.add_development_dependency "bourbon"
-  spec.add_development_dependency "neat"
-  spec.add_development_dependency "bootstrap-sass"
-  spec.add_development_dependency "font-awesome-sass"
-
-  # compass fails with SASS than 3.3+
-  # https://github.com/chriseppstein/compass/issues/1513
-  spec.add_development_dependency "sass", "~> 3.2.13"
+  spec.add_development_dependency "bundler", "~> 1.6"
 end

data/lib/jekyll-assets/bootstrap.rb

@@ -1,10 +1,8 @@
 require "sprockets"
 
 gemspec = Gem::Specification.find_by_name "bootstrap-sass"
-%w[fonts javascripts stylesheets].each do |asset|
-  if Gem::Version.new("3.2") <= gemspec.version
-    Sprockets.append_path File.join(gemspec.gem_dir, "assets", asset)
-  else
-    Sprockets.append_path File.join(gemspec.gem_dir, "vendor", "assets", asset)
-  end
+subpath = Gem::Version.new("3.2") <= gemspec.version ? "" : "vendor"
+
+%w[images fonts javascripts stylesheets].each do |asset|
+  Sprockets.append_path File.join(gemspec.gem_dir, subpath, "assets", asset)
 end

data/lib/jekyll/assets_plugin/renderer.rb

@@ -1,47 +1,59 @@
 module Jekyll
   module AssetsPlugin
     class Renderer
-      STYLESHEET = '<link rel="stylesheet" href="%s">'
-      JAVASCRIPT = '<script src="%s"></script>'
-      IMAGE      = '<img src="%s">'
+      STYLESHEET = '<link rel="stylesheet" href="%{path}"%{attrs}>'
+      JAVASCRIPT = '<script src="%{path}"%{attrs}></script>'
+      IMAGE      = '<img src="%{path}"%{attrs}>'
+
+      URI_RE     = %r{^(?:[^:]+:)?//(?:[^./]+\.)+[^./]+/}
 
       def initialize(context, logical_path)
-        @site = context.registers[:site]
-        @path = logical_path.strip
+        @site   = context.registers[:site]
+        @path   = logical_path.strip
+
+        @path, _, @attrs = @path.partition(" ") if @path[" "]
       end
 
       def render_asset
+        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
       end
 
       def render_javascript
-        @path << ".js" if File.extname(@path).empty?
-        render_tag JAVASCRIPT
+        render_tag JAVASCRIPT, ".js"
       end
 
       def render_stylesheet
-        @path << ".css" if File.extname(@path).empty?
-        render_tag STYLESHEET
+        render_tag STYLESHEET, ".css"
       end
 
       def render_image
         render_tag IMAGE
       end
 
-      protected
+      private
+
+      def render_tag(template, extension = nil)
+        return format(template, :path => @path, :attrs => @attrs) if remote?
+
+        @path << extension if extension && File.extname(@path).empty?
 
-      def render_tag(template)
         asset = @site.assets[@path]
         tags  = (@site.assets_config.debug ? asset.to_a : [asset]).map do |a|
-          format template, AssetPath.new(a).to_s
+          format template, :path => AssetPath.new(a).to_s, :attrs => @attrs
         end
 
         tags.join "\n"
       end
+
+      def remote?
+        @path =~ URI_RE
+      end
     end
   end
 end

data/lib/jekyll/assets_plugin/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module AssetsPlugin
-    VERSION = "0.8.1"
+    VERSION = "0.9.0"
   end
 end

data/spec/fixtures/_assets/alert.js

@@ -0,0 +1 @@
+alert('test');

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

@@ -11,10 +11,15 @@ RSpec.describe Jekyll::AssetsPlugin::Filters do
     "Liquid error: Couldn't find file '#{file}"
   end
 
+  def render_tag(template, path, attrs = "")
+    template = Jekyll::AssetsPlugin::Renderer.const_get template
+    format template, :path => path, :attrs => attrs
+  end
+
   context "{{ '<file>' | image }}" do
     def tag_re(name)
       file = "/assets/#{name}-[a-f0-9]{32}\.png"
-      Regexp.new "^#{Jekyll::AssetsPlugin::Renderer::IMAGE % file}$"
+      Regexp.new "^#{render_tag :IMAGE, file}$"
     end
 
     context "when <file> exists" do
@@ -31,7 +36,7 @@ RSpec.describe Jekyll::AssetsPlugin::Filters do
   context "{{ '<file>' | stylesheet }}" do
     def tag_re(name)
       file = "/assets/#{name}-[a-f0-9]{32}\.css"
-      Regexp.new "^#{Jekyll::AssetsPlugin::Renderer::STYLESHEET % file}$"
+      Regexp.new "^#{render_tag :STYLESHEET, file}$"
     end
 
     context "when <file> exists" do
@@ -53,7 +58,7 @@ RSpec.describe Jekyll::AssetsPlugin::Filters do
   context "{{ '<file>' | javascript }}" do
     def tag_re(name)
       file = "/assets/#{name}-[a-f0-9]{32}\.js"
-      Regexp.new "^#{Jekyll::AssetsPlugin::Renderer::JAVASCRIPT % file}$"
+      Regexp.new "^#{render_tag :JAVASCRIPT, file}$"
     end
 
     context "when <file> exists" do

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

@@ -14,20 +14,42 @@ RSpec.describe Jekyll::AssetsPlugin::Renderer do
 
   let(:renderer) do
     context = OpenStruct.new(:registers => { :site => site })
-    described_class.new context, "app"
+    described_class.new context, asset
   end
 
+  let(:asset) { "app" }
+
   describe "#render_javascript" do
     subject { renderer.render_javascript }
 
     context "when debug mode enabled" do
       let(:assets_config) { Hash[:debug, true] }
       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>$/) }
+      end
+
+      context "and path contains attributes" do
+        let(:asset) { "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*<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>$/) }
+      end
+
+      context "and path contains attributes" do
+        let(:asset) { "app data-test=true" }
+        it { is_expected.to include "data-test=true" }
+      end
     end
   end
 
@@ -37,12 +59,92 @@ RSpec.describe Jekyll::AssetsPlugin::Renderer do
     context "when debug mode enabled" do
       let(:assets_config) { Hash[:debug, true] }
       it { is_expected.to match(/^(\s*<link rel="stylesheet" [^>]+>\s*){3}$/) }
+
+      context "and URI given" do
+        let(:asset) { "http://example.com/style.css" }
+        it { is_expected.to match(/^<link rel="stylesheet" href="#{asset}">$/) }
+      end
+
+      context "and path contains attributes" do
+        let(:asset) { "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}$/) }
+
+      context "and URI given" do
+        let(:asset) { "http://example.com/style.css" }
+        it { is_expected.to match(/^<link rel="stylesheet" href="#{asset}">$/) }
+      end
+
+      context "and path contains attributes" do
+        let(:asset) { "app data-test=true" }
+        it { is_expected.to include "data-test=true" }
+      end
     end
   end
 
+  describe "#render_image" do
+    subject { renderer.render_image }
+
+    let(:asset) { "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}">$/) }
+      end
+
+      context "and path contains attributes" do
+        let(:asset) { "noise.png 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(%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}">$/) }
+      end
+
+      context "and path contains attributes" do
+        let(:asset) { "noise.png data-test=true" }
+        it { is_expected.to include "data-test=true" }
+      end
+    end
+  end
+
+  describe "#render_asset" do
+    subject { renderer.render_asset }
+    let(:asset) { "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}/) }
+      end
+    end
+
+    context "when debug mode disabled" do
+      let(:assets_config) { Hash[:debug, false] }
+      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}/) }
+      end
+    end
+  end
 end

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

@@ -11,10 +11,15 @@ RSpec.describe Jekyll::AssetsPlugin::Tag do
     "Liquid error: Couldn't find file '#{file}'"
   end
 
+  def render_tag(template, path, attrs = "")
+    template = Jekyll::AssetsPlugin::Renderer.const_get template
+    format template, :path => path, :attrs => attrs
+  end
+
   context "{% image <file> %}" do
     def tag_re(name)
       file = "/assets/#{name}-[a-f0-9]{32}\.png"
-      Regexp.new "^#{Jekyll::AssetsPlugin::Renderer::IMAGE % file}$"
+      Regexp.new "^#{render_tag :IMAGE, file}$"
     end
 
     context "when <file> exists" do
@@ -31,7 +36,7 @@ RSpec.describe Jekyll::AssetsPlugin::Tag do
   context "{% stylesheet <file> %}" do
     def tag_re(name)
       file = "/assets/#{name}-[a-f0-9]{32}\.css"
-      Regexp.new "^#{Jekyll::AssetsPlugin::Renderer::STYLESHEET % file}$"
+      Regexp.new "^#{render_tag :STYLESHEET, file}$"
     end
 
     context "when <file> exists" do
@@ -53,7 +58,7 @@ RSpec.describe Jekyll::AssetsPlugin::Tag do
   context "{% javascript <file> %}" do
     def tag_re(name)
       file = "/assets/#{name}-[a-f0-9]{32}\.js"
-      Regexp.new "^#{Jekyll::AssetsPlugin::Renderer::JAVASCRIPT % file}$"
+      Regexp.new "^#{render_tag :JAVASCRIPT, file}$"
     end
 
     context "when <file> exists" do

metadata

@@ -1,260 +1,120 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-assets
 version: !ruby/object:Gem::Version
-  version: 0.8.1
-  prerelease: 
+  version: 0.9.0
 platform: ruby
 authors:
 - Aleksey V Zapparov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-04 00:00:00.000000000 Z
+date: 2014-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.10'
 - !ruby/object:Gem::Dependency
   name: sprockets-sass
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sprockets-helpers
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: compass
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bourbon
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: neat
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bootstrap-sass
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: font-awesome-sass
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sass
-  requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.13
-description: ! "  Jekyll plugin, that allows you to write javascript/css assets in\n
-  \ other languages such as CoffeeScript, Sass, Less and ERB, concatenate\n  them,
-  respecting dependencies, minify and many more.\n"
+        version: '1.6'
+description: |2
+    Jekyll plugin, that allows you to write javascript/css assets in
+    other languages such as CoffeeScript, Sass, Less and ERB, concatenate
+    them, respecting dependencies, minify and many more.
 email:
 - ixti@member.fsf.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
+- ".yardopts"
 - Gemfile
 - Gemfile.jekyll-1.0
 - Guardfile
@@ -285,6 +145,7 @@ files:
 - lib/jekyll/assets_plugin/tag.rb
 - lib/jekyll/assets_plugin/version.rb
 - spec/fixtures/.gitignore
+- spec/fixtures/_assets/alert.js
 - spec/fixtures/_assets/app.css.erb
 - spec/fixtures/_assets/app.js
 - spec/fixtures/_assets/fonts/vapor.eot
@@ -322,36 +183,30 @@ files:
 homepage: http://ixti.github.com/jekyll-assets
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1413477886479781936
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1413477886479781936
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
-summary: jekyll-assets-0.8.1
+specification_version: 4
+summary: jekyll-assets-0.9.0
 test_files:
 - spec/fixtures/.gitignore
+- spec/fixtures/_assets/alert.js
 - spec/fixtures/_assets/app.css.erb
 - spec/fixtures/_assets/app.js
 - spec/fixtures/_assets/fonts/vapor.eot