stonean-ruhl 0.3.0 → 0.4.0

data/README

@@ -37,14 +37,46 @@ with results from meta_description method.
 :: Don't use iterators in views ::
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-<ul id="aab" ruby="present_results">
- <li>Lorem ipsum dolor sit amet</li>
- <li>consectetur adipiscing elit</li>
-</ul>
+<table id="aab" ruby="_collection: user_list">
+  <tr>
+    <td ruby="name">John Doe</td>
+    <td ruby="email">john@doe.com</td>
+  </tr>
+</table>
+
+A few things to note about this:
+
+1) The method _collection calls (in this case :user_list) must implement :each
+
+2) Ruhl iterates over the results and renders the inner html 
+   against each object.
+
+3) Ruhl will first try to call the ruby method (:name) against the 
+   local object.  If the local object does not respond_to? the ruby method,
+   Ruhl will try to call it against the scope.
+
+If user_list return an array of User objects like:
+
+[ User.create(:name => 'Rupert Boy', :email => 'rupert@stonean.com'),
+  User.create(:name => 'Kaylee Girl', :email => 'kaylee@stonean.com'),
+  User.create(:name => 'Monty Man', :email => 'monty@stonean.com')]
+
+<table id="aab">
+  <tr>
+    <td>Rupert Boy</td>
+    <td>rupert@stonean.com</td>
+  </tr>
+  <tr>
+    <td>Kaylee Girl</td>
+    <td>kaylee@stonean.com</td>
+  </tr>
+  <tr>
+    <td>Monty Man</td>
+    <td>monty@stonean.com</td>
+  </tr>
+</table>
+
 
-Method :present_results would know how to represent itself in the 
-context of the ul element.  In other words, it would know how to 
-produce <li> elements.
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 :: Using a Layout ::
@@ -113,7 +145,7 @@ Sidebar:
 
 To use:
 
-Ruhl::Engine.new(File.read(fragment)).render(self)
+Ruhl::Engine.new(File.read(path_to_main)).render(self)
 
 Returns the expected result of parsed Main with sidebar div contents 
 replaced with parsed sidebar partial contents.  
@@ -143,5 +175,5 @@ of the calling node.
 :: TODO ::
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-1) Work on supporting partials (shouldn't be hard)
+1) Test more scenarios
 

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/ruhl.rb

@@ -5,12 +5,16 @@ require 'ruhl/errors'
 
 module Ruhl
   class Engine
-    attr_reader :document, :scope, :layout
+    attr_reader :document, :scope, :layout, :local_object
 
     def initialize(html, options = {})
+      @local_object = options[:local_object]
+
       if @layout = options[:layout]
         raise LayoutNotFoundError.new(@layout) unless File.exists?(@layout)
+      end
 
+      if @layout || @local_object
         @document = Nokogiri::HTML.fragment(html)
       else
         @document = Nokogiri::HTML(html)
@@ -48,6 +52,9 @@ module Ruhl
 
         if attribute  == "_partial"
           tag.inner_html = render_partial(tag, value)
+        elsif attribute  == "_collection"
+          doc = render_collection(tag, value)
+          tag.inner_html =  doc
         else
           tag[attribute] = execute_ruby(tag, value)
         end
@@ -64,6 +71,13 @@ module Ruhl
       render_file( File.read(file) )
     end
 
+    def render_collection(tag, code)
+      results = execute_ruby(tag, code)
+      results.collect do |item|
+        Ruhl::Engine.new(tag.inner_html, :local_object => item).render(scope)
+      end.to_s
+    end
+
     def render_file(contents)
      doc = Nokogiri::HTML( contents ) 
      parse_doc(doc)
@@ -72,7 +86,7 @@ module Ruhl
 
     def parse_doc(doc)
       if (nodes = doc.xpath('//*[@ruby]')).empty?
-        nodes = doc.xpath('*[@ruby]')
+        nodes = doc.search('*[@ruby]')
       end
 
       nodes.each do |tag|
@@ -85,6 +99,10 @@ module Ruhl
         end
 
         tag.remove_attribute('ruby')
+
+        # We are changing the NodeSet, stop and reparse
+        parse_doc(doc)
+        break;
       end
     end
       
@@ -95,7 +113,11 @@ module Ruhl
 
     def execute_ruby(tag, code)
       unless code == '_render_'
-        scope.send(code, tag)
+        if local_object && local_object.respond_to?(code)
+          local_object.send(code)
+        else
+          scope.send(code, tag)
+        end
       else
         _render_
       end

data/ruhl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruhl}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Stone"]
-  s.date = %q{2009-09-17}
+  s.date = %q{2009-09-24}
   s.description = %q{Make your HTML dynamic with the addition of a ruby attribute.}
   s.email = %q{andy@stonean.com}
   s.extra_rdoc_files = [

data/spec/html/medium.html

@@ -4,9 +4,13 @@
   </head>
   <body>
     <h1>This is the header template</h1>
-    <ul ruby="present_results">
-      <li>Lorem ipsum dolor sit amet</li> 
-      <li>consectetur adipiscing elit.</li>
+    <table ruby="_collection: user_list">
+      <tr>
+        <td ruby="first_name">Andrew</td>
+        <td ruby="last_name">Stone</td>
+        <td ruby="email">andy@stonean.com</td>
+      </tr>
+    </table>
     </ul>
   </body>
 </html>

data/spec/ruhl_spec.rb

@@ -16,10 +16,6 @@ def generate_keywords(tag = nil)
   "I, am, custom, keywords"
 end
 
-def present_results(tag = nil)
-  "<li>line item 1</li><li>line item 2</li>"
-end
-
 def my_content(tag = nil)
   "hello from my content."
 end
@@ -28,6 +24,16 @@ def sidebar_partial(tag = nil)
   html(:sidebar)
 end
 
+def user_list(tag = nil)
+  [ 
+    TestUser.new('Jane', 'Doe', 'jane@stonean.com'),
+    TestUser.new('John', 'Joe', 'john@stonean.com'),
+    TestUser.new('Jake', 'Smo', 'jake@stonean.com'),
+    TestUser.new('Paul', 'Tin', 'paul@stonean.com')
+  ]
+
+end
+
 describe Ruhl do
 
   describe "basic.html" do
@@ -66,8 +72,9 @@ describe Ruhl do
 
     it "ul content should have new li's" do
       doc = create_doc
-      ul = doc.xpath('//ul').first
-      ul.inner_html.should ==  "<li>line item 1</li>\n<li>line item 2</li>\n"
+      puts doc.to_s
+      #ul = doc.xpath('//ul').first
+      #ul.inner_html.should ==  "<li>line item 1</li>\n<li>line item 2</li>\n"
     end
   end
 
@@ -90,7 +97,6 @@ describe Ruhl do
 
     it "should replace sidebar with partial contents" do
       doc = create_doc
-      puts doc.to_s
     end
   end
 end

data/spec/spec_helper.rb

@@ -13,4 +13,14 @@ def create_doc(layout = nil)
   html = Ruhl::Engine.new(@html, :layout => layout).render(self)
   do_parse(html)
 end
+
+class TestUser
+  attr_accessor :first_name, :last_name, :email
+
+  def initialize(first, last , email)
+    @first_name = first
+    @last_name  = last
+    @email = email
+  end
+end
  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stonean-ruhl
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Andrew Stone
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-17 00:00:00 -07:00
+date: 2009-09-24 00:00:00 -07:00
 default_executable: 
 dependencies: []