classy_assets 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ae68f4846cdfc63757cd698e09ccb68299ba1e1
-  data.tar.gz: bfcadb8dbf17457e24675413a9c4c77941ec3fb5
+  metadata.gz: 26174ebc523413bc8b6a44a4bf0cbc678d268875
+  data.tar.gz: c51ecdc69a290e271c5302c0bf2d36b0a9c3c667
 SHA512:
-  metadata.gz: 61802ad99b6dadbd523bcd0a69f84ef66f56f496f974914b2b88dae310e0d85fd95dc3ea65f883653d689a7f7a4bb8464ee596f6416246ef6f61e9299640537a
-  data.tar.gz: 83a22842adb3bcb5fe5aadc093a898211179f15ec1ed94876855a2fc28464d778c70eb2b04c59b7ba571e6045e1ac860592b53ae441bb9b15a77560b7849aeed
+  metadata.gz: 44d6352fd0cd68dd6fce74e9485005c77a84a2c74a2fd3819a80abd888de4d95d01ae182f76ab0f54961d797f736fedb563f2f46623b6331e783044ae448abea
+  data.tar.gz: 639ee59717f6e78c4ecae87dcf03f1a8d1bd03111aed6097ad0fb5b8c233ea15447d999afc08021e20c00989263bbd55a21ab07882b4df4aeb20fc106ad428f6

data/README.md

@@ -1,6 +1,6 @@
 # ClassyAssets
 
-Classy Assets (powered by Sprockets) for Sinatra and Rack apps
+Sprockets-powered asset pipeline for classy Sinatra and/or Rack apps.
 
 ## Installation
 
@@ -14,18 +14,27 @@ And then execute:
 
 ## Usage
 
-ClassyAssets is available as Rack Middleware or a Sintra Extension. The Sinatra Extension version integrates the [sprockets-helpers](https://github.com/petebrowne/sprockets-helpers) to provide helper methods for generating asset paths.
+ClassyAssets consists of a **Rack Middleware**, which integrates your app with [Sprockets](https://github.com/sstephenson/sprockets) to serve your assets, and a **Sintra Extension**, which provides helper methods for generating asset paths.
 
-Use the Rack Middleware directly:
+Configure your environment:
 
 ````ruby
-require 'rack/classy_assets'
-class ClassyApp < Sinatra::Base
-  use Rack::ClassyAssets, root: 'path/to/your/app/root/directory'
+require 'classy_assets'
+ClassyAssets.config do |config|
+  config.asset_root = File.expand_path('../../', __FILE__)
+  # asset_root is required and must be set.
+  # See below for complete list of options.
 end
 ````
 
-Use the Sinatra Extension:
+Install the Rack Middleware (usually in `config.ru`):
+
+````ruby
+require 'rack/classy_assets'
+use Rack::ClassyAssets
+````
+
+Install the Sinatra Extension:
 
 ````ruby
 require 'sinatra/classy_assets'
@@ -34,30 +43,27 @@ class ClassyApp < Sinatra::Base
 end
 ````
 
-Both the middleware and extension assume your assets are stored in the `root` directory, in the following layout:
-
-        /assets
-          |_ images
-          |_ stylesheets
-          |_ javascripts
-
-Sass and CoffeeScript are fully supported.
-
-Available Options:
-
-Pass these in via the options hash if you're using the rack middleware.
-If you're using the sinatra extension, then configure your app's `settings` after the `register Sintra::ClassyAssets` statement to override the defaults
+Available Configuration Options:
 
 ````ruby
-  :root           # => path to root of the application. set by default in Sinatra apps, but must be explictly passed to the rack middleware, if used directly
-  :public_folder  # => path to public folder for the application. (default: File.join(root, 'public') )
-  :assets_prefix  # => currently does nothing useful (default: 'assets')
-  :asset_host     # => used by Sprockets::Helpers to return asset path prefixed by asset_host uri (default: nil)
-  :digest_assets  # => enable digest version of assets? true or false (default: false)
-  :css_compressor # => instance of a sprokets compatible css compressor class (default: ::YUI::CssCompressor.new)
-  :js_compressor  # => instance of a sprokets compatible js compressor class (default: ::Uglifier.new)
-  :sprockets      # => instance of Sprockets::Environment. Should almost never need to be set manually. (default: Sprockets::Environment.new(root) )
+  :asset_root             # => (String)  path to root of the application (required, must be set before configuring other options)
+  :asset_cache            # => (Boolean) enable/disable Sprockets environment caching (default: true in production, false in all other environments)
+  :asset_compress         # => (Boolean) enable/disable asset compression (default: nil)
+  :asset_debug            # => (Boolean) enable/disable asset debugging (default: true in development, false in all other environments)
+  :asset_digest           # => (Boolean) enable/disable asset digests (default: nil)
+  :asset_host             # => (String)  CDN hostname to use when building asset urls (default: nil)
+  :asset_manifest_path    # => (String)  path to output Sprockets manifest file (default:  asset_precompile_path + "manifest.json")
+  :asset_paths            # => (Array)   array of paths to add to the Sprockets environment (default: all paths under File.join(asset_root, asset_prefix))
+  :asset_precompile       # => (Array)   array of files to precompile. Globs and Regular Expressions are allowed. (default: [/\w+\.(?!js|css).+/, /application.(css|js)$/])
+  :asset_precompile_keep  # => (Integer) number of precompiled asset versions to keep (default: 2)
+  :asset_precompile_path  # => (String)  path to output precompiled assets to (default: File.join(asset_public_path, asset_prefix))
+  :asset_prefix           # => (String)  name of the directory assets should be stored/served under (default: 'assets')
+  :asset_public_path      # => (String)  path to your app's public folder (default: File.join(asset_root, 'public'))
+  :asset_version          # => (String)  arbitrary asset version, used by Sprockets (default: the version of ClassyAssets in use)
+  :css_compressor         # => (Symbol)  name of a css compressor registered with Sprockets (default: :yui)
+  :js_compressor          # => (Symbol)  name of a javascript compressor registered with Sprockets (default: :uglifier)
 ````
+
 ## Project Status
 
 - Build: [![Build Status](https://secure.travis-ci.org/styleseek/classy_assets.png?branch=master)](https://travis-ci.org/styleseek/classy_assets)

data/classy_assets.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |gem|
   gem.version       = ClassyAssets::VERSION
   gem.authors       = ['StyleSeek Engineering']
   gem.email         = ['engineering@styleseek.com']
-  gem.description   = %q{Asset Pipeline for classy Sinatra apps}
-  gem.summary       = %q{Classy Assets (powered by Sprockets) for Sinatra and Rack apps}
+  gem.description   = %q{Asset Pipeline for classy Sinatra (and/or Rack) apps}
+  gem.summary       = %q{Sprockets-powered asset pipeline for classy Sinatra and/or Rack apps.}
   gem.homepage      = 'https://github.com/styleseek/classy_assets'
   gem.license       = 'MIT'
 

data/lib/classy_assets/version.rb

@@ -1,3 +1,3 @@
 module ClassyAssets
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end

data/lib/rack/classy_assets.rb

@@ -1,20 +1,84 @@
 # encoding: utf-8
 
 require 'classy_assets'
-require 'rack/builder'
+require 'rack/file'
+require 'rack/utils'
+require 'rack/mime'
 
 module Rack
   class ClassyAssets
     def initialize(app)
       @app = app
+      @file_server = ::Rack::File.new(::ClassyAssets.config.asset_public_path, { 'Cache-Control' => 'public, max-age=31536000' })
     end
 
     def call(env)
-      if env['PATH_INFO'] =~ /\/#{::ClassyAssets.config.asset_prefix}\//
-        Rack::URLMap.new("/#{::ClassyAssets.config.asset_prefix}" => ::ClassyAssets.sprockets).call(env)
+      if %w(GET HEAD).include?(env['REQUEST_METHOD']) and env['PATH_INFO'].start_with?("/#{::ClassyAssets.config.asset_prefix}")
+        puts "ClassyAssets: GET or HEAD request"
+        request = Rack::Request.new(env)
+        encoding = Rack::Utils.select_best_encoding(%w(gzip identity), request.accept_encoding)
+        if encoding == 'gzip'
+          puts "ClassyAssets: encoding == gzip"
+          return serve_gzipped_asset(env)
+        else
+          puts "ClassyAssets: encoding != gzip"
+          return serve_asset(env)
+        end
+      end
+
+      status, headers, body = @app.call(env)
+      body.close if body.respond_to?(:close)
+      [status, headers, body]
+    end
+
+    private
+
+    def asset_path_exists?(path)
+      full_path = ::File.join(::ClassyAssets.config.asset_public_path, path)
+      ::File.exists?(full_path)
+    end
+
+    def serve_gzipped_asset(env)
+      compressed_path = env['PATH_INFO'] + '.gz'
+      if asset_path_exists?(compressed_path)
+        puts "ClassyAssets: gzip asset path exists"
+        env["PATH_INFO"] = compressed_path
+        status, headers, body = @file_server.call(env)
+        path = env["PATH_INFO"] = env["PATH_INFO"].chomp('.gz')
+
+        vary = headers["Vary"].to_s.split(",").map { |v| v.strip }
+        unless vary.include?("*") || vary.include?("Accept-Encoding")
+          headers["Vary"] = vary.push("Accept-Encoding").join(",")
+        end
+
+        headers['Content-Encoding'] = 'gzip'
+        headers['Content-Type'] = Rack::Mime.mime_type(File.extname(path), 'text/plain')
+        headers.delete('Content-Length')
+
+        if headers.has_key? 'Cache-Control'
+          headers['Cache-Control'] += ', no-transform' unless headers['Cache-Control'].include?('no-transform')
+        else
+          headers['Cache-Control'] = 'no-transform'
+        end
+      else
+        puts "ClassyAssets: gzip asset path not found"
+        env["PATH_INFO"].gsub!("/#{::ClassyAssets.config.asset_prefix}", '')
+        status, headers, body = ::ClassyAssets.sprockets.call(env)
+      end
+
+      [status, headers, body]
+    end
+
+    def serve_asset(env)
+      if asset_path_exists?(env['PATH_INFO'])
+        puts "ClassyAssets: asset path exists"                
+        status, headers, body = @file_server.call(env)
       else
-        @app.call(env)
+        puts "ClassyAssets: asset path not found"                
+        status, headers, body = ::ClassyAssets.sprockets.call(env)
       end
+      
+      [status, headers, body]
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: classy_assets
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - StyleSeek Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-21 00:00:00.000000000 Z
+date: 2013-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -94,7 +94,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Asset Pipeline for classy Sinatra apps
+description: Asset Pipeline for classy Sinatra (and/or Rack) apps
 email:
 - engineering@styleseek.com
 executables:
@@ -164,7 +164,7 @@ rubyforge_project:
 rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
-summary: Classy Assets (powered by Sprockets) for Sinatra and Rack apps
+summary: Sprockets-powered asset pipeline for classy Sinatra and/or Rack apps.
 test_files:
 - spec/classy_assets/config_spec.rb
 - spec/classy_assets/sprockets_spec.rb