merged Contiamo/hexdigest-fix

jwhitley · Mar 2, 2013 · 2af4e4a · 2af4e4a
2 parents 4240aba + 7eaa1a9
commit 2af4e4a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/lib/requirejs/rails/builder.rb b/lib/requirejs/rails/builder.rb
@@ -16,9 +16,11 @@ def build
     end
 
     def digest_for(path)
-      Rails.application.assets.file_digest(path).hexdigest
-    rescue StandardError => e
-      raise ArgumentError, "digest_for(#{path}) failed with #{e.class}: #{e.message}\n#{e.backtrace[0..4].join("\n")}"
+      if !Rails.application.assets.file_digest(path).nil?
+        Rails.application.assets.file_digest(path).hexdigest
+      else
+        puts "Asset digest not found:", path
+      end
     end
 
     def generate_rjs_driver

diff --git a/lib/requirejs/rails/version.rb b/lib/requirejs/rails/version.rb
@@ -1,6 +1,6 @@
 module Requirejs
   module Rails
-    Version = "0.9.1"
+    Version = "0.9.1.1"
     LibVersion = "2.1.2"
   end
 end
diff --git a/lib/tasks/requirejs-rails_tasks.rake b/lib/tasks/requirejs-rails_tasks.rake
@@ -118,7 +118,7 @@ EOM
     task :digestify_and_compress => ["requirejs:setup"] do
       requirejs.config.build_config['modules'].each do |m|
         asset_name = "#{requirejs.config.module_name_for(m)}.js"
-        built_asset_path = requirejs.config.target_dir + asset_name
+        built_asset_path = Rails.application.assets.find_asset(asset_name).pathname
         digest_name = asset_name.sub(/\.(\w+)$/) { |ext| "-#{requirejs.builder.digest_for(built_asset_path)}#{ext}" }
         digest_asset_path = requirejs.config.target_dir + digest_name
         requirejs.manifest[asset_name] = digest_name