classy_assets 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16e0896b4b3b3115e122a6ef5eef0b9b2bc43884
-  data.tar.gz: f2cffb4da33ba1d3f2869dc2d8f1456482279407
+  metadata.gz: 03d29251ccdb2bcc1c12d3dd5f68162410a3cad2
+  data.tar.gz: 7defa03d33fd94492cd8e94c61c9411cb3650283
 SHA512:
-  metadata.gz: afa26b7e3ef4b4870911d234a9c0c64043aa6946a3246ed25276afa1fb8fdf89e1fb1317290c3f9529b831ea6d898428005d1ebabc8db00ce42fae7dd654f023
-  data.tar.gz: 047bcb382fb9f5141c7b471b5a33b85ecd1a77d7cb67d175b3d29294abd994c1b0b4460e0388e34b1774546594201c4dab015072e2ed9e9a3332a5210464a621
+  metadata.gz: 75cc068bef0fe245c0218e6819d72be0d405e54d5fd779e6a2f453028c57eb5988a9394343ab12d71879e71341c0a57bc3c240bba093f304f0cd00580220ef10
+  data.tar.gz: 8d1cdb94f133d9c632c4b3720e2080ef71c7bcbe8948ccff5401ba3bd9013921e5a4f1603e85f1b67297dbfa8cca2086fcc54763c36d1eb455740e7a0d58d038

data/classy_assets.gemspec

@@ -21,8 +21,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'coffee-script'
   gem.add_dependency 'sass'
   gem.add_dependency 'sprockets'
-  gem.add_dependency 'sprockets-sass'
-  gem.add_dependency 'sprockets-helpers'
   gem.add_dependency 'compass'
   gem.add_dependency 'uglifier'
   gem.add_dependency 'yui-compressor'

data/lib/classy_assets/configuration.rb

@@ -82,9 +82,7 @@ module ClassyAssets
 
       @sprockets.context_class.class_eval do
         def asset_path(path, options = {})
-          depend_on_asset(path)
-          asset = environment.find_asset(path)
-          ClassyAssets.asset_url_for(asset.logical_path)
+          ClassyAssets.asset_url_for(path)
         end
       end
 

data/lib/classy_assets/version.rb

@@ -1,3 +1,3 @@
 module ClassyAssets
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/classy_assets.rb

@@ -4,25 +4,17 @@ require 'compass'
 require 'sass'
 require 'coffee_script'
 require 'sprockets'
-require 'sprockets-sass'
 require 'sinatra/base'
 require 'classy_assets/configuration'
 require 'classy_assets/version'
 
 module ClassyAssets
   def self.asset_url_for(asset)
-    asset = asset.instance_of?(::Sprockets::BundledAsset) ? asset : Configuration.sprockets[asset].logical_path
-    asset = build_digest_filename(asset) if Configuration.asset_digest
+    asset = Configuration.sprockets[asset].send(determine_path_type)
     debug = (Configuration.debug_mode) ? '?body=1' : ''
     "#{Configuration.asset_host}/#{Configuration.asset_prefix}/#{asset}#{debug}"
   end
 
-  def self.build_digest_filename(asset)
-    filename = asset.split(".")
-    ext = filename.pop
-    "#{filename.join('.')}-#{Configuration.sprockets.digest}.#{ext}"
-  end
-
   def self.asset_tag_from(sources, ext)
     sources = [sources] unless sources.is_a? Array
     sources.map do |source|
@@ -31,4 +23,10 @@ module ClassyAssets
       yield(asset_url)
     end.join('')
   end
+
+  def self.determine_path_type
+    (Configuration.asset_digest) ? :digest_path : :logical_path
+  end
 end
+
+require 'sass/script/functions'

data/lib/rack/classy_assets.rb

@@ -6,8 +6,10 @@ 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["#{asset}#{ext}"] || halt(404)
+        ::ClassyAssets::Configuration.sprockets[filename] || halt(404)
       end 
     end 
   end

data/lib/sass/script/functions.rb

@@ -0,0 +1,7 @@
+module Sass::Script::Functions
+  def asset_path(source)
+    assert_type source, :String
+    ClassyAssets.asset_url_for(source)
+  end
+  declare :asset_path, :args => [:source]
+end

data/spec/classy_assets_spec.rb

@@ -45,7 +45,7 @@ describe ClassyAssets do
 
     it "returns the digest url to the asset" do
       asset_url = ClassyAssets.asset_url_for 'application.js'
-      asset_url.must_equal "/assets/application-#{@digest}.js"
+      asset_url.must_equal "/assets/#{ClassyAssets::Configuration.sprockets['application.js'].digest_path}"
     end
   end
 

data/spec/support/assets/stylesheets/application.scss

@@ -1,3 +1,3 @@
 //= require stylesheet
 
-.bg { background-url: asset_path('image.png'); }
+.bg { background-url: asset-path('image.png'); }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: classy_assets
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - StyleSeek Engineering
@@ -52,34 +52,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sprockets-sass
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sprockets-helpers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: compass
   requirement: !ruby/object:Gem::Requirement
@@ -202,6 +174,7 @@ files:
 - lib/classy_assets/tasks/assets.rake
 - lib/classy_assets/version.rb
 - lib/rack/classy_assets.rb
+- lib/sass/script/functions.rb
 - lib/sinatra/classy_assets.rb
 - spec/classy_assets/configuration_spec.rb
 - spec/classy_assets_spec.rb