classy_assets 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bb5c045b40c7a18eedbfa6a32e7a9a71c8ae9ed
-  data.tar.gz: 4b20a1d196309da05e7edae4cdef3761c00dc3ed
+  metadata.gz: 5b2a4669a0892222ca15c7eb900fdb362d9e7d71
+  data.tar.gz: 7c3994fcfa62f5a9097337c9b1dd294654805da2
 SHA512:
-  metadata.gz: 69ab2b9dd844a9ab983e60511ab054659c8200eacba3ce408a02006da957e5b100c82052ed6f3074f12cfa33e3fff24c191136f328bc92c61b686f5dcf3dbc56
-  data.tar.gz: 63f2076784e5705129de6061bc7477944b2f6bdd9846fe1270364bc4931244c6d4ef0dd0e41a55bc5c6dd1bc972694c0169e10d0e917f81d8a2059345cd57624
+  metadata.gz: 66d0e7c3e2bebe79615c8a126fa17d98481b552e0b1e239ddba67b9a6fd85df1d2d82fbd980421b2e2f4cf785a79d95dee8b1cb1efef010c3968955d20402116
+  data.tar.gz: 7d04b3eb7ba3f67d766b7bff6328c5ffac2fe6684bb476d0cbab75ffffb86f0e841a8ed480f9a5f985a6c4637ae8ec2f51b64762e69ca568a885a4a3e178caa4

data/lib/classy_assets/version.rb

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

data/lib/rack/classy_assets.rb

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

data/spec/classy_assets_spec.rb

@@ -6,6 +6,8 @@ require 'classy_assets'
 describe ClassyAssets::Configuration do
   subject { ClassyAssets::Configuration }
   after do
+    ClassyAssets::Configuration.root_path = nil
+    ClassyAssets::Configuration.public_path = nil    
     ClassyAssets::Configuration.sprockets.clear_paths
   end
 
@@ -40,11 +42,11 @@ describe ClassyAssets::Configuration do
   end
 
   it "returns the path to the public folder" do
-    subject.public_path.must_equal File.expand_path('../support/public', __FILE__) 
+    subject.public_path.must_equal './public'
   end
   
   it "returns the path to the root folder" do
-    subject.root_path.must_equal File.expand_path('../support', __FILE__)
+    subject.root_path.must_equal '.'
   end
 
   it "returns the sprockets environment" do
@@ -52,7 +54,7 @@ describe ClassyAssets::Configuration do
   end
 
   it "returns the correct asset paths" do
-    subject.sprockets.paths.must_equal subject.asset_paths
+    subject.sprockets.paths.must_equal subject.asset_paths.map {|p| File.expand_path(p)  }
   end
 
   describe "configure" do

data/spec/rack/classy_assets_spec.rb

@@ -7,27 +7,26 @@ class MiddlewareApp < Sinatra::Base
   use Rack::ClassyAssets  
 end
 
-describe Rack::ClassyAssets do
-  include Rack::Test::Methods
-  def app
-    MiddlewareApp.new
-  end
+def app
+  MiddlewareApp.new
+end
 
+describe Rack::ClassyAssets do
   after do
     ClassyAssets::Configuration.sprockets.clear_paths
   end
 
   describe "stylesheets" do
     describe "css" do
-      it "will respond sucessfully" do
-        get '/assets/spec/support/stylesheet.css'
+      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/spec/support/application.css'
+        get '/assets/application.css'
         last_response.status.must_equal 200
       end
     end
@@ -36,14 +35,14 @@ describe Rack::ClassyAssets do
   describe "javascripts" do
     describe "js" do
       it "will respond sucessfully" do
-        get '/assets/spec/support/javascript.js'
+        get '/assets/javascript.js'
         last_response.status.must_equal 200
       end
     end
 
     describe "coffeescript" do
       it "will respond sucessfully" do
-        get '/assets/spec/support/application.js'
+        get '/assets/application.js'
         last_response.status.must_equal 200
       end
     end
@@ -52,21 +51,21 @@ describe Rack::ClassyAssets do
   describe "images" do
     describe "gif" do
       it "will respond sucessfully" do
-        get '/assets/spec/support/image.gif'
+        get '/assets/image.gif'
         last_response.status.must_equal 200
       end
     end
 
     describe "jpg" do
       it "will respond sucessfully" do
-        get '/assets/spec/support/image.jpg'
+        get '/assets/image.jpg'
         last_response.status.must_equal 200
       end
     end
     
     describe "png" do
       it "will respond sucessfully" do
-        get '/assets/spec/support/image.png'
+        get '/assets/image.png'
         last_response.status.must_equal 200
       end
     end
@@ -75,35 +74,35 @@ describe Rack::ClassyAssets do
   describe "fonts" do
     describe "eot" do
       it "will respond sucessfully" do
-        get '/assets/spec/support/font.eot'
+        get '/assets/font.eot'
         last_response.status.must_equal 200
       end
     end
 
     describe "otf" do
       it "will respond sucessfully" do
-        get '/assets/spec/support/font.otf'
+        get '/assets/font.otf'
         last_response.status.must_equal 200
       end
     end
     
     describe "svg" do
       it "will respond sucessfully" do
-        get '/assets/spec/support/font.svg'
+        get '/assets/font.svg'
         last_response.status.must_equal 200
       end
     end
     
     describe "ttf" do
       it "will respond sucessfully" do
-        get '/assets/spec/support/font.ttf'
+        get '/assets/font.ttf'
         last_response.status.must_equal 200
       end
     end
     
     describe "woff" do
       it "will respond sucessfully" do
-        get '/assets/spec/support/font.woff'
+        get '/assets/font.woff'
         last_response.status.must_equal 200
       end
     end

data/spec/sinatra/classy_assets_spec.rb

@@ -4,7 +4,6 @@ require 'spec_helper'
 require 'sinatra/classy_assets'
 
 class ExtensionApp < Sinatra::Base
-  set :root, File.expand_path('../../support', __FILE__)
   register Sinatra::ClassyAssets
 end
 
@@ -20,14 +19,14 @@ describe Rack::ClassyAssets do
   describe "stylesheets" do
     describe "css" do
       it "will respond sucessfully" do
-        get '/assets/spec/support/stylesheet.css'
+        get '/assets/stylesheet.css'
         last_response.status.must_equal 200
       end
     end
     
     describe "sass" do
       it "will respond sucessfully" do
-        get '/assets/spec/support/application.css'
+        get '/assets/application.css'
         last_response.status.must_equal 200
       end
     end
@@ -36,14 +35,14 @@ describe Rack::ClassyAssets do
   describe "javascripts" do
     describe "js" do
       it "will respond sucessfully" do
-        get '/assets/spec/support/javascript.js'
+        get '/assets/javascript.js'
         last_response.status.must_equal 200
       end
     end
 
     describe "coffeescript" do
       it "will respond sucessfully" do
-        get '/assets/spec/support/application.js'
+        get '/assets/application.js'
         last_response.status.must_equal 200
       end
     end
@@ -52,21 +51,21 @@ describe Rack::ClassyAssets do
   describe "images" do
     describe "gif" do
       it "will respond sucessfully" do
-        get '/assets/spec/support/image.gif'
+        get '/assets/image.gif'
         last_response.status.must_equal 200
       end
     end
 
     describe "jpg" do
       it "will respond sucessfully" do
-        get '/assets/spec/support/image.jpg'
+        get '/assets/image.jpg'
         last_response.status.must_equal 200
       end
     end
     
     describe "png" do
       it "will respond sucessfully" do
-        get '/assets/spec/support/image.png'
+        get '/assets/image.png'
         last_response.status.must_equal 200
       end
     end
@@ -75,35 +74,35 @@ describe Rack::ClassyAssets do
   describe "fonts" do
     describe "eot" do
       it "will respond sucessfully" do
-        get '/assets/spec/support/font.eot'
+        get '/assets/font.eot'
         last_response.status.must_equal 200
       end
     end
 
     describe "otf" do
       it "will respond sucessfully" do
-        get '/assets/spec/support/font.otf'
+        get '/assets/font.otf'
         last_response.status.must_equal 200
       end
     end
     
     describe "svg" do
       it "will respond sucessfully" do
-        get '/assets/spec/support/font.svg'
+        get '/assets/font.svg'
         last_response.status.must_equal 200
       end
     end
     
     describe "ttf" do
       it "will respond sucessfully" do
-        get '/assets/spec/support/font.ttf'
+        get '/assets/font.ttf'
         last_response.status.must_equal 200
       end
     end
     
     describe "woff" do
       it "will respond sucessfully" do
-        get '/assets/spec/support/font.woff'
+        get '/assets/font.woff'
         last_response.status.must_equal 200
       end
     end

data/spec/spec_helper.rb

@@ -11,9 +11,3 @@ 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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: classy_assets
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - StyleSeek Engineering
@@ -234,6 +234,18 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- assets/fonts/font.eot
+- assets/fonts/font.otf
+- assets/fonts/font.svg
+- assets/fonts/font.ttf
+- assets/fonts/font.woff
+- assets/images/image.gif
+- assets/images/image.jpg
+- assets/images/image.png
+- assets/javascripts/application.coffee
+- assets/javascripts/javascript.js
+- assets/stylesheets/application.scss
+- assets/stylesheets/stylesheet.css
 - bin/.files/pre-commit.hook
 - bin/classy_assets
 - classy_assets.gemspec
@@ -248,18 +260,6 @@ files:
 - spec/rack/classy_assets_spec.rb
 - spec/sinatra/classy_assets_spec.rb
 - spec/spec_helper.rb
-- spec/support/assets/fonts/font.eot
-- spec/support/assets/fonts/font.otf
-- spec/support/assets/fonts/font.svg
-- spec/support/assets/fonts/font.ttf
-- spec/support/assets/fonts/font.woff
-- spec/support/assets/images/image.gif
-- spec/support/assets/images/image.jpg
-- spec/support/assets/images/image.png
-- spec/support/assets/javascripts/application.coffee
-- spec/support/assets/javascripts/javascript.js
-- spec/support/assets/stylesheets/application.scss
-- spec/support/assets/stylesheets/stylesheet.css
 homepage: https://github.com/styleseek/classy_assets
 licenses:
 - MIT
@@ -289,15 +289,3 @@ test_files:
 - spec/rack/classy_assets_spec.rb
 - spec/sinatra/classy_assets_spec.rb
 - spec/spec_helper.rb
-- spec/support/assets/fonts/font.eot
-- spec/support/assets/fonts/font.otf
-- spec/support/assets/fonts/font.svg
-- spec/support/assets/fonts/font.ttf
-- spec/support/assets/fonts/font.woff
-- spec/support/assets/images/image.gif
-- spec/support/assets/images/image.jpg
-- spec/support/assets/images/image.png
-- spec/support/assets/javascripts/application.coffee
-- spec/support/assets/javascripts/javascript.js
-- spec/support/assets/stylesheets/application.scss
-- spec/support/assets/stylesheets/stylesheet.css