dynamic_assets 0.6.0 → 0.7.0

data/app/helpers/dynamic_assets_helpers.rb

@@ -32,7 +32,7 @@ protected
     path_args = []
     path_args << asset_ref.name
 
-    signature = asset_ref.signature binding
+    signature = asset_ref.signature DynamicAssets::ViewContext.get(controller)
     path_args << { :signature => signature } if signature.present?
 
     case asset_ref

data/lib/dynamic_assets.rb

@@ -11,3 +11,4 @@ require 'dynamic_assets/manager'
 require 'dynamic_assets/reference'
 require 'dynamic_assets/reference/javascript_reference'
 require 'dynamic_assets/reference/stylesheet_reference'
+require 'dynamic_assets/view_context'

data/lib/dynamic_assets/controller.rb

@@ -27,7 +27,7 @@ module DynamicAssets
         headers["Expires"] = (Time.now + 365.days).utc.httpdate
       end
 
-      render :layout => false, :text => asset.content(binding), :content_type => mime_type
+      render :layout => false, :text => asset.content(ViewContext.get(self)), :content_type => mime_type
     end
   end
 

data/lib/dynamic_assets/reference.rb

@@ -1,4 +1,5 @@
 require 'digest/sha1'
+require 'erubis'
 
 module DynamicAssets
   class Reference
@@ -116,7 +117,7 @@ module DynamicAssets
       if path_is_erb?(path)
         raise "ERB requires a context" unless @context
         begin
-          content_string = ERB.new(content_string).result @context
+          content_string = Erubis::Eruby.new(content_string).result @context
         rescue StandardError => e
           raise e.exception(parse_erb_error(e, path, content_string) ||
             "Error in ERB #{path}, unknown line number: #{e}")
@@ -137,7 +138,8 @@ module DynamicAssets
     def parse_erb_error(error, path, content_string)
       # Exception parsing inspired by HelpfulERB
 
-      return nil unless error.backtrace.first =~ /^[^:]+:(\d+):in /
+      trace_index = error.backtrace.find_index { |trace_line| trace_line =~ /^.erubis:(\d+):in / }
+      return nil unless trace_index
 
       line_number = $1.to_i
       lines = content_string.split /\n/
@@ -153,7 +155,8 @@ module DynamicAssets
           marker = n == line_number ? "*" : ""
           "%2s %#{width}i %s" % [marker, n, lines[i]]
         end.join("\n") +
-        "\n\n#{error.class}: #{error.message}"
+        "\n\n#{error.class}: #{error.message}" +
+        (trace_index > 0 ? "\n\nEncountered here:\n#{error.backtrace[0..trace_index-1].join "\n"}" : "")
     end
   end
 end

data/lib/dynamic_assets/view_context.rb

@@ -0,0 +1,16 @@
+
+module DynamicAssets
+  class ViewContext
+
+    def self.get(controller)
+      controller.view_context.tap do |c|
+        class << c
+          def get_binding
+            binding
+          end
+        end
+      end.get_binding
+    end
+
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: dynamic_assets
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Robert Davis
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-05 00:00:00 -05:00
+date: 2011-06-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,6 +112,7 @@ files:
 - lib/dynamic_assets/reference.rb
 - lib/dynamic_assets/reference/javascript_reference.rb
 - lib/dynamic_assets/reference/stylesheet_reference.rb
+- lib/dynamic_assets/view_context.rb
 - README.rdoc
 has_rdoc: true
 homepage: http://github.com/davisre/dynamic_assets
@@ -127,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1850481041292794772
+      hash: -1939636484692022246
       segments: 
       - 0
       version: "0"