asset 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8bb24feacfd52ac3d781e350fb69baf17d96efa
-  data.tar.gz: fe54f8ba994df28627af3deb0fa2ce2a4df8cc41
+  metadata.gz: 6867cd26673824ea72eeb8dd0e1cd71fb23fb380
+  data.tar.gz: 9f38ee1241bf966194b86bc7f6949bfe8878584d
 SHA512:
-  metadata.gz: 6cf5ec7f3b08f25ff879f960e894c6d49654a1e9264b5edaa938a732eb5f00f5acf14c7f140e7e800b30830d2befc30b81bec9420741b150be7f4a987aea64ef
-  data.tar.gz: f52fd0cffd5a48b9305010751025ed34a51958be0fc69f9a2f31e995a6c1941795adbf24b88b549022c60962692de0842daeec4c1af84835b8e45534888b64a5
+  metadata.gz: 7918c2dae433d1f4ac2fc6dc938d65d5afff0546c1346af8f49bc0ce091a5696e200bf04e4094bb05864550ae3f83699e162869e6f17b9a334a39799cd1769a0
+  data.tar.gz: 3941bea2e41d71310309f9ca9379328ba6ca72abd528752872f77b793f97efb5d235c58567aef44e6d6320056d7b019b03329ccc643929448d3d707b723b80e3

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+**Version 0.1.10** - *2017-01-22*
+
+- Included rubyracer as dependency, fixed Uglifier not working
+- Refactored router, now 404 only if item not found
+
 **Version 0.1.9** - *2017-01-19*
 
 - Added auto-reload with listen gem for development mode

data/asset.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'asset'
-  s.version     = '0.1.9'
-  s.date        = '2017-01-19'
+  s.version     = '0.1.10'
+  s.date        = '2017-01-22'
   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"]
@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'rack', '>= 0'
   s.add_runtime_dependency 'sass', '>= 0'
+  s.add_runtime_dependency 'therubyracer', '>= 0'
   s.add_runtime_dependency 'uglifier', '>= 0'
 
   s.add_development_dependency 'sinatra', '>= 0'

data/lib/asset.rb

@@ -6,20 +6,20 @@ require 'yaml'
 # @author:   Vidar <vidar@fugroup.net>, Fugroup Ltd.
 # @license:  MIT, contributions are welcome.
 module Asset
-
   autoload :Uglifier, 'uglifier'
   autoload :Sass, 'sass'
 
   class << self; attr_accessor :mode, :path, :cache, :favicon, :robots, :manifest, :bundle, :images, :listener, :debug; end
 
   # Default is development
-  @mode = ENV['RACK_ENV'] || 'development'
+  @mode = ENV['RACK_ENV'] || 'production'
 
   # Where your assets live
   @path = File.join(Dir.pwd, 'app', 'assets')
 
-  # Where to write the cache, default to APP_ROOT/tmp
-  @cache = File.join(Dir.pwd, 'tmp')
+  # Where to write the cache, default to /tmp
+  # Set to APP_ROOT: @cache = File.join(Dir.pwd, 'tmp')
+  @cache = '/tmp'
 
   # Automatically bounce (404) for browser /favicon.ico requests
   @favicon = true
@@ -45,13 +45,9 @@ require_relative 'assets/router'
 
 # Run a listener to automatically reload the assets on change
 if ::Asset.listener and ::Asset.mode == 'development'
-  autoload :Listen, 'listen'
-
-  if defined?(Listen)
-    # Reload assets on change
-    listener = Listen.to(::Asset.path) do |modified, added, removed|
-      ::Asset::Util.setup!
-    end
-    listener.start
+  begin
+    require 'listen'
+    Listen.to(::Asset.path){|m, a, r| ::Asset::Util.setup!}.start if defined?(Listen)
+  rescue LoadError
   end
 end

data/lib/assets/item.rb

@@ -26,19 +26,24 @@ module Asset
       File.join('/assets', @type, (p? ? @kpath : @path))
     end
 
-    # Get the content. Pass key = false to fetch from disk instead of the cache.
-    def content(key = nil)
-      key ? (@cached ||= cached) : (@joined ||= joined)
+    # Get the content, will be compressed in production typically.
+    def content(compress = p?)
+      compress ? cached : joined
     end
 
     # The cached content
     def cached
-      return File.read(cache_path) rescue compressed.tap{|r| write_cache(r)}
+      @cached ||= (read_cache || write_cache)
+    end
+
+    # Read cache
+    def read_cache
+      File.read(cache_path) rescue nil
     end
 
     # Store in cache
-    def write_cache(r)
-      File.open(cache_path, 'w'){|f| f.write(r)}
+    def write_cache
+      compressed.tap{|c| File.open(cache_path, 'w'){|f| f.write(c)}}
     end
 
     # Cache path
@@ -57,7 +62,7 @@ module Asset
       when 'css'
         Sass::Engine.new(joined, :syntax => :scss, :cache => false, :style => :compressed).render rescue joined
       when 'js'
-        Uglifier.compile(joined, {}) rescue joined
+        Uglifier.compile(joined, :mangle => false, :comments => :none) rescue joined
       end
     end
 

data/lib/assets/router.rb

@@ -1,7 +1,9 @@
 module Asset
+  # The Router class is a small Rack middleware that matches the asset URLs
+  # and serves the content, compressed if you are in production mode.
   class Router
 
-    # Mime types
+    # Mime types for responses
     MIME = {'js' => 'application/javascript; charset=UTF-8', 'css' => 'text/css; charset=UTF-8', 'txt' => 'text/plain; charset=UTF-8'}
 
     # Init
@@ -19,17 +21,18 @@ module Asset
 
       # Match /assets?/:type/path
       when /^(\/assets)?\/(js|css)\/(.+)/
+        # Extract type and path
         type, path = $2, $3
-        path =~ /-([a-f0-9]{1,32})\.(css|js)$/
+
+        # Extract digest key if any
+        path =~ /-([a-f0-9]{32})\.(css|js)$/
         path.gsub!("-#{@key}", '') if (@key = $1)
 
         # Find the item
         item = ::Asset.manifest.find{|i| i.path == path and i.type == type}
 
-        # Not found if no item, wrong key or no content
-        return not_found if !item or (@key and @key != item.key) or !item.content(@key)
-
-        found(item)
+        # Return the content or not found
+        item ? found(item) : not_found
 
       # Bounce favicon requests
       when (::Asset.favicon and /^\/favicon\.ico$/)
@@ -49,12 +52,14 @@ module Asset
 
     # Found
     def found(item)
-      [ 200, {'Content-Type' => MIME[item.type],
-        'Content-Length' => item.content(@key).size,
+      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
-        }, [item.content(@key)]]
+      }, [content]]
     end
 
     # Not found

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asset
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Fugroup Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2017-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: therubyracer
+  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: uglifier
   requirement: !ruby/object:Gem::Requirement