jadof 0.1.3 → 0.1.4

data/lib/jadof/page.rb

@@ -113,18 +113,28 @@ module JADOF #:nodoc:
 
     # @return [String] Using the #filename of the page given and available 
     # Page.formatters, we render and return the page #body.
-    def to_html page
+    def render page
       html = page.body
 
-      page.filename.scan(/\.([^\.]+)/).reverse.each do |match| # [ ["markdown"], ["erb"] ]
+      page.extensions.reverse.each do |match| # [ ["markdown"], ["erb"] ]
         if formatter = formatters[ match.first ]
-          html = formatter.call(html)
+          begin
+            html = formatter.call(html)
+          rescue ArgumentError => ex
+            if ex.message == 'wrong number of arguments (1 for 2)'
+              html = formatter.call(html, page)
+            else
+              raise
+            end
+          end
         end
       end
 
       html
     end
 
+    alias to_html render
+
     # @private
     # Helper for caching.  Will check to see if the {Page.cache} 
     # contains the given key and, if not, it will set the cache by calling
@@ -204,6 +214,11 @@ module JADOF #:nodoc:
     # it is in subdirectories.
     attr_accessor :parent
 
+    # @return [Array(String)] This file's extension(s).
+    def extensions
+      filename.scan(/\.([^\.]+)/).flatten
+    end
+
     # A page is a dumb object and doesn't know how to load itself from 
     # a file on the filesystem.  See `Page.from_path` to load a {Page} 
     # from a file.
@@ -226,10 +241,12 @@ module JADOF #:nodoc:
     # For `foo.markdown.erb`, `Page.formatters['erb']` and `Page.formatters['markdown']` will be used.
     #
     # With multiple extensions, the *last* extension is used first, and then the second-to-last, etc.
-    def to_html
-      self.class.to_html self
+    def render
+      self.class.render self
     end
 
+    alias to_html render
+
     # @return [true, false] If 2 pages have the same system path, they're the same.
     def == other_page
       return false unless other_page.is_a? Page

data/lib/jadof/spec/examples_for_page.rb

@@ -54,6 +54,18 @@ shared_examples_for "JADOF Page" do
       @jadof_page_class[:foo].filename.should == 'foo.markdown'
     end
 
+    it 'can easily get file extensions' do
+      create_page '123'
+      create_page 'foo.markdown'
+      create_page 'bar.markdown.haml'
+      create_page 'abc.markdown.haml.something'
+
+      @jadof_page_class['123'].extensions.should == %w( )
+      @jadof_page_class[:foo ].extensions.should == %w( markdown )
+      @jadof_page_class[:bar ].extensions.should == %w( markdown haml )
+      @jadof_page_class[:abc ].extensions.should == %w( markdown haml something )
+    end
+
     it 'has a path (the full system path to the file)' do
       create_page 'foo.markdown'
 
@@ -217,6 +229,7 @@ shared_examples_for "JADOF Page" do
           **Hello World!**
         }
 
+        @jadof_page_class[:foo].render.should == '**Hello World!**'
         @jadof_page_class[:foo].to_html.should == '**Hello World!**'
       end
       
@@ -227,9 +240,50 @@ shared_examples_for "JADOF Page" do
           **Hello World!**
         }
 
+        @jadof_page_class[:foo].render.should == '<p><strong>Hello World!</strong></p>'
         @jadof_page_class[:foo].to_html.should == '<p><strong>Hello World!</strong></p>'
       end
 
+      it 'formatters have access to the page' do
+        @jadof_page_class.formatters['something'] = lambda do |text, page|
+          text.gsub('FILENAME', page.filename)
+        end
+
+        create_page 'foo.something', %{
+          Hello from FILENAME
+        }
+
+        @jadof_page_class[:foo].body.should   == 'Hello from FILENAME'
+        @jadof_page_class[:foo].render.should == 'Hello from foo.something'
+      end
+
+      it 'formatters can be a class' do
+        class UpcaseFormatter
+          def self.call text
+            text.upcase
+          end
+        end
+
+        class FilenameFormatter
+          def self.call text, page
+            text.sub "FILENAME", page.filename
+          end
+        end
+
+        @jadof_page_class.formatters['upcase']   = UpcaseFormatter
+        @jadof_page_class.formatters['filename'] = FilenameFormatter
+
+        create_page 'foo.upcase', %{
+          Hello from FILENAME
+        }
+        create_page 'bar.filename', %{
+          Hello from FILENAME
+        }
+
+        @jadof_page_class[:foo].render.should == 'HELLO FROM FILENAME'
+        @jadof_page_class[:bar].render.should == 'Hello from bar.filename'
+      end
+
       it 'should support multiple file extensions, eg. foo.markdown.erb (erb renders first, then markdown)' do
         @jadof_page_class.formatters['markdown'] = lambda {|text| Maruku.new(text).to_html }
 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: jadof
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - remi
@@ -9,19 +14,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-21 00:00:00 -07:00
+date: 2010-02-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: indifferent-variable-hash
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 0
         version: 0.1.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: 
 email: remi@remitaylor.com
 executables: []
@@ -51,18 +60,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Just A Directory Of Files (JADOF)