netshade-oembed_links 0.1.2 → 0.1.3

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.1.3 / 2008-10-16
+
+* 1 minor enhancement
+  
+  * refactored no matching scheme into .none? matcher
+
 === 0.1.2 / 2008-10-16
 
 * 1 minor enhancement

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'hoe'
 
-Hoe.new('oembed_links', "0.1.2") do |p|
+Hoe.new('oembed_links', "0.1.3") do |p|
   p.summary = ""
   p.url = 'http://indystar.com/'
   p.description = "Easy OEmbed integration for Ruby (and Rails)."

data/lib/oembed_links.rb

@@ -358,7 +358,9 @@ class OEmbed
       if block.nil?
         txt
       else
-        txt.gsub!(u, yield(nil, u))
+        response = OEmbed::Response.new("", u, {})
+        yield(response, u)
+        txt.gsub!(u, response.rendered_content)
       end      
     end
   end

data/lib/oembed_links/response.rb

@@ -7,7 +7,7 @@ class OEmbed
     def initialize(provider, url, response_object)
       @provider = provider
       @url = url
-      @response = response_object
+      @response = response_object || {}
       @rendered_via_provider = @rendered_via_regex = @rendered_via_type = false
       @rendered = nil
     end
@@ -22,6 +22,14 @@ class OEmbed
       @rendered || self.to_s
     end
 
+
+    # Case where url has not matched at all
+    def none?(*args, &block)
+      if @response.keys.empty? && !has_rendered?
+        return render_content(*args, &block)
+      end
+    end
+    
     # Test if this response has been returned from
     # the given provider_name.
     def from?(provider_name, *args, &block)

data/oembed_links.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{oembed_links}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Indianapolis Star MD&D"]

data/spec/oembed_links_spec.rb

@@ -122,6 +122,7 @@ describe OEmbed, "transforming functions" do
 
   it "should always give priority to provider conditional blocks" do
     OEmbed.transform("http://test1.net/foo") do |r, url|
+      r.none? { "none" }
       r.any? { |a| "any" }
       r.video? { |v| "video" }
       r.from?(:test1) { |t| "test1" }
@@ -131,6 +132,7 @@ describe OEmbed, "transforming functions" do
 
   it "should always give priority regex conditional blocks over all others except provider" do
     OEmbed.transform("http://test1.net/foo") do |r, url|
+      r.none? { "none" }      
       r.any? { |a| "any" }
       r.video? { |v| "video" }
       r.matches?(/./) { |m| "regex" }
@@ -144,6 +146,7 @@ describe OEmbed, "transforming functions" do
 
   it "should recognize the type of content and handle the conditional block appropriately" do
     OEmbed.transform("http://test1.net/foo") do |r, url|
+      r.none? { "none" }      
       r.any? { |a| "any" }
       r.video? { |v| "video" }
     end.should == "video"
@@ -166,6 +169,16 @@ describe OEmbed, "transforming functions" do
     end.should == "foo" 
   end
 
+  it "should pass control to the .none? block if no scheme matched" do
+    OEmbed.transform("http://not.a.valid.url.host/fake") do |r, url|
+      r.none? { "nomatch" }
+      r.audio? { |a| "audio" }
+      r.hedgehog? { |v| "hedgey"}
+      r.from?(:test2) { |t| "test2" }
+      r.matches?(/baz/) { |m| "regex" }
+    end.should == "nomatch" 
+  end
+
   it "should allow templates to be used to process the output" do
     url_provides({
      "url" => "template!"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: netshade-oembed_links
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Indianapolis Star MD&D