rails_bridge 0.0.6 → 0.0.7

data/Gemfile.lock

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

data/README.rdoc

@@ -152,7 +152,7 @@ Default values can be set for a group of requests by sub-classing RailsBridge::C
   
 === Setting global defaults
 
-Global default values can be set directly on the RailsBridge::ContentBridge class.  They are used by all inheriting sub-classes unless overridden by the sub-class.
+Global default values can be set directly on the RailsBridge::ContentBridge class.  They are used by all inheriting sub-classes unless overridden by the sub-class.  
 
   RailsBridge::ContentBridge.logger = Logger.new(STDOUT)
   RailsBridge::ContentBridge.cache = ActiveSupport::Cache::MemCacheStore(:compress => true)
@@ -163,7 +163,7 @@ I recommend putting these declaration in an initializer file under config/initia
   
 === Overriding request values on execution
 
-All defined values for a request can be overridden at runtime by passing them in as options to the get method:
+All defined values for a request can be specified at runtime by passing them in as options to the get method.  All parameters passed this way will override existing values, with the exception of :params, which are merged with those defined at the request declaration and class level.
 
   content = RailsBridge::ContentBridge.get_server_com( :params=>{:p1=>'p1'}, :request_timeout=>2000, :cache_timeout=>0 )
   

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/rails_bridge/content_bridge.rb

@@ -52,11 +52,8 @@ module RailsBridge
         logger.debug "get key: #{key}"
         content = self.cache.fetch(key, :race_condition_ttl=>5.seconds)
       end
-
       
-      def get_remote_content( remote, options={} )
-        hydra = Typhoeus::Hydra.hydra # the singleton Hydra
-        hydra.disable_memoization
+      def process_remote_and_options( remote, options )
         if remote.is_a? Symbol
           raise "Undefined content_request :#{remote}" unless remote = @@content_requests[remote]
         end
@@ -67,7 +64,7 @@ module RailsBridge
         if remote.is_a? RailsBridge::ContentRequest
           content_request = remote
           remote_url = content_request.url
-          options[:params] ||= content_request.params
+          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
@@ -79,9 +76,15 @@ module RailsBridge
         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]
+      end
+      
+      def get_remote_content( remote, options={} )
+        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
         # options[:verbose] = true # for debugging only
-        
         request = Typhoeus::Request.new(remote_url, options)
         unless self.cache && request.cache_timeout && request.cache_timeout > 0 && result = cache_get( request.cache_key )
           result = default_content

data/lib/rails_bridge/content_request.rb

@@ -37,7 +37,10 @@ module RailsBridge
     def host;       @host       || (self.content_bridge && self.content_bridge.host);               end
     def port;       @port       || (self.content_bridge && self.content_bridge.port)  || 80;        end
     def path;       @path       || (self.content_bridge && self.content_bridge.path) || '/';        end
-    def params;     @params     || (self.content_bridge && self.content_bridge.params);             end
+    def params
+      content_bridge_params = (self.content_bridge && self.content_bridge.params) || {}
+      content_bridge_params.merge( @params || {} )
+    end
     
     def url= url
       uri = URI.parse( url )

data/rails_bridge.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails_bridge}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["shock"]
-  s.date = %q{2011-01-04}
+  s.date = %q{2011-01-05}
   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/unit/content_bridge_spec.rb

@@ -45,6 +45,15 @@ describe RailsBridge::ContentBridge do
     ContentBridgeTest.get_chang(:default_content=>"YADA YADA").should == "YADA YADA"
   end
 
+  it "adds :params specified at level to those already defined", :focus=>false do    
+    class ContentBridgeTestA < ContentBridgeTest
+      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'})
+    options[:params].should == {:p1=>'p1', :p2=>'p2', :p3=>'p3'}
+  end
+
   it "subclassing a ContentBridge does not change parent class' attributes", :focus=>false do
     class ContentBridgeTest2 < ContentBridgeTest
       self.default_content = "Some other content."

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - shock
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-04 00:00:00 -06:00
+date: 2011-01-05 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: -3957783545554095629
+      hash: 2020536357921793301
       segments: 
       - 0
       version: "0"