refactor get method

Author: Kirill Platonov

lib/proxy_manager/proxy.rb

@@ -14,34 +14,45 @@ def initialize(proxies)
     end
 
     def get(count = 1)
-      raise 'List is empty' if @list.empty?
+      get_proxy(count)
+    end
 
-      items = []
-      new_list = @list.clone
+    def get!(count = 1)
+      get_proxy(count, true)
+    end
 
-      @list.each_with_index do |proxy, key|
-        new_list.shift
-        new_list << proxy
-
-        if count == 1
-          items = proxy
-          break
-        else
-          items << proxy
-          break if items.size == count
-        end
+    def self.connectable?(proxy)
+      proxy = proxy.chomp.split(':') if proxy.is_a? String
+      ip, port = proxy
+      connection = Net::HTTP.new("http://google.com", nil, ip, port)
+      connection.open_timeout = 3
+      connection.read_timeout = 3
+
+      connection.start do |http|
+        return true if http.get('/')
       end
 
-      @list = new_list
+      false
+    rescue Exception => e
+      false
+    end
 
-      raise 'There are no available proxy' if items.empty?
+    private
 
-      save_to_file(@list_file, @list) if @list_file
+    def load_list_from_array(proxies)
+      @list = proxies.map { |arg| [arg.split(':')[0], arg.split(':')[1].to_i] }
+    end
 
-      items
+    def load_from_file(file)
+      result = []
+      IO.readlines(file).each do |line|
+        ip, port = line.chomp.split(':')
+        result << [ip, port.to_i] if ip.is_a?(String) && port.is_a?(String)
+      end
+      result
     end
 
-    def get!(count = 1)
+    def get_proxy(count, check_connection = false)
       raise 'List is empty' if @list.empty?
 
       items = []
@@ -50,7 +61,7 @@ def get!(count = 1)
       @list.each_with_index do |proxy, key|
         new_list.shift
 
-        if self.class.connectable? proxy
+        if !check_connection || self.class.connectable?(proxy)
           new_list << proxy
 
           if count == 1
@@ -72,37 +83,6 @@ def get!(count = 1)
       items
     end
 
-    def self.connectable?(proxy)
-      proxy = proxy.chomp.split(':') if proxy.is_a? String
-      ip, port = proxy
-      connection = Net::HTTP.new("http://google.com", nil, ip, port)
-      connection.open_timeout = 3
-      connection.read_timeout = 3
-
-      connection.start do |http|
-        return true if http.get('/')
-      end
-
-      false
-    rescue Exception => e
-      false
-    end
-
-    private
-
-    def load_list_from_array(proxies)
-      @list = proxies.map { |arg| [arg.split(':')[0], arg.split(':')[1].to_i] }
-    end
-
-    def load_from_file(file)
-      result = []
-      IO.readlines(file).each do |line|
-        ip, port = line.chomp.split(':')
-        result << [ip, port.to_i] if ip.is_a?(String) && port.is_a?(String)
-      end
-      result
-    end
-
     def save_to_file(file, list)
       source = ''
       list.each { |p| source << "#{p[0]}:#{p[1]}\n" }