netshade-oembed_links 0.0.8 → 0.0.9

data/README

@@ -69,9 +69,16 @@ OEmbed.transform(text_to_transform) do |res, url|
 end
 
 This presumes you have a directory in your Rails views directory called "oembed", and a file
-of the form "video.html.erb" or "video.rhtml".  Haml templates are also supported (Erubis too).  If you are
-not using Rails, you may still use the template functionality, but you must specify the full path
-to the template.  See the RDocs for OEmbed::TemplateResolver for more information.
+of the form "video.html.erb" or "video.rhtml".  If you are not using Rails, you may still use the
+template functionality, but you must specify the full path to the template. When you are integrating
+with Rails, you may use any template library that is installed for your Rails app; when you are using
+the absolute filename method, you only have access to ERB, Erubis or HAML.
+
+As of version 0.0.9, your Rails oembed templates have access to all the traditional Rails template helper methods
+(such as Rails' link_to, image_tag, etc.); the templates are processed using the Rails template rendering
+pipeline, and as such may even do evil things like access your Models.
+
+See the RDocs for OEmbed::TemplateResolver for more information regarding templates and oembed_links.
 
 
 
@@ -80,6 +87,7 @@ See the rdocs for much more complete examples.  The specs directory has some exa
 use, but the test to code ratio is slim atm.
 
 Thanks to the Indianapolis Star I&D department for open sourcing this; most notably Chris Vannoy for giving the okay.
+Thanks to Kyle Slattery for adding Viddler to the example oembed_links.yml
 
 
 CZ - chris.zelenak!at!!indystar.com

data/lib/oembed_links/template_resolver.rb

@@ -33,12 +33,7 @@ class OEmbed
     # Resolves the template path for the given (potentially relative) path
     # If the given path is found to exist immediately, whether by itself
     # or when combined with the optionally present template_root (OEmbed::TemplateResolver.template_root),
-    # it is returned immediately.  Otherwise, a check is made to see if the
-    # usual Rails classes (ActionView and ApplicationController) have been defined,
-    # and if so, detect the Rails template path via the .view_paths class
-    # method of ApplicationController.  Furthermore, Haml support is detected
-    # by presence of a Haml template handler in the ActionView::Template
-    # class, and if it's found, given default precedence over the other template forms.
+    # it is returned immediately.  
     #
     # If no path is found for the supplied template path, an exception
     # is raised.
@@ -47,21 +42,6 @@ class OEmbed
       found_path = nil
       if File.exists?(tmp_path)
         found_path = tmp_path
-      else
-        # Rails like templates
-        if defined?(ApplicationController) && defined?(ActionView)
-          exts = ["html.erb", "erb", "rhtml"]
-          exts = (["haml"] + exts) if ActionView::Template.class_eval("@@template_handlers").keys.include?("haml")
-          unless exts.any? { |e| path =~ /\.#{e}/ }
-            for ext in exts
-              if found_path = resolve_path_in_view_paths("#{path}.#{ext}", ApplicationController.view_paths)
-                break
-              end
-            end
-          end
-          found_path ||= resolve_path_in_view_paths(path, ApplicationController.view_paths)
-
-        end
       end
       unless found_path
         raise StandardError.new("File not found: #{path}")
@@ -72,48 +52,60 @@ class OEmbed
 
     # Evaluate the template at the given (possibly relative) path,
     # assigning the template the local variables url, data and response.
+    # If ApplicationController and ActionController have been defined, then
+    # it is assumed that you are specifying a Rails template path, and an instance
+    # ApplicationController will be used to render the results.  You may use
+    # Rails-style helpers / models inside your template, as the ActionView rendering
+    # pipeline will be used.  NOTE that to accomplish this, the Rails TestRequest
+    # and TestResponse classes will be loaded and used, if they have not been loaded already. 
+    #
+    # If no Rails style template was found or you are not using rails, the following actions take place:
     # If you specify a template processor (via OEmbed::TemplateResolver.template_processor=)
-    # then it will be used to process the template at the given path.  Otherwise
-    # a processor will be selected on the following criterion:
+    # then it will be used to process the template at the given path (taking any configured template_root
+    # into account.  Otherwise a processor will be selected on the following criterion:
     #
     # If the file extension is haml, then the Haml library will be required and used
     # If the Erubis library has been loaded or the file extension is erubis, the Erubis library will be used
     # In all other cases, the ERB library will be used
+    #
+
     #
     # The evaluated result of the template will be returned.
     def self.eval_template_for_path(path, url, data, response)
-      if actual_path = resolve_template_path(path)
+      if defined?(ApplicationController) && defined?(ActionController)
+        if !defined?(ActionController::TestRequest) ||
+            !defined?(ActionController::TestResponse)
+          require 'action_controller/test_process'          
+        end
+        @app_c ||= ApplicationController.new
+        rendered_response = @app_c.process(ActionController::TestRequest.new,
+                                           ActionController::TestResponse.new,
+                                           :render_for_file,
+                                           path,
+                                           200,
+                                           true,
+                                           { :data => data, :url => url, :response => response }).body
+      end
+      if rendered_response.nil? && actual_path = resolve_template_path(path)
         contents = File.read(actual_path)
         processor = (@template_processor || File.extname(actual_path)[1..4]).to_s
         has_erubis = defined?(Erubis)
         if processor == "haml"
           require 'haml' unless defined?(Haml)
-          Haml::Engine.new(contents).render({ }, :data => data, :url => url, :response => response)
+          rendered_response = Haml::Engine.new(contents).render({ }, :data => data, :url => url, :response => response)
         elsif processor == "erubis" || has_erubis
           require 'erubis' unless has_erubis
-          Erubis::Eruby.new(contents).result(:data => data, :url => url, :response => response)
+          rendered_response = Erubis::Eruby.new(contents).result(:data => data, :url => url, :response => response)
         else
           require 'erb' unless defined?(ERB)
-          ERBTemplate.new(url, data, response).evaluate(contents)
-        end
+          rendered_response = ERBTemplate.new(url, data, response).evaluate(contents)
+        end        
       end
+      return rendered_response
     end
 
     private
 
-    # Resolve a relative path among an array of potential base
-    # paths, returning the found path if it exists or nil if
-    # none were found.
-    def self.resolve_path_in_view_paths(desired, view_paths)
-      view_paths.each do |p|
-        prop = File.join(p, desired)
-        if File.exists?(prop)
-          return prop
-        end
-      end
-      return nil
-    end
-
     class ERBTemplate
       attr_reader :url, :data, :response
 

data/oembed_links.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
     s.name       = "oembed_links"
-    s.version    = "0.0.8"
+    s.version    = "0.0.9"
     s.author     = "Indianapolis Star"
     s.email      = "bugs at indystar dot com"
     s.homepage   = "http://www.indystar.com"

data/oembed_links_example.yml

@@ -6,6 +6,7 @@
   :vimeo: "http://www.vimeo.com/api/oembed.{format}"
   :hulu: "http://www.hulu.com/api/oembed.{format}"
   :flickr: "http://www.flickr.com/services/oembed"
+  :viddler: "http://lab.viddler.com/services/oembed/"
 
 :oohembed:
   :format: "json"
@@ -37,4 +38,9 @@
 :flickr:
   :format: "xml"
   :schemes:
-    - "http://*.flickr.com/*"
+    - "http://*.flickr.com/*"
+    
+:viddler:
+  :format: "xml"
+  :schemes:
+    - "http://*.viddler.com/*"

data/spec/oembed_links_spec.rb

@@ -234,31 +234,20 @@ describe OEmbed, "Rails template resolving functions" do
     OEmbed::TemplateResolver.template_processor = nil
     @current_path = File.dirname(__FILE__)
     @template_path = File.join(@current_path, "templates")
+    
+    require 'actionpack'
+    require 'action_controller'
+    require 'action_controller/test_process'
 
-    class ::ActionView
-      class Template
-        @@template_handlers = { }
-
-        def self.support_haml!
-          @@template_handlers = {"haml" => "nothing"}
-        end
-
-        def self.do_not_support_haml!
-          @@template_handlers = { }
-        end
-        
-      end
-    end
-
-    class ::ApplicationController
-      def self.view_paths
-        [File.dirname(__FILE__)]
-      end
+    class ::ApplicationController < ActionController::Base
+      
     end
-    
+    ApplicationController.view_paths += [File.dirname(__FILE__)]
+    Dependencies.mark_for_unload(ApplicationController)
   end
 
   it "should support Rails-like template paths for template selection" do
+
     OEmbed.transform("http://test1.net/foo") do |r, url|
       r.any?(:template => "templates/test")
     end.should == "rails erb\n"
@@ -269,17 +258,6 @@ describe OEmbed, "Rails template resolving functions" do
       r.any?(:template => "templates/test.rhtml")
     end.should == "rails rhtml"
   end
-
-  it "should allow haml support in the Rails app" do
-    ActionView::Template.support_haml!
-    OEmbed.transform("http://test1.net/foo") do |r, url|
-      r.any?(:template => "templates/test")
-    end.should == "rails haml\n"
-    ActionView::Template.do_not_support_haml!
-    OEmbed.transform("http://test1.net/foo") do |r, url|
-      r.any?(:template => "templates/test")
-    end.should == "rails erb\n"    
-  end
   
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: netshade-oembed_links
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - Indianapolis Star
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-08 00:00:00 -07:00
+date: 2008-08-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency