asset 0.1.14 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0748263acb1dc8fa7dafafbaf46759c4e50a28c8
-  data.tar.gz: f993ae2401bcf3a5dda14a78b9e67490d1148ccb
+  metadata.gz: 06536e51676a5659bbf7bdc27bd0813377ad92bd
+  data.tar.gz: d81786f8d07370fc9da801f684d65002ef0bfb9a
 SHA512:
-  metadata.gz: dd4706519a5da6af9626ccf4baa1464dd754b84f57bdc01835f0f7dbef39f4fe2e0df82aa462be2b620fc385a9821be9ab189bfa399b7fa86f9e34205a37194b
-  data.tar.gz: acc00c0c65be0bbb717b927725c1c4175c8809e6b0a7e70edf17fae68540c78f1bdb65575ed44d4b278501d66e6fb7c1ca4d91782fd1cb7c6908affc0efacf72
+  metadata.gz: 89dcb3239bc7c159af662f557648792ea372ab399e24b449547c53343fae4bbbe3f139256d4f3adb1a678da577ade6f6c1b4cbe11d0bfbfbd41c9050db2015c2
+  data.tar.gz: 51592460d1f4cdc4f3a13c26efbb957894d7dcc51cca1270d9ed97c53163da38ee7c0c4fec04abc208a2eeb8a74f179868e16f00f404e58d5f64c51fb4844ee1

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+**Version 0.2.0** - *2017-02-01*
+
+- Using atomic_write, adding activesupport as dependency
+- Fixed mime types
+- Adjusted caching
+
 **Version 0.1.14** - *2017-01-27*
 
 - Setting bundle last modified to max bundle modified time

data/README.md

@@ -83,7 +83,12 @@ use Asset::Router
 
 # Set up middleware stack
 app = Rack::Builder.new do
-  use Asset::Router # Include the Asset middleware router
+
+  # Use Rack::Cache to enable 304 for last modified
+  use Rack::Cache
+
+  # Include the Asset middleware router
+  use Asset::Router
 
   # Use this setup to have files served from /assets/images and /assets/fonts
   use Rack::Static, :urls => ['/images', '/fonts'], :root => APP_ASSETS,
@@ -94,6 +99,7 @@ app = Rack::Builder.new do
   run App # Your app goes here
 end
 
+# Run app
 run app
 
 # Files will be available here on your server (HTTP):

data/asset.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'asset'
-  s.version     = '0.1.14'
-  s.date        = '2017-01-27'
+  s.version     = '0.2.0'
+  s.date        = '2017-02-01'
   s.summary     = "Compress and serve your CSS and JS assets automatically"
   s.description = "The only thing you need for your assets."
   s.authors     = ["Fugroup Limited"]
@@ -12,6 +12,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'sass', '>= 0'
   s.add_runtime_dependency 'therubyracer', '>= 0'
   s.add_runtime_dependency 'uglifier', '>= 0'
+  s.add_runtime_dependency 'activesupport', '>= 0'
 
   s.add_development_dependency 'sinatra', '>= 0'
   s.add_development_dependency 'puma', '>= 0'

data/lib/asset.rb

@@ -1,5 +1,7 @@
 require 'rack'
 require 'yaml'
+require 'active_support'
+require 'active_support/core_ext'
 
 # Asset packer, middleware and helpers
 # @homepage: https://github.com/fugroup/asset
@@ -17,9 +19,8 @@ module Asset
   # Where your assets live
   @path = File.join(Dir.pwd, 'app', 'assets')
 
-  # Where to write the cache, default to /tmp
-  # Set to APP_ROOT: @cache = File.join(Dir.pwd, 'tmp')
-  @cache = '/tmp'
+  # Where to write the cache, default to ./tmp
+  @cache = File.join(Dir.pwd, 'tmp')
 
   # Automatically bounce (404) for browser /favicon.ico requests
   @favicon = true

data/lib/assets/item.rb

@@ -43,7 +43,7 @@ module Asset
 
     # Store in cache
     def write_cache
-      compressed.tap{|c| File.open(cache_path, 'w'){|f| f.write(c)}}
+      compressed.tap{|c| File.atomic_write(cache_path){|f| f.write(c)}}
     end
 
     # Cache path
@@ -71,15 +71,16 @@ module Asset
       @joined ||= files.map{|f| File.read(File.join(::Asset.path, @type, f))}.join
     end
 
-    # Production mode?
-    def p?
-      %w[staging production].include?(::Asset.mode)
-    end
-
     # Print data
     def print
       [:path, :type, :key, :name, :modified, :files, :content].map{|r| "#{r.upcase}: #{send(r).inspect}"}.join("\n")
     end
 
+    private
+
+    # Production mode?
+    def p?
+      ::Asset::Util.p?
+    end
   end
 end

data/lib/assets/router.rb

@@ -4,7 +4,7 @@ module Asset
   class Router
 
     # Mime types for responses
-    MIME = {'js' => 'application/javascript; charset=UTF-8', 'css' => 'text/css; charset=UTF-8', 'txt' => 'text/plain; charset=UTF-8'}
+    MIME = {'js' => 'application/javascript;charset=utf-8', 'css' => 'text/css;charset=utf-8', 'txt' => 'text/plain;charset=utf-8'}
 
     # Init
     def initialize(app)
@@ -54,9 +54,9 @@ module Asset
       content = item.content(!!@key)
       [ 200, {'Content-Type' => MIME[item.type],
         'Content-Length' => content.size,
-        'Cache-Control' => 'max-age=86400, public',
-        'Expires' => (Time.now + 86400*30).utc.rfc2822,
-        'Last-Modified' => item.modified.utc.rfc2822
+        'Cache-Control' => 'public, max-age=86400',
+        'Expires' => (Time.now.utc + (86400 * 30)).httpdate,
+        'Last-Modified' => item.modified.httpdate,
       }, [content]]
     end
 

data/lib/assets/util.rb

@@ -63,5 +63,9 @@ module Asset
       Hash[*img.flatten]
     end
 
+    # Production mode?
+    def self.p?
+      %w[staging production].include?(::Asset.mode)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asset
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.2.0
 platform: ruby
 authors:
 - Fugroup Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-27 00:00:00.000000000 Z
+date: 2017-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  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: sinatra
   requirement: !ruby/object:Gem::Requirement