proxtopus 0.0.31 → 0.0.35

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzBmMDU3N2E2MzY1YmZkM2Q3ZjI0ZWE5OGUxZTQ5MzlmNTg0NDA4Nw==
+    N2QzNWNhM2NhOTJhNjVlODBjOGU1ZjhiOGM4N2Q5NjE5NmRlMTA3ZA==
   data.tar.gz: !binary |-
-    M2I3OTMxMzUxYjExMTQwNjJiMWY2MmVjOTdkZWQ2ZDdlYzZhYjBhZQ==
+    YTgxYTQ3NzFiMTNkMTVkOTg3NjBlMzFkNWM3MjRkMmJlZDhmZmQ5Ng==
 SHA512:
   metadata.gz: !binary |-
-    Y2Q5ZGUzZjZlYWRkMjQzNjAwODcwMTZmYTE2ZjM0MDRjMWZlZjgwZDliNDNi
-    MWIxZDY2MGI1M2JhMjdmYTQ2YjhlOWExZTAzYThlM2RlYTc5OWZkZmRlZDk0
-    NWIzOWQzMDhhYjViOGUxODgwOGVhMjViOTJjNmRkYmYyYmUxZDE=
+    Zjc4NmVhOTM2NmNkNDZkZjQ5NzIyMDk3NDVmYTQwZTk4MTlmOGQ4MjM4NmM3
+    MWY0NDg3YjU4ZDBmZjkxNzZlZjhhZjEwNGU1NDI4NTQ1ZjgwNjZiNDI2NWQ3
+    NjkyNGE1MTUyY2ZiYWVmODFmZTVjYjI3MDllMjNiMzBmM2VhMTk=
   data.tar.gz: !binary |-
-    NDk5MTQyMGQ3M2ZhYjVmZjQ3MDZmMjcyZDJhYjkxMmU1ZGE0NzllODc3MDcx
-    ZGUwMWZlNWRkMzY4MDI4NzVjMjBlY2NhZTMzMGZjMmRkMjZiMWZiZjRjM2Jk
-    NWYzODgwOWQ1MTcyNTNlNWNmODkzZTUyNmMwMzEyYjhjYmY1NjE=
+    YzVkNzZhYjg1NDRhYzUyZTY0NGQzZWVjNWE2YjNlZTdkMzgxYzhmMjQxNWM1
+    NmIyMDVkMThkZjQ4MWJjNTQ5M2NiY2VmYWRiYzE1MjdkNmNkM2QwYmU5YmZh
+    NDE0OTgxMzc5YWNhYTgzNDFmODY2NWEyZjZiZjg2OTc3MWM4NzE=

data/lib/proxtopus/client.rb

@@ -16,8 +16,8 @@ module Proxtopus
       @resources = ResourceSet.new(resources)
       @proxies = ProxySet.new
       self
-    rescue => e
-      puts "Proxtopus::Client -- #{e.inspect}"
+    #rescue => e
+    #  puts "Proxtopus::Client -- #{e.inspect}"
     end
     
     # p.collect({:cs => ['US'], etc...})
@@ -26,22 +26,31 @@ module Proxtopus
       #use_opts = (opts.nil?)? api_options : opts
       #get(use_opts)
       @resources.each do |resource|
-        @proxies.push(resource.collect)
+        response = Request.get(resource)
+        #puts response.proxies.inspect
+        #gets
+        @proxies.push(response.proxies)
       end
-    rescue => e
-      puts "Proxtopus::Client -- #{e.inspect}"
+      #puts "[@proxies in Client]"
+      #puts @proxies.inspect
+      #puts
+      #puts
+      #gets
+      @proxies
+    #rescue => e
+    #  puts "Proxtopus::Client -- #{e.inspect}"
     end
     
     def random_proxy
       @proxies[rand(0..(@proxies.count-1))]
-    rescue => e
-      puts "Proxtopus::Client -- #{e.inspect}"
+    #rescue => e
+    #  puts "Proxtopus::Client -- #{e.inspect}"
     end
     
     def delete_proxy(proxy)
       @proxies.delete(proxy)
-    rescue => e
-      puts "Proxtopus::Client -- #{e.inspect}"
+    #rescue => e
+    #  puts "Proxtopus::Client -- #{e.inspect}"
     end
     
   private

data/lib/proxtopus/proxy.rb

@@ -4,11 +4,25 @@ module Proxtopus
     attr_accessor :host, :port, :protocol, :country, :anonymity
     
     def initialize(host, port, protocol, country, anonymity)
-      @host = host.to_s
+      @host = host.to_s.downcase
       @port = port.to_i
-      @protocol = protocol.to_s
+      @protocol = protocol.to_s.downcase
       @country = country.to_s
-      @anonymity = anonymity.to_s
+      if anonymity =~ /h(igh(ly)?)?\s*a(non(ymous)?)?\s*(p(roxy)?)?/ix
+        @anonymity = 'HAP'
+      elsif anonymity =~ /a(non(ymous)?)?\s*(p(roxy)?)?/ix
+        @anonymity = 'AP'
+      elsif anonymity =~ /t(rans(parent)?)?\s*(p(roxy)?)?/ix
+        @anonymity = 'TP'
+      else
+        puts "Invalid anonymity '#{anonymity}'... ignoring."
+        @anonymity = nil
+      end
+      
+      #puts "[Initialized Proxy]"
+      #puts "#{@procotol}://#{@host}:#{@port} w/ #{@anonymity},#{@country}"
+      #puts
+      #puts
     end
     
     def ==(other)

data/lib/proxtopus/request.rb

@@ -1,16 +1,39 @@
 module Proxtopus
-  class Request# < Mechanize
+#  class Request# < Mechanize
+  module Request
     
-    attr_reader :resource, :response
+    class << self
+      def get_page(resource)
+        raise ArgumentError, "Request.new() requires resource to be of type Proxtopus::Resource!" if !resource.is_a?(Proxtopus::Resource)
+        AGENT.get(resource.uri.to_s)
+      end
+      
+      def get(resource)
+        response = Response.new(get_page(resource), resource)
+        #puts "[response in Request]"
+        #puts response.inspect
+        #puts
+        #puts
+        #gets
+        response
+        #puts response.proxies.inspect
+        #gets
+      end
+    end
+    
+=begin
+    attr_reader :page
     
     def initialize(resource)
       #puts "to request"
       raise ArgumentError, "Request.new() requires resource to be of type Proxtopus::Resource!" if !resource.is_a?(Proxtopus::Resource)
       
-      @resource = resource
-      page = Mechanize.new.get(@resource.uri.to_s)
-      @response = Response.new(page.body, @resource.format, @resource.elements)
+      #@resource = resource
+      @page = Mechanize.new.get(resource.uri.to_s)
+      #@response = Response.new(page.body, @resource.format, @resource.elements)
+      
+      self
     end
-
+=end
   end
 end

data/lib/proxtopus/resource.rb

@@ -1,33 +1,46 @@
 module Proxtopus
   class Resource
     
-    attr_reader :request, :response, :url, :params, :format, :elements 
+    attr_reader :url, :params, :format, :elements 
     
-    def initialize(resource)
-      #puts resource.class
-      #puts
-      #puts resource.inspect
-      if resource.is_a?(Proxtopus::Resource)
-        @request = resource.request
-        @response = resource.response
-        @url = resource.url
-        @params = resource.params
-        @format = resource.format
-        @elements = resource.elements
-      elsif resource.is_a?(Hash)
-        @request = resource[:request]               || raise(ArgumentError, "Resource must have a specified request hash!")
-        @response = resource[:response]             || raise(ArgumentError, "Resource must have a specified resource hash!")
-        @url = resource[:request][:url]             || raise(ArgumentError, "Resource must have a specified request url!")
-        @params = resource[:request][:params]       || raise(ArgumentError, "Resource must have a specified request param!")
-        @format = resource[:response][:format]      || raise(ArgumentError, "Resource must have a specified resource format!")
-        @elements = resource[:response][:elements]  || raise(ArgumentError, "Resource must have a specified resource set of elemenra!")
-      else
-        raise ArgumentError, "Resource.new() expects resource as a Proxtopus::Resource or Hash!"
-      end
+    def initialize(request, response)
+      raise ArgumentError, "Resource.new() expects request as a hash of config values!" if !request.is_a?(Hash)
+      raise ArgumentError, "Resource.new() expects response as a hash of config values!" if !response.is_a?(Hash)
+
+      #@request = resource[:request]               || raise(ArgumentError, "Resource must have a specified request hash!")
+      #@response = resource[:response]             || raise(ArgumentError, "Resource must have a specified resource hash!")
+      @url = request[:url]                        || raise(ArgumentError, "Resource must have a specified request url!")
+      @params = request[:params]                  || nil
+      @format = response[:format]                 || raise(ArgumentError, "Resource must have a specified resource format!")
+      @elements = response[:elements]             || raise(ArgumentError, "Resource must have a specified resource set of elemenra!")
+
+      #if resource.is_a?(Proxtopus::Resource)
+      #  @request = resource.request
+      #  @response = resource.response
+      #  @url = resource.url
+      #  @params = resource.params
+      #  @format = resource.format
+      #  @elements = resource.elements
+      #elsif resource.is_a?(Hash)
+      #  @request = resource[:request]               || raise(ArgumentError, "Resource must have a specified request hash!")
+      #  @response = resource[:response]             || raise(ArgumentError, "Resource must have a specified resource hash!")
+      #  @url = resource[:request][:url]             || raise(ArgumentError, "Resource must have a specified request url!")
+      #  @params = resource[:request][:params]       || raise(ArgumentError, "Resource must have a specified request param!")
+      #  @format = resource[:response][:format]      || raise(ArgumentError, "Resource must have a specified resource format!")
+      #  @elements = resource[:response][:elements]  || raise(ArgumentError, "Resource must have a specified resource set of elemenra!")
+      #else
+      #  raise ArgumentError, "Resource.new() expects resource as a Proxtopus::Resource or Hash!"
+      #end
     end
     
     def collect
-      Request.new(self).response.parsed
+      #request = Request.new(self)
+      #results = Request.new(self).response.parsed
+      #puts "[RESULTS]"
+      #puts results.inspect
+      #puts
+      #puts
+      #results
     end
     
     def uri

data/lib/proxtopus/resource_set.rb

@@ -2,8 +2,8 @@ module Proxtopus
   class ResourceSet < Array
     
     def initialize(resources=nil)
-      if resources
-        resources.each { |r| self.push(r) }
+      if resources.is_a?(Array)
+        resources.each { |r| push(r) }
       end
     end
     
@@ -13,7 +13,7 @@ module Proxtopus
       end
       
       if resource.is_a?(Hash)
-        resource = Resource.new(resource)
+        resource = Resource.new(resource[:request], resource[:response])
       end
       
       super(resource) if !include?(resource)

data/lib/proxtopus/response.rb

@@ -1,27 +1,36 @@
 module Proxtopus
   class Response
         
-    attr_reader :body, :format, :parsed
+    attr_reader :page, :resource, :proxies
     
-    def initialize(page, format, elements)
+    def initialize(page, resource)
       #puts "to response"
       #raise ArgumentError, "Response.new() expects page to be of type Mechanize::Page!" if !page.is_a?(Mechanize::Page)
       #raise ArgumentError, "Response.new() expects format to be of type Symbol!" if !format.is_a?(Symbol)
       #raise ArgumentError, "Response.new() expects elements to be of type Symbol!" if !format.is_a?(Symbol)
       
-      @body = page
-      @format = format
-      @elements = elements
+      @page = page
+      @resource = resource
+      #@body = page
+      #@format = format
+      #@elements = elements
       
-      if format == :json
-        @parsed = Parser.json(@body, @elements)
-      elsif format == :xml
-        @parsed = Parser.xml(@body, @elements)
+      if resource.format == :json
+        @proxies = Parser.json(page.body, resource.elements)
+      elsif resource.format == :xml
+        @proxies = Parser.xml(page.body, resource.elements)
       #elsif format == :rss
       #  @parsed = Parser.rss(@body, @elements)
       else
-        puts "Format #{format} is currenly unsupported... consider adding it =]"
+        raise ArgumentError, "Format #{resource.format} is currenly unsupported... consider adding it =]"
       end
+      
+      #puts "[@proxies in Response]"
+      #puts @proxies.inspect
+      #puts
+      #puts
+      #gets
+      @proxies
     end
     
   end

data/lib/proxtopus/response_parser.rb

@@ -5,30 +5,40 @@ module Proxtopus
       class << self
         def json(body, elements)
           ret = ProxySet.new
-          els = JSON.parse(body)[elements[:root]]
+          els = JSON.parse(body)[elements[:root]] || nil
           els.each do |el|
-            host = el[elements[:host]]
-            port = el[elements[:port]]
-            anonymity = el[elements[:anonymity]]
-            protocol = el[elements[:protocol]]
-            country = el[elements[:country]]
-            ret.push(Proxy.new(host, port, anonymity, protocol, country))
+            host = el[elements[:host]]            || nil
+            port = el[elements[:port]]            || nil
+            anonymity = el[elements[:anonymity]]  || nil
+            protocol = el[elements[:protocol]]    || nil
+            country = el[elements[:country]]      || nil
+            ret.push(Proxy.new(host, port, protocol, country, anonymity))
           end
+          #puts "[ret in ResponseParser->json]"
+          #puts ret.inspect
+          #puts
+          #puts
+          #gets
           ret
         end
         
         def xml(body, elements)
           ret = ProxySet.new
           doc = Nokogiri::HTML(body)
-          els = doc.xpath(elements[:root])
+          els = doc.xpath(elements[:root])                    || nil
           els.each do |el|
-            host = el.xpath(elements[:host]).text
-            port = el.xpath(elements[:port]).text
-            anonymity = el.xpath(elements[:anonymity]).text
-            protocol = el.xpath(elements[:protocol]).text
-            country = el.xpath(elements[:country]).text
-            ret.push(Proxy.new(host, port, anonymity, protocol, country))
+            host = el.xpath(elements[:host]).text             || nil
+            port = el.xpath(elements[:port]).text             || nil
+            anonymity = el.xpath(elements[:anonymity]).text   || nil
+            protocol = el.xpath(elements[:protocol]).text     || nil
+            country = el.xpath(elements[:country]).text       || nil
+            ret.push(Proxy.new(host, port, protocol, country, anonymity))
           end
+          #puts "[ret in ResponseParser->xml]"
+          #puts ret.inspect
+          #puts
+          #puts
+          #gets
           ret
         end
         

data/lib/proxtopus.rb

@@ -3,6 +3,7 @@ Bundler.require(:default)
 
 require 'uri'
 
+require_relative './proxtopus/countries/carmen'
 require_relative './proxtopus/client'
 require_relative './proxtopus/request'
 require_relative './proxtopus/response_parser'
@@ -13,6 +14,8 @@ require_relative './proxtopus/proxy'
 require_relative './proxtopus/proxy_set'
 
 module Proxtopus
+  
+  AGENT = Mechanize.new
 
   class << self
     # p = Proxtopus.new_client do
@@ -28,8 +31,8 @@ module Proxtopus
     #  Client.new(&block) if block_given?
     #end
     def client(resources_file)
-      resources = "[#{File.read(resources_file)}]".gsub!(/\r|\n|\s/,'')
-      Client.new(eval(resources))
+      resources = eval("[#{File.read(resources_file)}]".gsub!(/\r|\n|\s/,''))
+      Client.new(resources)
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: proxtopus
 version: !ruby/object:Gem::Version
-  version: 0.0.31
+  version: 0.0.35
 platform: ruby
 authors:
 - Ethan Barron