RubyGems - ruhl - Versions diffs - 0.16.0 → 0.17.0 - Mend

ruhl 0.16.0 → 0.17.0

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.16.0
1	+ 0.17.0

data/lib/ruhl/engine.rb CHANGED Viewed

@@ -156,16 +156,22 @@ module Ruhl
         throw :done
       else
         if continue_processing?
+          # yield if block given. otherwise do nothing and have ruhl
+          # continue processing
           yield if block_given?
         else
-          process_results
+          if block_given?
+            yield
+          else
+            process_results
+          end
         end
       end
     end
     def ruhl_unless
       if call_result
-        unless call_result_empty?
+        unless call_result_empty_array?
           current_tag.remove
           throw :done
         end
@@ -225,15 +231,19 @@ module Ruhl
     def stop_processing?
       call_result.nil? ||
         call_result == false ||
-          call_result_empty?
+          call_result_empty_array?
     end
     def continue_processing?
-      call_result == true || !call_result_empty?
+      call_result == true || call_result_populated_array?
     end
-    def call_result_empty?
-      call_result.kind_of?(Enumerable) && call_result.empty?
+    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
     def log_context(code)

data/ruhl.gemspec ADDED Viewed

@@ -0,0 +1,84 @@
+# Generated by jeweler
+# 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.17.0"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Andrew Stone"]
+  s.date = %q{2009-11-21}
+  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 = [
+    "README"
+  ]
+  s.files = [
+    ".gitignore",
+     "README",
+     "Rakefile",
+     "VERSION",
+     "lib/ruhl.rb",
+     "lib/ruhl/engine.rb",
+     "lib/ruhl/errors.rb",
+     "lib/ruhl/rails.rb",
+     "lib/ruhl/rails/active_record.rb",
+     "lib/ruhl/rails/helper.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",
+     "spec/html/hash.html",
+     "spec/html/if.html",
+     "spec/html/if_on_collection.html",
+     "spec/html/if_with_hash.html",
+     "spec/html/layout.html",
+     "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",
+     "spec/html/special.html",
+     "spec/html/swap.html",
+     "spec/html/use.html",
+     "spec/html/use_if.html",
+     "spec/rcov.opts",
+     "spec/ruhl_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/stonean/ruhl}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Ruby Hypertext Language}
+  s.test_files = [
+    "spec/ruhl_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<nokogiri>, ["= 1.4.0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+    else
+      s.add_dependency(%q<nokogiri>, ["= 1.4.0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<nokogiri>, ["= 1.4.0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+  end
+end

data/spec/html/if_with_hash.html ADDED Viewed

@@ -0,0 +1,9 @@
+<html>
+  <head>
+    <title>This is a title template</title>
+  </head>
+  <body>
+    <h1>This is the header template</h1>
+    <p data-ruhl="_if: hash_value"/>
+  </body>
+</html>

data/spec/ruhl_spec.rb CHANGED Viewed

@@ -95,7 +95,7 @@ describe Ruhl do
     it_should_behave_like "having sidebar"
     it "should update the h1" do
-      puts @doc.xpath("//div[@id='main']").first.children[1].
+      @doc.xpath("//div[@id='main']").first.children[1].
         inner_html.should == "Welcome to the Home page"
     end
   end
@@ -154,6 +154,27 @@ describe Ruhl do
       it_should_behave_like "if with users"
     end
+    describe "hash returned" do
+      before do
+        class ContextObject
+          def users?
+            true
+          end
+        end
+        @html = File.read html(:if_with_hash)
+        @doc = create_doc
+      end
+      it "should use hash appropriately" do
+        ptag = @doc.xpath("/html/body/p").first
+        ptag["class"].should == "pretty"
+        ptag["id"].should == "8675309"
+        ptag.inner_html.should=="jenny"
+      end
+    end
   end
   describe "if_on_collection.html" do

data/spec/spec_helper.rb CHANGED Viewed

@@ -206,6 +206,9 @@ class ContextObject
       {:value => 'WY', :inner_html => 'Wyoming'}]
   end
+  def hash_value
+    {:class => "pretty", :id => "8675309", :inner_html => "jenny"}
+  end
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruhl
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Andrew Stone
@@ -53,6 +53,7 @@ files:
 - lib/ruhl/rails/helper.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
@@ -61,6 +62,7 @@ files:
 - spec/html/hash.html
 - spec/html/if.html
 - spec/html/if_on_collection.html
+- spec/html/if_with_hash.html
 - spec/html/layout.html
 - spec/html/loop.html
 - spec/html/main_with_form.html