RubyGems - ruhl - Versions diffs - 0.7.0 → 0.8.0 - Mend

ruhl 0.7.0 → 0.8.0

Files changed (9) hide show

data/README CHANGED

@@ -1,5 +1,6 @@
 RuHL (Ruby Hypertext Language)
+**gem available on gemcutter: http://gemcutter.org/gems/ruhl
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 :: What? ::
@@ -70,9 +71,10 @@ _render_    - This is used in your layout and lets rule know where to inject
 _partial    - Path to a partial file.  RuHL must be able to find/read this file.
 _if         - If the method returns nil, the tag will not be included on output.
-_render_if  - If the method returns false, the tag will not be included on output.
+_unless     - If the method does not return nil, the tag will not be
+              included on output.
 _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)
@@ -236,7 +238,7 @@ of the calling node.
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-:: Conditional display of block (_render_if)::
+:: Conditional display of block (_if)::
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 <html>
@@ -245,7 +247,7 @@ of the calling node.
   </head>
   <body>
     <h1>This is the header template</h1>
-    <div data-ruhl="_render_if: has_users?">
+    <div data-ruhl="_if: users?">
       <table>
         <thead>
           <tr>
@@ -265,7 +267,7 @@ of the calling node.
   </body>
 </html>
-if has_users? returns false then the div (including it's contents) are not shown
+if users? returns false then the div (including it's contents) are not shown
 on output.
@@ -297,7 +299,38 @@ on output.
   </body>
 </html>
-if email == nil  then the td is not shown.
+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.
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 :: Notes ::

data/VERSION CHANGED

	@@ -1 +1 @@
1	- 0.7.0
1	+ 0.8.0

data/lib/ruhl.rb CHANGED

@@ -90,24 +90,19 @@ module Ruhl
         attribute, value = pair.split(':')
         if value.nil?
-          tag.inner_html = execute_ruby(tag, attribute)
+          tag.inner_html = execute_ruby(tag, attribute.strip)
         else
           value.strip!
-          if attribute  == "_partial"
+          case attribute
+          when "_partial"
             tag.inner_html = render_partial(tag, value)
-          elsif attribute  == "_collection"
+          when "_collection"
             render_collection(tag, value)
-          elsif attribute  == "_if"
-            contents = execute_ruby(tag, value)
-            if contents
-              tag.inner_html = contents
-            else
-              tag.remove
-            end
-          elsif attribute  == "_render_if"
-            unless execute_ruby(tag, value)
-              tag.remove
-            end
+          when "_if"
+            return unless process_if(tag, value)
+          when "_unless"
+            return if process_unless(tag, value)
           else
             tag[attribute] = execute_ruby(tag, value)
           end
@@ -115,6 +110,28 @@ module Ruhl
       end
     end
+    def process_if(tag, value)
+      contents = execute_ruby(tag, value)
+      if contents
+        tag.inner_html = contents unless contents == true
+        true
+      else
+        tag.remove
+        false
+      end
+    end
+    def process_unless(tag, value)
+      contents = execute_ruby(tag, value)
+      if contents
+        tag.remove
+        true
+      else
+        tag.inner_html = contents unless contents == false
+        false
+      end
+    end
     def execute_ruby(tag, code)
       unless code == '_render_'
         if local_object && local_object.respond_to?(code)

data/ruhl.gemspec CHANGED

@@ -5,11 +5,11 @@
 Gem::Specification.new do |s|
   s.name = %q{ruhl}
-  s.version = "0.7.0"
+  s.version = "0.8.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-07}
+  s.date = %q{2009-10-08}
   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 = [
@@ -31,7 +31,6 @@ Gem::Specification.new do |s|
      "spec/html/layout.html",
      "spec/html/main_with_sidebar.html",
      "spec/html/medium.html",
-     "spec/html/render_if.html",
      "spec/html/seo.html",
      "spec/html/sidebar.html",
      "spec/rcov.opts",

data/spec/html/if.html CHANGED

@@ -4,7 +4,7 @@
   </head>
   <body>
     <h1>This is the header template</h1>
-    <table>
+    <table data-ruhl="_if: users?">
       <thead>
         <tr>
           <td>First Name</td>
@@ -18,6 +18,6 @@
         <td data-ruhl="_if: email">andy@stonean.com</td>
       </tr>
     </table>
-    </ul>
+    <p data-ruhl="_unless: users?, no_users_message"/>
   </body>
 </html>

data/spec/ruhl_spec.rb CHANGED

@@ -1,40 +1,11 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
-def generate_h1(tag = nil)
-  "data from presenter"
-end
-def data_from_method(tag = nil)
-  "I am data from a method"
-end
-def generate_description(tag = nil)
-  "I am a custom meta description"
-end
-def generate_keywords(tag = nil)
-  "I, am, custom, keywords"
-end
-def my_content(tag = nil)
-  "hello from my content."
-end
-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'),
-    TestUser.new('NoMail', 'Man')
-  ]
-end
 describe Ruhl do
+  before do
+    @co = ContextObject.new
+  end
   describe "basic.html" do
     before do
@@ -43,7 +14,7 @@ describe Ruhl do
     it "content of p should be content from data_from_method" do
        doc = create_doc
-       doc.xpath('//h1').first.content.should == generate_h1
+       doc.xpath('//h1').first.content.should == @co.generate_h1
     end
   end
@@ -55,13 +26,13 @@ describe Ruhl do
     it "meta keywords should be replaced" do
       doc = create_doc
       doc.xpath('//meta[@name="keywords"]').first['content'].
-        should == generate_keywords
+        should == @co.generate_keywords
     end
     it "meta title should be replaced" do
       doc = create_doc
       doc.xpath('//meta[@name="description"]').first['content'].
-        should == generate_description
+        should == @co.generate_description
     end
   end
@@ -109,52 +80,50 @@ describe Ruhl do
   end
   describe "if.html" do
-    before do
-      @html = File.read html(:if)
-      @doc = create_doc
-    end
-    it "first data row should equal first user " do
-      table = @doc.xpath('/html/body/table/tr//td')
-      table.children[0].to_s.should == "Jane"
-      table.children[1].to_s.should == "Doe"
-      table.children[2].to_s.should == "jane@stonean.com"
-    end
-    it "last data row should equal last user " do
-      table = @doc.xpath('/html/body/table/tr//td')
-      table.children[12].to_s.should == "NoMail"
-      table.children[13].to_s.should == "Man"
-      table.children[14].should == nil
-    end
-  end
+    describe "no users" do
+      before do
+        class ContextObject
+          def users?(tag = nil)
+            false
+          end
+        end
+        @html = File.read html(:if)
+        @doc = create_doc
+      end
-  describe "render if.html" do
-    it "table should not render" do
-      def has_users?(tag = nil)
-        false
+      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
-      @html = File.read html(:render_if)
-      @doc = create_doc
-      nodes = @doc.xpath('/html/body//*')
-      nodes.children.length.should == 1
-      nodes.children.to_s.should == "This is the header template"
+      it "no user message should render" do
+        nodes = @doc.xpath('/html/body//*')
+        nodes.children[1].to_s.should == @co.no_users_message
+      end
     end
-    it "table shouldrender" do
-      def has_users?(tag = nil)
-        true
+    describe "has users" do
+      before do
+        class ContextObject
+          def users?(tag = nil)
+            true
+          end
+        end
+        @html = File.read html(:if)
+        @doc = create_doc
       end
-      @html = File.read html(:render_if)
-      @doc = create_doc
-      nodes = @doc.xpath('/html/body//*')
-      nodes.children.length.should > 1
+      it "table should render" do
+        nodes = @doc.xpath('/html/body//*')
+        nodes.children.length.should > 1
-      table = @doc.xpath('/html/body/div/table/tr//td')
-      table.children[12].to_s.should == "NoMail"
-      table.children[13].to_s.should == "Man"
+        table = @doc.xpath('/html/body/table/tr//td')
+        table.children[12].to_s.should == "NoMail"
+        table.children[13].to_s.should == "Man"
+      end
     end
   end
 end

data/spec/spec_helper.rb CHANGED

@@ -1,19 +1,5 @@
 require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib ruhl]))
-def html(name)
-  File.join( File.dirname(__FILE__), 'html', "#{name}.html" )
-end
-def do_parse(html)
-  Nokogiri::HTML(html)
-end
-def create_doc(layout = nil)
-  options = {:layout => layout}
-  html = Ruhl::Engine.new(@html, :layout => layout).render(self)
-  do_parse(html)
-end
 class TestUser
   attr_accessor :first_name, :last_name, :email
@@ -24,3 +10,65 @@ class TestUser
   end
 end
+class ContextObject
+  def generate_h1(tag = nil)
+    "data from presenter"
+  end
+  def data_from_method(tag = nil)
+    "I am data from a method"
+  end
+  def generate_description(tag = nil)
+    "I am a custom meta description"
+  end
+  def generate_keywords(tag = nil)
+    "I, am, custom, keywords"
+  end
+  def my_content(tag = nil)
+    "hello from my content."
+  end
+  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'),
+      TestUser.new('NoMail', 'Man')
+    ]
+  end
+  def users?(tag = nil)
+    true
+  end
+  def no_users_message(tag = nil)
+    "Sorry no users found"
+  end
+end
+def html(name)
+  File.join( File.dirname(__FILE__), 'html', "#{name}.html" )
+end
+def create_doc(layout = nil)
+  options = {:layout => layout}
+  html = Ruhl::Engine.new(@html, :layout => layout).
+    render(ContextObject.new)
+  do_parse(html)
+end
+def do_parse(html)
+  Nokogiri::HTML(html)
+end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruhl
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Andrew Stone
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2009-10-07 00:00:00 -04:00
+date: 2009-10-08 00:00:00 -04:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -56,7 +56,6 @@ files:
 - spec/html/layout.html
 - spec/html/main_with_sidebar.html
 - spec/html/medium.html
-- spec/html/render_if.html
 - spec/html/seo.html
 - spec/html/sidebar.html
 - spec/rcov.opts

data/spec/html/render_if.html DELETED

@@ -1,25 +0,0 @@
-<html>
-  <head>
-    <title>This is a title template</title>
-  </head>
-  <body>
-    <h1>This is the header template</h1>
-    <div data-ruhl="_render_if: has_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>