curb-openuri 0.1.0 → 0.2.0

data/Rakefile

@@ -24,16 +24,7 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.libs << 'lib' << 'spec'
-  t.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |t|
-  t.libs << 'lib' << 'spec'
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.rcov = true
-end
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new
 
 task :default => :spec

data/VERSION.yml

@@ -1,4 +1,5 @@
 --- 
-:patch: 0
-:minor: 1
 :major: 0
+:minor: 2
+:patch: 0
+:build: 

data/curb-openuri.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{curb-openuri}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roman Shterenzon"]
-  s.date = %q{2009-11-29}
+  s.date = %q{2010-11-10}
   s.description = %q{open-uri drop-in replacement that uses curb}
   s.email = %q{romanbsd@yahoo.com}
   s.extra_rdoc_files = [
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/romanbsd/curb-openuri}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{open-uri drop-in replacement that uses curb}
   s.test_files = [
     "spec/curb_openuri_spec.rb",
@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<curb>, [">= 0.1.4"])
     else
       s.add_dependency(%q<curb>, [">= 0.1.4"])

data/lib/curl_agent.rb

@@ -76,7 +76,9 @@ class CurlAgent
     agent = CurlAgent.new(name, options)
 
     agent.perform!
-    io = StringIO.new(agent.body_str)
+    io = IO.new(agent.body_str, agent.header_str)
+    io.base_uri = URI.parse(agent.last_effective_url) rescue nil
+    io.status = [agent.response_code, '']
     if block
       block.call(io)
     else
@@ -93,4 +95,32 @@ class CurlAgent
     end
     return mode, perm, rest
   end
-end
+
+  class IO < StringIO
+    # returns an Array which consists status code and message.
+    attr_accessor :status
+
+    # returns a URI which is base of relative URIs in the data.
+    # It may differ from the URI supplied by a user because redirection.
+    attr_accessor :base_uri
+
+    def initialize(body_str, header_str)
+      super(body_str)
+      @header_str = header_str
+    end
+
+    # returns a Hash which represents header fields.
+    # The Hash keys are downcased for canonicalization.
+    def meta
+      @meta ||= begin
+        arr = @header_str.split(/\r?\n/)
+        arr.shift
+        arr.inject({}) do |hash, hdr|
+          key, val = hdr.split(/:\s+/, 2)
+          hash[key.downcase] = val
+          hash
+        end
+      end
+    end
+  end
+end

data/spec/curl_agent_spec.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/spec_helper'
+require 'uri'
 
 describe "CurlAgent" do
 
@@ -62,6 +63,7 @@ EOF
   describe 'when used with open' do
     before(:each) do
       @headers = {'User-Agent'=>'foo'}
+      @url = 'http://www.example.com/'
       @curl_easy = mock('curl_easy')
       Curl::Easy.should_receive(:new).and_return(@curl_easy)
       @curl_easy.stub!(:headers).and_return(@headers)
@@ -72,23 +74,41 @@ EOF
       @curl_easy.stub!(:timeout=)
       @curl_easy.stub!(:perform)
       @curl_easy.stub!(:body_str).and_return('test')
+      @curl_easy.stub!(:response_code).and_return(200)
+      @curl_easy.stub!(:last_effective_url).and_return(@url)
+      @curl_easy.stub!(:header_str).and_return("HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nServer: Apache")
     end
 
     it 'shall permit to specify user-agent' do
       @curl_easy.headers['User-Agent'].should_not == 'curl'
-      CurlAgent.open('http://www.example.com/', 'User-Agent'=>'curl')
+      CurlAgent.open(@url, 'User-Agent'=>'curl')
       @curl_easy.headers['User-Agent'].should == 'curl'
     end
 
     it 'shall permit to override timeout' do
       @curl_easy.should_receive(:'timeout=').once.with(10)
-      CurlAgent.open('http://www.example.com/', :timeout => 10)
+      CurlAgent.open(@url, :timeout => 10)
     end
 
     it 'shall use block when provided' do
-      CurlAgent.open('http://www.example.com/') {|f| f.read}.should == 'test'
+      CurlAgent.open(@url) {|f| f.read}.should == 'test'
     end
 
+    it 'shall return io object which responds to base_uri' do
+      io = CurlAgent.open(@url)
+      io.should respond_to(:base_uri)
+      io.base_uri.should be_a_kind_of(URI)
+      io.base_uri.to_s.should == @url
+    end
+
+    it 'shall return io object which responds to meta' do
+      io = CurlAgent.open(@url)
+      io.should respond_to(:meta)
+      meta = io.meta
+      meta.should be_a_kind_of(Hash)
+      meta.should have(2).keys
+      meta['server'].should == 'Apache'
+    end
   end
 
   describe 'when parsing parameters to open' do

data/spec/spec_helper.rb

@@ -1,9 +1,5 @@
-require 'spec'
+require 'rspec'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
-require 'curb_openuri'
-
-Spec::Runner.configure do |config|
-  
-end
+require 'curb_openuri'

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: curb-openuri
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Roman Shterenzon
@@ -9,19 +14,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-29 00:00:00 +02:00
+date: 2010-11-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: curb
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 4
         version: 0.1.4
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: open-uri drop-in replacement that uses curb
 email: romanbsd@yahoo.com
 executables: []
@@ -53,21 +63,25 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: open-uri drop-in replacement that uses curb