asset 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cd9e5084290d4157c2f2c45785bbc5813256273
-  data.tar.gz: 46b793da9b9774e454134f193036381d03e459f5
+  metadata.gz: 932eaabc18bcabdc15594baf1ad4efd8232b0183
+  data.tar.gz: 096e286dca5b2889169391a0877f66a0fe34482d
 SHA512:
-  metadata.gz: bd153573b90fbc422dadf116410462db9f06b8cbab3b0a3b6d5985d54d88b93e375819593c552d73456f41393180a9344fcab1eb215eadb5d6629bbbf62c2cb9
-  data.tar.gz: b73c59885ceacc7fcc72aa4b628c76a816ff31e62112bf65227a41d9f03eec3da89c67f80dbfb55b9d474ec51bc29383ebb27390a51589f3e8bf504255ac3e76
+  metadata.gz: 741dff30d58e04a02d311ec51c65952e1bb49c23c246bb8ac6238f5fd18cd1dd8ec9321f6d1a437d38182cf32ba16791f380f56adf551d3636393972224b7418
+  data.tar.gz: ddfc8b5a2f2c5f730a368f486bd7cb3a5b5faa6114d5b1933de085542375295abd7a8021ede99fb7c883906dedd3c7836b83cffee326b121dda06adbe8cf727a

data/.gitignore

@@ -2,3 +2,4 @@
 Gemfile.lock
 log
 tmp
+.sass-cache

data/CHANGELOG.md

@@ -1,3 +1,9 @@
-**Version 0.1.0** - *2017-01-05*
+**Version 0.1.0** - *2017-01-07*
+
+- Options added for robots.txt and favicon.ico
+- Compress and bundle options are working
+- Fixed caching issue
+
+**Version 0.0.3** - *2017-01-05*
 
 - Fixed gemspec issues

data/README.md

@@ -11,18 +11,31 @@ gem install asset
 or add to Gemfile. In your Rack app include the line
 ```ruby
 # Rack apps
-include Asset::Helpers
+include Asset::Router
 
 # Sinatra
-helpers Asset::Helpers
+helpers Asset::Router
 ```
 
 ### Settings
 ```ruby
-Asset.mode = ENV['RACK_ENV'] || MODE rescue 'development'
-Asset.path = APP_ASSETS rescue File.join(Dir.pwd, 'app', 'assets')
-Asset.cache = File.join(Dir.pwd, 'tmp')
-Asset.debug = false
+# Default is development
+@mode = ENV['RACK_ENV'] || 'development'
+
+# 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')
+
+# Automatically bounce (404) for browser /favicon.ico requests
+@favicon = true
+
+# Send /robots.txt to a standard robots txt with reference to /sitemap.xml
+@robots = true
+
+# Debug option
+@debug = false
 ```
 
 ### Usage
@@ -42,11 +55,14 @@ js:
 # Example with options:
 css:
 - app.css:
+  # Compress = false will prevent the file from being compressed (default true)
   - compress: true
-  - bundle: false
+  # This will not be part of the bundle.js if bundle = false (default true)
+  - bundle: true
 - themes/themes.css
 
 js:
+  # The same options apply to JS files
 - app.js:
   - bundle: false
 - lib/cookie.js
@@ -60,11 +76,11 @@ js:
 # Multiple
 <%= script_tag 'app.js', 'lib/cookies.js' %>
 
-# Bundle all files with 'application.js'
-<%= script_tag 'application.js' %>
+# Bundle all Javscript files with 'bundle.js'
+<%= script_tag 'bundle.js' %>
 
-# Bundle all files with 'application.css'
-<%= script_tag 'application.css' %>
+# Bundle all CSS files with 'bundle.css'
+<%= script_tag 'bundle.css' %>
 ```
 
 In development mode, all files will be printed. In production mode, you'll get only one file.
@@ -111,15 +127,8 @@ The helpers will generate these URLs, so you don't have to worry about it.
 
 ### Images and fonts
 
-To include support for other static file types likes images and fonts, use [Rack::Static](https://github.com/rack/rack/blob/master/lib/rack/static.rb)
+To include support for other static file types likes images and fonts, use [Rack::Static,](https://github.com/rack/rack/blob/master/lib/rack/static.rb) see the example above.
 
-```ruby
-use Rack::Static, :urls => ['/images', '/fonts'], :root => APP_ASSETS,
-  :header_rules => [
-    [:all, {'Cache-Control' => 'public, max-age=31536000'}],
-    [:fonts, {'Access-Control-Allow-Origin' => '*'}]
-  ]
-```
 
 We've included an image tag helper too for this use:
 ```erb

data/asset.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'asset'
-  s.version     = '0.0.3'
-  s.date        = '2017-01-05'
+  s.version     = '0.1.0'
+  s.date        = '2017-01-07'
   s.summary     = "Compress and serve your CSS and JS automatically"
   s.description = "The only thing you need for your assets."
   s.authors     = ["Fugroup Limited"]

data/lib/asset.rb

@@ -1,22 +1,32 @@
 require 'rack'
-
+require 'yaml'
+autoload :Uglifier, 'uglifier'
+autoload :Tilt, 'tilt'
+
+# Asset packer, middleware and helpers
+# @homepage: https://github.com/fugroup/asset
+# @author:   Vidar <vidar@fugroup.net>, Fugroup Ltd.
+# @license:  MIT, contributions are welcome.
 module Asset
+  class << self; attr_accessor :mode, :path, :cache, :favicon, :robots, :manifest, :debug; end
 
-  # # # # # #
-  # Asset packer, middleware and helpers
-  # @homepage: https://github.com/fugroup/asset
-  # @author:   Vidar <vidar@fugroup.net>, Fugroup Ltd.
-  # @license:  MIT, contributions are welcome.
-  # # # # # #
-
-  class << self; attr_accessor :mode, :path, :cache, :manifest, :debug; end
-
-  # Default is production
+  # Default is development
   @mode = ENV['RACK_ENV'] || 'development'
+
+  # 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')
-  @debug = false
 
+  # Automatically bounce (404) for browser /favicon.ico requests
+  @favicon = true
+
+  # Send /robots.txt to a standard robots txt with reference to /sitemap.xml
+  @robots = true
+
+  # Debug option
+  @debug = false
 end
 
 require_relative 'assets/util'

data/lib/assets/item.rb

@@ -1,51 +1,55 @@
 module Asset
   class Item
 
-    attr_accessor :path, :type, :key, :modified, :compress, :bundle, :name
+    attr_accessor :path, :type, :key, :modified, :compress, :bundle, :app, :name, :kpath
 
     # Init
     def initialize(*args)
       @path, @type, @key, @modified, @compress, @bundle = args
+      @app = !!(@path =~ /^bundle\.(js|css)$/)
       @name = @path.rpartition('.')[0]
+      @kpath = "#{@name}-#{kext}"
     end
 
-    # File? Or bundle?
-    def file?
-      @path !~ /^application\.(js|css)$/
+    # Get the files for this item
+    def files
+      (@app and !p?) ? bundle_files : [p? ? @kpath : @path]
     end
 
-    # Get the files. Pass keyed = false to get the path instead of the file
-    def files(keyed = true)
-      if file? or (keyed and ::Asset.mode == 'production')
-        [keyed ? file : path]
-      else
-        ::Asset.manifest.select{|i| i.type == @type and i.file?}.map{|i| keyed ? i.file : i.path}
-      end
-    end
-
-    # Get the file, meaning the full path with key
-    def file
-      ::Asset.mode == 'development' ? @path : %{#{file? ? @name : 'application'}-#{@key}.#{@type}}
+    # Get the files for the bundle
+    def bundle_files
+      @bundle_files ||= ::Asset.manifest.select{|i| i.type == @type and i.bundle and !i.app}.map{|i| p? ? i.kpath : i.path}
     end
 
     # Get the content. Pass cache = false to fetch from disk instead of the cache.
-    def content(cache = (::Asset.mode = 'production'))
-      return joined unless cache
-
-      File.read(File.join(::Asset.cache, %{#{@key}.#{@type}})).tap{|f| return f if f} rescue nil
+    def content(key = nil)
+      (!key or !@compress) ? (@joined ||= joined) : (@cached ||= cached)
+    end
 
-      # Compress the files
+    # The cached content
+    def cached
+      File.read(cache_path).tap{|f| return f if f} rescue nil
       compressed.tap{|r| write_cache(r)}
     end
 
     # Store in cache
     def write_cache(r)
-      File.open(File.join(::Asset.cache, %{#{@key}.#{@type}}), 'w'){|f| f.write(r)}
+      File.open(cache_path, 'w'){|f| f.write(r)}
+    end
+
+    # Cache path
+    def cache_path
+      @cache_path ||= File.join(::Asset.cache, kext)
+    end
+
+    # Key and extension
+    def kext
+      @kext ||= %{#{@key}.#{@type}}
     end
 
     # Compressed joined files
     def compressed
-      case @type
+      @compressed ||= case @type
       when 'css'
         Tilt.new('scss', :style => :compressed){ joined }.render rescue joined
       when 'js'
@@ -55,12 +59,17 @@ module Asset
 
     # All files joined
     def joined
-      @joined ||= files(false).map{|f| File.read(File.join(::Asset.path, @type, f))}.join
+      @joined ||= files.map{|f| File.read(File.join(::Asset.path, @type, f))}.join
+    end
+
+    # Production mode?
+    def p?
+      ::Asset.mode == 'production'
     end
 
     # Print data
     def print
-      [:path, :type, :key, :name, :modified, :files, :content].each{|r| puts "#{r.upcase}: #{send(r).inspect}"}
+      [:path, :type, :key, :name, :modified, :files, :content].map{|r| "#{r.upcase}: #{send(r).inspect}"}.join("\n")
     end
 
   end

data/lib/assets/router.rb

@@ -24,23 +24,23 @@ module Asset
       # Match /assets?/:type/path
       when /^(\/assets)?\/(js|css)\/(.+)/
         type, path = $2, $3
+        path =~ /-([a-f0-9]{1,32})/
+        path.gsub!("-#{@key}", '') if (@key = $1)
 
-        path =~ /(-[a-f0-9]{1,32})/
-        path = path.gsub($1, '') if $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 ($1 and $1 != item.key) or !item.content(!!$1)
+        return not_found if !item or (@key and @key != item.key) or !item.content(@key)
 
         found(item)
 
       # Bounce favicon requests
-      when /^\/favicon\.ico$/
+      when (::Asset.favicon and /^\/favicon\.ico$/)
         not_found
 
       # Return a standard robots.txt
-      when /^\/robots\.txt$/
+      when (::Asset.robots and /^\/robots\.txt$/)
         robots
 
       else
@@ -54,11 +54,11 @@ module Asset
     # Found
     def found(item)
       [ 200, {'Content-Type' => MIME[item.type],
-        'Content-Length' => item.content.size,
+        'Content-Length' => item.content(@key).size,
         'Cache-Control' => 'max-age=86400, public',
         'Expires' => (Time.now + 86400*30).utc.rfc2822,
         'Last-Modified' => item.modified.utc.rfc2822
-        }, [item.content]]
+        }, [item.content(@key)]]
     end
 
     # Not found

data/lib/assets/util.rb

@@ -3,16 +3,16 @@ module Asset
 
     # Get timestamp
     def self.mtime(path)
-      File.mtime(asset_path(path))
+      File.mtime(asset_path(path)).utc
     end
 
     # Asset path
     def self.asset_path(path)
-      File.join(::Asset.path, File.split(path))
+      File.join(::Asset.path, path)
     end
 
     # Digest
-    def self.digest(path, time)
+    def self.digest(path, time = mtime(path))
       Digest::MD5.hexdigest(%{#{path}#{time.to_i}})
     end
 
@@ -32,7 +32,7 @@ module Asset
           path = h ? name.keys[0] : name
 
           # Get the modified time of the asset
-          modified = mtime("#{type}/#{path}").utc
+          modified = mtime("#{type}/#{path}")
 
           # Record max to know the latest change
           max = modified if modified > max
@@ -43,10 +43,10 @@ module Asset
             (h ? name['compress'] : true), (h ? name['bundle'] : true))
         end
 
-        # Insert the application bundle
+        # Insert the bundle
         manifest.insert(0, ::Asset::Item.new(
-          "application.#{type}", type,
-          digest("application.#{type}", max), max))
+          "bundle.#{type}", type,
+          digest("bundle.#{type}", max), max))
       end
       manifest
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asset
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Fugroup Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-05 00:00:00.000000000 Z
+date: 2017-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack