puffing-billy 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17920d6438879d1d259e39e392c06bd47b42fce5
-  data.tar.gz: c9637100ed8fe09ac260dc2c29fe3047975e9a69
+  metadata.gz: 6557e02e504855ec7a7776eeee317695021c9e50
+  data.tar.gz: c25a26247ee30db7daa8158f739503b19848615f
 SHA512:
-  metadata.gz: 4eb515c5510665d687778a9672ab955fade8c6fb2c4970056e6122c8688b01755c910e675929588c519b77a9f41ca4f799e0de33e6c5eb0656a286f52aa255ae
-  data.tar.gz: b33a22eb955333f85094a73ffeaf7a59416bdef8b87686815d50329e15619ba70c9dd3bbfe913f47a7805c830bab4f85d266a5d66eaa7845763683ca7d223a55
+  metadata.gz: 94a428edbe74084084326f1daad96992928f8c22dcc6e52d0c95bc153e3d4296bd754f3bd3dfb02d1a435729e62e46726f5ed772fd6a646ce9c8e95a1ae0452d
+  data.tar.gz: c0d6395651e775a9bde1a67cb164617fceb901baa758e204dc4fc5adea37932cd68a0095471906f5d31fbaae3868c9b9092d4cd8e43705553f781d1266836357

data/CHANGELOG.md

@@ -1,4 +1,10 @@
+v0.4.1, 2015-01-02
+------------------
+
+  * Use Addressable for all URI parsing
+
 v0.4.0, 2015-01-02
+------------------
 
   * Add new configuration to merge cache hits by URL regex (#76)
   * Allow pipes in URLs by switching to Addressable (#84)
@@ -16,7 +22,7 @@ v0.3.0, 2014-12-29
   * Adds EventMachine timeout configuration (#57)
   * Support dynamic jsonp with params (#58)
   * Writing error messages to the logger rather than stdout (#69)
-  * Don't recommend changing javascript_driver config (#70)
+  * Do not recommend changing javascript_driver config (#70)
   * README link pointing at wrong target (#73)
   * Adding example config to README for playing nicely with Webmock, VCR (#74)
   * Make dynamic_jsonp regex less brittle (#81)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    puffing-billy (0.4.0)
+    puffing-billy (0.4.1)
       addressable
       em-http-request
       em-synchrony

data/lib/billy/handlers/cache_handler.rb

@@ -1,4 +1,5 @@
 require 'billy/handlers/handler'
+require 'addressable/uri'
 require 'cgi'
 
 module Billy
@@ -35,7 +36,7 @@ module Billy
     private
 
     def replace_response_callback(response, url)
-      request_uri = URI::parse(url)
+      request_uri = Addressable::URI.parse(url)
       if request_uri.query
         params = CGI::parse(request_uri.query)
         if params['callback'].any? and response[:content].match(/\w+\(/)

data/lib/billy/handlers/proxy_handler.rb

@@ -1,4 +1,5 @@
 require 'billy/handlers/handler'
+require 'addressable/uri'
 require 'eventmachine'
 require 'em-synchrony/em-http'
 
@@ -73,7 +74,7 @@ module Billy
     def disabled_request?(url)
       return false unless Billy.config.non_whitelisted_requests_disabled
 
-      uri = URI(url)
+      uri = Addressable::URI.parse(url)
       # In isolated environments, you may want to stop the request from happening
       # or else you get "getaddrinfo: Name or service not known" errors
       blacklisted_path?(uri.path) || !whitelisted_url?(uri)
@@ -86,7 +87,7 @@ module Billy
     def cacheable?(url, headers, status)
       return false unless Billy.config.cache
 
-      url = URI(url)
+      url = Addressable::URI.parse(url)
       # Cache the responses if they aren't whitelisted host[:port]s but always cache blacklisted paths on any hosts
       cacheable_status?(status) && (!whitelisted_url?(url) || blacklisted_path?(url.path))
     end

data/lib/billy/handlers/stub_handler.rb

@@ -1,4 +1,5 @@
 require 'billy/handlers/handler'
+require 'addressable/uri'
 
 module Billy
   class StubHandler
@@ -7,7 +8,7 @@ module Billy
     def handle_request(method, url, headers, body)
       if handles_request?(method, url, headers, body)
         if (stub = find_stub(method, url))
-          query_string = URI.parse(url).query || ""
+          query_string = Addressable::URI.parse(url).query || ""
           params = CGI.parse(query_string)
           stub.call(params, headers, body).tap do |response|
             Billy.log(:info, "puffing-billy: STUB #{method} for '#{url}'")

data/lib/billy/json_utils.rb

@@ -1,4 +1,3 @@
-require 'uri'
 require 'json'
 
 module Billy
@@ -37,4 +36,4 @@ module Billy
       JSONUtils::sort_hash_keys(JSON.parse(json_str, symbolize_names: true)).to_json
     end
   end
-end
+end

data/lib/billy/proxy.rb

@@ -1,5 +1,4 @@
 require 'cgi'
-require 'uri'
 require 'eventmachine'
 
 module Billy

data/lib/billy/proxy_connection.rb

@@ -1,4 +1,4 @@
-require 'uri'
+require 'addressable/uri'
 require 'eventmachine'
 require 'http/parser'
 require 'em-http'
@@ -36,7 +36,7 @@ module Billy
         restart_with_ssl(@parser.request_url)
       else
         if @ssl
-          uri = URI.parse(@parser.request_url)
+          uri = Addressable::URI.parse(@parser.request_url)
           @url = "https://#{@ssl}#{[uri.path,uri.query].compact.join('?')}"
         else
           @url = @parser.request_url

data/lib/billy/version.rb

@@ -1,3 +1,3 @@
 module Billy
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/tasks/billy.rake

@@ -1,3 +1,5 @@
+require 'addressable/uri'
+
 namespace :cache do
 
   desc 'Print out all cache file information'
@@ -57,7 +59,7 @@ namespace :cache do
 
     Dir.glob(cache_path+file_pattern) do |filename|
       data = load_cache_file(filename)
-      url = URI(data[:url])
+      url = Addressable::URI.parse(data[:url])
       data[:url_path] = "#{url.path}#{url.query ? '?'+url.query : ''}#{url.fragment ? '#'+url.fragment : ''}"
       data[:filename] = filename.gsub(Rails.root.to_s+'/','')
       cache_array << data

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puffing-billy
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Olly Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-02 00:00:00.000000000 Z
+date: 2015-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec