rails_bridge 0.0.8 → 0.0.9

data/Gemfile.lock

@@ -16,7 +16,7 @@ GIT
 PATH
   remote: .
   specs:
-    rails_bridge (0.0.7)
+    rails_bridge (0.0.8)
       activesupport
       rails_bridge
       typhoeus (~> 0.2.0)

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/lib/rails_bridge/content_bridge.rb

@@ -14,9 +14,8 @@ module RailsBridge
 
     # Class Attributes
     class_inheritable_accessor :protocol, :host, :port, :path, :params, :request_timeout, :cache_timeout, :default_content
-    class_inheritable_accessor :cache, :logger
+    class_inheritable_accessor :cache, :logger, :on_success
     @@content_requests = {}
-    @@on_success = nil
         
     # Initialize Default Class Attribute Values
     self.request_timeout = DEFAULT_REQUEST_TIMEOUT
@@ -30,18 +29,14 @@ module RailsBridge
       # custom accessor methods
       def content_requests; @@content_requests; end
 
+      alias :cia_on_sucess :on_success
       def on_success
         if block_given?
-          @@on_success = Proc.new
+          self.on_success= Proc.new
         else
-          @@on_success
+          self.cia_on_sucess
         end
       end
-
-      def on_success=(proc)
-        @@on_success = proc
-      end
-
         
       def cache_set key, content, expires_in
         logger.debug "set key: #{key}"
@@ -53,41 +48,45 @@ module RailsBridge
         content = self.cache.fetch(key, :race_condition_ttl=>5.seconds)
       end
       
-      def process_remote_and_options( remote, options )
+      def get_content_request_from_remote( remote )
         if remote.is_a? Symbol
           raise "Undefined content_request :#{remote}" unless remote = @@content_requests[remote]
         end
         if remote.is_a? Hash
           remote = RailsBridge::ContentRequest.new remote
           remote.content_bridge = self
+        elsif remote.is_a? String
+          remote = RailsBridge::ContentRequest.new(:url=>remote)
+          remote.content_bridge = self
+        elsif !remote.is_a? RailsBridge::ContentRequest
+          raise "Unexpected remote type: #{remote.class}"
         end
-        if remote.is_a? RailsBridge::ContentRequest
-          content_request = remote
-          remote_url = content_request.url
-          options[:params] = content_request.params.merge( options[:params] || {} )
-          options[:request_timeout] ||= content_request.request_timeout
-          options[:cache_timeout] ||= content_request.cache_timeout
-          options[:default_content] ||= content_request.default_content
-          on_success = content_request.on_success
-        else
-          remote_url = remote
-          on_sucess = nil
-        end
-        options[:request_timeout] ||= self.request_timeout
-        options[:cache_timeout] ||= self.cache_timeout
-        options[:timeout] = options.delete(:request_timeout)  # Rename the request timeout param for Typhoeus
-        [remote_url, options]
+        remote
+      end
+      
+      # collect options by precedence
+      def get_merged_options( content_request, options )
+        options[:params]          =   content_request.params.merge( options[:params] || {} )
+        options[:request_timeout] ||= content_request.request_timeout || self.request_timeout
+        options[:cache_timeout]   ||= content_request.cache_timeout || self.cache_timeout
+        options[:on_success]      ||= content_request.on_success || self.on_success
+        options[:default_content] ||= content_request.default_content || self.default_content
+        options
       end
       
       def request_remote_content( remote, options={}, &block )
-        hydra = Typhoeus::Hydra.hydra # the singleton Hydra
-        hydra.disable_memoization
-        remote_url, options = process_remote_and_options( remote, options )
-        default_content = options.delete(:default_content) || self.default_content
+        content_request = get_content_request_from_remote( remote )
+        options = get_merged_options( content_request, options )
+        
+        # convert options for Typhoeus
+        options[:timeout] =   options.delete(:request_timeout)  # Rename the request timeout param for Typhoeus
+        on_success_proc = options.delete(:on_success)
+        default_content = options.delete(:default_content)
+        
         # options[:verbose] = true # for debugging only
-        request = Typhoeus::Request.new(remote_url, options)
+
+        request = Typhoeus::Request.new(content_request.url, options)
         if self.cache && request.cache_timeout && request.cache_timeout > 0 && result = cache_get( request.cache_key )
-          # result = on_success.call(result) if on_success
           block.call(result)
         else
           result = default_content
@@ -95,16 +94,18 @@ module RailsBridge
             case response.code
             when 200
               result = response.body
-              result = on_success.call(result) if on_success
+              result = on_success_proc.call(result) if on_success_proc
               cache_set( request.cache_key, result, request.cache_timeout ) if self.cache && request.cache_timeout && request.cache_timeout > 0
               logger.debug "ContentBridge : Request Succeeded - Content: #{result}"
             when 0
-              logger.warn "ContentBridge : Request Timeout for #{remote_url}"
+              logger.warn "ContentBridge : Request Timeout for #{content_request.url}"
             else
-              logger.warn "ContentBridge : Request for #{remote_url}\mRequest Failed with HTTP result code: #{response.code}\n#{response.body}"
+              logger.warn "ContentBridge : Request for #{content_request.url}\mRequest Failed with HTTP result code: #{response.code}\n#{response.body}"
             end
             block.call(result)
           end
+          hydra = Typhoeus::Hydra.hydra # the singleton Hydra
+          hydra.disable_memoization
           hydra.queue request
         end
         nil

data/rails_bridge.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails_bridge}
-  s.version = "0.0.8"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["shock"]
-  s.date = %q{2011-01-05}
+  s.date = %q{2011-01-06}
   s.description = %q{Allows for easy embedding of content from a remote HTTP server and exporting of the Rails HTML layout into another template.}
   s.email = %q{billdoughty@capitalthought.com}
   s.extra_rdoc_files = [

data/spec/integration/content_bridge_spec.rb

@@ -60,6 +60,28 @@ describe RailsBridge::ContentBridge do
     cbt.get_chang(:params=>{:sleep=>20},:request_timeout=>10).should == cbt.content_requests[:chang].default_content
   end
   
+  it "calls the bridge's on_success proc when defined" do
+    cbt = ContentBridgeTest
+    cbt.on_success do |content|
+      content +"ext"
+    end
+    cbt.get_chang(:cache_timeout=>0).should == DEFAULT_RETURN_DATA+"ext"
+    cbt.on_success = nil
+  end
+  
+  it "calls the request's on_success proc when defined" do
+    cbt = ContentBridgeTest
+    cbt.on_success do |content|
+      content +"ext"
+    end
+    ContentBridgeTest.content_requests[:chang].on_success do |content|
+      content +"ext2"
+    end
+    cbt.get_chang(:cache_timeout=>0).should == DEFAULT_RETURN_DATA+"ext2"
+    cbt.on_success = nil
+    ContentBridgeTest.content_requests[:chang].on_success = nil
+  end
+  
   it "does not cache a request's content when the cache_timeout is 0 or nil" do
     cbt = ContentBridgeTest
     cbt.get_chang(:cache_timeout=>0).should == DEFAULT_RETURN_DATA

data/spec/unit/content_bridge_spec.rb

@@ -50,7 +50,8 @@ describe RailsBridge::ContentBridge do
       self.params = {:p1=>'p1'}
       content_request( :yang, :params=>{:p3=>'p3'} )
     end
-    remote_url, options = ContentBridgeTestA.process_remote_and_options(ContentBridgeTestA.content_requests[:yang], :params=>{:p2=>'p2'})
+    content_request = ContentBridgeTestA.get_content_request_from_remote(ContentBridgeTestA.content_requests[:yang])
+    options = ContentBridgeTestA.get_merged_options( content_request, :params=>{:p2=>'p2'} )
     options[:params].should == {:p1=>'p1', :p2=>'p2', :p3=>'p3'}
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - shock
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-05 00:00:00 -06:00
+date: 2011-01-06 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -331,7 +331,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -987999199138465577
+      hash: 2155733246513016336
       segments: 
       - 0
       version: "0"