lilu 0.1.2 → 0.1.3

data/AUTHORS

@@ -0,0 +1,2 @@
+Yurii Rashkovskii <yrashk@verbdev.com> Maintainer
+Michael Holub <mholub@railsware.com>   Ideas, some specs

data/lib/hpricot_ext.rb

@@ -0,0 +1,42 @@
+require 'hpricot'
+
+class Hpricot::Elem
+  attr_accessor :cache_search
+  alias :_search :search
+  def search(expr,&block)
+    if @_inner_html
+      self.inner_html= @_inner_html 
+      @_inner_html = nil
+    end
+    if cache_search
+      @_search ||= {}
+      @_search[expr] || @_search[expr] = _search(expr,&block)
+    else
+      _search(expr,&block)
+    end
+  end
+
+  def _inner_html=(html)
+    @_inner_html = html
+  end
+
+  alias :_output :output
+  def output(out, opts={})
+    if @_inner_html
+      if empty? and ElementContent[@stag.name] == :EMPTY
+        @stag.output(out, opts.merge(:style => :empty))
+      else
+        @stag.output(out, opts)
+        out << @_inner_html
+        if @etag
+          @etag.output(out, opts)
+        elsif !opts[:preserve]
+          ETag.new(@stag.name).output(out,opts)
+        end
+      end
+    else
+      _output(out,opts)
+    end
+  end
+
+end

data/lib/lilu.rb

@@ -1,50 +1,12 @@
 require 'rubygems'
-require 'hpricot'
 require 'active_support'
 
-class Hpricot::Elem
-  attr_accessor :cache_search
-  alias :_search :search
-  def search(expr,&block)
-    if @_inner_html
-      self.inner_html= @_inner_html 
-      @_inner_html = nil
-    end
-    if cache_search
-      @_search ||= {}
-      @_search[expr] || @_search[expr] = _search(expr,&block)
-    else
-      _search(expr,&block)
-    end
-  end
+require File.dirname(__FILE__) + '/hpricot_ext'
 
-  def _inner_html=(html)
-    @_inner_html = html
-  end
 
-  alias :_output :output
-  def output(out, opts={})
-    if @_inner_html
-      if empty? and ElementContent[@stag.name] == :EMPTY
-        @stag.output(out, opts.merge(:style => :empty))
-      else
-        @stag.output(out, opts)
-        out << @_inner_html
-        if @etag
-          @etag.output(out, opts)
-        elsif !opts[:preserve]
-          ETag.new(@stag.name).output(out,opts)
-        end
-      end
-    else
-      _output(out,opts)
-    end
-  end
-
-end
 module Lilu
 
-  module Version ; MAJOR, MINOR, TINY = 0, 1, 2 ; end
+  module Version ; MAJOR, MINOR, TINY = 0, 1, 3 ; end
 
   class Action
     attr_accessor :element
@@ -102,7 +64,7 @@ module Lilu
       when Proc
         with(new_element.call.to_s)
       when nil
-        with(block.call) if block_given?
+        with renderer.instance_eval(&block) if block_given?
       else
         element.swap new_element.to_s
       end
@@ -118,8 +80,8 @@ module Lilu
         arg.each_pair do |path,value|
           value = value.call if value.is_a?(Proc)
           case path
-          when String
-            elem = element.at(path)
+          when ElementAt
+            elem = path.find_at(element)
             raise ElementNotFound.new(elem) unless elem
 
             saved_element = element
@@ -129,7 +91,7 @@ module Lilu
             res
           when Replacing
             Replace.new(path.element,renderer).with value.to_s
-          when renderer
+          when ElementText
             element._inner_html = value.to_s
           else
             element[path] = value.to_s
@@ -155,7 +117,9 @@ module Lilu
     end
   end
 
-  # Experimental stuff
+  
+  # Helpers
+  
   class Replacing
     attr_reader :element
     def initialize(renderer,element)
@@ -168,6 +132,18 @@ module Lilu
       end
     end
   end
+  
+  class ElementAt
+    attr_reader :path
+    def initialize(renderer,path)
+      @renderer, @path = @renderer, path
+    end
+    def find_at(element)
+      element.at(path)
+    end
+  end
+  
+  class ElementText ; include Singleton ; end
   #
 
   class ElementNotFound < Exception
@@ -222,25 +198,32 @@ module Lilu
       render({:partial => name}.merge(opts))
     end
 
-    # Helper for lambda
-    alias_method :L, :lambda
-
     def element_at(path)
       doc.at(path)
     end
 
+    # Helper for Replacing
+    def replacing(element)
+      Replacing.new(self,element)
+    end
+    
+    # Helper for ElementAt
+    def at(element)
+      ElementAt.new(self,element)
+    end
+    
+    # Helper for ElementText
+    def text
+      ElementText.instance
+    end
+
     def method_missing(sym,*args)
       return @view.send(sym,*args) if @view and @view.respond_to?(sym)
-      return instance_variable_get("@#{sym}") if args.empty? and instance_variables.member? "@#{sym}"
+      return instance_variable_get("@#{sym}") if args.empty? and instance_variables.member?("@#{sym}")
       return @controller.send(sym, *args) if @controller and @controller.respond_to?(sym)
       raise NoMethodError.new(sym.to_s)
     end
-
-    # Helper for replacing
-    def replacing(element)
-      Replacing.new(self,element)
-    end
-
+    
     protected
 
     def find_elements(*path)

data/spec/lilu_spec.rb

@@ -72,7 +72,7 @@ describe Lilu::Renderer do
   end
 
   it "should update element details on update(path).with Hash construct" do
-    @instructions = %{update("#some-data").with :id => "some-lilu-data", "a" => { :href => "/", self => "is here" }   }
+    @instructions = %{update("#some-data").with :id => "some-lilu-data", at("a") => { :href => "/", text => "is here" }   }
     @html_source = %{<div id="some-data">Lola <a href="#">is there</a></div>}
     @renderer = Lilu::Renderer.new(@instructions,@html_source)
     result = Hpricot(@renderer.apply)
@@ -83,7 +83,7 @@ describe Lilu::Renderer do
 
   it "should populate element details on populate(path).for(:each,@blogs) { block }  construct" do
     @blogs = [OpenStruct.new(:url => "http://railsware.com", :blog_id => 1, :name => "Railsware"),OpenStruct.new(:url => "http://railsware.com/", :blog_id => 2, :name => "Railsware!")]
-    @instructions = %{populate("#blog-example").for(:each,@blogs) {|blog| mapping 'a' => {:href => blog.url, self => blog.name}, :id => blog.blog_id } }
+    @instructions = %{populate("#blog-example").for(:each,@blogs) {|blog| mapping at('a') => {:href => blog.url, text => blog.name}, :id => blog.blog_id } }
     @html_source = %{<ul id="blogs"><li id="blog-example"><a href="#">My Blog</a></li></ul>}
     @renderer = Lilu::Renderer.new(@instructions,@html_source,self)
     result = Hpricot(@renderer.apply)
@@ -97,7 +97,7 @@ describe Lilu::Renderer do
 
   it "should populate element details on populate(:all,path).for(:each,@blogs) { block }  construct" do
     @blogs = [OpenStruct.new(:url => "http://railsware.com", :blog_id => 1, :name => "Railsware")]
-    @instructions = %{populate(:all,".blog-example").for(:each,@blogs) {|blog| mapping 'a' => {:href => blog.url, self => blog.name}, :id => blog.blog_id } }
+    @instructions = %{populate(:all,".blog-example").for(:each,@blogs) {|blog| mapping at('a') => {:href => blog.url, text => blog.name}, :id => blog.blog_id } }
     @html_source = %{<ul id="blogs1"><li id="blog-example" class="blog-example"><a href="#">My Blog</a></li></ul><ul id="blogs2"><li id="blog-example" class="blog-example"><a href="#">My Blog</a></li></ul>}
     @renderer = Lilu::Renderer.new(@instructions,@html_source,self)
     result = Hpricot(@renderer.apply)
@@ -111,7 +111,7 @@ describe Lilu::Renderer do
   end
 
   it "should update all elements, matched by path on update(:all, path).with Hash construct" do
-    @instructions = %{update(:all, "a").with :href => "#", self => 'Stay here'}
+    @instructions = %{update(:all, "a").with :href => "#", text => 'Stay here'}
     @html_source = %{<a href="http://java.net">C'mon, Java!</a><a href="http://www.php.net">Go away!</a>}
     @renderer = Lilu::Renderer.new(@instructions,@html_source)
     result = Hpricot(@renderer.apply)
@@ -119,7 +119,7 @@ describe Lilu::Renderer do
   end
 
   it "should update all elements, matched by path on update(:all, path).with Hash construct, taking in account each element content" do
-    @instructions = 'update(:all, "a").with :href => L{"#{element[:href]}/download"}, self => L{"Download #{element.inner_html}"}'
+    @instructions = 'update(:all, "a").with :href => lambda{"#{element[:href]}/download"}, text => lambda{"Download #{element.inner_html}"}'
     links =  {"http://java.net" => "C'mon, Java!", "http://www.php.net" => "Go away!"}
     @html_source = ""
     links.each_pair {|url,name| @html_source << %{<a href="#{url}">#{name}</a>} }
@@ -131,7 +131,7 @@ describe Lilu::Renderer do
   end
 
   it "should update all elements, matched by path on update(:all, path).with Block construct, taking in account each element content" do
-    @instructions = 'update(:all, "a").with { mapping :href => "#{element[:href]}/download", self => "Download #{element.inner_html }" }'
+    @instructions = 'update(:all, "a").with { mapping :href => "#{element[:href]}/download", text => "Download #{element.inner_html }" }'
     links =  {"http://java.net" => "C'mon, Java!", "http://www.php.net" => "Go away!"}
     @html_source = ""
     links.each_pair {|url,name| @html_source << %{<a href="#{url}">#{name}</a>} }
@@ -143,7 +143,7 @@ describe Lilu::Renderer do
   end
 
   it "should update all elements, matched by path on update(:all, path).with Lambda construct, taking in account each element content" do
-    @instructions = 'update(:all, "a").with L{ mapping :href => "#{element[:href]}/download", self => "Download #{element.inner_html }" }'
+    @instructions = 'update(:all, "a").with lambda { mapping :href => "#{element[:href]}/download", text => "Download #{element.inner_html }" }'
     links =  {"http://java.net" => "C'mon, Java!", "http://www.php.net" => "Go away!"}
     @html_source = ""
     links.each_pair {|url,name| @html_source << %{<a href="#{url}">#{name}</a>} }
@@ -186,7 +186,7 @@ describe Lilu::Renderer do
   end
 
   it "should replace element with another using replace().with Lambda construct" do
-    @instructions = "replace('#main').with  L{ 'Hello!' }"
+    @instructions = "replace('#main').with  lambda { 'Hello!' }"
     @html_source = '<html><body><div id="main">Blablabla</div></body></html>'
     @renderer = Lilu::Renderer.new(@instructions,@html_source)
     result = Hpricot(@renderer.apply)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: lilu
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
-date: 2007-06-30 00:00:00 +02:00
+  version: 0.1.3
+date: 2007-07-08 00:00:00 +02:00
 summary: View subsystem that allows to keep pure HTML for views
 require_paths: 
 - lib
@@ -15,10 +15,11 @@ description: View subsystem that allows to keep pure HTML for views
 autorequire: 
 - rake
 - hpricot
+- lib/hpricot_ext
 - lib/lilu
 - lib/lilu_view
 - lib/lilu_camping
-default_executable: fixturease.rb
+default_executable: 
 bindir: bin
 has_rdoc: false
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
@@ -33,8 +34,9 @@ cert_chain:
 post_install_message: 
 authors: 
 - Yurii Rashkovskii
-- Michael Holub
 files: 
+- AUTHORS
+- lib/hpricot_ext.rb
 - lib/lilu.rb
 - lib/lilu_view.rb
 - lib/lilu_camping.rb