curl_ffi 0.0.2 → 0.0.3

data/lib/curl_ffi/version.rb

@@ -1,3 +1,3 @@
 module CurlFFI
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/curl_ffi.rb

@@ -1,13 +1,8 @@
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
-require 'ffi'
-
-require "curl_ffi/ffi_bindings"
+require "ffi"
+require "bindings"
 
 module CurlFFI
-  extend CurlFFI::CurlBindings
-
   autoload :Easy,   "curl_ffi/easy"
   autoload :Multi,  "curl_ffi/multi"
 end

data/spec/{curl → curl_ffi}/easy_spec.rb

@@ -1,20 +1,20 @@
-require "spec_helper"
+require File.expand_path("../spec_helper", File.dirname(__FILE__))
 
-module Curl
-  describe Easy, ".new" do
-    it "should return a new Curl::Easy object" do
-      Easy.new.should be_a(Easy)
+describe CurlFFI::Easy do
+  describe "when calling Easy.new" do
+    it "should return a new CurlFFI::Easy object" do
+      CurlFFI::Easy.new.should be_a(CurlFFI::Easy)
     end
   end
 
-  describe Easy do
+  describe "CurlFFI::Easy" do
     before :each do
-      @easy = Easy.new
+      @easy = CurlFFI::Easy.new
     end
 
     describe "#dup" do
-      it "should return a new Curl::Easy object" do
-        @easy.dup.should be_a(Easy)
+      it "should return a new CurlFFI::Easy object" do
+        @easy.dup.should be_a(CurlFFI::Easy)
       end
 
       it "should have a seperate libCurl handle" do
@@ -31,20 +31,20 @@ module Curl
 
     describe "#setopt" do
       it "should correctly set string options" do
-        @easy.setopt(OPTION[:URL], "http://google.de")
+        @easy.setopt(CurlFFI::OPTION[:URL], "http://google.de")
       end
 
       it "should correctly set string options" do
-        @easy.setopt(OPTION[:PORT], 123)
+        @easy.setopt(CurlFFI::OPTION[:PORT], 123)
       end
     end
 
     describe "#getinfo" do
       it "should return internal information" do
-        @easy.getinfo(INFO[:EFFECTIVE_URL]).should == ""
+        @easy.getinfo(CurlFFI::INFO[:EFFECTIVE_URL]).should == ""
 
-        @easy.setopt(OPTION[:URL], "http://google.de")
-        @easy.getinfo(INFO[:EFFECTIVE_URL]).should == "http://google.de"
+        @easy.setopt(CurlFFI::OPTION[:URL], "http://google.de")
+        @easy.getinfo(CurlFFI::INFO[:EFFECTIVE_URL]).should == "http://google.de"
       end
     end
 

data/spec/{curl → curl_ffi}/multi_spec.rb

@@ -1,17 +1,17 @@
-require "spec_helper"
+require File.expand_path("../spec_helper", File.dirname(__FILE__))
 
-module Curl
-  describe Multi, ".new" do
-    it "should return a new Curl::Easy object" do
-      Multi.new.should be_a(Multi)
+describe CurlFFI::Multi do
+  describe "CurlFFI::Multi.new" do
+    it "should return a new CurlFFI::Easy object" do
+      CurlFFI::Multi.new.should be_a(CurlFFI::Multi)
     end
   end
 
-  describe Multi do
+  describe "Multi should work" do
     before :each do
-      @multi = Multi.new
-      @easy = Easy.new
-      @easy.setopt(OPTION[:PROXY], "")
+      @multi = CurlFFI::Multi.new
+      @easy = CurlFFI::Easy.new
+      @easy.setopt(CurlFFI::OPTION[:PROXY], "")
     end
 
     describe "#add_handle" do
@@ -25,13 +25,13 @@ module Curl
         @multi.info_read_next.should be_nil
       end
 
-      it "should return Curl::Message objects when messages are available" do
-        @easy.setopt(OPTION[:URL], "http://google.de")
+      it "should return CurlFFI::Message objects when messages are available" do
+        @easy.setopt(CurlFFI::OPTION[:URL], "http://google.de")
         @multi.add_handle(@easy)
 
         @multi.perform while @multi.running != 0
         message = @multi.info_read_next
-        message.should be_a(Curl::Message)
+        message.should be_a(CurlFFI::Message)
         message[:msg].should == :DONE
       end
     end
@@ -41,15 +41,15 @@ module Curl
         @multi.info_read_all.should == []
       end
 
-      it "should return an array of Curl::Message objects when messages are available" do
-        @easy.setopt(OPTION[:URL], "http://google.de")
+      it "should return an array of CurlFFI::Message objects when messages are available" do
+        @easy.setopt(CurlFFI::OPTION[:URL], "http://google.de")
         @multi.add_handle(@easy)
 
         @multi.perform while @multi.running != 0
         messages = @multi.info_read_all
         messages.size.should == 1
 
-        messages.first.should be_a(Curl::Message)
+        messages.first.should be_a(CurlFFI::Message)
         messages.first[:msg].should == :DONE
       end
     end
@@ -60,7 +60,7 @@ module Curl
       end
 
       it "should return the timeout till the next call to #perform" do
-        @easy.setopt(OPTION[:URL], "http://google.de")
+        @easy.setopt(CurlFFI::OPTION[:URL], "http://google.de")
         @multi.add_handle(@easy)
 
         @multi.timeout.should == 1
@@ -71,7 +71,7 @@ module Curl
 
     describe "#perform" do
       before :each do
-        @easy.setopt(OPTION[:URL], "http://google.de")
+        @easy.setopt(CurlFFI::OPTION[:URL], "http://google.de")
         @multi.add_handle(@easy)
       end
 

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
-require "rubygems"
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'curl_ffi'
+require 'rspec'
 
-require "lib/curl"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Arthur Schreiber
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-05 00:00:00 -07:00
+date: 2010-11-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,17 +56,19 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
+- Gemfile.lock
+- Rakefile
 - curl_ffi.gemspec
 - examples/evented_multi.rb
 - examples/perform_multi.rb
 - examples/select_multi.rb
+- lib/bindings.rb
 - lib/curl_ffi.rb
-- lib/curl_ffi/curl_bindings.rb
 - lib/curl_ffi/easy.rb
 - lib/curl_ffi/multi.rb
 - lib/curl_ffi/version.rb
-- spec/curl/easy_spec.rb
-- spec/curl/multi_spec.rb
+- spec/curl_ffi/easy_spec.rb
+- spec/curl_ffi/multi_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/nokarma/curl-ffi
@@ -102,7 +104,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: An FFI based libCurl interface
-test_files: 
-- spec/curl/easy_spec.rb
-- spec/curl/multi_spec.rb
-- spec/spec_helper.rb
+test_files: []
+