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

ruhl 0.8.1 → 0.8.2

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

data/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 0.8.1
1	+ 0.8.2

data/lib/ruhl.rb CHANGED Viewed

@@ -25,7 +25,7 @@ module Ruhl
     def render(current_scope)
       set_scope(current_scope)
-      parse_doc(@document)
+      parse_doc(document)
       if @layout
         render_with_layout
@@ -54,9 +54,10 @@ module Ruhl
       render_file( File.read(file) )
     end
-    def render_collection(tag, code)
+    def render_collection(tag, code, actions = nil)
       results = execute_ruby(tag, code)
+      tag['data-ruhl'] = actions if actions.to_s.strip.length > 0
       html = tag.to_html
       new_content = results.collect do |item|
@@ -73,7 +74,7 @@ module Ruhl
     end
     def parse_doc(doc)
-      if (nodes = doc.xpath('//*[@data-ruhl][1]')).empty?
+      if (nodes = doc.xpath('*[@data-ruhl][1]')).empty?
         nodes = doc.search('*[@data-ruhl]')
       end
@@ -86,7 +87,8 @@ module Ruhl
     end
     def process_attribute(tag, code)
-      code.split(',').each do |pair|
+      actions = code.split(',')
+      actions.dup.each_with_index do |pair, ndx|
         attribute, value = pair.split(':')
         if value.nil?
@@ -98,7 +100,9 @@ module Ruhl
           when "_partial"
             tag.inner_html = render_partial(tag, value)
           when "_collection"
-            render_collection(tag, value)
+            actions.delete_at(ndx)
+            render_collection(tag, value, actions.join(','))
+            return
           when "_if"
             return unless process_if(tag, value)
           when "_unless"
@@ -141,6 +145,15 @@ module Ruhl
       else
         _render_
       end
+    rescue NoMethodError => e
+      puts <<CONTEXT
+Context:
+  tag           : #{tag.inspect}
+  code          : #{code.inspect}
+  local_object  : #{local_object.inspect}
+  scope         : #{scope.inspect}
+CONTEXT
+      raise e
     end
     def set_scope(current_scope)

data/ruhl.gemspec CHANGED Viewed

@@ -5,7 +5,7 @@
 Gem::Specification.new do |s|
   s.name = %q{ruhl}
-  s.version = "0.8.1"
+  s.version = "0.8.2"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Stone"]
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
      "spec/html/fragment.html",
      "spec/html/if.html",
      "spec/html/layout.html",
+     "spec/html/loop.html",
      "spec/html/main_with_sidebar.html",
      "spec/html/medium.html",
      "spec/html/seo.html",

data/spec/html/loop.html ADDED Viewed

@@ -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="_collection: states_for_select, value: abbr,  name">
+    </select>
+  </body>
+</html>

data/spec/ruhl_spec.rb CHANGED Viewed

@@ -126,6 +126,18 @@ describe Ruhl do
       end
     end
   end
+  describe "loop.html" do
+    before do
+      @html = File.read html(:loop)
+    end
+    it "will be injected into layout.html" do
+      doc  = create_doc( html(:loop) )
+      options = doc.xpath('/html/body/select//option')
+      options.children.length.should == @co.states_for_select.length
+    end
+  end
 end

data/spec/spec_helper.rb CHANGED Viewed

@@ -1,5 +1,23 @@
 require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib ruhl]))
+def html(name)
+  File.join( File.dirname(__FILE__), 'html', "#{name}.html" )
+end
+def create_doc(layout = nil)
+  options = {:layout => layout}
+  html = Ruhl::Engine.new(@html, :layout => layout).
+    render(ContextObject.new)
+  do_parse(html)
+end
+def do_parse(html)
+  Nokogiri::HTML(html)
+end
 class TestUser
   attr_accessor :first_name, :last_name, :email
@@ -52,23 +70,59 @@ class ContextObject
   def no_users_message(tag = nil)
     "Sorry no users found"
   end
-end
-def html(name)
-  File.join( File.dirname(__FILE__), 'html', "#{name}.html" )
-end
-def create_doc(layout = nil)
-  options = {:layout => layout}
-  html = Ruhl::Engine.new(@html, :layout => layout).
-    render(ContextObject.new)
-  do_parse(html)
-end
+  def states_for_select(tag = nil)
+    state = Struct.new(:abbr, :name)
+    [ state.new('AL', 'Alabama'),
+      state.new('AK', 'Alaska'),
+      state.new('AZ', 'Arizona'),
+      state.new('AR', 'Arkansas'),
+      state.new('CA', 'California'),
+      state.new('CO', 'Colorado'),
+      state.new('CT', 'Connecticut'),
+      state.new('DE', 'Delaware'),
+      state.new('FL', 'Florida'),
+      state.new('GA', 'Georgia'),
+      state.new('HI', 'Hawaii'),
+      state.new('ID', 'Idaho'),
+      state.new('IL', 'Illinois'),
+      state.new('IN', 'Indiana'),
+      state.new('IA', 'Iowa'),
+      state.new('KS', 'Kansas'),
+      state.new('KY', 'Kentucky'),
+      state.new('LA', 'Louisiana'),
+      state.new('ME', 'Maine'),
+      state.new('MD', 'Maryland'),
+      state.new('MA', 'Massachusetts'),
+      state.new('MI', 'Michigan'),
+      state.new('MN', 'Minnesota'),
+      state.new('MS', 'Mississippi'),
+      state.new('MO', 'Missouri'),
+      state.new('MT', 'Montana'),
+      state.new('NE', 'Nebraska'),
+      state.new('NV', 'Nevada'),
+      state.new('NH', 'New Hampshire'),
+      state.new('NJ', 'New Jersey'),
+      state.new('NM', 'New Mexico'),
+      state.new('NY', 'New York'),
+      state.new('NC', 'North Carolina'),
+      state.new('ND', 'North Dakota'),
+      state.new('OH', 'Ohio'),
+      state.new('OK', 'Oklahoma'),
+      state.new('OR', 'Oregon'),
+      state.new('PA', 'Pennsylvania'),
+      state.new('RI', 'Rhode Island'),
+      state.new('SC', 'South Carolina'),
+      state.new('SD', 'South Dakota'),
+      state.new('TN', 'Tennessee'),
+      state.new('TX', 'Texas'),
+      state.new('UT', 'Utah'),
+      state.new('VT', 'Vermont'),
+      state.new('VA', 'Virginia'),
+      state.new('WA', 'Washington'),
+      state.new('WV', 'West Virginia'),
+      state.new('WI', 'Wisconsin'),
+      state.new('WY', 'Wyoming')]
+  end
-def do_parse(html)
-  Nokogiri::HTML(html)
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruhl
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Andrew Stone
@@ -54,6 +54,7 @@ files:
 - spec/html/fragment.html
 - spec/html/if.html
 - spec/html/layout.html
+- spec/html/loop.html
 - spec/html/main_with_sidebar.html
 - spec/html/medium.html
 - spec/html/seo.html