http 0.8.14 → 0.9.0.pre

data/spec/lib/http/options/merge_spec.rb

@@ -55,7 +55,6 @@ RSpec.describe HTTP::Options, "merge" do
       :socket_class     => described_class.default_socket_class,
       :ssl_socket_class => described_class.default_ssl_socket_class,
       :ssl_context      => nil,
-      :cache      => described_class.default_cache,
       :cookies    => {})
   end
 end

data/spec/lib/http/request_spec.rb

@@ -133,19 +133,14 @@ RSpec.describe HTTP::Request do
     end
   end
 
-  describe "#caching" do
-    subject { request.caching }
-    it { is_expected.to be_a HTTP::Request::Caching }
-  end
-
   describe "#headline" do
     subject { request.headline }
 
-    it { is_expected.to eq "GET /foo?bar=baz HTTP/1.1" }
+    it { is_expected.to eq "GET /foo?bar=baz#moo HTTP/1.1" }
 
     context "with proxy" do
       let(:proxy) { {:user => "user", :pass => "pass"} }
-      it { is_expected.to eq "GET http://example.com/foo?bar=baz HTTP/1.1" }
+      it { is_expected.to eq "GET http://example.com/foo?bar=baz#moo HTTP/1.1" }
     end
   end
 end

data/spec/lib/http/response_spec.rb

@@ -109,11 +109,6 @@ RSpec.describe HTTP::Response do
     end
   end
 
-  describe "#caching" do
-    subject { response.caching }
-    it { is_expected.to be_a HTTP::Response::Caching }
-  end
-
   describe "#cookies" do
     let(:cookies) { ["a=1", "b=2; domain=example.com", "c=3; domain=bad.org"] }
     let(:headers) { {"Set-Cookie" => cookies} }

data/spec/lib/http_spec.rb

@@ -204,14 +204,6 @@ RSpec.describe HTTP do
     end
   end
 
-  describe ".cache" do
-    it "sets cache option" do
-      cache = double(:cache, :perform => nil)
-      client = HTTP.cache cache
-      expect(client.default_options[:cache]).to eq cache
-    end
-  end
-
   describe ".persistent" do
     let(:host) { "https://api.github.com" }
 

data/spec/spec_helper.rb

@@ -17,6 +17,11 @@ require "http"
 require "rspec/its"
 require "support/capture_warning"
 
+# Are we in a flaky environment?
+def flaky_env?
+  defined?(JRUBY_VERSION) && ENV["CI"]
+end
+
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
   config.expect_with :rspec do |expectations|

data/spec/support/connection_reuse_shared.rb

@@ -42,6 +42,8 @@ RSpec.shared_context "handles shared connections" do
 
       context "with a socket issue" do
         it "transparently reopens" do
+          skip "flaky environment" if flaky_env?
+
           first_socket = client.get("#{server.endpoint}/socket").body.to_s
           expect(first_socket).to_not eq("")
 

data/spec/support/http_handling_shared.rb

@@ -50,6 +50,7 @@ RSpec.shared_context "HTTP handling" do
           let(:read_timeout) { 0 }
 
           it "times out" do
+            skip "flaky environment" if flaky_env?
             expect { response }.to raise_error(HTTP::TimeoutError, /Read/i)
           end
         end
@@ -123,6 +124,8 @@ RSpec.shared_context "HTTP handling" do
 
       context "on a mixed state" do
         it "re-opens the connection" do
+          skip "flaky environment" if flaky_env?
+
           first_socket_id = client.get("#{server.endpoint}/socket/1").body.to_s
 
           client.instance_variable_set(:@state, :dirty)
@@ -154,6 +157,8 @@ RSpec.shared_context "HTTP handling" do
 
       context "with a socket issue" do
         it "transparently reopens" do
+          skip "flaky environment" if flaky_env?
+
           first_socket_id = client.get("#{server.endpoint}/socket").body.to_s
           expect(first_socket_id).to_not eq("")
           # Kill off the sockets we used
@@ -184,6 +189,8 @@ RSpec.shared_context "HTTP handling" do
       let(:options) { {} }
 
       it "opens new sockets" do
+        skip "flaky environment" if flaky_env?
+
         expect(sockets_used).to_not include("")
         expect(sockets_used.uniq.length).to eq(2)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 0.8.14
+  version: 0.9.0.pre
 platform: ruby
 authors:
 - Tony Arcieri
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
@@ -107,9 +107,6 @@ files:
 - examples/parallel_requests_with_celluloid.rb
 - http.gemspec
 - lib/http.rb
-- lib/http/cache.rb
-- lib/http/cache/headers.rb
-- lib/http/cache/null_cache.rb
 - lib/http/chainable.rb
 - lib/http/client.rb
 - lib/http/connection.rb
@@ -124,24 +121,18 @@ files:
 - lib/http/options.rb
 - lib/http/redirector.rb
 - lib/http/request.rb
-- lib/http/request/caching.rb
 - lib/http/request/writer.rb
 - lib/http/response.rb
 - lib/http/response/body.rb
-- lib/http/response/caching.rb
-- lib/http/response/io_body.rb
 - lib/http/response/parser.rb
 - lib/http/response/status.rb
 - lib/http/response/status/reasons.rb
-- lib/http/response/string_body.rb
 - lib/http/timeout/global.rb
 - lib/http/timeout/null.rb
 - lib/http/timeout/per_operation.rb
 - lib/http/uri.rb
 - lib/http/version.rb
 - logo.png
-- spec/lib/http/cache/headers_spec.rb
-- spec/lib/http/cache_spec.rb
 - spec/lib/http/client_spec.rb
 - spec/lib/http/content_type_spec.rb
 - spec/lib/http/headers/mixin_spec.rb
@@ -155,14 +146,10 @@ files:
 - spec/lib/http/options/proxy_spec.rb
 - spec/lib/http/options_spec.rb
 - spec/lib/http/redirector_spec.rb
-- spec/lib/http/request/caching_spec.rb
 - spec/lib/http/request/writer_spec.rb
 - spec/lib/http/request_spec.rb
 - spec/lib/http/response/body_spec.rb
-- spec/lib/http/response/caching_spec.rb
-- spec/lib/http/response/io_body_spec.rb
 - spec/lib/http/response/status_spec.rb
-- spec/lib/http/response/string_body_spec.rb
 - spec/lib/http/response_spec.rb
 - spec/lib/http_spec.rb
 - spec/spec_helper.rb
@@ -191,14 +178,44 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: HTTP should be easy
-test_files: []
+test_files:
+- spec/lib/http/client_spec.rb
+- spec/lib/http/content_type_spec.rb
+- spec/lib/http/headers/mixin_spec.rb
+- spec/lib/http/headers_spec.rb
+- spec/lib/http/options/body_spec.rb
+- spec/lib/http/options/form_spec.rb
+- spec/lib/http/options/headers_spec.rb
+- spec/lib/http/options/json_spec.rb
+- spec/lib/http/options/merge_spec.rb
+- spec/lib/http/options/new_spec.rb
+- spec/lib/http/options/proxy_spec.rb
+- spec/lib/http/options_spec.rb
+- spec/lib/http/redirector_spec.rb
+- spec/lib/http/request/writer_spec.rb
+- spec/lib/http/request_spec.rb
+- spec/lib/http/response/body_spec.rb
+- spec/lib/http/response/status_spec.rb
+- spec/lib/http/response_spec.rb
+- spec/lib/http_spec.rb
+- spec/spec_helper.rb
+- spec/support/black_hole.rb
+- spec/support/capture_warning.rb
+- spec/support/connection_reuse_shared.rb
+- spec/support/dummy_server.rb
+- spec/support/dummy_server/servlet.rb
+- spec/support/http_handling_shared.rb
+- spec/support/proxy_server.rb
+- spec/support/servers/config.rb
+- spec/support/servers/runner.rb
+- spec/support/ssl_helper.rb
 has_rdoc: 

data/lib/http/cache.rb

@@ -1,146 +0,0 @@
-require "time"
-require "rack-cache"
-
-module HTTP
-  class Cache
-    # NoOp logger.
-    class NullLogger
-      def error(_msg = nil)
-      end
-
-      def debug(_msg = nil)
-      end
-
-      def info(_msg = nil)
-      end
-
-      def warn(_msg = nil)
-      end
-    end
-
-    # @return [Response] a cached response that is valid for the request or
-    #   the result of executing the provided block
-    #
-    # @yield [request, options] on cache miss so that an actual
-    # request can be made
-    def perform(request, options, &request_performer)
-      req = request.caching
-
-      invalidate_cache(req) if req.invalidates_cache?
-
-      get_response(req, options, request_performer)
-    end
-
-    protected
-
-    # @return [Response] the response to the request, either from the
-    # cache or by actually making the request
-    def get_response(req, options, request_performer)
-      cached_resp = cache_lookup(req)
-      return cached_resp if cached_resp && !cached_resp.stale?
-
-      # cache miss
-      logger.debug { "Cache miss for <#{req.uri}>, making request" }
-      actual_req = if cached_resp
-                     req.conditional_on_changes_to(cached_resp)
-                   else
-                     req
-                   end
-      actual_resp = make_request(actual_req, options, request_performer)
-
-      handle_response(cached_resp, actual_resp, req)
-    end
-
-    # @return [Response] the most useful of the responses after
-    #   updating the cache as appropriate
-    def handle_response(cached_resp, actual_resp, req)
-      if actual_resp.status.not_modified? && cached_resp
-        logger.debug { "<#{req.uri}> not modified, using cached version." }
-        cached_resp.validated!(actual_resp)
-        store_in_cache(req, cached_resp)
-        return cached_resp
-
-      elsif req.cacheable? && actual_resp.cacheable?
-        store_in_cache(req, actual_resp)
-        return actual_resp
-
-      else
-        return actual_resp
-      end
-    end
-
-    # @return [HTTP::Response::Caching] the actual response returned
-    # by request_performer
-    def make_request(req, options, request_performer)
-      req.sent_at = Time.now
-
-      request_performer.call(req, options).caching.tap do |res|
-        res.received_at  = Time.now
-        res.requested_at = req.sent_at
-      end
-    end
-
-    # @return [HTTP::Response::Caching, nil] the cached response for the request
-    def cache_lookup(request)
-      return nil if request.skips_cache?
-
-      rack_resp = metastore.lookup(request, entitystore)
-      return if rack_resp.nil?
-
-      HTTP::Response.new(
-        rack_resp.status, "1.1", rack_resp.headers, stringify(rack_resp.body)
-      ).caching
-    end
-
-    # Store response in cache
-    #
-    # @return [nil]
-    #
-    # ---
-    #
-    # We have to convert the response body in to a string body so
-    # that the cache store reading the body will not prevent the
-    # original requester from doing so.
-    def store_in_cache(request, response)
-      response.body = response.body.to_s
-      metastore.store(request, response, entitystore)
-      nil
-    end
-
-    # Invalidate all response from the requested resource
-    #
-    # @return [nil]
-    def invalidate_cache(request)
-      metastore.invalidate(request, entitystore)
-    end
-
-    # Inits a new instance
-    #
-    # @option opts [String] :metastore   URL to the metastore location
-    # @option opts [String] :entitystore URL to the entitystore location
-    # @option opts [Logger] :logger      logger to use
-    def initialize(opts)
-      @metastore   = storage.resolve_metastore_uri(opts.fetch(:metastore))
-      @entitystore = storage.resolve_entitystore_uri(opts.fetch(:entitystore))
-      @logger = opts.fetch(:logger) { NullLogger.new }
-    end
-
-    attr_reader :metastore, :entitystore, :logger
-
-    def storage
-      @@storage ||= Rack::Cache::Storage.new # rubocop:disable Style/ClassVars
-    end
-
-    def stringify(body)
-      if body.respond_to?(:each)
-        "".tap do |buf|
-          body.each do |part|
-            buf << part
-          end
-        end
-      else
-        body.to_s
-      end
-    end
-  end
-end

data/lib/http/cache/headers.rb

@@ -1,100 +0,0 @@
-require "delegate"
-
-require "http/errors"
-require "http/headers"
-
-module HTTP
-  class Cache
-    # Convenience methods around cache control headers.
-    class Headers < ::SimpleDelegator
-      def initialize(headers)
-        if headers.is_a? HTTP::Headers
-          super headers
-        else
-          super HTTP::Headers.coerce headers
-        end
-      end
-
-      # @return [Boolean] does this message force revalidation
-      def forces_revalidation?
-        must_revalidate? || max_age == 0
-      end
-
-      # @return [Boolean] does the cache control include 'must-revalidate'
-      def must_revalidate?
-        matches?(/\bmust-revalidate\b/i)
-      end
-
-      # @return [Boolean] does the cache control include 'no-cache'
-      def no_cache?
-        matches?(/\bno-cache\b/i)
-      end
-
-      # @return [Boolean] does the cache control include 'no-stor'
-      def no_store?
-        matches?(/\bno-store\b/i)
-      end
-
-      # @return [Boolean] does the cache control include 'public'
-      def public?
-        matches?(/\bpublic\b/i)
-      end
-
-      # @return [Boolean] does the cache control include 'private'
-      def private?
-        matches?(/\bprivate\b/i)
-      end
-
-      # @return [Numeric] the max number of seconds this message is
-      # considered fresh.
-      def max_age
-        explicit_max_age || seconds_til_expires || Float::INFINITY
-      end
-
-      # @return [Boolean] is the vary header set to '*'
-      def vary_star?
-        get(HTTP::Headers::VARY).any? { |v| "*" == v.strip }
-      end
-
-      private
-
-      # @return [Boolean] true when cache-control header matches the pattern
-      def matches?(pattern)
-        get(HTTP::Headers::CACHE_CONTROL).any? { |v| v =~ pattern }
-      end
-
-      # @return [Numeric] number of seconds until the time in the
-      # expires header is reached.
-      #
-      # ---
-      # Some servers send a "Expires: -1" header which must be treated as expired
-      def seconds_til_expires
-        get(HTTP::Headers::EXPIRES).
-          map { |e| http_date_to_ttl(e) }.
-          max
-      end
-
-      def http_date_to_ttl(t_str)
-        ttl = to_time_or_epoch(t_str) - Time.now
-
-        ttl < 0 ? 0 : ttl
-      end
-
-      # @return [Time] parses t_str at a time; if that fails returns epoch time
-      def to_time_or_epoch(t_str)
-        Time.httpdate(t_str)
-      rescue ArgumentError
-        Time.at(0)
-      end
-
-      # @return [Numeric] the value of the max-age component of cache control
-      def explicit_max_age
-        get(HTTP::Headers::CACHE_CONTROL).
-          map { |v| (/max-age=(\d+)/i).match(v) }.
-          compact.
-          map { |m| m[1].to_i }.
-          max
-      end
-    end
-  end
-end