jekyll-assets 0.3.6 → 0.3.7

data/HISTORY.md

@@ -1,3 +1,8 @@
+### 0.3.7 (2013-04-29)
+
+* Refactor AssetFile to avoid stale assets caching. See #23.
+
+
 ### 0.3.6 (2013-04-28)
 
 * Ruby 2.0.0 support. See #16.

data/lib/jekyll/assets_plugin/asset_file.rb

@@ -1,50 +1,49 @@
-# stdlib
-require "forwardable"
-
-
 module Jekyll
   module AssetsPlugin
     class AssetFile
 
-      extend Forwardable
-
-
       @@mtimes = Hash.new
 
 
-      attr_reader :asset
-
-
-      def_delegator :@site, :assets_config, :config
-      def_delegator :@asset, :content_type
+      attr_reader :logical_path
 
 
       def initialize site, asset
-        @site, @asset = site, asset
+        @site, @logical_path = site, asset.logical_path
       end
 
 
       def destination dest
-        File.join dest, config.dirname, filename
+        File.join dest, @site.assets_config.dirname, filename
       end
 
 
       def filename
-        case config.cachebust
+        case cachebust = @site.assets_config.cachebust
         when :none, :soft then asset.logical_path
         when :hard        then asset.digest_path
-        else raise "Unknown cachebust strategy: #{config.cachebust.inspect}"
+        else raise "Unknown cachebust strategy: #{cachebust.inspect}"
         end
       end
 
 
+      def asset
+        @site.assets[logical_path]
+      end
+
+
+      def content_type
+        asset.content_type
+      end
+
+
       def path
-        @asset.pathname.to_s
+        asset.pathname.to_s
       end
 
 
       def mtime
-        @asset.mtime.to_i
+        asset.mtime.to_i
       end
 
 
@@ -59,29 +58,26 @@ module Jekyll
         return false if File.exist?(dest_path) and !modified?
         @@mtimes[path] = mtime
 
-        @asset.write_to dest_path
-        @asset.write_to "#{dest_path}.gz" if gzip?
+        asset.write_to dest_path
+        asset.write_to "#{dest_path}.gz" if gzip?
 
         true
       end
 
 
       def == other
-        case other
-        when AssetFile        then @asset == other.asset
-        when Sprockets::Asset then @asset == other
-        else false
-        end
+        return false unless other.respond_to? :logical_path
+        other.logical_path == logical_path
       end
 
 
       def gzip?
-        config.gzip && config.gzip.include?(content_type)
+        @site.assets_config.gzip.include? content_type
       end
 
 
       def to_s
-        "#<Jekyll::AssetsPlugin::AssetFile:#{asset.logical_path}>"
+        "#<Jekyll::AssetsPlugin::AssetFile:#{logical_path}>"
       end
 
     end

data/lib/jekyll/assets_plugin/configuration.rb

@@ -47,7 +47,7 @@ module Jekyll
 
       def gzip
         return @data.gzip if @data.gzip.is_a? Array
-        @data.gzip ? DEFAULTS[:gzip] : false
+        @data.gzip ? DEFAULTS[:gzip] : []
       end
 
 

data/lib/jekyll/assets_plugin/environment.rb

@@ -3,7 +3,6 @@ require "sprockets"
 
 
 # internal
-require "jekyll/assets_plugin/asset_file"
 require "jekyll/assets_plugin/liquid_processor"
 
 

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

@@ -5,6 +5,7 @@ require "jekyll"
 # internal
 require "jekyll/assets_plugin/configuration"
 require "jekyll/assets_plugin/environment"
+require "jekyll/assets_plugin/asset_file"
 
 
 module Jekyll

data/lib/jekyll/assets_plugin/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module AssetsPlugin
-    VERSION = "0.3.6"
+    VERSION = "0.3.7"
   end
 end

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

@@ -102,7 +102,7 @@ module Jekyll::AssetsPlugin
       context "when gzip is disabled" do
         let(:config){ Configuration.new(:gzip => false) }
         subject { config.gzip }
-        it { should be false }
+        it { should == [] }
       end
     end
   end

metadata

@@ -1,32 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-assets
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
+  prerelease: 
 platform: ruby
 authors:
 - Aleksey V Zapparov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-28 00:00:00.000000000 Z
+date: 2013-04-29 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: '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
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,105 +46,118 @@ dependencies:
 - !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: guard-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: rb-inotify
   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'
-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.
+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"
 email:
 - ixti@member.fsf.org
 executables: []
@@ -201,27 +219,34 @@ 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: -2575730464667574048
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2575730464667574048
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
-summary: jekyll-assets-0.3.6
+specification_version: 3
+summary: jekyll-assets-0.3.7
 test_files:
 - spec/fixtures/.gitignore
 - spec/fixtures/_assets/app.css.erb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 832045a15d6f254fb11848378bf00c5b94894515
-  data.tar.gz: 2985a2194b2393f21199d8faf70a22d33e6f133a
-SHA512:
-  metadata.gz: 217c2da729697c4e7cc95aa0e7c424ae234423ce8b94ac0ee27e8d1a47069316bd1342f189d0c2a54fa52ac8ac3eab1bbdac59d4c2610e9349f9a7c7af0cebce
-  data.tar.gz: 118175635e6306e85929ff95549a927b695600416417f549310d6333e3ab1d0adb4778623165aa1bb6846a3350bea4902f205d5b147678e1ee42cff899811d06