RubyGems - ruhl - Versions diffs - 0.8.2 → 0.9.0 - Mend

ruhl 0.8.2 → 0.9.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 (10) hide show

data/README +33 -3
data/VERSION +1 -1
data/lib/ruhl.rb +49 -16
data/ruhl.gemspec +5 -2
data/spec/html/form.html +19 -0
data/spec/html/hash.html +13 -0
data/spec/html/main_with_form.html +25 -0
data/spec/ruhl_spec.rb +46 -3
data/spec/spec_helper.rb +16 -1
metadata +5 -2

data/README CHANGED

@@ -84,6 +84,8 @@ _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 ::
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -337,6 +339,37 @@ if email.nil?  then the td is not shown.
 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.
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 :: Notes ::
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -345,9 +378,6 @@ if users? == false then the "No Users were found" message appears.
 * The data-ruhl attribute is always removed from the output.
-* Each method called must accept a tag parameter.
-    e.g def page_header(tag)
 * 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

data/VERSION CHANGED

	@@ -1 +1 @@
1	- 0.8.2
1	+ 0.9.0

data/lib/ruhl.rb CHANGED

@@ -5,7 +5,8 @@ require 'ruhl/errors'
 module Ruhl
   class Engine
-    attr_reader :document, :scope, :layout, :layout_source, :local_object
+    attr_reader :document, :scope, :layout, :layout_source,
+                :local_object, :block_object
     def initialize(html, options = {})
       @local_object   = options[:local_object]
@@ -51,6 +52,7 @@ module Ruhl
     def render_partial(tag, code)
       file = execute_ruby(tag, code)
       raise PartialNotFoundError.new(file) unless File.exists?(file)
       render_file( File.read(file) )
     end
@@ -83,6 +85,7 @@ module Ruhl
       tag = nodes.first
       code = tag.remove_attribute('data-ruhl')
       process_attribute(tag, code.value)
       parse_doc(doc)
     end
@@ -91,33 +94,46 @@ module Ruhl
       actions.dup.each_with_index do |pair, ndx|
         attribute, value = pair.split(':')
+        attribute.strip!
         if value.nil?
-          tag.inner_html = execute_ruby(tag, attribute.strip)
+          results = execute_ruby(tag, attribute)
+          process_results(tag, results)
         else
           value.strip!
-          case attribute
-          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)
-          else
+          unless attribute =~ /^_/
             tag[attribute] = execute_ruby(tag, value)
+          else
+            case attribute
+            when "_use"
+              @block_object = execute_ruby(tag, value)
+              @tag_block = tag
+            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
         end
       end
+      if @tag_block == tag
+        @tag_block    = nil
+        @block_object = nil
+      end
     end
     def process_if(tag, value)
       contents = execute_ruby(tag, value)
       if contents
-        tag.inner_html = contents unless contents == true
+        process_results(tag, contents) unless contents == true
         true
       else
         tag.remove
@@ -135,12 +151,28 @@ module Ruhl
       end
     end
+    def process_results(tag, results)
+      if results.is_a?(Hash)
+        results.each do |key, value|
+          if key == :inner_html
+            tag.inner_html = value
+          else
+            tag[key.to_s] = value
+          end
+        end
+      else
+        tag.inner_html = results
+      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)
+          block_object.send(code)
         else
-          scope.send(code, tag)
+          scope.send(code)
         end
       else
         _render_
@@ -151,6 +183,7 @@ Context:
   tag           : #{tag.inspect}
   code          : #{code.inspect}
   local_object  : #{local_object.inspect}
+  block_object  : #{block_object.inspect}
   scope         : #{scope.inspect}
 CONTEXT
       raise e

data/ruhl.gemspec CHANGED

@@ -5,11 +5,11 @@
 Gem::Specification.new do |s|
   s.name = %q{ruhl}
-  s.version = "0.8.2"
+  s.version = "0.9.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-08}
+  s.date = %q{2009-10-13}
   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 = [
@@ -26,10 +26,13 @@ Gem::Specification.new do |s|
      "lib/ruhl/sinatra.rb",
      "ruhl.gemspec",
      "spec/html/basic.html",
+     "spec/html/form.html",
      "spec/html/fragment.html",
+     "spec/html/hash.html",
      "spec/html/if.html",
      "spec/html/layout.html",
      "spec/html/loop.html",
+     "spec/html/main_with_form.html",
      "spec/html/main_with_sidebar.html",
      "spec/html/medium.html",
      "spec/html/seo.html",

data/spec/html/form.html ADDED

@@ -0,0 +1,19 @@
+<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>

data/spec/html/hash.html ADDED

@@ -0,0 +1,13 @@
+<html>
+  <head>
+    <title>This is a title template</title>
+  </head>
+  <body>
+    <!-- basic hash example -->
+    <h1>Select User</h1>
+    <label class="radio" data-ruhl="_collection: user_list">
+      <span data-ruhl="last_name"/>
+      <input type="radio" data-ruhl="radio_input"/>
+    </label>
+  </body>
+</html>

data/spec/html/main_with_form.html ADDED

@@ -0,0 +1,25 @@
+<html>
+  <head>
+    <title>This is a title template</title>
+  </head>
+  <body>
+    <h1>My Account</h1>
+    <div id="sidebar" data-ruhl="_use: user, _partial: form_partial">
+      <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" />
+        <label for='user_last_name'>Last Name:</label>
+        <input id="user_last_name" name="user[last_name]" size="30" type="text" />
+        <label for='user_email'>Email:</label>
+        <input id="user_email" name="user[email]" size="30" type="text" />
+        <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

@@ -1,7 +1,5 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
 describe Ruhl do
   before do
     @co = ContextObject.new
@@ -76,6 +74,16 @@ describe Ruhl do
     it "should replace sidebar with partial contents" do
       doc = create_doc
+      html = %{<div id="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>
+</div>}
+      doc.xpath('//div[@id="sidebar"]').to_s.should == html
     end
   end
@@ -133,11 +141,46 @@ describe Ruhl do
     end
     it "will be injected into layout.html" do
-      doc  = create_doc( html(:loop) )
+      doc  = create_doc
       options = doc.xpath('/html/body/select//option')
       options.children.length.should == @co.states_for_select.length
     end
   end
+  describe "form.html" do
+    before do
+      @html = File.read html(:main_with_form)
+      @doc  = create_doc
+    end
+    it "first name will be set" do
+      @doc.xpath('/html/body/div//input')[0]['value'].should == "Jane"
+    end
+    it "last name will be set" do
+      @doc.xpath('/html/body/div//input')[1]['value'].should == "Doe"
+    end
+    it "email will be set" do
+      @doc.xpath('/html/body/div//input')[2]['value'].should == "jane@stonean.com"
+    end
+  end
+  describe "hash.html" do
+    before do
+      @html = File.read html(:hash)
+    end
+    it "have radio inputsi with proper attributes" do
+      doc  = create_doc
+      nodes = doc.xpath('/html/body/label//input')
+      nodes[0]['value'].should == 'doe'
+      nodes[1]['value'].should == 'joe'
+      nodes[2]['value'].should == 'smo'
+      nodes[3]['value'].should == 'tin'
+      nodes[4]['value'].should == 'man'
+    end
+  end
 end

data/spec/spec_helper.rb CHANGED

@@ -19,15 +19,26 @@ end
 class TestUser
-  attr_accessor :first_name, :last_name, :email
+  attr_accessor :id, :first_name, :last_name, :email
   def initialize(first, last , email = nil)
     @first_name = first
     @last_name  = last
     @email = email
+    @id = rand(100)
+  end
+  def radio_input(tag = nil)
+    { :inner_html => first_name, :id => "user_#{id.to_s}",
+      :name => "user[id]", :value => last_name.downcase}
   end
 end
+def user(tag = nil)
+  TestUser.new('Jane', 'Doe', 'jane@stonean.com')
+end
 class ContextObject
   def generate_h1(tag = nil)
     "data from presenter"
@@ -53,6 +64,10 @@ class ContextObject
     html(:sidebar)
   end
+  def form_partial(tag = nil)
+    html(:form)
+  end
   def user_list(tag = nil)
     [
       TestUser.new('Jane', 'Doe', 'jane@stonean.com'),

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruhl
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Andrew Stone
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2009-10-08 00:00:00 -04:00
+date: 2009-10-13 00:00:00 -04:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -51,10 +51,13 @@ files:
 - lib/ruhl/sinatra.rb
 - ruhl.gemspec
 - spec/html/basic.html
+- spec/html/form.html
 - spec/html/fragment.html
+- spec/html/hash.html
 - spec/html/if.html
 - spec/html/layout.html
 - spec/html/loop.html
+- spec/html/main_with_form.html
 - spec/html/main_with_sidebar.html
 - spec/html/medium.html
 - spec/html/seo.html