captched_to_death 0.2.0 → 0.2.1

data/README.rdoc

@@ -29,7 +29,7 @@ Pass a block if you want to set the verbose option, that enables RestClient resp
       c.verbose  = true
     end
 
-=== Balance checking
+==== Balance checking
 
 With your client initialized using you account credentials, you can check your current balance like so:
 
@@ -38,7 +38,7 @@ With your client initialized using you account credentials, you can check your c
 
 Note that the "balance" in the response means your cents left.
 
-=== CAPTCHA decoding
+==== CAPTCHA decoding
 
 With your client initialized using you account credentials, you can decode a CAPTCHA challenge if you still have credits left on your account. To do do so, just pass the CAPTCHA image URL:
 
@@ -47,21 +47,21 @@ With your client initialized using you account credentials, you can decode a CAP
 
 Note that only GIF, JPEG and PNG are supported as valid CAPTCHA challenges. Also, the response time depends on the current DeathByCaptcha server load.
 
-=== CAPTCHA status checking
+==== CAPTCHA status checking
 
 Once the challenge has already been accepted, it's status can be checked at any time using it's CAPTCHA ID.
 
     client.captcha(36723349)
     => {"status"=>0, "captcha"=>36723349, "is_correct"=>true, "text"=>"jd472tfo"}
 
-=== CAPTCHA reporting
+==== CAPTCHA reporting
 
 If you think the result of the challenge decoding is not correct you can report it to get a refund. But mind that you have to report it within the hour of submitting it and that abusing this feature might get you banned.
 
     client.report(36723349)
     => {"status"=>0, "captcha"=>36723349, "is_correct"=>false, "text"=>"jd472tfo"}
 
-=== DeathByCaptcha server status checking
+=== CaptchedToDeath::Server
 
 You can check the current status of the DeathByCaptcha server to find out the average decoding time at any particular moment. This time will directly affect the response time of any decoding you submit afterwards.
 

data/captched_to_death.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.authors     = ["Cristian R. Arroyo"]
   s.email       = ["cristian.arroyo@vivaserver.com"]
   s.homepage    = "https://github.com/vivaserver/captched_to_death"
-  s.summary     = %q{A simple HTTP client to DeathByCaptcha API}
-  s.description = %q{A simple HTTP client to DeathByCaptcha API using just RestClient}
+  s.summary     = %q{A simple HTTP client to the DeathByCaptcha API}
+  s.description = %q{A simple HTTP client to the DeathByCaptcha API using just RestClient}
 
   s.add_runtime_dependency 'rest-client', "~> 1.6"
   s.add_development_dependency 'minitest'

data/lib/captched_to_death/client.rb

@@ -33,9 +33,18 @@ module CaptchedToDeath
     #
     def balance
       fail RejectedError if empty_credentials?
-      response = RestClient.post "#{API_URI}/user", {:username => @username, :password => @password}, :accept => @accept
-      fail ServiceError unless response.code == 200
+      response = RestClient.post "#{API_URI}/user", {
+        :username => @username,
+        :password => @password
+      }, :accept => @accept
       JSON.parse(response) 
+    rescue RestClient::Exception => e
+      case e.http_code
+      when 403
+        fail RejectedError
+      else
+        fail ServiceError
+      end
     end
 
     # Polls for uploaded CAPTCHA status.
@@ -50,6 +59,8 @@ module CaptchedToDeath
       case e.http_code
       when 404
         fail NotFound 
+      when 500
+        fail ServiceError
       #503 (Service Temporarily Unavailable) when our service is overloaded (usually around 3:00–6:00 PM EST)
       when 503  
         # not sure 503 is ever sent, but retry if it is
@@ -84,8 +95,7 @@ module CaptchedToDeath
         # (...so it'll be returned as a 200)
       #403 (Forbidden) credentials were rejected, or you don't have enough credits
       when 403
-        # TODO: discrimate wrong credentials
-        fail NoCreditError
+        fail NoCreditError if balance
       #400 (Bad Request) if your request was not following the specification or not a valid image
       when 400
         fail RejectedError
@@ -104,13 +114,18 @@ module CaptchedToDeath
     #
     def report(captcha_id)
       fail RejectedError if empty_credentials?
-
       response = RestClient.post "#{API_URI}/captcha/#{captcha_id}/report", {
         :username => @username,
         :password => @password,
       }, :accept => @accept
-
       JSON.parse(response) 
+    rescue RestClient::Exception => e
+      case e.http_code
+      when 403
+        fail RejectedError
+      else
+        fail ServiceError
+      end
     end
 
     private

data/lib/captched_to_death/version.rb

@@ -1,3 +1,3 @@
 module CaptchedToDeath
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: captched_to_death
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-11-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &72562580 !ruby/object:Gem::Requirement
+  requirement: &83665140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *72562580
+  version_requirements: *83665140
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &72562370 !ruby/object:Gem::Requirement
+  requirement: &83664920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72562370
+  version_requirements: *83664920
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &72562140 !ruby/object:Gem::Requirement
+  requirement: &83664660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,8 +43,8 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72562140
-description: A simple HTTP client to DeathByCaptcha API using just RestClient
+  version_requirements: *83664660
+description: A simple HTTP client to the DeathByCaptcha API using just RestClient
 email:
 - cristian.arroyo@vivaserver.com
 executables: []
@@ -89,5 +89,5 @@ rubyforge_project:
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: A simple HTTP client to DeathByCaptcha API
+summary: A simple HTTP client to the DeathByCaptcha API
 test_files: []