curl_ffi 0.0.6 → 0.0.8

data/.gitignore

@@ -1,3 +1,5 @@
 pkg/*
 *.gem
 .bundle
+*.tmproj
+

data/lib/bindings.rb

@@ -934,7 +934,9 @@ module CurlFFI
     elsif option >= OPTION_FUNCTIONPOINT
       self.easy_setopt_pointer(handle, option, value)
     elsif option >= OPTION_OBJECTPOINT
-      if value.respond_to?(:to_str)
+      if value.is_a?(Proc)
+        self.easy_setopt_pointer(handle, option, value)
+      elsif value.respond_to?(:to_str)
         self.easy_setopt_string(handle, option, value.to_str)
       else
         self.easy_setopt_pointer(handle, option, value)

data/lib/curl_ffi/easy.rb

@@ -3,33 +3,39 @@ require "curl_ffi"
 module CurlFFI
   class Easy
 
-    attr_reader :pointer
+    attr_reader :pointer, :options
 
     def initialize
       @pointer = FFI::AutoPointer.new(CurlFFI.easy_init, CurlFFI.method(:easy_cleanup))
+      @options = {}
+    end
+
+    def reset_options
+      @options = {}
     end
 
     def reset
       CurlFFI.easy_reset(@pointer)
+      @options = {}
     end
 
     def initialize_copy(other)
       @pointer = FFI::AutoPointer.new(CurlFFI.easy_duphandle(other.pointer), CurlFFI.method(:easy_cleanup))
     end
 
-    def escape(string)
-      str_pointer = CurlFFI.easy_escape(@pointer, string, string.length)
-      result = str_pointer.null? ? nil : str_pointer.read_string
+    def escape(_string)
+      str_pointer = CurlFFI.easy_escape(@pointer, _string, _string.length)
+      @escaped    = str_pointer.null? ? nil : str_pointer.read_string.dup
       CurlFFI.free(str_pointer)
-      result
+      return(@escaped)
     end
 
     def unescape(string)
       int_pointer = FFI::MemoryPointer.new(:int)
       str_pointer = CurlFFI.easy_unescape(@pointer, string, string.length, int_pointer)
-      result = str_pointer.read_string(int_pointer.read_int)
+      @unescaped  = str_pointer.read_string(int_pointer.read_int).dup
       CurlFFI.free(str_pointer)
-      result
+      @unescaped
     end
 
     def error_string(error_code)
@@ -37,19 +43,16 @@ module CurlFFI
     end
 
     def perform
-      check_code(CurlFFI.easy_perform(@pointer))
+      check_code(@_code = CurlFFI.easy_perform(@pointer))
     end
 
     def setopt(option, value)
-      check_code(CurlFFI.easy_setopt(@pointer, option, value))
-    end
+      @_option = option
+      @_value  = value
 
-    def setopt_handler(option, value)
-      check_code(CurlFFI.easy_setopt_handler(@pointer, option, value))
-    end
+      check_code(@_code = CurlFFI.easy_setopt(@pointer, @_option, @_value))
 
-    def setopt_str_handler(option, value)
-      check_code(CurlFFI.easy_setopt_handler_string(@pointer, option, value))
+      @options[@_option] = @_value
     end
 
     def getinfo(info)
@@ -68,11 +71,9 @@ module CurlFFI
 
     protected
       def check_code(result)
-        
         if result != :OK
           raise "Error - #{result}" unless result.nil?
         end
-        return result
       end
 
       def getinfo_double(info)

data/lib/curl_ffi/version.rb

@@ -1,3 +1,3 @@
 module CurlFFI
-  VERSION = "0.0.6"
+  VERSION = "0.0.8"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Arthur Schreiber
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-08 00:00:00 -08:00
+date: 2010-11-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency