ruhl 1.2.0 → 1.3.0

data/.gitignore

@@ -2,3 +2,4 @@
 *.swp
 pkg/**
 coverage/**
+test.log

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.3.0

data/lib/ruhl.rb

@@ -10,6 +10,7 @@ module Ruhl
     attr_accessor :logger, :encoding
     attr_accessor :inspect_local_object, :inspect_block_object
     attr_accessor :inspect_scope
+    attr_accessor :use_instance_variables, :log_instance_variable_warning
   end
 
   self.logger = Logger.new(STDOUT)
@@ -19,4 +20,7 @@ module Ruhl
   self.inspect_local_object = false
   self.inspect_block_object = false
   self.inspect_scope = false
+
+  self.use_instance_variables = true
+  self.log_instance_variable_warning = true
 end

data/lib/ruhl/engine.rb

@@ -44,7 +44,7 @@ module Ruhl
     def render_with_layout
       raise LayoutNotFoundError.new(@layout) unless File.exists?(@layout)
 
-      render_nodes Nokogiri::HTML( @layout_source || File.read(@layout) )
+      render_nodes Nokogiri::HTML( @layout_source || file_contents(@layout) )
     end
 
     def render_partial
@@ -52,7 +52,7 @@ module Ruhl
         raise PartialNotFoundError.new(call_result) 
       end
 
-      render_nodes Nokogiri::HTML.fragment( File.read(call_result) )
+      render_nodes Nokogiri::HTML.fragment( file_contents(call_result) )
     end
 
     def render_collection
@@ -64,7 +64,7 @@ module Ruhl
       new_content = call_result.collect do |item|
         
         if actions.empty? && current_tag.xpath('.//*[@data-ruhl]').empty?
-          if item.is_a?(Hash)
+          if item.kind_of?(Hash)
             t = current_tag.dup
             apply_hash(t, item)
             t.to_html
@@ -131,7 +131,7 @@ module Ruhl
         if attribute =~ /^_/
           send("ruhl#{attribute}")
         else
-          current_tag[attribute] = call_result.to_s
+          write_tag_attribute(current_tag, attribute, call_result)
         end
       end
     rescue NoMethodError => nme
@@ -195,7 +195,7 @@ module Ruhl
     end
 
     def process_results
-      if call_result.is_a?(Hash)
+      if call_result.kind_of?(Hash)
         apply_hash(current_tag, call_result)
      else
         current_tag.inner_html = call_result.to_s
@@ -207,30 +207,52 @@ module Ruhl
         if key == :inner_html
           tag.inner_html = value.to_s
         else
-          tag[key.to_s] = value.to_s
+          write_tag_attribute(tag, key.to_s, value)
         end
       end
     end
 
+    def write_tag_attribute(tag, attribute, value)
+      if tag[attribute] && attribute.downcase == 'class'
+        tag[attribute] = "#{tag[attribute]} #{value}"
+      else
+        tag[attribute] = value.to_s
+      end
+    end
+
     def execute_ruby(code)
       if code == '_render_'
         _render_
       else
         args = code.strip.split('|').collect{|p| p.strip}
 
-        if block_object.respond_to?(args.first)
-          block_object.send(*args)
-        elsif local_object.respond_to?(args.first)
-          local_object.send(*args)
-        else
-          scope.send(*args)
+        [block_object, local_object, scope].compact.each do |obj|
+          return call_to(obj, args) rescue NoMethodError
+        end
+
+        if Ruhl.use_instance_variables
+          # No luck so far, lets see if code is actually an instance
+          # variable.  
+          ivar = :"@#{code}"
+          if scope.instance_variable_defined?(ivar)
+            if Ruhl.log_instance_variable_warning
+              Ruhl.logger.warn("Ruhl did NOT find a method named: #{code} but did find and is using: @#{code}")
+            end
+            return scope.instance_variable_get(ivar)
+          end
         end
+
+        log_context(code)
+        raise NoMethodError.new("Neither method nor instance variable found: #{args.first}")
+      end
+    end
+
+    def call_to(object, args)
+      if object.kind_of?(Hash) && ( object.has_key?(args.first) || object.has_key?(args.first.to_sym))
+        object[args.first] || object[args.first.to_sym]
+      else
+        object.send(*args)
       end
-    rescue NoMethodError => nme
-      Ruhl.logger.error(nme.message)
-      Ruhl.logger.error(nme.backtrace.join("\n"))
-      log_context(code)
-      raise nme
     end
 
     def set_scope(current_scope)
@@ -250,8 +272,8 @@ module Ruhl
 
     def call_result_populated_array?
       call_result.kind_of?(Array) && !call_result.empty?
-
     end
+
     def call_result_empty_array?
       call_result.kind_of?(Array) && call_result.empty?
     end
@@ -279,5 +301,19 @@ CONTEXT
               send(object_str).class.to_s
             end
     end
+
+    if RUBY_VERSION == '1.8.6'
+      def file_contents(path_to_file)
+        File.open(path_to_file,'r') do |f|
+          f.read
+        end
+      end
+    else
+      def file_contents(path_to_file)
+        File.open(path_to_file, "r:#{Ruhl.encoding}") do |f|
+          f.read
+        end
+      end
+    end
   end # Engine
 end # Ruhl

data/ruhl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruhl}
-  s.version = "1.2.0"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Stone"]
-  s.date = %q{2010-02-01}
+  s.date = %q{2010-02-10}
   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 = [
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
      "spec/html/basic.html",
      "spec/html/collection_of_hashes.html",
      "spec/html/collection_of_strings.html",
+     "spec/html/combination.html",
      "spec/html/form.html",
      "spec/html/fragment.html",
      "spec/html/hash.html",
@@ -44,7 +45,6 @@ Gem::Specification.new do |s|
      "spec/html/loop.html",
      "spec/html/main_with_form.html",
      "spec/html/main_with_sidebar.html",
-     "spec/html/medium.html",
      "spec/html/parameters.html",
      "spec/html/seo.html",
      "spec/html/sidebar.html",

data/spec/html/combination.html

@@ -0,0 +1,32 @@
+<html>
+  <head>
+    <title>This is a title template</title>
+  </head>
+  <body>
+    <h1>This is the header template</h1>
+    <p id='time'>It is now <span data-ruhl='_swap:time'/> time</p>
+    <table>
+      <thead>
+        <tr>
+          <td>First Name</td>
+          <td>Last Name</td>
+          <td>Email</td>
+        </tr>
+      </thead>
+      <tbody>
+        <tr class='user_data' data-ruhl="_collection: user_list, class: user_id">
+          <td data-ruhl="first_name">Andrew</td>
+          <td data-ruhl="last_name">Stone</td>
+          <td data-ruhl="email">andy@stonean.com</td>
+        </tr>
+      </tbody>
+    </table>
+    </ul>
+
+    <ul id="ruby_urls">
+      <li data-ruhl="_use: ruby_urls">
+        <a href="http://rubytrends.com" data-ruhl="href: href, name">RubyTrends</a>
+      </li>
+    </ul>
+  </body>
+</html>

data/spec/ruhl_spec.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe Ruhl do
@@ -34,25 +35,59 @@ describe Ruhl do
     end
   end
 
-  describe "medium.html" do
+  describe "combination.html" do
     before do
-      @html = File.read html(:medium)
-      @doc = create_doc
+      @html = File.read html(:combination)
     end
 
-    it "first data row should equal first user " do
-      table = @doc.xpath('/html/body/table/tr//td')
+    it 'first data row should equal first user' do
+      doc = create_doc
+      table = doc.xpath('/html/body/table/tbody/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')
+    it 'last data row should equal last user' do
+      doc = create_doc
+      table = doc.xpath('/html/body/table/tbody/tr//td')
       table.children[9].to_s.should == "Paul"
       table.children[10].to_s.should == "Tin"
       table.children[11].to_s.should == "paul@stonean.com"
     end
+
+    it 'should append user_id to class' do
+      doc = create_doc
+      rows = doc.xpath('/html/body/table/tbody//tr')
+      rows.each do |row|
+        row['class'].should =~ /^user_data user_\d+$/
+      end
+    end
+
+    it 'should set href from hash' do
+      doc = create_doc
+      rows = doc.xpath("/html/body/ul[@id='ruby_urls']/li//a")
+      rows[0].inner_html.should == 'Ruby Lang'
+      rows[0]['href'].should == 'http://ruby-lang.org'
+      rows[1].inner_html.should == 'RubyonRails'
+      rows[1]['href'].should == 'http://rubyonrails.com'
+      rows[2].inner_html.should == 'RubyFlow'
+      rows[2]['href'].should == 'http://rubyflow.com'
+      rows[3].inner_html.should == 'RubyTrends'
+      rows[3]['href'].should == 'http://rubytrends.com'
+    end
+
+    it 'should use instance variable' do
+      doc = create_doc
+      p = doc.xpath("/html/body/p[@id='time']")
+      p.inner_html.should == 'It is now Peanut Butter Jelly time'
+    end
+
+    it 'should not use instance variable' do
+      Ruhl.use_instance_variables = false
+      lambda{ create_doc }.should raise_error(NoMethodError)
+      Ruhl.use_instance_variables = true
+    end
   end
 
   describe "fragment.html" do
@@ -362,6 +397,11 @@ describe Ruhl do
         options = @doc.xpath('/html/body/select//option')
         options.children.length.should == @co.state_options.length
       end
+
+      it "should have selected Georgia" do
+        state = @doc.xpath('/html/body/select//option[@selected]')
+        state[0]['value'].should == "GA"
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib ruhl]))
 
+Ruhl.logger = Logger.new('test.log')
+
 def html(name)
   File.join( File.dirname(__FILE__), 'html', "#{name}.html" )
 end
@@ -30,9 +32,13 @@ class TestUser
   end
 
   def radio_input
-    { :inner_html => first_name, :id => "user_#{id.to_s}", 
+    { :inner_html => first_name, :id => user_id, 
       :name => "user[id]", :value => last_name.downcase}
   end
+
+  def user_id
+    "user_#{id}"
+  end
 end
  
 def user
@@ -41,6 +47,10 @@ end
 
 
 class ContextObject
+  def initialize
+    @time = 'Peanut Butter Jelly'
+  end
+
   def language
     'Ruby'
   end
@@ -163,7 +173,7 @@ class ContextObject
       {:value => 'CT', :inner_html => 'Connecticut'},
       {:value => 'DE', :inner_html => 'Delaware'},
       {:value => 'FL', :inner_html => 'Florida'},
-      {:value => 'GA', :inner_html => 'Georgia'},
+      {:value => 'GA', :inner_html => 'Georgia', :selected => true},
       {:value => 'HI', :inner_html => 'Hawaii'},
       {:value => 'ID', :inner_html => 'Idaho'},
       {:value => 'IL', :inner_html => 'Illinois'},
@@ -210,6 +220,14 @@ class ContextObject
     {:class => "pretty", :id => "8675309", :inner_html => "jenny"}
   end
 
+  def ruby_urls
+    [
+      {:name => 'Ruby Lang', :href => 'http://ruby-lang.org'},
+      {'name' => 'RubyonRails', :href => 'http://rubyonrails.com'},
+      {:name => 'RubyFlow', 'href' => 'http://rubyflow.com'},
+      {'name' => 'RubyTrends', 'href' => 'http://rubytrends.com'}
+    ]
+  end
 end
 
 def points_of_interest

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruhl
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Andrew Stone
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-01 00:00:00 -05:00
+date: 2010-02-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,6 +59,7 @@ files:
 - spec/html/basic.html
 - spec/html/collection_of_hashes.html
 - spec/html/collection_of_strings.html
+- spec/html/combination.html
 - spec/html/form.html
 - spec/html/fragment.html
 - spec/html/hash.html
@@ -69,7 +70,6 @@ files:
 - spec/html/loop.html
 - spec/html/main_with_form.html
 - spec/html/main_with_sidebar.html
-- spec/html/medium.html
 - spec/html/parameters.html
 - spec/html/seo.html
 - spec/html/sidebar.html

data/spec/html/medium.html

@@ -1,23 +0,0 @@
-<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="email">andy@stonean.com</td>
-      </tr>
-    </table>
-    </ul>
-  </body>
-</html>