ruhl 0.11.2 → 0.12.0

data/Rakefile

@@ -23,7 +23,7 @@ begin
     gemspec.email = "andy@stonean.com"
     gemspec.homepage = "http://github.com/stonean/ruhl"
     gemspec.authors = ["Andrew Stone"]
-    gemspec.add_dependency('nokogiri','>=1.3.3')
+    gemspec.add_dependency('nokogiri','=1.4.0')
     gemspec.add_development_dependency('rspec')
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.11.2
+0.12.0

data/lib/ruhl/engine.rb

@@ -15,6 +15,7 @@ module Ruhl
       if @layout || @local_object || @block_object
         @document = Nokogiri::HTML.fragment(html)
       else
+
         @document = Nokogiri::HTML(html)
       end
     end
@@ -60,14 +61,20 @@ module Ruhl
       html = current_tag.to_html
       
       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 && current_tag.xpath('.//*[@data-ruhl]').length == 0
-          current_tag.inner_html = item.to_s
-          current_tag.to_html
+          if item.is_a?(Hash)
+            t = current_tag.dup
+            apply_hash(t, item)
+            t.to_html
+          else
+            current_tag.inner_html = item.to_s
+            current_tag.to_html
+          end
         else
           Ruhl::Engine.new(html, :local_object => item).render(scope)
         end
+
       end.to_s
 
       current_tag.swap(new_content)
@@ -170,18 +177,22 @@ module Ruhl
 
     def process_results
       if call_result.is_a?(Hash)
-        call_result.each do |key, value|
-          if key == :inner_html
-            current_tag.inner_html = value.to_s
-          else
-            current_tag[key.to_s] = value.to_s
-          end
-        end
-      else
+        apply_hash(current_tag, call_result)
+     else
         current_tag.inner_html = call_result.to_s
       end
     end
 
+    def apply_hash(tag, hash)
+      hash.each do |key, value|
+        if key == :inner_html
+          tag.inner_html = value.to_s
+        else
+          tag[key.to_s] = value.to_s
+        end
+      end
+    end
+
     def execute_ruby(code)
       if code == '_render_'
         _render_

data/lib/ruhl/rails.rb

@@ -1,4 +1,5 @@
 require 'ruhl'
+require 'ruhl/rails/ruhl_presenter'
 
 module Ruhl
   class Plugin < ActionView::TemplateHandler

data/lib/ruhl/rails/active_record_presenter.rb

@@ -0,0 +1,57 @@
+module ActiveRecordPresenter
+  def error_messages?
+    !presentee.errors.empty?
+  end
+  
+  def error_messages
+    return if presentee.errors.empty?
+    presentee.errors.full_messages
+  end
+  
+  # Pass presenter method call to model so you don't have to
+  # redefine every model method in the presenter class.
+  def method_missing(name, *args)
+    if presentee.respond_to?(name)
+      presentee.send(name, *args)
+    end
+  end
+
+  # Extend scope of respond_to? to model.
+  def respond_to?(name)  
+    if super
+      true
+    else
+      presentee.respond_to?(name)
+    end
+  end
+  
+  def define_paths(model)
+    define_action(model, 'show')                      # show_path(@user)
+    define_action(model, 'update')                    # update_path(@user)
+    define_action(model, 'delete')                    # delete_path(@user)
+    define_action("edit_#{model}", 'edit')            # edit_path(@user)
+    define_action(model.pluralize, 'index', false)    # index_path
+    define_action(model.pluralize, 'create', false)   # create_path
+    define_action("new_#{model}", 'new', false)       # new_path
+  end
+  
+  private
+  
+  def define_action(model, action, use_presentee = true)
+    if use_presentee
+      self.class.send(:define_method, "#{action}_path") do
+        context.send("#{model}_path", presentee)
+      end      
+      self.class.send(:define_method, "#{action}_url") do
+        context.send("#{model}_url", presentee)
+      end      
+    else
+      self.class.send(:define_method, "#{action}_path") do
+        context.send("#{model}_path")
+      end      
+      self.class.send(:define_method, "#{action}_url") do
+        context.send("#{model}_url")
+      end      
+    end
+  end
+end

data/lib/ruhl/rails/ruhl_presenter.rb

@@ -0,0 +1,24 @@
+require 'ruhl/rails/active_record_presenter'
+
+class RuhlPresenter
+  include ActiveRecordPresenter
+
+  attr_reader :presentee, :context
+  
+  def initialize(obj, context)
+    @presentee = obj
+    @context = context
+    define_paths(obj.class.name.underscore.downcase)
+  end
+  
+end
+
+module ActionController
+  class Base    
+    def presenter_for(obj)
+      eval("#{obj.class.name}Presenter").new(obj,self)
+    end
+    
+    helper_method :presenter_for   
+  end
+end

data/ruhl.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{ruhl}
-  s.version = "0.11.1"
+  s.version = "0.12.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-27}
+  s.date = %q{2009-11-14}
   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 = [
@@ -24,9 +24,12 @@ Gem::Specification.new do |s|
      "lib/ruhl/engine.rb",
      "lib/ruhl/errors.rb",
      "lib/ruhl/rails.rb",
+     "lib/ruhl/rails/active_record_presenter.rb",
+     "lib/ruhl/rails/ruhl_presenter.rb",
      "lib/ruhl/sinatra.rb",
      "ruhl.gemspec",
      "spec/html/basic.html",
+     "spec/html/collection_of_hashes.html",
      "spec/html/collection_of_strings.html",
      "spec/html/form.html",
      "spec/html/fragment.html",
@@ -41,6 +44,7 @@ Gem::Specification.new do |s|
      "spec/html/parameters.html",
      "spec/html/seo.html",
      "spec/html/sidebar.html",
+     "spec/html/special.html",
      "spec/html/use.html",
      "spec/html/use_if.html",
      "spec/rcov.opts",
@@ -63,14 +67,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<nokogiri>, [">= 1.3.3"])
+      s.add_runtime_dependency(%q<nokogiri>, ["= 1.4.0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
     else
-      s.add_dependency(%q<nokogiri>, [">= 1.3.3"])
+      s.add_dependency(%q<nokogiri>, ["= 1.4.0"])
       s.add_dependency(%q<rspec>, [">= 0"])
     end
   else
-    s.add_dependency(%q<nokogiri>, [">= 1.3.3"])
+    s.add_dependency(%q<nokogiri>, ["= 1.4.0"])
     s.add_dependency(%q<rspec>, [">= 0"])
   end
 end
+

data/spec/html/collection_of_hashes.html

@@ -0,0 +1,11 @@
+<html>
+  <head>
+    <title>Hello World</title>
+  </head>
+  <body>
+    <h1 data-ruhl="generate_h1">I am a templated headline</h1>
+    <select id="states">
+      <option data-ruhl="_use: state_options">
+    </select>
+  </body>
+</html>

data/spec/ruhl_spec.rb

@@ -327,6 +327,23 @@ describe Ruhl do
     end
   end
       
+
+  
+  describe "collection_of_hashes.html" do
+    describe "user_list is not empty" do
+      before do
+        @html = File.read html(:collection_of_hashes)
+        @doc = create_doc
+      end
+
+
+      it "should have option for each state" do
+        options = @doc.xpath('/html/body/select//option')
+        options.children.length.should == @co.state_options.length
+      end
+    end
+  end
+
   describe "special.html" do
     before do
       @html = File.read html(:special)
@@ -334,9 +351,14 @@ describe Ruhl do
     end
 
     it "will convert entities" do
-      ps = @doc.xpath("/html/body//p")
-      ps[0].inner_html.should == "Here is a space and another one."
+      ps = @doc.xpath("/html/body/p")
+      ps[0].inner_html.should =~ /^Here is a space and another one.$/
       ps[1].inner_html.should == "RuHL © 2009"
+
+      # To verify everything is correct, I did it the old fashioned way
+      # File.open('test.html',"w") do |f|
+      #   f << @doc.to_s
+      # end
     end
   end
 

data/spec/spec_helper.rb

@@ -149,6 +149,60 @@ class ContextObject
       state.new('WY', 'Wyoming')]
   end
 
+  def state_options
+    [ {:value => 'AL', :inner_html => 'Alabama'},
+      {:value => 'AK', :inner_html => 'Alaska'},
+      {:value => 'AZ', :inner_html => 'Arizona'},
+      {:value => 'AR', :inner_html => 'Arkansas'},
+      {:value => 'CA', :inner_html => 'California'},
+      {:value => 'CO', :inner_html => 'Colorado'},
+      {:value => 'CT', :inner_html => 'Connecticut'},
+      {:value => 'DE', :inner_html => 'Delaware'},
+      {:value => 'FL', :inner_html => 'Florida'},
+      {:value => 'GA', :inner_html => 'Georgia'},
+      {:value => 'HI', :inner_html => 'Hawaii'},
+      {:value => 'ID', :inner_html => 'Idaho'},
+      {:value => 'IL', :inner_html => 'Illinois'},
+      {:value => 'IN', :inner_html => 'Indiana'},
+      {:value => 'IA', :inner_html => 'Iowa'},
+      {:value => 'KS', :inner_html => 'Kansas'},
+      {:value => 'KY', :inner_html => 'Kentucky'},
+      {:value => 'LA', :inner_html => 'Louisiana'},
+      {:value => 'ME', :inner_html => 'Maine'},
+      {:value => 'MD', :inner_html => 'Maryland'},
+      {:value => 'MA', :inner_html => 'Massachusetts'},
+      {:value => 'MI', :inner_html => 'Michigan'},
+      {:value => 'MN', :inner_html => 'Minnesota'},
+      {:value => 'MS', :inner_html => 'Mississippi'},
+      {:value => 'MO', :inner_html => 'Missouri'},
+      {:value => 'MT', :inner_html => 'Montana'},
+      {:value => 'NE', :inner_html => 'Nebraska'},
+      {:value => 'NV', :inner_html => 'Nevada'},
+      {:value => 'NH', :inner_html => 'New Hampshire'},
+      {:value => 'NJ', :inner_html => 'New Jersey'},
+      {:value => 'NM', :inner_html => 'New Mexico'},
+      {:value => 'NY', :inner_html => 'New York'},
+      {:value => 'NC', :inner_html => 'North Carolina'},
+      {:value => 'ND', :inner_html => 'North Dakota'},
+      {:value => 'OH', :inner_html => 'Ohio'},
+      {:value => 'OK', :inner_html => 'Oklahoma'},
+      {:value => 'OR', :inner_html => 'Oregon'},
+      {:value => 'PA', :inner_html => 'Pennsylvania'},
+      {:value => 'RI', :inner_html => 'Rhode Island'},
+      {:value => 'SC', :inner_html => 'South Carolina'},
+      {:value => 'SD', :inner_html => 'South Dakota'},
+      {:value => 'TN', :inner_html => 'Tennessee'},
+      {:value => 'TX', :inner_html => 'Texas'},
+      {:value => 'UT', :inner_html => 'Utah'},
+      {:value => 'VT', :inner_html => 'Vermont'},
+      {:value => 'VA', :inner_html => 'Virginia'},
+      {:value => 'WA', :inner_html => 'Washington'},
+      {:value => 'WV', :inner_html => 'West Virginia'},
+      {:value => 'WI', :inner_html => 'Wisconsin'},
+      {:value => 'WY', :inner_html => 'Wyoming'}]
+  end
+
+
 end
 
 def points_of_interest

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruhl
 version: !ruby/object:Gem::Version 
-  version: 0.11.2
+  version: 0.12.0
 platform: ruby
 authors: 
 - Andrew Stone
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-06 00:00:00 -05:00
+date: 2009-11-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,9 +18,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 1.3.3
+        version: 1.4.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -49,9 +49,12 @@ files:
 - lib/ruhl/engine.rb
 - lib/ruhl/errors.rb
 - lib/ruhl/rails.rb
+- lib/ruhl/rails/active_record_presenter.rb
+- lib/ruhl/rails/ruhl_presenter.rb
 - lib/ruhl/sinatra.rb
 - ruhl.gemspec
 - spec/html/basic.html
+- spec/html/collection_of_hashes.html
 - spec/html/collection_of_strings.html
 - spec/html/form.html
 - spec/html/fragment.html