crayfish 0.2.2 → 0.2.3

data/lib/crayfish/html.rb

@@ -71,6 +71,33 @@ module Crayfish
       @pdf     = pdf
     end
 
+    def asset_paths
+      @@asset_paths ||= ::ActionView::Helpers::AssetTagHelper::AssetPaths.new(::Rails.configuration.action_controller)
+    end
+
+    def public_path_to_fs_path path
+      search_paths = [::Rails.public_path] + ::Rails.configuration.assets.paths
+      search_paths.each do |search_path|
+        if File.exists?("#{search_path}/#{path}")
+          return "#{search_path}/#{path}"
+        end
+      end
+
+      if /^\/assets\/(?<path>.*)$/ =~ path
+        search_paths.each do |search_path|
+          if File.exists?("#{search_path}/#{path}")
+            return "#{search_path}/#{path}"
+          end
+        end
+      end
+      raise "Could not locate #{path} in #{search_paths.inspect}"
+    end
+
+    def image_fs_path image
+      public_path = asset_paths.compute_public_path(image, 'images')
+      public_path_to_fs_path(public_path)
+    end
+
     def apply_style cell,style
       # background-color:#ccccff
       style.split(';').each do |style|
@@ -107,8 +134,7 @@ module Crayfish
 
       case name
       when :img
-        # we would really like to use image_path here
-        image = {:image => "app#{node.attributes['src'].value}"}
+        image = { :image =>  image_fs_path(node.attributes['src'].value) }
         image[:width]  = node.attributes['width'].value.to_f  if node.attributes['width']
         image[:height] = node.attributes['height'].value.to_f if node.attributes['height']
         return image

data/lib/crayfish/version.rb

@@ -21,5 +21,5 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 module Crayfish
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/test/dummy/log/test.log

@@ -1425,3 +1425,203 @@ undefined local variable or method `aaa' for #<CrayfishActionViewTest::ActionVie
    (0.1ms)  rollback transaction
    (0.0ms)  begin transaction
    (0.0ms)  rollback transaction
+   (0.3ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+unknown node p in CrayHtml
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+unknown node p in CrayHtml
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.3ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+unknown node p in CrayHtml
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.3ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+unknown node p in CrayHtml
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.3ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+unknown node p in CrayHtml
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.3ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+unknown node p in CrayHtml
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+unknown node p in CrayHtml
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.3ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+unknown node p in CrayHtml
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.3ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+unknown node p in CrayHtml
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+unknown node p in CrayHtml
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction

data/test/html_test.rb

@@ -28,11 +28,29 @@ class HtmlTest < ActiveSupport::TestCase
     @html = ::Crayfish::Html.new(nil,nil)
   end
 
+  test "should locate public files" do
+    ::Rails.stubs(:public_path).returns('/pub')
+    ::Rails.configuration.assets.stubs(:paths).returns([])
+    File.expects(:exists?).with("/pub/a.file").returns(true)
+    assert_equal "/pub/a.file", @html.public_path_to_fs_path('a.file')
+  end
+
+  test "should locate public files in a asset path" do
+    ::Rails.stubs(:public_path).returns('/pub')
+    ::Rails.configuration.assets.stubs(:paths).returns(['/assets'])
+    File.expects(:exists?).with("/pub/a.file").returns(false)
+    File.expects(:exists?).with("/assets/a.file").returns(true)
+    assert_equal "/assets/a.file", @html.public_path_to_fs_path('a.file')
+  end
+
   test "compile img" do
     img = stub('html img')
     img.stubs(:name).returns(:img)
-    img.stubs(:attributes).returns({ 'src' => OpenStruct.new(:value => '/some url')})
-    assert_equal @html.compile(img), :image=>"app/some url"
+    img.stubs(:attributes).returns({ 'src' => OpenStruct.new(:value => 'a.file')})
+    ::Rails.stubs(:public_path).returns('/pub')
+    ::Rails.configuration.assets.stubs(:paths).returns([])
+    File.expects(:exists?).with("/pub//images/a.file").returns(true)
+    assert_equal @html.compile(img), :image=>"/pub//images/a.file"
   end
 
   test "compile empty td" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crayfish
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-27 00:00:00.000000000Z
+date: 2012-05-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70290046667320 !ruby/object:Gem::Requirement
+  requirement: &70107095324480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70290046667320
+  version_requirements: *70107095324480
 - !ruby/object:Gem::Dependency
   name: prawn
-  requirement: &70290046666360 !ruby/object:Gem::Requirement
+  requirement: &70107095323160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70290046666360
+  version_requirements: *70107095323160
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70290046665540 !ruby/object:Gem::Requirement
+  requirement: &70107095321480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70290046665540
+  version_requirements: *70107095321480
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70290046663920 !ruby/object:Gem::Requirement
+  requirement: &70107095319680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70290046663920
+  version_requirements: *70107095319680
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70290046660760 !ruby/object:Gem::Requirement
+  requirement: &70107095318780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70290046660760
+  version_requirements: *70107095318780
 description: Crayfish - PDF templating for Rails
 email:
 - patrick.hanevold@gmail.com
@@ -133,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 791229958043033619
+      hash: 4351079184167744567
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 791229958043033619
+      hash: 4351079184167744567
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15