RubyGems - ruhl - Versions diffs - 0.9.7 → 0.10.0 - Mend

ruhl 0.9.7 → 0.10.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

data/README +2 -387
data/VERSION +1 -1
data/lib/ruhl/engine.rb +115 -82
data/ruhl.gemspec +4 -2
data/spec/html/if_on_collection.html +23 -0
data/spec/html/use_if.html +28 -0
data/spec/ruhl_spec.rb +85 -26
data/spec/spec_helper.rb +13 -13
metadata +4 -2

data/README CHANGED Viewed

@@ -2,392 +2,7 @@ RuHL (Ruby Hypertext Language)
 **gem available on gemcutter: http://gemcutter.org/gems/ruhl
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-:: What? ::
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Documentation has been moved to:
-RuHL parses HTML (using Nokogiri) and by using a data-ruhl attribute, makes
-the contents dynamic!
-Let's say you have the following HTML in a file called ('hello_world.ruhl')
-<html>
-  <body>
-    <p data-ruhl="say_hello"/>
-  </body>
-</html>
-And you have the following method available to self:
-def say_hello
-  "Hello World"
-end
-If you call
-RuHL::Engine.new(File.read('hello_world.ruhl')).render(self)
-It will return:
-<html>
-  <body>
-    <p>Hello World</p>
-  </body>
-</html>
-Notice that it removes the data-ruhl attribute.
-You can pass an options hash to RuHL:
-  RuHL::Engine.new(File.read('hello_world.ruhl'), options).render(self)
-Right now, RuHL knows the following options:
-  :layout         =>  This is the file name of the layout
-  :layout_source  =>  If the framework (like Rails) has already read the file,
-                      pass the contents through so RuHL doesn't have to reread
-                      the file.
-                      If you don't pass :layout_source, RuHL must be able to
-                      find/read :layout
-  :local_object   =>  If you are rendering a show page for @person, pass the
-                      @person object into RuHL.  RuHL will first try to call
-                      the methods against the local_object then try the scope.
-                      For example:
-                        <li data-ruhl="first_name">
-                      RuHL will first try @person.first_name.
-There are some special methods defined by RuHL (examples follow):
-_render_    - This is used in your layout and lets rule know where to inject
-              the rendered sub content.
-_partial    - Path to a partial file.  RuHL must be able to find/read this file.
-_if         - If the method returns true, processing will continue.
-              If the method returns a value other than true, the inner_html
-                of the tag will be set to that value.
-              If the method returns false or nil, processing will halt and
-                the tag will not be included on output.
-_unless     - If the method returns true, processing will halt and the tag
-              will not included on output.
-              If the method returns false, processing will continue.
-_collection - RuHL expects the method reference to return an array of objects.
-              RuHL will iteratate over the collection and render the contents
-              of the tag agains the collection item. (example below)
-_use        - The object returned is used within the scope of the tag.
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-:: Rails ::
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-In your config/environment.rb :
-  config.gem 'ruhl', :lib => 'ruhl/rails'
-Your filenames should end in .ruhl ('show.html.ruhl')
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-:: Sinatra ::
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-require 'ruhl/sinatra'
-You can then do:
-get '/' do
-  ruhl(:index, :layout => path_to_layout)
-end
-*******************************************************************************
-*
-* EXAMPLES
-*
-*******************************************************************************
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-:: Replacing attribute values ::
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-<meta data-ruhl="content: meta_description" content='This is a description template'
-  id='metaDescription' name='description' />
-content: meta_description is telling the parser to replace attribute 'content'
-with results from meta_description method.
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-:: Don't use iterators in views ::
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-<table id="aab">
-  <tr data-ruhl="_collection: user_list">
-    <td data-ruhl="name">John Doe</td>
-    <td data-ruhl="email">john@doe.com</td>
-  </tr>
-</table>
-The above will call the :user_list method and iterate over the results.  For each result it will duplicate the tag and it's contents.  For the above example this means:
-  <tr data-ruhl="_collection: user_list">
-    <td data-ruhl="name">John Doe</td>
-    <td data-ruhl="email">john@doe.com</td>
-  </tr>
-is duplicated for each user in user_list.
-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>
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-:: Using a Layout ::
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Layout:
-<html>
-  <head>
-    <title>This is a title template</title>
-  </head>
-  <body>
-    <div data-ruhl="_render_"></div>
-  </body>
-</html>
-Fragment:
-<h1 data-ruhl="generate_h1">I am a templated headline</h1>
-<p data-ruhl="my_content">Lorem ipsum dolor sit amet</p>
-To use:
-RuHL::Engine.new(File.read(fragment), :layout => path_to_layout).render(self)
-Returns the expected result of parsed Layout w/ parsed Fragment.
-Note the use of the _render_ method.  This is a 'special' method that
-RuHL uses to inject the results of the parsed fragment into the layout.
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-:: Using a Partial ::
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Main:
-<html>
-  <head>
-    <title>This is a title template</title>
-  </head>
-  <body>
-    <div id="wrap">
-      <div id="sidebar" data-ruhl="_partial: sidebar_partial">
-        <h3>Sidebar links</h3>
-        <ul>
-          <li><a href="#">Link 1</a></li>
-          <li><a href="#">Link 2</a></li>
-          <li><a href="#">Link 3</a></li>
-          <li><a href="#">Link 4</a></li>
-        </ul>
-      </div>
-      <div id="main">
-        <h1> My main content</h1>
-        <p>Text designers would put here to test their layout</p>
-      </div>
-    </div>
-  </body>
-</html>
-Sidebar:
-<h3>Real Sidebarlinks</h3>
-<ul>
-  <li><a href="#">Real Link 1</a></li>
-  <li><a href="#">Real Link 2</a></li>
-  <li><a href="#">Real Link 3</a></li>
-  <li><a href="#">Real Link 4</a></li>
-</ul>
-To use:
-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.
-Note the use of the _partial key.  This is a 'special' key that RuHL
-uses to inject the results of the parsed partial into the contents
-of the calling node.
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-:: Conditional display of block (_if)::
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-<html>
-  <head>
-    <title>This is a title template</title>
-  </head>
-  <body>
-    <h1>This is the header template</h1>
-    <div data-ruhl="_if: users?">
-      <table>
-        <thead>
-          <tr>
-            <td>First Name</td>
-            <td>Last Name</td>
-            <td>Email</td>
-          </tr>
-        </thead>
-        <tr data-ruhl="_collection: user_list">
-          <td data-ruhl="first_name">Andrew</td>
-          <td data-ruhl="last_name">Stone</td>
-          <td data-ruhl="email">andy@stonean.com</td>
-        </tr>
-      </table>
-    </div>
-    </ul>
-  </body>
-</html>
-if users? returns false then the div (including it's contents) are not shown
-on output.
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-:: Conditional display of tag (_if)::
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-<html>
-  <head>
-    <title>This is a title template</title>
-  </head>
-  <body>
-    <h1>This is the header template</h1>
-    <table>
-      <thead>
-        <tr>
-          <td>First Name</td>
-          <td>Last Name</td>
-          <td>Email</td>
-        </tr>
-      </thead>
-      <tr data-ruhl="_collection: user_list">
-        <td data-ruhl="first_name">Andrew</td>
-        <td data-ruhl="last_name">Stone</td>
-        <td data-ruhl="_if: email">andy@stonean.com</td>
-      </tr>
-    </table>
-    </ul>
-  </body>
-</html>
-if email.nil?  then the td is not shown.
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-:: Conditional display of tag (_unless)::
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-<html>
-  <head>
-    <title>This is a title template</title>
-  </head>
-  <body>
-    <h1>This is the header template</h1>
-    <table data-ruhl="_if: users?">
-      <thead>
-        <tr>
-          <td>First Name</td>
-          <td>Last Name</td>
-          <td>Email</td>
-        </tr>
-      </thead>
-      <tr data-ruhl="_collection: user_list">
-        <td data-ruhl="first_name">Andrew</td>
-        <td data-ruhl="last_name">Stone</td>
-        <td data-ruhl="_if: email">andy@stonean.com</td>
-      </tr>
-    </table>
-    <p data-ruhl="_unless: users?">No Users were found.</p>
-    </ul>
-  </body>
-</html>
-if users? == false then the "No Users were found" message appears.
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-:: Scope object to tag block (_use)::
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-<html>
-  <head>
-    <title>My Account</title>
-  </head>
-  <body>
-    <div data-ruhl="_use: current_user">
-      <h1> Editing <span data-ruhl="full_name"/></h1>
-      <table>
-        <thead>
-          <tr>
-            <td>First Name</td>
-            <td>Last Name</td>
-            <td>Email</td>
-          </tr>
-        </thead>
-        <tr>
-          <td data-ruhl="first_name">Andrew</td>
-          <td data-ruhl="last_name">Stone</td>
-          <td data-ruhl="_if: email">andy@stonean.com</td>
-        </tr>
-      </table>
-    </div>
-  </body>
-</html>
-The table row information will be replace with the current_user details.
-*Note: _use can not be used with _partial as it replaces the inner_html
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-:: Notes ::
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* No eval (I don't think eval is evil, it's just not the way this works)
-* The data-ruhl attribute is always removed from the output.
-* Since it's just HTML, syntax highlighting is built-in.
-  For vim, just add this to your ~/.vimrc:
-    au BufNewFile,BufRead *.ruhl set filetype=html
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-:: TODO ::
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-1) Test more scenarios
+http://stonean.com/page/ruhl

data/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 0.9.7
1	+ 0.10.0

data/lib/ruhl/engine.rb CHANGED Viewed

@@ -1,7 +1,7 @@
 module Ruhl
   class Engine
-    attr_reader :document, :scope, :layout, :layout_source,
-      :local_object, :block_object
+    attr_reader :layout, :layout_source, :local_object, :block_object
+    attr_reader :document, :scope, :current_tag, :call_result, :ruhl_actions
     def initialize(html, options = {})
       @local_object   = options[:local_object] || options[:object]
@@ -45,38 +45,37 @@ module Ruhl
       render_nodes Nokogiri::HTML( @layout_source || File.read(@layout) )
     end
-    def render_partial(tag, code)
-      file = execute_ruby(tag, code)
-      raise PartialNotFoundError.new(file) unless File.exists?(file)
+    def render_partial
+      unless File.exists?(call_result)
+        raise PartialNotFoundError.new(call_result)
+      end
-      render_nodes Nokogiri::HTML.fragment( File.read(file) )
+      render_nodes Nokogiri::HTML.fragment( File.read(call_result) )
     end
-    def render_collection(tag, code, actions = nil)
-      results = execute_ruby(tag, code)
-      actions = actions.to_s.strip
+    def render_collection
+      actions = ruhl_actions.join(",").to_s.strip if ruhl_actions
-      tag['data-ruhl'] = actions if actions.length > 0
-      html = tag.to_html
+      current_tag['data-ruhl'] = actions if actions.length > 0
+      html = current_tag.to_html
-      new_content = results.collect do |item|
+      new_content = call_result.collect do |item|
         # Call to_s on the item only if there are no other actions
         # and there are no other nested data-ruhls
-        if actions.length == 0 && tag.xpath('.//*[@data-ruhl]').length == 0
-          tag.inner_html = item.to_s
-          tag.to_html
+        if actions.length == 0 && current_tag.xpath('.//*[@data-ruhl]').length == 0
+          current_tag.inner_html = item.to_s
+          current_tag.to_html
         else
           Ruhl::Engine.new(html, :local_object => item).render(scope)
         end
       end.to_s
-      tag.swap(new_content)
+      current_tag.swap(new_content)
     end
-    def render_block(tag, code)
-      bo = execute_ruby(tag, code)
-      Ruhl::Engine.new(tag.inner_html, :block_object => bo).render(scope)
+    def render_block
+      Ruhl::Engine.new(current_tag.inner_html,
+                        :block_object => call_result).render(scope)
     end
     def render_nodes(nodes)
@@ -91,97 +90,117 @@ module Ruhl
       return if nodes.empty?
-      tag = nodes.first
-      code = tag.remove_attribute('data-ruhl')
-      process_attribute(tag, code.value)
+      @current_tag = nodes.first
+      @ruhl_actions = current_tag.remove_attribute('data-ruhl').value.split(',')
+      process_attribute
       parse_doc(doc)
     end
-    def process_attribute(tag, code)
-      actions = code.split(',')
-      actions.dup.each_with_index do |pair, ndx|
-        attribute, value = pair.split(':')
-        attribute.strip!
+    def process_attribute
+      catch(:done) do
+        ruhl_actions.dup.each_with_index do |action, ndx|
+          # Remove action from being applied twice.
+          ruhl_actions.delete_at(ndx)
+          process_action(action)
+        end
+      end
+    end
+    def process_action(action)
+      attribute, value = action.split(':')
-        if value.nil?
-          results = execute_ruby(tag, attribute)
-          process_results(tag, results)
+      code = (value || attribute)
+      @call_result = execute_ruby(code.strip)
+      if value.nil?
+        process_results
+      else
+        if attribute =~ /^_/
+          process_ruhl(attribute, value)
         else
-          value.strip!
-          unless attribute =~ /^_/
-            tag[attribute] = execute_ruby(tag, value).to_s
-          else
-            case attribute
-            when "_use"
-              tag.inner_html =  render_block(tag, value)
-            when "_partial"
-              tag.inner_html = render_partial(tag, value)
-            when "_collection"
-              actions.delete_at(ndx)
-              render_collection(tag, value, actions.join(','))
-              return
-            when "_if"
-              return unless process_if(tag, value)
-            when "_unless"
-              return if process_unless(tag, value)
-            end
-          end
+          current_tag[attribute] = call_result.to_s
         end
       end
     end
+    def process_ruhl(attribute, value)
+      case attribute
+      when "_use_if"
+        ruhl_if { ruhl_use }
+      when "_use", "_collection"
+        ruhl_use
+      when "_partial"
+        current_tag.inner_html = render_partial
+      when "_if"
+        ruhl_if
+      when "_unless"
+        ruhl_unless
+      end
+    end
+    def ruhl_use
+      if call_result.kind_of?(Enumerable) and !call_result.instance_of?(String)
+        render_collection
+        throw :done
+      else
+        current_tag.inner_html = render_block
+      end
+    end
-    def process_if(tag, value)
-      contents = execute_ruby(tag, value)
-      if contents
-        process_results(tag, contents) unless contents == true
-        true
+    def ruhl_if
+      if stop_processing?
+        current_tag.remove
+        throw :done
       else
-        tag.remove
-        false
+        if continue_processing?
+          yield if block_given?
+        else
+          process_results
+        end
       end
     end
-    def process_unless(tag, value)
-      contents = execute_ruby(tag, value)
-      if contents
-        tag.remove
-        true
-      else
-        false
+    def ruhl_unless
+      if call_result
+        unless call_result_empty?
+          current_tag.remove
+          throw :done
+        end
       end
     end
-    def process_results(tag, results)
-      if results.is_a?(Hash)
-        results.each do |key, value|
+    def process_results
+      if call_result.is_a?(Hash)
+        call_result.each do |key, value|
           if key == :inner_html
-            tag.inner_html = value.to_s
+            current_tag.inner_html = value.to_s
           else
-            tag[key.to_s] = value.to_s
+            current_tag[key.to_s] = value.to_s
           end
         end
       else
-        tag.inner_html = results.to_s
+        current_tag.inner_html = call_result.to_s
       end
     end
-    def execute_ruby(tag, code)
-      unless code == '_render_'
-        if local_object && local_object.respond_to?(code)
-          local_object.send(code)
-        elsif block_object && block_object.respond_to?(code)
+    def execute_ruby(code)
+      if code == '_render_'
+        _render_
+      else
+        if block_object && block_object.respond_to?(code)
           block_object.send(code)
+        elsif local_object && local_object.respond_to?(code)
+          local_object.send(code)
         else
           scope.send(code)
         end
-      else
-        _render_
       end
     rescue NoMethodError => e
-      log_context(tag,code)
+      log_context(code)
       raise e
     end
@@ -190,10 +209,24 @@ module Ruhl
       @scope = current_scope
     end
-    def log_context(tag,code)
+    def stop_processing?
+      call_result.nil? ||
+        call_result == false ||
+          call_result_empty?
+    end
+    def continue_processing?
+      call_result == true || !call_result_empty?
+    end
+    def call_result_empty?
+      call_result.kind_of?(Enumerable) && call_result.empty?
+    end
+    def log_context(code)
       Ruhl.logger.error <<CONTEXT
 Context:
-  tag           : #{tag.inspect}
+  tag           : #{current_tag.inspect}
   code          : #{code.inspect}
   local_object  : #{local_object.inspect}
   block_object  : #{block_object.inspect}

data/ruhl.gemspec CHANGED Viewed

@@ -5,11 +5,11 @@
 Gem::Specification.new do |s|
   s.name = %q{ruhl}
-  s.version = "0.9.7"
+  s.version = "0.10.0"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Stone"]
-  s.date = %q{2009-10-18}
+  s.date = %q{2009-10-24}
   s.description = %q{Make your HTML dynamic with the addition of a data-ruhl attribute.}
   s.email = %q{andy@stonean.com}
   s.extra_rdoc_files = [
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
      "spec/html/fragment.html",
      "spec/html/hash.html",
      "spec/html/if.html",
+     "spec/html/if_on_collection.html",
      "spec/html/layout.html",
      "spec/html/loop.html",
      "spec/html/main_with_form.html",
@@ -40,6 +41,7 @@ Gem::Specification.new do |s|
      "spec/html/seo.html",
      "spec/html/sidebar.html",
      "spec/html/use.html",
+     "spec/html/use_if.html",
      "spec/rcov.opts",
      "spec/ruhl_spec.rb",
      "spec/spec.opts",

data/spec/html/if_on_collection.html ADDED Viewed

@@ -0,0 +1,23 @@
+<html>
+  <head>
+    <title>This is a title template</title>
+  </head>
+  <body>
+    <h1>This is the header template</h1>
+    <table data-ruhl="_if: user_list">
+      <thead>
+        <tr>
+          <td>First Name</td>
+          <td>Last Name</td>
+          <td>Email</td>
+        </tr>
+      </thead>
+      <tr data-ruhl="_collection: user_list">
+        <td data-ruhl="first_name">Andrew</td>
+        <td data-ruhl="last_name">Stone</td>
+        <td data-ruhl="_if: email">andy@stonean.com</td>
+      </tr>
+    </table>
+    <p data-ruhl="_unless: user_list, no_users_message"/>
+  </body>
+</html>

data/spec/html/use_if.html ADDED Viewed

@@ -0,0 +1,28 @@
+<html>
+  <head>
+    <title>This is a title template</title>
+  </head>
+  <body>
+    <div id="sidebar" data-ruhl="_use_if: user">
+      <h1>My Account</h1>
+      <form action="/account" class="edit_user" id="edit_user" method="post">
+        <label for='user_first_name'>First Name:</label>
+        <input id="user_first_name" name="user[first_name]" size="30" type="text"
+        data-ruhl="value: first_name" />
+        <label for='user_last_name'>Last Name:</label>
+        <input id="user_last_name" name="user[last_name]" size="30" type="text"
+        data-ruhl="value: last_name" />
+        <label for='user_email'>Email:</label>
+        <input id="user_email" name="user[email]" size="30" type="text"
+        data-ruhl="value: email" />
+        <div class='btn_row'>
+          <input id="user_submit" name="commit" type="submit" value="Login" />
+        </div>
+      </form>
+    </div>
+  </body>
+</html>

data/spec/ruhl_spec.rb CHANGED Viewed

@@ -82,11 +82,35 @@ describe Ruhl do
     end
   end
+  shared_examples_for "if with no users" do
+    it "table should not render" do
+      nodes = @doc.xpath('/html/body//*')
+      nodes.children.length.should == 2
+      nodes.children[0].to_s.should == "This is the header template"
+    end
+    it "no user message should render" do
+      nodes = @doc.xpath('/html/body//*')
+      nodes.children[1].to_s.should == @co.no_users_message
+    end
+  end
+  shared_examples_for "if with users" do
+    it "table should render" do
+      nodes = @doc.xpath('/html/body//*')
+      nodes.children.length.should > 1
+      table = @doc.xpath('/html/body/table/tr//td')
+      table.children[12].to_s.should == "NoMail"
+      table.children[13].to_s.should == "Man"
+    end
+  end
   describe "if.html" do
-    describe "no users" do
+    describe "users? is false" do
       before do
         class ContextObject
-          def users?(tag = nil)
+          def users?
             false
           end
         end
@@ -95,22 +119,13 @@ describe Ruhl do
         @doc = create_doc
       end
-      it "table should not render" do
-        nodes = @doc.xpath('/html/body//*')
-        nodes.children.length.should == 2
-        nodes.children[0].to_s.should == "This is the header template"
-      end
-      it "no user message should render" do
-        nodes = @doc.xpath('/html/body//*')
-        nodes.children[1].to_s.should == @co.no_users_message
-      end
+      it_should_behave_like "if with no users"
     end
-    describe "has users" do
+    describe "users? is true" do
       before do
         class ContextObject
-          def users?(tag = nil)
+          def users?
             true
           end
         end
@@ -119,14 +134,45 @@ describe Ruhl do
         @doc = create_doc
       end
-      it "table should render" do
-        nodes = @doc.xpath('/html/body//*')
-        nodes.children.length.should > 1
+      it_should_behave_like "if with users"
+    end
+  end
+  describe "if_on_collection.html" do
+    describe "user_list is empty" do
+      before do
+        class ContextObject
+          def user_list
+            []
+          end
+        end
+        @html = File.read html(:if_on_collection)
+        @doc = create_doc
+      end
+      it_should_behave_like "if with no users"
+    end
+    describe "user_list is not empty" do
+      before do
+        class ContextObject
+          def user_list
+            [
+              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'),
+              TestUser.new('NoMail', 'Man')
+            ]
+          end
+        end
-        table = @doc.xpath('/html/body/table/tr//td')
-        table.children[12].to_s.should == "NoMail"
-        table.children[13].to_s.should == "Man"
+        @html = File.read html(:if_on_collection)
+        @doc = create_doc
       end
+      it_should_behave_like "if with users"
     end
   end
@@ -177,12 +223,7 @@ describe Ruhl do
     end
   end
-  describe "use.html" do
-    before do
-      @html = File.read html(:use)
-      @doc  = create_doc
-    end
+  shared_examples_for "if with user" do
     it "first name will be set" do
       @doc.xpath('/html/body/div//input')[0]['value'].should == "Jane"
     end
@@ -195,6 +236,24 @@ describe Ruhl do
       @doc.xpath('/html/body/div//input')[2]['value'].should == "jane@stonean.com"
     end
   end
+  describe "use.html" do
+    before do
+      @html = File.read html(:use)
+      @doc  = create_doc
+    end
+    it_should_behave_like "if with user"
+  end
+  describe "use_if.html" do
+    before do
+      @html = File.read html(:use_if)
+      @doc  = create_doc
+    end
+    it_should_behave_like "if with user"
+  end
   describe "collection_of_strings.html" do
     before do

data/spec/spec_helper.rb CHANGED Viewed

@@ -29,47 +29,47 @@ class TestUser
     @nicknames = ['Auntie','Pattern']
   end
-  def radio_input(tag = nil)
+  def radio_input
     { :inner_html => first_name, :id => "user_#{id.to_s}",
       :name => "user[id]", :value => last_name.downcase}
   end
 end
-def user(tag = nil)
+def user
   TestUser.new('Jane', 'Doe', 'jane@stonean.com')
 end
 class ContextObject
-  def generate_h1(tag = nil)
+  def generate_h1
     "data from presenter"
   end
-  def data_from_method(tag = nil)
+  def data_from_method
     "I am data from a method"
   end
-  def generate_description(tag = nil)
+  def generate_description
     "I am a custom meta description"
   end
-  def generate_keywords(tag = nil)
+  def generate_keywords
     "I, am, custom, keywords"
   end
-  def my_content(tag = nil)
+  def my_content
     "hello from my content."
   end
-  def sidebar_partial(tag = nil)
+  def sidebar_partial
     html(:sidebar)
   end
-  def form_partial(tag = nil)
+  def form_partial
     html(:form)
   end
-  def user_list(tag = nil)
+  def user_list
     [
       TestUser.new('Jane', 'Doe', 'jane@stonean.com'),
       TestUser.new('John', 'Joe', 'john@stonean.com'),
@@ -79,15 +79,15 @@ class ContextObject
     ]
   end
-  def users?(tag = nil)
+  def users?
     true
   end
-  def no_users_message(tag = nil)
+  def no_users_message
     "Sorry no users found"
   end
-  def states_for_select(tag = nil)
+  def states_for_select
     state = Struct.new(:abbr, :name)
     [ state.new('AL', 'Alabama'),
       state.new('AK', 'Alaska'),

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruhl
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.10.0
 platform: ruby
 authors:
 - Andrew Stone
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2009-10-18 00:00:00 -04:00
+date: 2009-10-24 00:00:00 -04:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -57,6 +57,7 @@ files:
 - spec/html/fragment.html
 - spec/html/hash.html
 - spec/html/if.html
+- spec/html/if_on_collection.html
 - spec/html/layout.html
 - spec/html/loop.html
 - spec/html/main_with_form.html
@@ -65,6 +66,7 @@ files:
 - spec/html/seo.html
 - spec/html/sidebar.html
 - spec/html/use.html
+- spec/html/use_if.html
 - spec/rcov.opts
 - spec/ruhl_spec.rb
 - spec/spec.opts