classy_assets 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d46c96e739ac209aa3be084cb29edc50b128add9
-  data.tar.gz: aadd3440b39e892a6274140698bbe05324c8cf22
+  metadata.gz: e9ec6db00dd5b915529cd34cdd6e6bb446b349bc
+  data.tar.gz: bfe108e29e8043150a6eafac96f62d90b739b69c
 SHA512:
-  metadata.gz: 80185477cad1aadc5f8d472bae056b27a66454bf145c2604f5c987a39eabec5d9b40ebf4792e5cbdd59abd40d24ee197162e03a18260d3f7b733156f81f42817
-  data.tar.gz: 22d8aef7596fa473f83907f5092832e4757b5a8b392d2a67ea185f8cfc4999a3f5e66a9553724184af3df802253388472e177ccb58cca64258934d55c521f138
+  metadata.gz: b744c30940d2b046e742e0a3c1ff0b44a428dc67a71df34edbe581ab5c9354bf36820c79ec4bf1e1182392db9deedb7d3841066bc0a4dfe32673bcc4035e5ff8
+  data.tar.gz: 6cf13ce5ed8a463696de6533e90229eead7633228e5887bc5fbbe9ed276c46a75c8d9b91135f51875ed5ea71566de3a438b00c755d165f8c46c7ac530da0bae0

data/lib/classy_assets/config.rb

@@ -0,0 +1,44 @@
+# encoding: utf-8
+
+require 'singleton'
+
+module ClassyAssets
+  class Config
+    include Singleton
+
+    attr_accessor :asset_debug, :asset_digest, :asset_host, :asset_paths, :asset_prefix, :asset_root
+
+    def asset_debug
+      @asset_debug ||= (ENV['RACK_ENV'] == 'development')
+    end
+
+    def asset_digest
+      @asset_digest ||= false
+    end
+
+    def asset_paths
+      @asset_paths ||= build_asset_paths
+      @asset_paths.uniq! # ensure no duplicates
+      @asset_paths
+    end
+
+    def asset_prefix
+      @asset_prefix ||= 'assets'
+    end
+
+    def asset_root
+      raise Errors::NilAssetRoot.new if @asset_root.nil?
+      @asset_root
+    end
+
+    def public_path
+      @public_path ||= File.join(asset_root, 'public')
+    end
+
+    private
+    
+    def build_asset_paths
+      Dir.glob(File.join(asset_root, asset_prefix, '*'))
+    end
+  end
+end

data/lib/classy_assets/errors/nil_asset_root.rb

@@ -0,0 +1,11 @@
+# encoding: utf-8
+
+module ClassyAssets
+  module Errors
+    class NilAssetRoot < StandardError
+      def message
+        "ClassyAssets.config.asset_root is nil, and must be configured."
+      end
+    end
+  end
+end

data/lib/classy_assets/sprockets.rb

@@ -0,0 +1,27 @@
+# encoding: utf-8
+
+require 'singleton'
+require 'sprockets'
+
+module ClassyAssets
+  class Sprockets
+    include Singleton
+
+    def environment
+      asset_root = ClassyAssets.config.asset_root
+      @environment = ::Sprockets::Environment.new(asset_root)
+
+      ClassyAssets.config.asset_paths.each do |asset_path|
+        @environment.append_path asset_path
+      end
+
+      @environment.context_class.class_eval do
+        def asset_path(path, options = {})
+          ClassyAssets.asset_url_for(path)
+        end
+      end
+
+      @environment
+    end
+  end
+end

data/lib/classy_assets/version.rb

@@ -1,3 +1,3 @@
 module ClassyAssets
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/lib/classy_assets.rb

@@ -12,21 +12,36 @@ require 'sinatra/base'
 require 'sprockets'
 
 # classy assets components
+require 'classy_assets/config'
 require 'classy_assets/configuration'
+require 'classy_assets/errors/nil_asset_root'
 require 'classy_assets/sass/script/functions'
+require 'classy_assets/sprockets'
 require 'classy_assets/sprockets/sass_importer'
 require 'classy_assets/version'
 
-# Utility methods
 module ClassyAssets
+  # singleton sprockets environment
+  def self.sprockets
+    ClassyAssets::Sprockets.instance.environment
+  end
+
+  # singleton configuration
+  def self.config(&block)
+    yield ClassyAssets::Config.instance if block_given?
+    ClassyAssets::Config.instance
+  end
+
+  # utility methods
+
   def self.asset_url_for(asset)
-    asset = Configuration.sprockets[asset].send(determine_path_type)
-    debug = (Configuration.debug_mode) ? '?body=1' : ''
-    "#{Configuration.asset_host}/#{Configuration.asset_prefix}/#{asset}#{debug}"
+    asset = sprockets[asset].send(determine_path_type)
+    debug = (config.asset_debug) ? '?body=1' : ''
+    "#{config.asset_host}/#{config.asset_prefix}/#{asset}#{debug}"
   end
 
   def self.asset_data_uri_for(asset)
-    asset = Configuration.sprockets[asset]
+    asset = sprockets[asset]
     base64 = Base64.encode64(asset.to_s).gsub(/\s+/, "")
     "data:#{asset.content_type};base64,#{EscapeUtils.escape_url(base64)}"
   end
@@ -35,12 +50,14 @@ module ClassyAssets
     sources = [sources] unless sources.is_a? Array
     sources.map do |source|
       source = "#{source}.#{ext}" unless source =~ /\.#{ext}$/
-      asset_url = (source =~ /\/|http/) ? source : ::ClassyAssets.asset_url_for(source)
+      asset_url = (source =~ /\/|http/) ? source : asset_url_for(source)
       yield(asset_url)
     end.join('')
   end
 
+  private
+
   def self.determine_path_type
-    (Configuration.asset_digest) ? :digest_path : :logical_path
+    (config.asset_digest) ? :digest_path : :logical_path
   end
 end

data/lib/rack/classy_assets.rb

@@ -1,16 +1,20 @@
 # encoding: utf-8
 
 require 'classy_assets'
+require 'rack/builder'
 
 module Rack
-  class ClassyAssets < Sinatra::Base
-    ::ClassyAssets::Configuration.sprockets.mime_types.each do |ext, content_type|
-      get "/#{::ClassyAssets::Configuration.asset_prefix}/*#{ext}" do |asset|
-        filename = "#{asset}#{ext}"
-        filename.gsub!(/-(\h{32})#{ext}$/, ext) if ::ClassyAssets::Configuration.asset_digest
-        content_type content_type
-        ::ClassyAssets::Configuration.sprockets[filename] || halt(404)
-      end 
-    end 
+  class ClassyAssets
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      if env['PATH_INFO'] =~ /\/#{::ClassyAssets.config.asset_prefix}\//
+        Rack::URLMap.new("/#{::ClassyAssets.config.asset_prefix}" => ::ClassyAssets.sprockets).call(env)
+      else
+        @app.call(env)
+      end
+    end
   end
 end

data/spec/classy_assets/config_spec.rb

@@ -0,0 +1,49 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe ClassyAssets::Config do
+  before do
+    @asset_root = File.expand_path('../../support', __FILE__)
+    @asset_host = 'http://example.com'
+    @asset_prefix = 'assets'
+    
+    @asset_paths = Dir.glob(File.join(@asset_root, @asset_prefix, '*'))
+    @vendor_path = File.expand_path('../../support/vendor', __FILE__)
+    @asset_paths << @vendor_path
+
+    ClassyAssets.config do |config|
+      config.asset_root = @asset_root # must be configured first
+      config.asset_debug = true
+      config.asset_digest = true
+      config.asset_host = @asset_host
+      config.asset_paths << @vendor_path
+    end
+
+    @configuration = ClassyAssets.config
+  end
+
+  it "returns the configured asset_debug" do
+    @configuration.asset_debug.must_equal true
+  end
+
+  it "returns the configured asset_digest" do
+    @configuration.asset_digest.must_equal true
+  end
+
+  it "returns the configured asset_host" do
+    @configuration.asset_host.must_equal @asset_host
+  end
+
+  it "returns the configured asset_prefix" do
+    @configuration.asset_prefix.must_equal @asset_prefix
+  end
+
+  it "returns the configured asset_root" do
+    @configuration.asset_root.must_equal @asset_root
+  end
+
+  it "returns the configured asset_paths" do
+    @configuration.asset_paths.must_equal @asset_paths
+  end
+end

data/spec/classy_assets/sprockets_spec.rb

@@ -0,0 +1,22 @@
+# encoding: utf-8
+
+require 'spec_helper'
+require 'spec_config_helper'
+
+describe ClassyAssets::Sprockets do
+  before do
+    asset_root = ClassyAssets.config.asset_root
+    asset_prefix = ClassyAssets.config.asset_prefix
+    
+    @asset_paths = Dir.glob(File.join(asset_root, asset_prefix, '*'))
+    @sprockets = ClassyAssets.sprockets
+  end
+
+  it "returns the sprockets environment" do
+    @sprockets.must_be_kind_of Sprockets::Environment
+  end
+
+  it "returns the correct asset paths" do
+    @sprockets.paths.must_equal @asset_paths
+  end
+end

data/spec/rack/classy_assets_spec.rb

@@ -1,14 +1,10 @@
 # encoding: utf-8
 
 require 'spec_helper'
+require 'spec_config_helper'
 require 'rack/classy_assets'
 
 class ClassyApp < Sinatra::Base
-  configure do
-    ClassyAssets::Configuration.configure do |config|
-      config.root_path = File.expand_path('../../support', __FILE__)
-    end
-  end
   use Rack::ClassyAssets
 end
 
@@ -16,7 +12,7 @@ def app
   ClassyApp.new
 end
 
-describe Rack::ClassyAssets do  
+describe Rack::ClassyAssets do
   context "stylesheets" do
     context "css" do
       it "will respond sucessfully" do

data/spec/sinatra/classy_assets_spec.rb

@@ -1,47 +1,47 @@
 # encoding: utf-8
 
 require 'spec_helper'
+require 'spec_config_helper'
 require 'sinatra/classy_assets'
 
-class ClassyApp < Sinatra::Base
-  configure do
-    ClassyAssets::Configuration.configure do |config|
-      config.root_path = File.expand_path('../../support', __FILE__)
-    end
-  end
+class ClassySinatraApp < Sinatra::Base
   register Sinatra::ClassyAssets
 
-  get "/with_css" do
-    slim :index, layout: :layout_css
+  get "/stylesheet_tag" do
+    slim :stylesheet_tag
   end
 
-  get "/with_media_option" do
-    slim :index, layout: :layout_media
+  get "/stylesheet_tag_media" do
+    slim :stylesheet_tag_media
   end
 
-  get "/with_js" do
-    slim :index, layout: :layout_js
+  get "/javascript_tag" do
+    slim :javascript_tag
   end
 
-  template :layout_css do
-    "html\n\thead\n\t\t==stylesheet_tag('application')\n\tbody\n\t\t==yield\n"
+  template :index do
+    "| Classy Assets"
   end
 
-  template :layout_media do
-    "html\n\thead\n\t\t==stylesheet_tag('application', media: 'print')\n\tbody\n\t\t==yield\n"
+  template :layout do
+    "html\n\tbody\n\t\t==yield\n"
   end
 
-  template :layout_js do
-    "html\n\thead\n\tbody\n\t\t==javascript_tag('application')\n==yield\n"
+  template :stylesheet_tag do
+    "==stylesheet_tag('application')"
   end
 
-  template :index do
-    "| Classy Assets"
+  template :stylesheet_tag_media do
+    "==stylesheet_tag('application', media: 'print')"
+  end
+
+  template :javascript_tag do
+    "==javascript_tag('application')"
   end
 end
 
 def app
-  ClassyApp.new
+  ClassySinatraApp.new
 end
 
 describe Sinatra::ClassyAssets do
@@ -54,112 +54,25 @@ describe Sinatra::ClassyAssets do
 
   context "Helpers" do
     it "outputs a stylesheet link tag" do
-      get "/with_css"
+      get "/stylesheet_tag"
       last_response.body.must_match(/<link href="\/assets\/application.css" media="screen" rel="stylesheet">/)
     end
 
     it "outputs the stylesheet tag with the correct media attribute" do
-      get "/with_media_option"
+      get "/stylesheet_tag_media"
       last_response.body.must_match(/<link href="\/assets\/application.css" media="print" rel="stylesheet">/)
     end
 
     it "outputs a javascript tag" do
-      get "/with_js"
+      get "/javascript_tag"
       last_response.body.must_match(/<script src="\/assets\/application.js"><\/script>/)
     end
   end
 
   context "uses Rack::ClassyAssets middleware" do
-    describe "stylesheets" do
-      describe "css" do
-        it "will respond sucessfully" do
-          get '/assets/stylesheet.css'
-          last_response.status.must_equal 200
-        end
-      end
-      
-      describe "sass" do
-        it "will respond sucessfully" do
-          get '/assets/application.css'
-          last_response.status.must_equal 200
-        end
-      end
-    end
-
-    describe "javascripts" do
-      describe "js" do
-        it "will respond sucessfully" do
-          get '/assets/javascript.js'
-          last_response.status.must_equal 200
-        end
-      end
-
-      describe "coffeescript" do
-        it "will respond sucessfully" do
-          get '/assets/application.js'
-          last_response.status.must_equal 200
-        end
-      end
-    end
-    
-    describe "images" do
-      describe "gif" do
-        it "will respond sucessfully" do
-          get '/assets/image.gif'
-          last_response.status.must_equal 200
-        end
-      end
-
-      describe "jpg" do
-        it "will respond sucessfully" do
-          get '/assets/image.jpg'
-          last_response.status.must_equal 200
-        end
-      end
-      
-      describe "png" do
-        it "will respond sucessfully" do
-          get '/assets/image.png'
-          last_response.status.must_equal 200
-        end
-      end
-    end
-
-    describe "fonts" do
-      describe "eot" do
-        it "will respond sucessfully" do
-          get '/assets/font.eot'
-          last_response.status.must_equal 200
-        end
-      end
-
-      describe "otf" do
-        it "will respond sucessfully" do
-          get '/assets/font.otf'
-          last_response.status.must_equal 200
-        end
-      end
-      
-      describe "svg" do
-        it "will respond sucessfully" do
-          get '/assets/font.svg'
-          last_response.status.must_equal 200
-        end
-      end
-      
-      describe "ttf" do
-        it "will respond sucessfully" do
-          get '/assets/font.ttf'
-          last_response.status.must_equal 200
-        end
-      end
-      
-      describe "woff" do
-        it "will respond sucessfully" do
-          get '/assets/font.woff'
-          last_response.status.must_equal 200
-        end
-      end
+    it "requests for assets will respond sucessfully" do
+      get '/assets/stylesheet.css'
+      last_response.status.must_equal 200
     end
   end
 end

data/spec/spec_config_helper.rb

@@ -0,0 +1,5 @@
+# encoding: utf-8
+
+ClassyAssets.config do |config|
+  config.asset_root = File.expand_path('../support', __FILE__)
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: classy_assets
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - StyleSeek Engineering
@@ -183,18 +183,22 @@ files:
 - classy_assets.gemspec
 - lib/classy_assets.rb
 - lib/classy_assets/cli.rb
-- lib/classy_assets/configuration.rb
+- lib/classy_assets/config.rb
+- lib/classy_assets/errors/nil_asset_root.rb
 - lib/classy_assets/sass/script/functions.rb
+- lib/classy_assets/sprockets.rb
 - lib/classy_assets/sprockets/sass_importer.rb
 - lib/classy_assets/tasks.rb
 - lib/classy_assets/tasks/assets.rake
 - lib/classy_assets/version.rb
 - lib/rack/classy_assets.rb
 - lib/sinatra/classy_assets.rb
-- spec/classy_assets/configuration_spec.rb
+- spec/classy_assets/config_spec.rb
+- spec/classy_assets/sprockets_spec.rb
 - spec/classy_assets_spec.rb
 - spec/rack/classy_assets_spec.rb
 - spec/sinatra/classy_assets_spec.rb
+- spec/spec_config_helper.rb
 - spec/spec_helper.rb
 - spec/support/assets/fonts/font.eot
 - spec/support/assets/fonts/font.otf
@@ -208,6 +212,7 @@ files:
 - spec/support/assets/javascripts/javascript.js
 - spec/support/assets/stylesheets/application.scss
 - spec/support/assets/stylesheets/stylesheet.css
+- spec/support/vendor/.gitkeep
 homepage: https://github.com/styleseek/classy_assets
 licenses:
 - MIT
@@ -233,10 +238,12 @@ signing_key:
 specification_version: 4
 summary: Classy Assets (powered by Sprockets) for Sinatra and Rack apps
 test_files:
-- spec/classy_assets/configuration_spec.rb
+- spec/classy_assets/config_spec.rb
+- spec/classy_assets/sprockets_spec.rb
 - spec/classy_assets_spec.rb
 - spec/rack/classy_assets_spec.rb
 - spec/sinatra/classy_assets_spec.rb
+- spec/spec_config_helper.rb
 - spec/spec_helper.rb
 - spec/support/assets/fonts/font.eot
 - spec/support/assets/fonts/font.otf
@@ -250,3 +257,4 @@ test_files:
 - spec/support/assets/javascripts/javascript.js
 - spec/support/assets/stylesheets/application.scss
 - spec/support/assets/stylesheets/stylesheet.css
+- spec/support/vendor/.gitkeep

data/lib/classy_assets/configuration.rb

@@ -1,92 +0,0 @@
-# encoding: utf-8
-
-module ClassyAssets
-  class Configuration
-    def self.configure
-      yield self
-    end
-    
-    def self.asset_digest
-      @asset_digest.nil? ? false : @asset_digest
-    end
-
-    def self.asset_digest=(digest)
-      @asset_digest = digest
-    end
-
-    def self.asset_host
-      @asset_host
-    end
-
-    def self.asset_host=(host)
-      @asset_host = host
-    end
-
-    def self.asset_paths
-      @asset_paths || build_asset_paths
-    end
-
-    def self.asset_paths=(paths)
-      @asset_paths = paths.to_a
-    end
-
-    def self.asset_prefix
-      @asset_prefix || 'assets'
-    end
-
-    def self.asset_prefix=(prefix)
-      @asset_prefix = prefix
-    end
-
-    def self.debug_mode
-      @debug_mode.nil? ? (ENV['RACK_ENV'] == 'development') : @debug_mode
-    end
-
-    def self.debug_mode=(debug)
-      @debug_mode = debug
-    end
-
-    def self.public_path
-      @public_path || File.join(root_path, 'public')
-    end
-    
-    def self.public_path=(path)
-      @public_path = path
-    end
-
-    def self.root_path
-      @root_path || '.'
-    end
-    
-    def self.root_path=(path)
-      @root_path = path
-    end
-
-    def self.sprockets
-      new_sprockets_environment
-    end
-
-    private
-
-    def self.build_asset_paths
-      Dir.glob(File.join(root_path, asset_prefix, '*'))
-    end
-
-    def self.new_sprockets_environment
-      @sprockets = ::Sprockets::Environment.new(root_path)
-      asset_paths.each do |asset_path|
-        unless @sprockets.paths.include?(asset_path)
-          @sprockets.append_path asset_path
-        end
-      end
-
-      @sprockets.context_class.class_eval do
-        def asset_path(path, options = {})
-          ClassyAssets.asset_url_for(path)
-        end
-      end
-
-      @sprockets
-    end
-  end
-end  

data/spec/classy_assets/configuration_spec.rb

@@ -1,52 +0,0 @@
-# encoding: utf-8
-
-require 'spec_helper'
-require 'classy_assets'
-
-describe ClassyAssets::Configuration do
-  before do
-    @root_path = File.expand_path('../support', __FILE__)
-    ClassyAssets::Configuration.configure do |config|
-      config.root_path = @root_path
-    end
-    @configuration = ClassyAssets::Configuration
-    @public_path = File.expand_path('../support/public', __FILE__)
-    @asset_paths = Dir.glob(File.join(@configuration.root_path, @configuration.asset_prefix, '*'))    
-  end
-  
-  it "returns the configured root_path" do
-    @configuration.root_path.must_equal @root_path
-  end
-
-  it "returns the computed public_path" do
-    @configuration.public_path.must_equal @public_path
-  end
-
-  it "returns an array of asset paths" do
-    @configuration.asset_paths.must_equal @asset_paths
-  end
-  
-  it "returns the asset digest setting" do
-    @configuration.asset_digest.must_equal false 
-  end
-
-  it "returns the asset host" do
-    @configuration.asset_host.must_equal nil
-  end
-
-  it "returns the asset prefix" do
-    @configuration.asset_prefix.must_equal 'assets'
-  end
-
-  it "returns the debug mode setting" do
-    @configuration.debug_mode.must_equal false
-  end
-  
-  it "returns the sprockets environment" do
-    @configuration.sprockets.must_be_kind_of Sprockets::Environment
-  end
-
-  it "returns the correct paths" do
-     @configuration.sprockets.paths.must_equal @configuration.asset_paths
-  end
-end