RubyGems - ruhl - Versions diffs - 0.9.2 → 0.9.3 - Mend

ruhl 0.9.2 → 0.9.3

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 (8) hide show

data/VERSION +1 -1
data/lib/ruhl.rb +5 -4
data/ruhl.gemspec +2 -2
data/spec/html/collection_of_strings.html +15 -6
data/spec/ruhl_spec.rb +57 -5
data/spec/spec.opts +1 -2
data/spec/spec_helper.rb +2 -1
metadata +2 -2

data/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 0.9.2
1	+ 0.9.3

data/lib/ruhl.rb CHANGED Viewed

@@ -66,10 +66,11 @@ module Ruhl
       html = tag.to_html
       new_content = results.collect do |item|
-        if actions.length == 0 && tag.children.length == 0
-          t = tag.dup
-          t.inner_html = item.to_s
-          t
+        # 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 && tag.xpath('.//*[@data-ruhl]').length == 0
+          tag.inner_html = item.to_s
+          tag.to_html
         else
           Ruhl::Engine.new(html, :local_object => item).render(scope)
         end

data/ruhl.gemspec CHANGED Viewed

@@ -5,11 +5,11 @@
 Gem::Specification.new do |s|
   s.name = %q{ruhl}
-  s.version = "0.9.2"
+  s.version = "0.9.3"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Stone"]
-  s.date = %q{2009-10-15}
+  s.date = %q{2009-10-16}
   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 = [

data/spec/html/collection_of_strings.html CHANGED Viewed

@@ -4,19 +4,28 @@
   </head>
   <body>
     <h1>Ruby:</h1>
-    <ul>
-      <li data-ruhl="_collection: points_of_interest"></li>
-   </ul>
+    <ul id='call-to_s'>
+      <li data-ruhl="_collection: points_of_interest">
+        <span>sample</span>
+      </li>
+    </ul>
+    <h1>Ruby user:</h1>
+    <ul id='_use-call-to_s' data-ruhl="_use:user">
+      <li data-ruhl="_collection: nicknames">
+        <span>sample</span>
+      </li>
+    </ul>
     <h1>Ruby Titlized:</h1>
-    <ul>
+    <ul id='call-upcase'>
       <li data-ruhl="_collection: points_of_interest">
-        <span data-ruhl="capitalize"/>
+        <span data-ruhl="upcase"/>
       </li>
    </ul>
     <h1>Ruby reversed:</h1>
-    <ul>
+    <ul id='call-reverse'>
       <li data-ruhl="_collection: points_of_interest, reverse"></li>
    </ul>
   </body>

data/spec/ruhl_spec.rb CHANGED Viewed

@@ -182,7 +182,6 @@ describe Ruhl do
     end
   end
   describe "use.html" do
     before do
       @html = File.read html(:use)
@@ -201,15 +200,68 @@ describe Ruhl do
       @doc.xpath('/html/body/div//input')[2]['value'].should == "jane@stonean.com"
     end
   end
   describe "collection_of_strings.html" do
     before do
       @html = File.read html(:collection_of_strings)
+      @doc  = create_doc
     end
-    it "will have the string values in the li's" do
-      doc  = create_doc
-      puts doc.to_s
+    describe "with no nested data-ruhls or other actions" do
+      it "will have 5 line items" do
+        @doc.xpath("//ul[@id='call-to_s']").first.children.length.should == 10
+      end
+      it "will have correct content" do
+        @doc.xpath("//ul[@id='call-to_s']//li").first.inner_html.should == "Object oriented"
+      end
+      describe 'called from within a _use' do
+        it "will have correct line items" do
+          @doc.xpath("/html/body//ul[@id='_use-call-to_s']/li").children.length.should == 2
+        end
+        it "will have correct content" do
+          @doc.xpath("/html/body/ul[@id='_use-call-to_s']//li").first.inner_html.should == "Auntie"
+        end
+      end
+    end
+    describe "with a nested data-ruhl" do
+      it "will have 5 line items" do
+        @doc.xpath("/html/body//ul[@id='call-upcase']").first.children.length.should == 10
+      end
+      it "will have correct content" do
+        @doc.xpath("/html/body/ul[@id='call-upcase']/li//span").first.inner_html.
+          should == "OBJECT ORIENTED"
+      end
+    end
+    describe "with an additional action" do
+      it "will have 5 line items" do
+        @doc.xpath("/html/body//ul[@id='call-reverse']").first.children.length.should == 10
+      end
+      it "will have correct content" do
+        @doc.xpath("/html/body/ul[@id='call-reverse']//li").first.inner_html.
+          should == "detneiro tcejbO"
+      end
+      it "last item will have correct content" do
+        @doc.xpath("/html/body/ul[@id='call-reverse']//li").last.inner_html.
+          should == "ecruos nepo"
+      end
+    end
+  end
+  describe "when no method" do
+    before do
+      @html = "<p data-ruhl='nonexistant_method'>I am bad</p>"#File.read html(:debug)
+    end
+    it 'should complain' do
+      lambda{ @doc  = create_doc }.should raise_error(NoMethodError)
     end
   end
 end

data/spec/spec.opts CHANGED Viewed

@@ -1,3 +1,2 @@
 --color
---format
-  progress
+--format s

data/spec/spec_helper.rb CHANGED Viewed

@@ -19,13 +19,14 @@ end
 class TestUser
-  attr_accessor :id, :first_name, :last_name, :email
+  attr_accessor :id, :first_name, :last_name, :email, :nicknames
   def initialize(first, last , email = nil)
     @first_name = first
     @last_name  = last
     @email = email
     @id = rand(100)
+    @nicknames = ['Auntie','Pattern']
   end
   def radio_input(tag = nil)

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruhl
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Andrew Stone
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2009-10-15 00:00:00 -04:00
+date: 2009-10-16 00:00:00 -04:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency