jekyll-assets 0.1.1 → 0.1.2

data/README.md

@@ -56,6 +56,10 @@ You can fine-tune configuration by editing your `_config.yml`:
       #
       dirname: assets
       #
+      # Base URL of assets paths.
+      #
+      baseurl: /assets/
+      #
       # Pathnames where to find assets relative to the root of the site.
       #
       sources:

data/lib/jekyll/assets_plugin/configuration.rb

@@ -45,6 +45,14 @@ module Jekyll
     #
     # Default: 'assets'
     #
+    #
+    # ##### baseurl
+    #
+    # Base URL for assets paths. By default equals dirname surrunded with
+    # slashes. You ight want to change it if your blog has baseurl configuration
+    # and served not from the root of the server, or if you want to keep your
+    # assets on CDN.
+    #
     class Configuration < OpenStruct
       @@defaults = {
         :dirname  => 'assets',
@@ -60,6 +68,9 @@ module Jekyll
         self.bundles  = [ self.bundles ] if self.bundles.is_a? String
         self.compress = OpenStruct.new(self.compress)
         self.dirname  = self.dirname.gsub(/^\/+|\/+$/, '')
+
+        # if baseurl not given - autoguess base on dirname
+        self.baseurl ||= "/#{self.dirname}/".squeeze '/'
       end
 
       # Returns bundles array with pattern strings converted to RegExps

data/lib/jekyll/assets_plugin/tag.rb

@@ -57,7 +57,7 @@ module Jekyll
       JAVASCRIPT = '<script type="text/javascript" src="%s"></script>'
       EXTENSIONS = { 'stylesheet' => '.css', 'javascript' => '.js' }
 
-      @@errors   = Set.new
+      @@errors = Set.new
 
       def initialize tag_name, logical_path, tokens
         super
@@ -108,7 +108,7 @@ module Jekyll
       def render_asset_path context
         with_asset context do |asset, site|
           return asset_not_bundled unless site.has_bundled_asset? asset
-          return "/#{site.assets_config.dirname}/#{asset.digest_path}"
+          return "#{site.assets_config.baseurl.chomp '/'}/#{asset.digest_path}"
         end
       end
 

data/lib/jekyll/assets_plugin/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module AssetsPlugin
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

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

@@ -6,6 +6,7 @@ module Jekyll::AssetsPlugin
     let(:defaults) do
       {
         :dirname  => 'assets',
+        :baseurl  => '/assets/',
         :sources  => %w{_assets/javascripts _assets/stylesheets _assets/images},
         :bundles  => %w{app.css app.js **.jpg **.png **.gif}
       }
@@ -19,6 +20,11 @@ module Jekyll::AssetsPlugin
         it { should == defaults[:dirname] }
       end
 
+      context 'assets baseurl' do
+        subject { config.baseurl }
+        it { should == defaults[:baseurl] }
+      end
+
       context 'sources list' do
         subject { config.sources }
         it { should =~ defaults[:sources] }
@@ -53,6 +59,25 @@ module Jekyll::AssetsPlugin
       config.compress.css.should == 'sass'
     end
 
+    context '#baseurl' do
+      it 'should respect explicit overrides' do
+        config = Configuration.new({
+          :dirname => 'foo',
+          :baseurl => '/bar/'
+        })
+
+        config.baseurl.should == '/bar/'
+      end
+
+      it 'should be auto-guessed from dirname' do
+        config = Configuration.new({
+          :dirname => 'foo'
+        })
+
+        config.baseurl.should == '/foo/'
+      end
+    end
+
     context '#js_compressor' do
       context 'when js compressor is given as "uglify"' do
         let(:config){ Configuration.new(:compress => {:js => 'uglify'}) }

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

@@ -76,6 +76,12 @@ module Jekyll::AssetsPlugin
         subject { render('{% asset_path vapor.js %}') }
         it { should be_empty }
       end
+
+      context 'with baseurl given as /foobar/' do
+        before { context[:registers][:site].assets_config.baseurl = '/foobar/' }
+        subject { render('{% asset_path app.css %}') }
+        it { should match(%r{^/foobar/app-[a-f0-9]{32}\.css$}) }
+      end
     end
 
     context '{% asset <file.ext> %}' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-assets
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-22 00:00:00.000000000 Z
+date: 2012-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -164,24 +164,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 346987987
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 346987987
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: jekyll-assets-0.1.1
+summary: jekyll-assets-0.1.2
 test_files:
 - spec/fixtures/.gitignore
 - spec/fixtures/_assets/app.css.erb
@@ -201,3 +195,4 @@ test_files:
 - spec/lib/jekyll/assets_plugin/tag_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixtures_path.rb
+has_rdoc: