rails3-footnotes 4.0.0.pre.5 → 4.0.0.pre.6

data/CHANGELOG

@@ -1,3 +1,6 @@
+== Footnotes v4.0.0.pre.6 (April 5, 2011)
+  * fix another Pathname error in Ruby 1.9
+
 == Footnotes v4.0.0.pre.5 (April 4, 2011)
   * fix Pathname error in Ruby 1.9
   * add view note that links to edit the view

data/lib/rails-footnotes/notes/layout_note.rb

@@ -18,7 +18,12 @@ module Footnotes
 
     protected
       def filename
-        Dir[Footnotes.view_subscriber.layout.to_s+".html*"].first
+        @filename ||= begin
+          layout = Footnotes.view_subscriber.layout
+          layout_glob = Rails.root.join("app/views", layout).to_s
+          layout_glob += ".html*"
+          Dir[layout_glob].first
+        end
       end
 
     end

data/lib/rails-footnotes/notes/render_note.rb

@@ -20,7 +20,7 @@ module Footnotes
 
         if @page
           view = Footnotes.view_subscriber.view_name
-          layout = Footnotes.view_subscriber.layout_name
+          layout = Footnotes.view_subscriber.layout
           partial_time = Footnotes.view_subscriber.partial_time
 
           rows = [["View", "Layout", "View Render", "Partial Render", "Total Render"],

data/lib/rails-footnotes/notes/view_note.rb

@@ -10,18 +10,13 @@ module Footnotes
       end
 
       def link
-        escape(Footnotes::Filter.prefix(filename, 1, 1))
+        escape(Footnotes::Filter.prefix(Footnotes.view_subscriber.view, 1, 1))
       end
 
       def valid?
         prefix? && filename
       end
 
-    protected
-      def filename
-        Footnotes.view_subscriber.view
-      end
-
     end
   end
 end

data/lib/rails-footnotes/version.rb

@@ -1,3 +1,3 @@
 module Footnotes
-  VERSION = "4.0.0.pre.5"
+  VERSION = "4.0.0.pre.6"
 end

data/lib/rails-footnotes/view_subscriber.rb

@@ -30,14 +30,10 @@ module Footnotes
     end
 
     def view_name
-      view && view.gsub(Rails.root.join("app/views/"),'')
+      view && view.gsub(Rails.root.join("app/views/").to_s, '')
     end
 
     def layout
-      page && Rails.root.join("app/views", page.payload[:layout])
-    end
-
-    def layout_name
       page && page.payload[:layout]
     end
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rails3-footnotes
 version: !ruby/object:Gem::Version 
-  hash: 1923831843
+  hash: 1923831845
   prerelease: true
   segments: 
   - 4
   - 0
   - 0
   - pre
-  - 5
-  version: 4.0.0.pre.5
+  - 6
+  version: 4.0.0.pre.6
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"