chuckle 1.0.0 → 1.0.1

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - jruby-19mode

data/chuckle.gemspec

@@ -10,8 +10,8 @@ Gem::Specification.new do |s|
   s.authors     = ["Adam Doppelt"]
   s.email       = ["amd@gurge.com"]
   s.homepage    = "http://github.com/gurgeous/chuckle"
-  s.summary     = "Chuckle - caching http client that wraps curl."
-  s.description = "A caching http client that wraps curl."
+  s.summary     = "Chuckle - an http client that caches on disk."
+  s.description = "An http client that caches on disk."
 
   s.rubyforge_project = "chuckle"
 

data/lib/chuckle/cache.rb

@@ -20,11 +20,13 @@ module Chuckle
     end
 
     def set(request, curl)
-      %w(body headers).each do |i|
-        src, dst = curl.send("#{i}_path"), request.send("#{i}_path")
-        FileUtils.mkdir_p(File.dirname(dst))
-        FileUtils.mv(src, dst)
-      end
+      # mkdirs
+      FileUtils.mkdir_p([File.dirname(request.headers_path), File.dirname(request.body_path)])
+
+      # now mv
+      FileUtils.mv(curl.headers_path, request.headers_path)
+      FileUtils.mv(curl.body_path, request.body_path)
+
       Response.new(request)
     end
 

data/lib/chuckle/client.rb

@@ -71,7 +71,7 @@ module Chuckle
       if !cache_errors?
         cache.clear(response.request)
       end
-      raise Error.new("#{Error.class}, #{error}", response)
+      raise Error.new("Chuckle::Error, #{error}", response)
     end
 
     def vputs(s)

data/lib/chuckle/response.rb

@@ -29,15 +29,16 @@ module Chuckle
     def parse
       self.curl_exit_code = Curl.exit_code_from_headers(headers)
 
+      self.uri = request.uri
       locations = headers.scan(/^Location: ([^\r\n]+)/m).flatten
       if !locations.empty?
         location = locations.last
         # some buggy servers do this. sigh.
         location = location.gsub(" ", "%20")
-        self.uri = URI.parse(location)
+        self.uri += location
       end
 
-      codes = headers.scan(/^HTTP\/\d\.\d (\d+).*?\r\n\r\n/m).flatten
+      codes = headers.scan(/^HTTP\/\d\.\d (\d+).*?\r\n/m).flatten
       codes = codes.map(&:to_i)
       self.code = codes.last
     end

data/lib/chuckle/version.rb

@@ -1,4 +1,4 @@
 module Chuckle
   # Gem version
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/test/helper.rb

@@ -46,6 +46,15 @@ module Helper
     hello
   EOF
 
+  HTTP_302_RELATIVE = <<-EOF.gsub(/(^|\n) +/, "\\1")
+    HTTP/1.1 302 FOUND
+    Location: /two
+
+    HTTP/1.0 200 OK
+
+    hello
+  EOF
+
   HTTP_404 = <<-EOF.gsub(/(^|\n) +/, "\\1")
     HTTP/1.1 404 Not Found
 

data/test/test_requests.rb

@@ -24,6 +24,13 @@ class TestRequests < Minitest::Test
     assert_equal "hello\n", response.body
   end
 
+  def test_302_relative
+    response = mcurl(HTTP_302_RELATIVE) { client.get(URL) }
+    assert_equal 200, response.code
+    assert_equal URI.parse("#{URL}/two"), response.uri
+    assert_equal "hello\n", response.body
+  end
+
   def test_404
     e = assert_raises Chuckle::Error do
       mcurl(HTTP_404) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chuckle
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2013-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -91,7 +91,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: A caching http client that wraps curl.
+description: An http client that caches on disk.
 email:
 - amd@gurge.com
 executables: []
@@ -99,6 +99,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -139,13 +140,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2600014295267267585
+      hash: -3317364503700294322
 requirements: []
 rubyforge_project: chuckle
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Chuckle - caching http client that wraps curl.
+summary: Chuckle - an http client that caches on disk.
 test_files:
 - test/helper.rb
 - test/test_cache.rb