web 0.0.4 → 0.1.0

data/lib/web.rb

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/web/ext/net_http'
+require File.dirname(__FILE__) + '/web/ext/net_http' if defined?(Net::HTTP)
+require File.dirname(__FILE__) + '/web/ext/typhoeus' if defined?(Typhoeus)
 require File.dirname(__FILE__) + '/web/faker'
 
 module Web
@@ -19,6 +20,10 @@ module Web
       registered << options
     end
 
+    def unregister_all
+      @registered = []
+    end
+
     # an array of registrations
     def registered
       @registered ||= []
@@ -26,7 +31,7 @@ module Web
 
     # Get the cache we're using
     def cache
-      @cache ||= RedisCache.new
+      @cache ||= MemoryCache.new
     end
 
   end

data/lib/web/ext/net_http.rb

@@ -104,8 +104,28 @@ module Net
       protocol = use_ssl? ? 'https' : 'http'
       path = request.path
       path = URI.parse(request.path).request_uri if request.path =~ /^http/
+      path = path.chop if path.end_with?('/') # remove trailing slashes in caching layer
       # TODO handle basic auth
-      "#{protocol}://#{address}:#{port}#{path}"
+      if (use_ssl? && port == 443) || (!use_ssl? && port == 80)
+        "#{protocol}://#{address}#{path}"
+      else
+        "#{protocol}://#{address}:#{port}#{path}"
+      end
+    end
+
+  end
+
+end
+
+module Web
+
+  module ReadableHTTPResponse
+
+    include HTTPResponse
+
+    def read_body(dest = nil, &block)
+      yield @body if block_given?
+      @body
     end
 
   end

data/lib/web/ext/typhoeus.rb

@@ -0,0 +1,64 @@
+require 'typhoeus'
+
+require File.dirname(__FILE__) + '/../http_response'
+
+module Typhoeus
+
+  class Response
+
+    def cached?
+      !!@cached
+    end
+
+  end
+
+  class Request
+
+    # A dummy cache timeout so that our cache always
+    # gets called
+    def cache_timeout
+      1
+    end
+
+  end
+
+  class Hydra
+
+    # Thank you to the creators of Typhoeus for making this so easy
+    # to do.
+
+    def initialize_with_web(options = {})
+      initialize_without_web(options)
+      # On cache set, record this if we should
+      cache_setter do |req|
+        web = Web::Faker.new req.method, req.url, req.body, req.headers
+        if web.desired?
+          res = req.response
+          web.record res.code, res.body, res.headers_hash
+        end
+      end
+      # On cache get, reconstruct the response and send it back
+      cache_getter do |req|
+        web = Web::Faker.new req.method, req.url, req.body, req.headers
+        if web.desired? && web_response = web.response_for
+          # put the headers back together, since we cache them as a dict
+          h_str = web_response.headers ?
+            web_response.headers.map { |k, v| "#{k}: #{v}" }.join("\n") : ''
+          # and then reconstruct the response
+          response = Typhoeus::Response.new({
+            :code => web_response.code,
+            :headers => h_str,
+            :body => web_response.body
+          })
+          response.instance_variable_set :@cached, true
+          response
+        end
+      end
+    end
+
+    alias_method :initialize_without_web, :initialize
+    alias_method :initialize, :initialize_with_web
+
+  end
+
+end

data/lib/web/faker.rb

@@ -7,6 +7,10 @@ module Web
 
     attr_reader :cache, :key
 
+    # method is expected to be a symbol, downcase
+    # url is expected to be a full url, trailing slash chopped off
+    # body is expected to be nil or a string
+    # headers is expected to be a hash
     def initialize(method, url, body, headers)
       @key = "#{method}:#{url}"
       @cache = Web.cache
@@ -24,6 +28,9 @@ module Web
     end
 
     # Given a response, marshall down and record in redis
+    # code is expected to be Fixnum
+    # body is expected to be a string or nil
+    # headers is expected to be a hash
     def record(code, body, headers)
       # save and return the response
       res = Web::Response.new code, body, headers

data/lib/web/http_response.rb

@@ -8,15 +8,4 @@ module Web
 
   end
 
-  module ReadableHTTPResponse
-
-    include HTTPResponse
-
-    def read_body(dest = nil, &block)
-      yield @body if block_given?
-      @body
-    end
-
-  end
-
 end

data/lib/web/version.rb

@@ -1,5 +1,5 @@
 module Web
 
-  VERSION = '0.0.4'
+  VERSION = '0.1.0'
 
 end

data/spec/spec_helper.rb

@@ -1,3 +1,8 @@
+require 'uri'
+
+require 'net/http'
+require 'typhoeus'
 require File.dirname(__FILE__) + '/../lib/web'
 
-REQUEST_URL = URI.parse 'http://google.com'
+REQUEST_URL_STRING = 'http://google.com'
+REQUEST_URL = URI.parse REQUEST_URL_STRING

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-22 00:00:00.000000000 -04:00
-default_executable: 
+date: 2011-08-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2154099420 !ruby/object:Gem::Requirement
+  requirement: &17525600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,25 +21,36 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154099420
+  version_requirements: *17525600
+- !ruby/object:Gem::Dependency
+  name: typhoeus
+  requirement: &17525180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *17525180
 description: web is a library for caching HTTP responses
 email: john.crepezzi@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/web/cache/memcached_cache.rb
-- lib/web/cache/memory_cache.rb
-- lib/web/cache/redis_cache.rb
+- lib/web.rb
+- lib/web/response.rb
+- lib/web/ext/typhoeus.rb
 - lib/web/ext/net_http.rb
+- lib/web/version.rb
+- lib/web/status_codes.rb
 - lib/web/faker.rb
 - lib/web/http_response.rb
-- lib/web/response.rb
-- lib/web/status_codes.rb
-- lib/web/version.rb
-- lib/web.rb
+- lib/web/cache/memory_cache.rb
+- lib/web/cache/memcached_cache.rb
+- lib/web/cache/redis_cache.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/seejohnrun/web
 licenses: []
 post_install_message: 
@@ -61,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: web
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: cache HTTP responses