curl 0.0.8 → 0.0.9

data/lib/curl.rb

@@ -32,6 +32,7 @@ class CURL
     attr_accessor :user_agent
     
   def initialize(keys={})
+    @socks_hostname = keys[:socks_hostname] ||= false
     @cache = ( keys[:cache] ? keys[:cache] : false  )
     @cache_time = ( keys[:cache_time] ? keys[:cache_time] : 3600*24*1  ) # 1 day cache life
     @connect_timeout = keys[:connect_timeout] || 6
@@ -65,10 +66,11 @@ class CURL
     end
     
     def socks(socks_uri)
-    	socks = ( socks_uri.is_a?(URI) ? socks_uri : URI.parse("http://#{socks_uri}") )
-    	@setup_params = "#{@setup_params} --socks5-hostname \"#{socks.host}:#{socks.port}\" "
-    	@setup_params = "#{@setup_params} --proxy-user \"#{socks.user}:#{socks.password}\" " if socks.user
-    	@setup_params
+      socks = ( socks_uri.is_a?(URI) ? socks_uri : URI.parse("http://#{socks_uri}") )
+      s = @socks_hostname ? "--socks5-hostname" : "--socks5"
+      @setup_params = "#{@setup_params} #{s} \"#{socks.host}:#{socks.port}\" "
+      @setup_params = "#{@setup_params} --proxy-user \"#{socks.user}:#{socks.password}\" " if socks.user
+      @setup_params
     end
     
     def self.check(proxy)
@@ -100,6 +102,7 @@ class CURL
       ref = keys[:ref] ||= nil
       count = keys[:count] ||= 3
       encoding = keys[:encoding] ||= "utf-8"
+      raw = ( keys[:raw]==nil ? false : keys[:raw] )
       
       if @cache
         filename = cache_file(url)
@@ -114,7 +117,7 @@ class CURL
           return open(filename).read
         end
       else
-        return get_raw(url, {:count=>count , :ref=>ref, :encoding=>encoding})
+        return get_raw(url, {:count=>count , :ref=>ref, :encoding=>encoding, :raw=>raw})
       end
       
     end
@@ -123,6 +126,7 @@ class CURL
       ref = keys[:ref] ||= nil
       count = keys[:count] ||= 3
       encoding = keys[:encoding] ||= "utf-8"
+      raw = ( keys[:raw]==nil ? false : keys[:raw] )
       
       cmd = "curl #{cookies_store} #{browser_type} #{@setup_params} #{ref}  \"#{url}\"  "
     	if @debug
@@ -134,8 +138,13 @@ class CURL
     			count -= 1
     			result = self.get(url,count) if count > 0
                 end
-      result.force_encoding(encoding)
-      ( encoding=="utf-8" ? result.clean : Iconv.new("UTF-8", "WINDOWS-1251").iconv(result) )
+      #      result.force_encoding(encoding)
+      if raw
+        return result
+      else
+        return ( encoding=="utf-8" ? result.clean : Iconv.new("UTF-8", "WINDOWS-1251").iconv(result) )
+      end
+        
     end
     
 # 	формат данных для поста
@@ -175,26 +184,29 @@ class CURL
 #			}    
     def send(url,post_data, ref = nil,count=5 )
     	
-			post_q = '' # "  -F \"method\"=\"post\"  "
-			post_data.each do |key,val|
-				pre = ""
-				if key
-						pre = "@" if key.scan("file").size>0 or key.scan("photo").size>0 
-					val = val.gsub('"','\"')
-					post_q += " -F \"#{key}\"=#{pre}\"#{val}\" " 
-				end
-			end
-			
-		cmd = "curl   #{cookies_store} #{browser_type} #{post_q}  #{@setup_params} #{ref}  \"#{url}\" "		
-		puts cmd.red if @debug
-		
-		result = open_pipe(cmd)
-    		#if result.to_s.strip.size == 0 
-    		#	puts "empty result, left #{count} try".yellow  if @debug
-    		#	count -= 1
-    		#	result = self.send(url,post_data,nil,count) if count > 0
-			#end
-    	result
+      post_q = '' # "  -F \"method\"=\"post\"  "
+      post_data.each do |key,val|
+        pre = ""
+        if key
+          key = key.to_s
+          pre = "@" if key.scan("file").size>0 or key.scan("photo").size>0 or key.scan("@").size>0
+          key = key.to_s.gsub("@",'')
+          val = val.to_s
+          val = val.gsub('"','\"')
+          post_q += " -F \"#{key}\"=#{pre}\"#{val}\" " 
+        end
+      end
+      
+      cmd = "curl   #{cookies_store} #{browser_type} #{post_q}  #{@setup_params} #{ref}  \"#{url}\" "		
+      puts cmd.red if @debug
+      
+      result = open_pipe(cmd)
+      #if result.to_s.strip.size == 0 
+      #	puts "empty result, left #{count} try".yellow  if @debug
+      #	count -= 1
+      #	result = self.send(url,post_data,nil,count) if count > 0
+      #end
+      result
     end
     
     

data/lib/string_cleaner.rb

@@ -178,4 +178,4 @@ module String::Cleaner
 end
 class String
   include String::Cleaner
-end
+end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: curl
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 8
-  version: 0.0.8
+  prerelease: 
+  version: 0.0.9
 platform: ruby
 authors: 
 - tg0
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-07 00:00:00 +02:00
+date: 2011-03-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,10 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 1
         version: 0.2.1
   type: :runtime
   version_requirements: *id001
@@ -40,10 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 1
         version: 1.1.1
   type: :runtime
   version_requirements: *id002
@@ -74,21 +62,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: curl
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: shell CURL ruby wrapper.