jekyll-assets 0.12.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b13b9ae4b4a5eae8cb3afdf1e3d46e3b7b0ca23
-  data.tar.gz: 811a606087a27842d0b2b1a65d1720a734830712
+  metadata.gz: 1486650f4f5b1efb09c5b1702d8f052e6b736a87
+  data.tar.gz: aac54191d17adae04afea7a41662310f160a50f8
 SHA512:
-  metadata.gz: 2aba32817397a9efc3daa1b63d213a3172a434a520c8ee0f69019ed3698c9308c438a1979fe8a4cd6da823d1deecbb556bd294bd04f6b9292ac01b4f60e1322c
-  data.tar.gz: e63294b112e63448dc5383c4f2346db0923649e93b0ffe3813eec2aa25e5d5f208326b00fa4e2b3ddc1f6f16f0e5249ab7ccaa6554c5ca7eead2c5b4846f1859
+  metadata.gz: aac486f0eb18fd587fc992e542b26d27fc0438998dbe397be8c23936d948d684f2825a3f495327a16fd6dd0d2b090d1ee96e8dd71c57af34428eeac3c84d45ff
+  data.tar.gz: b92ff5a3abc206ca4612a8154c9ecbf3268c5c33ed6919abe9c3f898a1ef1de0bea20a83aabf2e45dcab64dd7ff1013574569f3480a1843db2f1e3ed4737deaf

data/HISTORY.md

@@ -1,6 +1,11 @@
 ### master (unreleased)
 
 
+### 0.13.0 (2015-02-01)
+
+* Respect Jekyll config's `baseurl` when auto-guessing baseurl. See #125.
+
+
 ### 0.12.1 (2014-12-08)
 
 * Fix regression with image attributes when `autosize` is used. See #117.
@@ -161,6 +166,11 @@
 * Update jekyll dependency `~> 1.0`
 
 
+### 0.4.3 (2014-12-21)
+
+* Fix configuration reader. See #119.
+
+
 ### 0.4.2 (2013-05-08)
 
 * Require jekyll < 1.0.0. This is a the last release with support of 0.x branch

data/lib/jekyll/assets_plugin/configuration.rb

@@ -19,7 +19,8 @@ module Jekyll
         :version         => 1
       }.freeze
 
-      def initialize(config = {})
+      def initialize(site, config = {})
+        @site = site
         @data = OpenStruct.new DEFAULTS.merge(config)
 
         @data.sources  = [@data.sources] if @data.sources.is_a? String
@@ -30,12 +31,16 @@ module Jekyll
         @data.js_compressor   ||= compress.js
         @data.css_compressor  ||= compress.css
         @data.cache           ||= @data.cache_assets
-
-        # if baseurl not given - autoguess base on dirname
-        @data.baseurl ||= "/#{@data.dirname}/".squeeze "/"
       end
 
       def baseurl
+        unless @data.baseurl
+          baseurl = "/" << [@site.config["baseurl"], @data.dirname].join("/")
+
+          # if baseurl not given - autoguess base on dirname
+          @data.baseurl = baseurl.squeeze("/")
+        end
+
         @data.baseurl.chomp "/"
       end
 

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

@@ -21,7 +21,7 @@ module Jekyll
         end
 
         def assets_config
-          @assets_config ||= Configuration.new(config["assets"] || {})
+          @assets_config ||= Configuration.new(self, config["assets"] || {})
         end
 
         def assets

data/lib/jekyll/assets_plugin/version.rb

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

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

@@ -1,9 +1,10 @@
 require "spec_helper"
 
 RSpec.describe Jekyll::AssetsPlugin::Configuration do
-  context "with defaults" do
-    let(:config) { described_class.new }
+  let(:options)     { {} }
+  subject(:config)  { described_class.new(@site, options) }
 
+  context "with defaults" do
     context "output assets dirname" do
       subject { config.dirname }
       it { is_expected.to eq described_class::DEFAULTS[:dirname] }
@@ -62,7 +63,7 @@ RSpec.describe Jekyll::AssetsPlugin::Configuration do
   end
 
   it "overrides specified options and leave defaults for missing" do
-    config = described_class.new({
+    config = described_class.new(@site, {
       :sources        => %w(abc),
       :css_compressor => "sass"
     })
@@ -75,95 +76,88 @@ RSpec.describe Jekyll::AssetsPlugin::Configuration do
 
   context "#cache" do
     context "when specified as String" do
+      let(:options) { { :cache => "/tmp/jekyll-assets" } }
+
       it "overrides default cache path" do
-        config = described_class.new :cache => "/tmp/jekyll-assets"
         expect(config.cache_path).to eq("/tmp/jekyll-assets")
       end
     end
   end
 
   context "#baseurl" do
-    it "respects explicit overrides" do
-      expect(described_class.new({
-        :dirname => "foo",
-        :baseurl => "/bar/"
-      }).baseurl).to eq("/bar")
+    subject { config.baseurl }
+
+    context "when given" do
+      let(:options) { { :dirname => "foo", :baseurl => "/bar/" } }
+      it { is_expected.to eq "/bar" }
     end
 
-    it "is auto-guessed from dirname" do
-      expect(described_class.new({
-        :dirname => "foo"
-      }).baseurl).to eq("/foo")
+    context "when not explicitly given" do
+      let(:options) { { :dirname => "foo" } }
+      it { is_expected.to eq "/foo" }
+
+      context "and site has baseurl config" do
+        before { @site.config["baseurl"] = "/blog" }
+        it { is_expected.to eq "/blog/foo" }
+      end
     end
   end
 
   context "#js_compressor" do
+    subject { config.js_compressor }
+
     context "when js compressor is given as `uglify`" do
-      let(:config) { described_class.new(:js_compressor => "uglify") }
-      subject { config.js_compressor }
+      let(:options) { { :js_compressor => "uglify" } }
       it { is_expected.to be :uglify }
     end
 
     context "otherwise" do
-      let(:config) { described_class.new }
-      subject { config.js_compressor }
       it { is_expected.to be_falsey }
     end
   end
 
   context "#css_compressor" do
+    subject { config.css_compressor }
+
     context "when css compressor is given as `sass`" do
-      let(:config) { described_class.new(:css_compressor => "sass") }
-      subject { config.css_compressor }
+      let(:options) { { :css_compressor => "sass" } }
       it { is_expected.to be :sass }
     end
 
     context "otherwise" do
-      let(:config) { described_class.new }
-      subject { config.css_compressor }
       it { is_expected.to be_falsey }
     end
   end
 
   context "#gzip" do
+    subject { config.gzip }
+
     context "when gzip is disabled" do
-      let(:config) { described_class.new(:gzip => false) }
-      subject { config.gzip }
+      let(:options) { { :gzip => false } }
       it { is_expected.to eq [] }
     end
   end
 
   context "#version" do
-    subject { described_class.new(:version => version).version }
+    let(:options) { { :version => "abc" } }
+    subject       { config.version }
 
-    context "when given as 123" do
-      let(:version) { 123 }
-      it { is_expected.to eq 123 }
-      it { is_expected.to be_a Integer }
-    end
-
-    context "when given as 'abc'" do
-      let(:version) { "abc" }
-      it { is_expected.to eq "abc" }
-      it { is_expected.to be_a String }
-    end
+    it { is_expected.to be options.fetch(:version) }
   end
 
   context "Deprecated options" do
-    subject(:config) { described_class.new options }
-
     context "compress" do
       let :options do
         { :compress => { :js => "uglify", :css => "sass" } }
       end
 
       describe "#js_compressor" do
-        subject { super().js_compressor }
+        subject { config.js_compressor }
         it { is_expected.to be :uglify }
       end
 
       describe "#css_compressor" do
-        subject { super().css_compressor }
+        subject { config.css_compressor }
         it { is_expected.to be :sass }
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-assets
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Aleksey V Zapparov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2015-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -215,7 +215,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: jekyll-assets-0.12.1
+summary: jekyll-assets-0.13.0
 test_files:
 - spec/fixtures/.gitignore
 - spec/fixtures/_assets/alert.js