pakyow-assets 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2473155b9ea62813fe1db2b6771e89c2d639df0
-  data.tar.gz: ffa5e7ab9d7b770fc96e48fc1e33e6120cf01179
+  metadata.gz: c322853e853a355500e4b045b22acbcbec3c8925
+  data.tar.gz: 29ce5c954d0d4c71025efdd12dfe70548155a9be
 SHA512:
-  metadata.gz: 8d369efcc20b280a5219ea42c2c5ed71a8e6d61d4ab2864771944d5b1e4bc4f6c2cfccc015b68e2e8b09384b274e85a2e336d59880fb47c412cf85583ae82592
-  data.tar.gz: 167a5a1a9f68772ade30c41296fe7f19bad85dfb5784be23ecb0f4744531e648b5896483d06e4d0585ae4d0d78305f588fa71433e79f535ddb8188adb7396300
+  metadata.gz: 3e8c251d6f988046ff36e19bfef1200d4d5eefdb3d5009eb1eca1e02652f519e7567d0284400212b1178c2b826fd9eae8febacdefed5a2afa30fc621746c5dba
+  data.tar.gz: 760555a99ee7ee4ba3078831066c40aec304b3ac455eb4228b56107cbd544a8d507e12a0e706df66f6186077e954caf51929d1b2fd67e127b6231a536f5bd7ca

data/CHANGELOG.md

@@ -1,6 +1,17 @@
+# 0.1.2 / 2015-11-30
+
+  * Fix bug causing html processor being registered too late, thus not mixing in
+    the fingerprinted asset names into the html
+  * Fingerprint contents after all assets are fingerprinted, not before
+  * Add option to not fingerprint assets
+  * Add Vary and Last-Modified cache headers
+  * Handle unknown asset types by copying them over during compilation
+
 # 0.1.1 / 2015-11-29
 
-  * TODO
+  * Take dependent assets into account when building the hash
+  * Use sass gem rather than sassc; choosing reliability over speed
+  * Make sure assets middleware executes first
 
 # 0.1.0 / 2015-11-26
 

data/lib/assets.rb

@@ -56,13 +56,24 @@ module Pakyow
     end
 
     def self.output_ext(ext)
-      ".#{preprocessors[normalize_ext(ext)][:output_ext]}"
+      ".#{preprocessor_for_ext(ext)[:output_ext]}"
     end
 
     def self.preprocessor?(ext)
       preprocessors.values.map { |info| info[:output_ext] }.flatten.include?(normalize_ext(ext))
     end
 
+    def self.preprocessor_for_ext(ext)
+      ext = normalize_ext(ext)
+
+      preprocessors[ext] || {
+        block: nil,
+        output_ext: ext,
+        fingerprint_contents: false,
+        finterprint: false
+      }
+    end
+
     def self.compile_asset_at_path(asset, path)
       absolute_path = File.join(path, asset)
 
@@ -70,28 +81,42 @@ module Pakyow
       asset_ext = output_ext(File.extname(asset))
       asset_file = File.basename(asset, '.*')
 
+      if fingerprinted?(asset_ext)
+        compiled_asset = "#{asset_file + '-' + asset_hash(absolute_path) + asset_ext}"
+      else
+        compiled_asset = "#{asset_file + asset_ext}"
+      end
+
       compiled_path = File.join(
         Pakyow::Config.app.root,
         Pakyow::Config.assets.compiled_asset_path,
         asset_dir,
-        "#{asset_file + '-' + asset_hash(absolute_path) + asset_ext}"
+        compiled_asset
       )
 
       unless File.exists?(compiled_path)
         FileUtils.mkdir_p(File.dirname(compiled_path))
-        FileUtils.rm(Dir.glob(File.join(Pakyow::Config.app.root, Pakyow::Config.assets.compiled_asset_path, asset_dir, "#{asset_file}-*#{asset_ext}")))
+
+        if fingerprinted?(asset_ext)
+          glob_path = File.join(Pakyow::Config.app.root, Pakyow::Config.assets.compiled_asset_path, asset_dir, "#{asset_file}-*#{asset_ext}")
+        else
+          glob_path = File.join(Pakyow::Config.app.root, Pakyow::Config.assets.compiled_asset_path, asset_dir, asset_file + asset_ext)
+        end
+
+        FileUtils.rm(Dir.glob(glob_path))
         File.open(compiled_path, 'wb+') { |fp| fp.write(preprocess(absolute_path)) }
       end
 
       compiled_path
     end
 
-    def self.preprocessor(*exts, output: nil, fingerprint_contents: false, &block)
+    def self.preprocessor(*exts, output: nil, fingerprint: false, fingerprint_contents: false, &block)
       exts.each do |ext|
         preprocessors[ext] = {
           block: block,
           output_ext: output || ext,
-          fingerprint_contents: fingerprint_contents
+          fingerprint_contents: fingerprint_contents,
+          fingerprint: fingerprint
         }
       end
     end
@@ -103,11 +128,10 @@ module Pakyow
     end
 
     def self.preprocess(path)
-      preprocessor = preprocessors[normalize_ext(File.extname(path))]
+      preprocessor = preprocessor_for_ext(File.extname(path))
       block = preprocessor[:block]
 
-      contents = block.nil? ? File.open(path, 'rb').read : block.call(path)
-      preprocessor[:fingerprint_contents] ? mixin_fingerprints(contents) : contents
+      block.nil? ? File.read(path) : block.call(path)
     end
 
     def self.precompile
@@ -120,21 +144,44 @@ module Pakyow
           compile_asset_at_path(asset, info[:path])
           absolute_path = File.join(info[:path], asset)
 
-          fingerprint = Digest::MD5.file(absolute_path).hexdigest
+          fingerprint = asset_hash(absolute_path)
 
-          fingerprinted_asset = File.join(
-            File.dirname(asset),
-            "#{File.basename(asset, '.*')}-#{fingerprint + output_ext(File.extname(asset))}",
-          )
+          if fingerprinted?(File.extname(asset))
+            fingerprinted_asset = File.join(
+              File.dirname(asset),
+              "#{File.basename(asset, '.*')}-#{fingerprint + output_ext(File.extname(asset))}",
+            )
+          else
+            fingerprinted_asset = File.join(
+              File.dirname(asset),
+              File.basename(asset, '.*') + output_ext(File.extname(asset)),
+            )
+          end
 
           replaceable_asset = File.join(
             File.dirname(asset),
             File.basename(asset, '.*') + output_ext(File.extname(asset)),
           )
 
-          manifest[replaceable_asset] = fingerprinted_asset
+          manifest[replaceable_asset] = {
+            original_ext: File.extname(asset),
+            fingerprinted_asset: fingerprinted_asset
+          }
         end
       end
+
+      base = File.join(Pakyow::Config.app.root, Pakyow::Config.assets.compiled_asset_path)
+
+      manifest.each do |replaceable_asset, info|
+        next unless fingerprint_contents?(info[:original_ext])
+
+        path = File.join(base, info[:fingerprinted_asset])
+
+        content = File.read(path)
+        File.open(path, 'wb') { |file|
+          file.write(mixin_fingerprints(content))
+        }
+      end
     end
 
     def self.manifest
@@ -144,8 +191,8 @@ module Pakyow
     def self.mixin_fingerprints(content)
       return content if content.nil? || content.empty?
 
-      manifest.each do |asset, fingerprinted_asset|
-        content = content.gsub(asset, fingerprinted_asset)
+      manifest.each do |asset, info|
+        content = content.gsub(asset, info[:fingerprinted_asset])
       end
 
       content
@@ -162,5 +209,13 @@ module Pakyow
       return [] if block.nil?
       block.call(absolute_path)
     end
+
+    def self.fingerprinted?(ext)
+      preprocessor_for_ext(ext)[:fingerprint]
+    end
+
+    def self.fingerprint_contents?(ext)
+      preprocessor_for_ext(ext)[:fingerprint_contents]
+    end
   end
 end

data/lib/middleware.rb

@@ -1,3 +1,5 @@
+require 'time'
+
 module Pakyow
   module Assets
     class Middleware
@@ -21,10 +23,12 @@ module Pakyow
               'Content-Type' => Rack::Mime.mime_type(File.extname(path))
             }
 
-            if Pakyow::Config.assets.cache
+            if Pakyow::Config.assets.cache && Pakyow::Assets.fingerprinted?(File.extname(path))
               mtime = File.mtime(path)
               headers['Age'] = (Time.now - mtime).to_i
               headers['Cache-Control'] = 'public, max-age=31536000'
+              headers['Vary'] = 'Accept-Encoding'
+              headers['Last-Modified'] = mtime.httpdate
             end
 
             [200, headers, File.open(path)]

data/lib/pakyow-assets.rb

@@ -8,7 +8,7 @@ require_relative 'preprocessors/image-preprocessor'
 require_relative 'preprocessors/javascript-preprocessor'
 require_relative 'preprocessors/sass-preprocessor'
 
-Pakyow::App.after :init do
+Pakyow::App.after :configure do
   config.assets.stores.each_pair do |name, path|
     Pakyow::Assets.register_path_with_name(path, name)
   end

data/lib/preprocessors/css-preprocessor.rb

@@ -1,7 +1,7 @@
 require 'yui/compressor'
 
-Pakyow::Assets.preprocessor :css, fingerprint_contents: true do |path|
-  content = File.open(path).read
+Pakyow::Assets.preprocessor :css, fingerprint: true, fingerprint_contents: true do |path|
+  content = File.read(path)
 
   if Pakyow::Config.assets.minify
     begin

data/lib/preprocessors/image-preprocessor.rb

@@ -1 +1 @@
-Pakyow::Assets.preprocessor :png, :jpg, :gif, :ico
+Pakyow::Assets.preprocessor :png, :jpg, :gif, :ico, fingerprint: true

data/lib/preprocessors/javascript-preprocessor.rb

@@ -1,7 +1,7 @@
 require 'yui/compressor'
 
-Pakyow::Assets.preprocessor :js, fingerprint_contents: true do |path|
-  content = File.open(path).read
+Pakyow::Assets.preprocessor :js, fingerprint: true, fingerprint_contents: true do |path|
+  content = File.read(path)
 
   if Pakyow::Config.assets.minify
     begin

data/lib/preprocessors/sass-preprocessor.rb

@@ -1,7 +1,7 @@
 require 'sass'
 require 'yui/compressor'
 
-Pakyow::Assets.preprocessor :scss, :sass, output: :css, fingerprint_contents: true do |path|
+Pakyow::Assets.preprocessor :scss, :sass, output: :css, fingerprint: true, fingerprint_contents: true do |path|
   content = Sass::Engine.for_file(path, {}).render
 
   if Pakyow::Config.assets.minify

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Pakyow
   module Assets
-    VERSION = '0.1.1'.freeze
+    VERSION = '0.1.2'.freeze
   end
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: pakyow-assets
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Bryan Powell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-29 00:00:00.000000000 Z
+date: 2015-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pakyow-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pakyow-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pakyow-presenter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.4'
 - !ruby/object:Gem::Dependency
   name: yui-compressor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.12'
 description: Asset Handling for Pakyow
@@ -109,19 +109,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Pakyow Assets
 test_files: []
-has_rdoc: