crayfish 0.2.3 → 0.2.4

data/lib/crayfish/html.rb

@@ -76,6 +76,10 @@ module Crayfish
     end
 
     def public_path_to_fs_path path
+      if /^(?<stripped>[^\?]*)\?[0-9]*$/ =~ path
+        path = stripped
+      end
+
       search_paths = [::Rails.public_path] + ::Rails.configuration.assets.paths
       search_paths.each do |search_path|
         if File.exists?("#{search_path}/#{path}")

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.3"
+  VERSION = "0.2.4"
 end

data/test/dummy/log/test.log

@@ -1625,3 +1625,118 @@ undefined local variable or method `aaa' for #<CrayfishActionViewTest::ActionVie
    (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.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.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.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.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.0ms)  begin transaction
+   (0.0ms)  rollback transaction

data/test/html_test.rb

@@ -43,6 +43,14 @@ class HtmlTest < ActiveSupport::TestCase
     assert_equal "/assets/a.file", @html.public_path_to_fs_path('a.file')
   end
 
+  test "should strip session key from public files" do # are these realy session keys?
+    ::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?123456')
+  end
+
   test "compile img" do
     img = stub('html img')
     img.stubs(:name).returns(:img)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crayfish
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70107095324480 !ruby/object:Gem::Requirement
+  requirement: &70128930912640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70107095324480
+  version_requirements: *70128930912640
 - !ruby/object:Gem::Dependency
   name: prawn
-  requirement: &70107095323160 !ruby/object:Gem::Requirement
+  requirement: &70128930893620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70107095323160
+  version_requirements: *70128930893620
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70107095321480 !ruby/object:Gem::Requirement
+  requirement: &70128930892100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70107095321480
+  version_requirements: *70128930892100
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70107095319680 !ruby/object:Gem::Requirement
+  requirement: &70128930890080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70107095319680
+  version_requirements: *70128930890080
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70107095318780 !ruby/object:Gem::Requirement
+  requirement: &70128930887780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70107095318780
+  version_requirements: *70128930887780
 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: 4351079184167744567
+      hash: -1425163839330226270
 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: 4351079184167744567
+      hash: -1425163839330226270
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15