luminati 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 605a01798b13966cac5eb5163813a1efdb5ad518
-  data.tar.gz: 5e39a3b73d23752baee3bb6f915698f5e50caf56
+  metadata.gz: 9adc62b4fd44c0b0e920daf365d0ccc4af9388b8
+  data.tar.gz: cf70c9548e92575255cd5df94710e7cd8998fee7
 SHA512:
-  metadata.gz: 910d8e208e0e68451f752acc2329db94c083fccb6fdd5459e804188dd46ff54eed8025fbb23bf5a095937b96f1c298c76be1247377cb0ae9df6688a001c8aca2
-  data.tar.gz: c3b3016b4ee55dabcb6b9e5ecb052db461512db235a7c31f6a374fc4a5bb8e7d3e5bf9778557a8406d525268cf7d93680c4fca15e221c3b27134b53c6651fd2b
+  metadata.gz: efebc81f6a72f0ca7cb1cd43121c9aaa21c9148b4554e61bc1ec96856ed742d7a6fca96c0491acc44f63dc6e301c6406493a0a6295b77f3c1b88f05aa197c463
+  data.tar.gz: 757cc46a7f860a163ec39e53cd93167cac9e077c37818d91fd76cbb2777f39e0e72be55f84aba56dc92c0436334921d33b3a688af238d24fd21af1088b58958d

data/lib/luminati.rb

@@ -1,5 +1,6 @@
 module Luminati
-  VERSION = "0.0.1"
-
+  VERSION = "0.0.2"
+  
+  require File.join(File.dirname(__FILE__), 'luminati/errors')
   require File.join(File.dirname(__FILE__), 'luminati/client')
 end

data/lib/luminati/client.rb

@@ -2,7 +2,7 @@ require 'faraday'
 
 module Luminati
   class Client
-    attr_accessor :username, :password, :zone, :port, :urls
+    attr_accessor :username, :password, :zone, :port, :urls, :regexes
     
     def initialize(username, password, zone: :gen, port: 22225)
       self.username   =   username
@@ -14,6 +14,10 @@ module Luminati
       self.urls       =   {
         master_proxy: "http://client.luminati.io/api/get_super_proxy"
       }
+      
+      self.regexes    =   {
+        failed_auth: /failed\sauth/i
+      }
     end
     
     def get_connection(country: nil, dns_resolution: :remote, session: nil)
@@ -38,20 +42,16 @@ module Luminati
     def fetch_master_proxy(country: nil)
       arguments       =   {raw:  1}
       arguments.merge!(country: country) if country
-      
-      response        =   get_response(self.urls[:master_proxy], arguments)
-      proxy           =   (response && response.body) ? response.body : nil
+      proxy           =   get_response(self.urls[:master_proxy], arguments)
     end
     
     def fetch_master_proxies(limit: 10)
       arguments       =   {format: :json, limit: limit}
-      response        =   get_response(self.urls[:master_proxy], arguments)
-      proxies         =   (response && response.body) ? response.body : nil
+      proxies         =   get_response(self.urls[:master_proxy], arguments)
     end
     
     def ping_master_proxy(address, port: self.port)
       response        =   get_response("http://#{address}:#{port}/ping")
-      return (response && response.body) ? response.body : nil
     end
     
     def ping_master_proxies(proxies, port: self.port)
@@ -70,7 +70,7 @@ module Luminati
     end
     
     def format_username(username)
-      username   =   (username =~ /-zone-([a-z0-9]*)/i).nil? ? "#{username}-zone-#{self.zone}" : username
+      username        =   (username =~ /-zone-([a-z0-9]*)/i).nil? ? "#{username}-zone-#{self.zone}" : username
     end
     
     def get_response(url, arguments = {}, options = {})
@@ -78,10 +78,19 @@ module Luminati
       
       connection      =   build_connection(options)
       response        =   connection.get(url, arguments)
+      response        =   (response && response.body) ? response.body : nil
+      
+      check_response_for_errors(response)
       
       return response
     end
     
+    def check_response_for_errors(response)
+      if (response && response.is_a?(String) && response.present?)
+        raise Luminati::FailedAuthError, "Failed to authenticate your account with Luminati.io. Please check your credentials or the contract for your account." if response =~ self.regexes[:failed_auth]
+      end
+    end
+    
     def build_connection(options = {})
       options.merge!(:ssl => {:verify => false})
       

data/lib/luminati/errors.rb

@@ -0,0 +1,3 @@
+module Luminati
+  class FailedAuthError < StandardError; end
+end

data/luminati.gemspec

@@ -3,7 +3,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.5") if s.respond_to? :required_rubygems_version=
 
   s.name = 'luminati'
-  s.version = '0.0.1'
+  s.version = '0.0.2'
 
   s.homepage      =   "https://github.com/Agiley/Luminati"
   s.email         =   "sebastian@agiley.se"
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
  Rakefile
  lib/luminati.rb
  lib/luminati/client.rb
+ lib/luminati/errors.rb
  luminati.gemspec
  spec/spec_helper.rb
  ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luminati
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Sebastian Johnsson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-15 00:00:00.000000000 Z
+date: 2015-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -79,6 +79,7 @@ files:
 - Rakefile
 - lib/luminati.rb
 - lib/luminati/client.rb
+- lib/luminati/errors.rb
 - luminati.gemspec
 - spec/spec_helper.rb
 homepage: https://github.com/Agiley/Luminati