classy_assets 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d91f5bda225e77c896e45bbb03f571a188d9b346
-  data.tar.gz: 61eb5ffe14f853db04e3b7a69f6c9f00928a90f3
+  metadata.gz: 0bb5c045b40c7a18eedbfa6a32e7a9a71c8ae9ed
+  data.tar.gz: 4b20a1d196309da05e7edae4cdef3761c00dc3ed
 SHA512:
-  metadata.gz: f97e4e4fcb9871a3816ee3bbfcc73a2c8b7ed10b4ad0bac0686d63a256822354cede9905f68aaa2c69ea9c49b3d82d275072e80c04637b5b65bc862fd6e34bf0
-  data.tar.gz: 5997a893de6248677f49d58388f71a9b8daee68bbb19ac854d457e327ab8646af114b2a0d3f9c4ffe0d41d6d8ca93793e41060ed51c6b6668adba803cbd4d05d
+  metadata.gz: 69ab2b9dd844a9ab983e60511ab054659c8200eacba3ce408a02006da957e5b100c82052ed6f3074f12cfa33e3fff24c191136f328bc92c61b686f5dcf3dbc56
+  data.tar.gz: 63f2076784e5705129de6061bc7477944b2f6bdd9846fe1270364bc4931244c6d4ef0dd0e41a55bc5c6dd1bc972694c0169e10d0e917f81d8a2059345cd57624

data/lib/classy_assets.rb

@@ -15,7 +15,7 @@ module ClassyAssets
     end
     
     def self.asset_digest
-      @asset_digest ||= false
+      @asset_digest.nil? ? false : @asset_digest
     end
 
     def self.asset_digest=(digest)
@@ -23,7 +23,7 @@ module ClassyAssets
     end
 
     def self.asset_paths
-      @asset_paths ||= build_asset_path(%w(fonts images javascripts stylesheets))
+      @asset_paths || build_asset_path(%w(fonts images javascripts stylesheets))
     end
 
     def self.asset_paths=(paths)
@@ -31,7 +31,7 @@ module ClassyAssets
     end
 
     def self.asset_host
-      @asset_host ||= nil
+      @asset_host
     end
 
     def self.asset_host=(host)
@@ -39,7 +39,7 @@ module ClassyAssets
     end
 
     def self.asset_prefix
-      @asset_prefix ||= 'assets'
+      @asset_prefix || 'assets'
     end
 
     def self.asset_prefix=(prefix)
@@ -47,7 +47,7 @@ module ClassyAssets
     end
 
     def self.css_compressor
-      @css_compressor ||= :yui
+      @css_compressor || :yui
     end
 
     def self.css_compressor=(compressor)
@@ -55,7 +55,7 @@ module ClassyAssets
     end
 
     def self.debug_mode
-      @debug_mode ||= (ENV['RACK_ENV'] == 'development')
+      @debug_mode.nil? ? (ENV['RACK_ENV'] == 'development') : @debug_mode
     end
 
     def self.debug_mode=(debug)
@@ -63,7 +63,7 @@ module ClassyAssets
     end
 
     def self.js_compressor
-      @js_compressor ||= :uglifier
+      @js_compressor || :uglifier
     end
 
     def self.js_compressor=(compressor)
@@ -71,7 +71,7 @@ module ClassyAssets
     end
 
     def self.public_path
-      @public_path ||= './public'
+      @public_path || File.join(root_path, 'public')
     end
     
     def self.public_path=(path)
@@ -79,7 +79,7 @@ module ClassyAssets
     end
 
     def self.root_path
-      @root_path ||= '.'
+      @root_path || '.'
     end
     
     def self.root_path=(path)
@@ -96,7 +96,7 @@ module ClassyAssets
     def self.sprockets
       @sprockets ||= ::Sprockets::Environment.new(root_path)
       asset_paths.each do |asset_path|
-        @sprockets.append_path asset_path unless @sprockets.paths.include? asset_path
+        @sprockets.append_path asset_path unless @sprockets.paths.include?(asset_path)
       end
       @sprockets
     end

data/lib/classy_assets/version.rb

@@ -1,3 +1,3 @@
 module ClassyAssets
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

data/lib/rack/classy_assets.rb

@@ -5,50 +5,52 @@ require 'classy_assets'
 module Rack
   class ClassyAssets < Sinatra::Base
     def initialize(app)
-      super(app)
-      @sprockets = ::ClassyAssets::Configuration.sprockets
+      super(app) 
     end
+    
+    set :sprockets, ::ClassyAssets::Configuration.sprockets
+    set :asset_prefix, ::ClassyAssets::Configuration.asset_prefix
 
-    get "/#{::ClassyAssets::Configuration.asset_prefix}/:script.js" do |script|
+    get "/#{settings.asset_prefix}/*/:script.js" do |path, script|
       content_type("application/javascript")
-      @sprockets["#{script}.js"]
+      settings.sprockets["#{path}/#{script}.js"]
     end
 
-    get "/#{::ClassyAssets::Configuration.asset_prefix}/:stylesheet.css" do |stylesheet|
+    get "/#{settings.asset_prefix}/*/:stylesheet.css" do |path, stylesheet|
       content_type("text/css")
-      @sprockets["#{stylesheet}.css"]
+      settings.sprockets["#{stylesheet}.css"]
     end
 
-    %w{jpg png gif}.each do |format|
-      get "/#{::ClassyAssets::Configuration.asset_prefix}/:image.#{format}" do |image|
-        content_type("image/#{format}")
-        @sprockets["#{image}.#{format}"]
+    %w(jpeg jpg png gif webp).each do |format|
+      get "/#{settings.asset_prefix}/*/:image.#{format}" do |path, image|
+        content_type("image/#{(format == 'jpg') ? 'jpeg' : format}")
+        settings.sprockets["#{image}.#{format}"]
       end
     end
 
-    get "/#{::ClassyAssets::Configuration.asset_prefix}/:font.ttf" do |font|
+    get "/#{settings.asset_prefix}/*/:font.ttf" do |path, font|
       content_type('application/x-font-truetype')
-      @sprockets["#{font}.ttf"]
+      settings.sprockets["#{font}.ttf"]
     end
 
-    get "/#{::ClassyAssets::Configuration.asset_prefix}/:font.eot" do |font|
+    get "/#{settings.asset_prefix}/*/:font.eot" do |path, font|
       content_type('application/vnd.ms-fontobject')
-      @sprockets["#{font}.eot"]
+      settings.sprockets["#{font}.eot"]
     end
 
-    get "/#{::ClassyAssets::Configuration.asset_prefix}/:font.svg" do |font|
+    get "/#{settings.asset_prefix}/*/:font.svg" do |path, font|
       content_type('image/svg+xml')
-      @sprockets["#{font}.svg"]
+      settings.sprockets["#{font}.svg"]
     end
 
-    get "/#{::ClassyAssets::Configuration.asset_prefix}/:font.woff" do |font|
+    get "/#{settings.asset_prefix}/*/:font.woff" do |path, font|
       content_type('application/x-font-woff')
-      @sprockets["#{font}.woff"]
+      settings.sprockets["#{font}.woff"]
     end
 
-    get "/#{::ClassyAssets::Configuration.asset_prefix}/:font.otf" do |font|
+    get "/#{settings.asset_prefix}/*/:font.otf" do |path, font|
       content_type('application/x-font-opentype')
-      @sprockets["#{font}.otf"]
+      settings.sprockets["#{font}.otf"]
     end
   end
 end

data/lib/sinatra/classy_assets.rb

@@ -7,18 +7,26 @@ module Sinatra
   module ClassyAssets
     def self.registered(app)
       app.use Rack::ClassyAssets
-      app.register ::Sinatra::Sprockets::Helpers
-      app.configure_sprockets_helpers do |config|
-        manifest_file = ::File.join(::ClassyAssets::Configuration.public_path, ::ClassyAssets::Configuration.asset_prefix, 'manifset.json')
+      app.register Sprockets::Helpers
+      app.configure do
+        ::Sprockets::Helpers.configure do |config|
+          classy_config = ::ClassyAssets::Configuration          
+          manifest_file = ::File.join(config.public_path,
+                                      classy_config.asset_prefix,
+                                      'manifset.json')
+          
+          config.asset_host   = classy_config.asset_host
+          config.debug        = classy_config.debug_mode
+          config.digest       = classy_config.asset_digest
+          config.environment  = classy_config.sprockets
+          config.public_path  = classy_config.public_path
+          config.prefix       = "/#{classy_config.asset_prefix}"
 
-        config.asset_host   = ::ClassyAssets::Configuration.asset_host
-        config.debug        = ::ClassyAssets::Configuration.debug_mode
-        config.digest       = ::ClassyAssets::Configuration.asset_digest
-        config.environment  = ::ClassyAssets::Configuration.sprockets
-        config.manifest     = ::Sprockets::Manifest.new(::ClassyAssets::Configuration.sprockets, manifest_file) if ::File.exists? manifest_file
-        config.prefix       = ::ClassyAssets::Configuration.asset_prefix
-        config.public_path  = ::ClassyAssets::Configuration.public_path
-      end 
+          if ::File.exists? manifest_file
+            config.manifest = ::Sprockets::Manifest.new(config.environment, manifest_file)
+          end
+        end
+      end
     end
   end
   register ClassyAssets

data/spec/classy_assets_spec.rb

@@ -5,7 +5,10 @@ require 'classy_assets'
 
 describe ClassyAssets::Configuration do
   subject { ClassyAssets::Configuration }
-  
+  after do
+    ClassyAssets::Configuration.sprockets.clear_paths
+  end
+
   it "returns an array of asset directories" do
     paths = %w(fonts images javascripts stylesheets)
     paths.map! { |dir_name| File.join(ClassyAssets::Configuration.root_path, ClassyAssets::Configuration.asset_prefix, dir_name) }
@@ -71,9 +74,4 @@ describe ClassyAssets::Configuration do
       ClassyAssets::Configuration.public_path.must_equal @public_path
     end
   end
-
-  #after do
-    #ClassyAssets::Configuration.root_path = nil
-    #ClassyAssets::Configuration.public_path = nil
-  #end
 end

data/spec/rack/classy_assets_spec.rb

@@ -3,13 +3,8 @@
 require 'spec_helper'
 require 'rack/classy_assets'
 
-ClassyAssets::Configuration.configure do |config|
-  config.root_path = File.expand_path('../../support', __FILE__)
-  config.public_path = File.expand_path('../../support/public', __FILE__)
-end
-
 class MiddlewareApp < Sinatra::Base
-  use Rack::ClassyAssets
+  use Rack::ClassyAssets  
 end
 
 describe Rack::ClassyAssets do
@@ -18,17 +13,21 @@ describe Rack::ClassyAssets do
     MiddlewareApp.new
   end
 
+  after do
+    ClassyAssets::Configuration.sprockets.clear_paths
+  end
+
   describe "stylesheets" do
     describe "css" do
       it "will respond sucessfully" do
-        get '/assets/stylesheet.css'
+        get '/assets/spec/support/stylesheet.css'
         last_response.status.must_equal 200
       end
     end
     
     describe "sass" do
       it "will respond sucessfully" do
-        get '/assets/application.css'
+        get '/assets/spec/support/application.css'
         last_response.status.must_equal 200
       end
     end
@@ -37,14 +36,14 @@ describe Rack::ClassyAssets do
   describe "javascripts" do
     describe "js" do
       it "will respond sucessfully" do
-        get '/assets/javascript.js'
+        get '/assets/spec/support/javascript.js'
         last_response.status.must_equal 200
       end
     end
 
     describe "coffeescript" do
       it "will respond sucessfully" do
-        get '/assets/application.js'
+        get '/assets/spec/support/application.js'
         last_response.status.must_equal 200
       end
     end
@@ -53,21 +52,21 @@ describe Rack::ClassyAssets do
   describe "images" do
     describe "gif" do
       it "will respond sucessfully" do
-        get '/assets/image.gif'
+        get '/assets/spec/support/image.gif'
         last_response.status.must_equal 200
       end
     end
 
     describe "jpg" do
       it "will respond sucessfully" do
-        get '/assets/image.jpg'
+        get '/assets/spec/support/image.jpg'
         last_response.status.must_equal 200
       end
     end
     
     describe "png" do
       it "will respond sucessfully" do
-        get '/assets/image.png'
+        get '/assets/spec/support/image.png'
         last_response.status.must_equal 200
       end
     end
@@ -76,35 +75,35 @@ describe Rack::ClassyAssets do
   describe "fonts" do
     describe "eot" do
       it "will respond sucessfully" do
-        get '/assets/font.eot'
+        get '/assets/spec/support/font.eot'
         last_response.status.must_equal 200
       end
     end
 
     describe "otf" do
       it "will respond sucessfully" do
-        get '/assets/font.otf'
+        get '/assets/spec/support/font.otf'
         last_response.status.must_equal 200
       end
     end
     
     describe "svg" do
       it "will respond sucessfully" do
-        get '/assets/font.svg'
+        get '/assets/spec/support/font.svg'
         last_response.status.must_equal 200
       end
     end
     
     describe "ttf" do
       it "will respond sucessfully" do
-        get '/assets/font.ttf'
+        get '/assets/spec/support/font.ttf'
         last_response.status.must_equal 200
       end
     end
     
     describe "woff" do
       it "will respond sucessfully" do
-        get '/assets/font.woff'
+        get '/assets/spec/support/font.woff'
         last_response.status.must_equal 200
       end
     end

data/spec/sinatra/classy_assets_spec.rb

@@ -3,32 +3,31 @@
 require 'spec_helper'
 require 'sinatra/classy_assets'
 
-ClassyAssets::Configuration.configure do |config|
-  config.root_path = File.expand_path('../../support', __FILE__)
-  config.public_path = File.expand_path('../../support/public', __FILE__)
-end
-
 class ExtensionApp < Sinatra::Base
+  set :root, File.expand_path('../../support', __FILE__)
   register Sinatra::ClassyAssets
 end
 
+def app
+  ExtensionApp.new
+end
+
 describe Rack::ClassyAssets do
-  include Rack::Test::Methods
-  def app
-    ExtensionApp.new
+  after do
+    ClassyAssets::Configuration.sprockets.clear_paths
   end
 
   describe "stylesheets" do
     describe "css" do
       it "will respond sucessfully" do
-        get '/assets/stylesheet.css'
+        get '/assets/spec/support/stylesheet.css'
         last_response.status.must_equal 200
       end
     end
     
     describe "sass" do
       it "will respond sucessfully" do
-        get '/assets/application.css'
+        get '/assets/spec/support/application.css'
         last_response.status.must_equal 200
       end
     end
@@ -37,14 +36,14 @@ describe Rack::ClassyAssets do
   describe "javascripts" do
     describe "js" do
       it "will respond sucessfully" do
-        get '/assets/javascript.js'
+        get '/assets/spec/support/javascript.js'
         last_response.status.must_equal 200
       end
     end
 
     describe "coffeescript" do
       it "will respond sucessfully" do
-        get '/assets/application.js'
+        get '/assets/spec/support/application.js'
         last_response.status.must_equal 200
       end
     end
@@ -53,21 +52,21 @@ describe Rack::ClassyAssets do
   describe "images" do
     describe "gif" do
       it "will respond sucessfully" do
-        get '/assets/image.gif'
+        get '/assets/spec/support/image.gif'
         last_response.status.must_equal 200
       end
     end
 
     describe "jpg" do
       it "will respond sucessfully" do
-        get '/assets/image.jpg'
+        get '/assets/spec/support/image.jpg'
         last_response.status.must_equal 200
       end
     end
     
     describe "png" do
       it "will respond sucessfully" do
-        get '/assets/image.png'
+        get '/assets/spec/support/image.png'
         last_response.status.must_equal 200
       end
     end
@@ -76,35 +75,35 @@ describe Rack::ClassyAssets do
   describe "fonts" do
     describe "eot" do
       it "will respond sucessfully" do
-        get '/assets/font.eot'
+        get '/assets/spec/support/font.eot'
         last_response.status.must_equal 200
       end
     end
 
     describe "otf" do
       it "will respond sucessfully" do
-        get '/assets/font.otf'
+        get '/assets/spec/support/font.otf'
         last_response.status.must_equal 200
       end
     end
     
     describe "svg" do
       it "will respond sucessfully" do
-        get '/assets/font.svg'
+        get '/assets/spec/support/font.svg'
         last_response.status.must_equal 200
       end
     end
     
     describe "ttf" do
       it "will respond sucessfully" do
-        get '/assets/font.ttf'
+        get '/assets/spec/support/font.ttf'
         last_response.status.must_equal 200
       end
     end
     
     describe "woff" do
       it "will respond sucessfully" do
-        get '/assets/font.woff'
+        get '/assets/spec/support/font.woff'
         last_response.status.must_equal 200
       end
     end

data/spec/spec_helper.rb

@@ -9,3 +9,11 @@ require 'classy_assets'
 require 'minitest/autorun'
 require 'minitest/reporters'
 MiniTest::Reporters.use! MiniTest::Reporters::SpecReporter.new
+
+include Rack::Test::Methods
+
+ClassyAssets::Configuration.configure do |config|
+  config.root_path = File.expand_path('../support', __FILE__)
+  config.public_path = File.expand_path('../support/public', __FILE__)
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: classy_assets
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - StyleSeek Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2013-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script