make dynamic jsonp flexible about response body format

andrba · Dec 23, 2014 · 24b848d · 24b848d
1 parent 230f281
commit 24b848d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/lib/billy/handlers/cache_handler.rb b/lib/billy/handlers/cache_handler.rb
@@ -38,8 +38,8 @@ def replace_response_callback(response, url)
       request_uri = URI::parse(url)
       if request_uri.query
         params = CGI::parse(request_uri.query)
-        if params['callback'] and response[:content].match(/^\w+\({/)
-          response[:content].sub!(/^\w+\({/, params['callback'].first + '({')
+        if params['callback'] and response[:content].match(/\w+\(/)
+          response[:content].sub!(/\w+\(/, params['callback'].first + '(')
         end
       end
     end

diff --git a/spec/lib/billy/handlers/cache_handler_spec.rb b/spec/lib/billy/handlers/cache_handler_spec.rb
@@ -63,6 +63,15 @@
                                       request[:headers],
                                       request[:body])).to eql({:status=>200, :headers=>{"Connection"=>"close"}, :content=>'dynamicCallback5678({"yolo":"kitten"})'})
       end
+
+      it 'is flexible about the format of the response body' do
+        expect(Billy::Cache.instance).to receive(:cached?).and_return(true)
+        expect(Billy::Cache.instance).to receive(:fetch).and_return({:status=>200, :headers=>{"Connection"=>"close"}, :content=> "/**/ dynamicCallback1234(\n{\"yolo\":\"kitten\"})"})
+        expect(handler.handle_request(request[:method],
+                                      request[:url],
+                                      request[:headers],
+                                      request[:body])).to eql({:status=>200, :headers=>{"Connection"=>"close"}, :content=>"/**/ dynamicCallback5678(\n{\"yolo\":\"kitten\"})"})
+      end
     end
 
     context 'updating jsonp callback names disabled' do