markbates-content_o_matic 0.0.1.20090720170922 → 0.0.2.20090721162019

data/lib/content_o_matic/response.rb

@@ -5,15 +5,11 @@ module ContentOMatic
     attr_accessor :status
     attr_accessor :body
     attr_accessor :url
-    attr_accessor :hpricot_doc
     
     def initialize(url, status, body = '')
       self.url = url
       self.status = status.to_i
       self.body = body
-      if success?
-        self.hpricot_doc = Hpricot(self.body)
-      end
     end
     
     def success?
@@ -32,10 +28,33 @@ module ContentOMatic
       return self.body != self.html_body
     end
     
-    def html_body
+    def body(normalize_assets = false)
+      if normalize_assets
+        unless @__normalized_body
+          @__normalized_body = @body.dup
+          doc = Nokogiri::HTML(@__normalized_body)
+          {'img' => 'src', 'script' => 'src', 
+            'link' => 'href', 'a' => 'href',
+            'iframe' => 'src', 'form' => 'action',
+            'object' => 'data'}.each do |key, attrib|
+            (doc/key).each do |elem|
+              o_link = elem[attrib]
+              next if o_link.blank?
+              elem[attrib] = normalize_asset_url(o_link)
+             end
+          end
+          @__normalized_body = doc.to_s
+        end
+        return @__normalized_body
+      end
+      @body
+    end
+    
+    def html_body(normalize_assets = false)
       unless @__doc_body
-        @__doc_body = self.hpricot_doc.at('body')
-        @__doc_body = @__doc_body.nil? ? self.body : @__doc_body.inner_html
+        doc = Nokogiri::HTML(self.body(normalize_assets))
+        @__doc_body = doc.at('body')
+        @__doc_body = @__doc_body.nil? ? self.body(normalize_assets) : @__doc_body.inner_html
       end
       return @__doc_body
     end
@@ -44,6 +63,26 @@ module ContentOMatic
       ContentOMatic::InvalidResponseError.new("URL: '#{self.url}' did not return a valid response! Status: '#{self.status}' Body: '#{self.body}'") unless self.success?
     end
     
+    private
+    def normalize_asset_url(src)
+      unless src.match(/^([a-zA-Z]+):\/\//)
+        relative = !src.match(/^\//)
+        if relative
+          # find the outer most url
+          # http://www.example.com/foo/index.html => http://www.example.com/foo
+          base =  File.dirname(self.url)
+        else
+          # absolute so find the inner most url
+          # http://www.example.com/index.html => http://www.example.com
+          base =  self.url.scan(/([a-zA-Z]+:\/\/[^\/]+)/).first
+        end
+        # bad: <img src="http://www.example.com/full_page.html/image2.jpg" />
+        n_src = File.join(base, src)
+        return n_src
+      end
+      return src
+    end
+    
   end # Response
 
 end # ContentOMatic

data/lib/content_o_matic/text_helper.rb

@@ -8,18 +8,22 @@ module ActionView
         if options.has_key?(:print_comments)
           comments = options.delete(:print_comments)
         end
+        html_body = true
+        if options.has_key?(:html_body)
+          html_body = options.delete(:html_body)
+        end
+        normalize_assets = true
+        if options.has_key?(:normalize_assets)
+          normalize_assets = options.delete(:normalize_assets)
+        end
         text = "<!-- Loading Content: '#{slug}' -->\n" if comments
         begin
-          html_body = true
-          if options.has_key?(:html_body)
-            html_body = options.delete(:html_body)
-          end
           res = ContentOMatic.get(slug, options)
           if res.success?
             if html_body
-              text << res.html_body
+              text << res.html_body(normalize_assets)
             else
-              text << res.body
+              text << res.body(normalize_assets)
             end
           else
             raise res.exception

data/lib/content_o_matic.rb

@@ -1,4 +1,4 @@
-require 'hpricot'
+require 'nokogiri'
 require 'configatron'
 require 'cachetastic'
 require 'logger'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: markbates-content_o_matic
 version: !ruby/object:Gem::Version 
-  version: 0.0.1.20090720170922
+  version: 0.0.2.20090721162019
 platform: ruby
 authors: 
 - markbates
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-20 00:00:00 -07:00
+date: 2009-07-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hpricot
+  name: nokogiri
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement