lexile 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec9cd6a42b9a06b46c1b02c746df407e2da081d0
-  data.tar.gz: 637458a662c8f341512e0e62c2294729d895505f
+  metadata.gz: f18c141815d88e2cf3f680ef9a5574921b1e1fe0
+  data.tar.gz: 3b63df5a1c0f140e39ce958858e12d5c0d122922
 SHA512:
-  metadata.gz: 44b1ed9e6886a095ab54d87934f7c64b99eb71517cee1404262b11e6814cbefe0bfab27c125e9d1a147cddad0be6e9e3d7c24aa6e4e536cc2ada68c181c0eda9
-  data.tar.gz: 897342499b5591b21b8e84cea75e1a9e6a356ffae0b640ba85aa468dcf7bbc7913b052016d3d29d1187fc3a6f2abfd09130af33e03c96bdc3c432e9b569d226b
+  metadata.gz: 148803341b89cd457a1e62f172133a236cd8e3c1aaed9f0c5acebe20a16f7475c0093d1fec6e3f291c6d86a6359bddd23e4046e737f327f02542aa275d38ba3a
+  data.tar.gz: 73abd89e69b0cd610ef574eb4204e1d786d8ba0d54100ea2f77134d77079793f3bef0333f9f114128678eadf9a1c9b48ba63581916511ef9a5c53d150b11d088

data/lexile.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
 
   spec.authors       = ["Mauricio Alvarez"]
   spec.email         = ["mauricio@curriculet.com"]
-  spec.date          = "2015-08-06"
+  spec.date          = Date.today
   spec.description   = "A gem for the Lexile® database API "
   spec.summary       = "A gem to find a book's Lexile DB entry by name or ISBN13"
   spec.homepage      = "https://github.com/curriculet/lexile"

data/lib/lexile/api/client.rb

@@ -21,7 +21,7 @@ module Lexile
 
         if configuration.is_a?(Module) && configuration.to_s == 'Lexile'
           config = configuration
-        else 
+        else
           if configuration.is_a?(Hash)
             config = Hashie::Mash.new( configuration )
             config.api_url = [config.endpoint,config.api_version].join('/')
@@ -47,32 +47,32 @@ module Lexile
       # @return [String]. The raw response body (JSON is expected) Raises appropriate exception if it fails
       # @raise Lexile::HTTPError when any HTTP error response is received
       def get( path, params={}, headers={})
-        
+
         get_args = build_get_args( params, headers)
-        
-        yield get_args if block_given? 
-                
+
+        yield get_args if block_given?
+
         #puts "CALLING API: #{Lexile.api_url}#{path} ===#{get_args}"
         response = self.class.get( path, get_args)
 
         case response.code
-        when 200..201
-          response
-          JSON.parse( response.body )
-        when 400
-          raise Lexile::BadRequest.new(response, params)
-        when 401
-          raise Lexile::AuthenticationFailed.new(response, params)
-        when 404
-          raise Lexile::NotFound.new(response, params)
-        when 500
-          raise Lexile::ServerError.new(response, params)
-        when 502
-          raise Lexile::Unavailable.new(response, params)
-        when 503, 504
-          raise Lexile::RateLimited.new(response, params)
-        else
-          raise Lexile::UnknownStatusCode.new(response, params)
+          when 200..201
+            response
+            JSON.parse( response.body )
+          when 400
+            raise Lexile::BadRequest.new(response, params)
+          when 401
+            raise Lexile::AuthenticationFailed.new(response, params)
+          when 404
+            raise Lexile::NotFound.new(response, params)
+          when 429
+            raise Lexile::TooManyRequests.new(response, params)
+          when 500
+            raise Lexile::ServerError.new(response, params)
+          when 502, 503, 504
+            raise Lexile::Unavailable.new(response, params)
+          else
+            raise Lexile::UnknownStatusCode.new(response, params)
         end
       end
 
@@ -96,7 +96,7 @@ module Lexile
         get_args[:query]      = query
         get_args[:headers]    = headers
         get_args[:basic_auth] = { username: Lexile.options[:username],
-                                     password: Lexile.options[:password]}
+                                  password: Lexile.options[:password]}
         get_args
       end
     end

data/lib/lexile/errors.rb

@@ -1,8 +1,9 @@
 module Lexile
-  class InvalidCredentials < StandardError; end
-  class CannotProcessResponse < StandardError; end
+  class Error < ::StandardError; end
+  class InvalidCredentials < Error; end
+  class CannotProcessResponse < Error; end
 
-  class HTTPError < StandardError
+  class HTTPError < Error
     attr_reader :response
     attr_reader :params
 
@@ -12,8 +13,12 @@ module Lexile
       super(response)
     end
 
+    def composed_message
+      "#{self.class.to_s} request_params: #{@params} response_status_code: #{@response.code} response_headers:#{@response.headers}"
+    end
+
     def to_s
-      "#{self.class.to_s} : #{response.code} #{response.body}"
+      composed_message
     end
   end
 
@@ -22,6 +27,6 @@ module Lexile
   class BadRequest            < HTTPError; end
   class ServerError           < HTTPError; end
   class AuthenticationFailed  < HTTPError; end
-  class RateLimited           < HTTPError; end
+  class TooManyRequests       < HTTPError; end
   class UnknownStatusCode     < HTTPError; end
 end

data/lib/lexile/version.rb

@@ -1,3 +1,3 @@
 module Lexile
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/lexile/api/client_spec.rb

@@ -80,14 +80,18 @@ describe Lexile::API::Client do
       {status: 400, ex: Lexile::BadRequest },
       {status: 401, ex: Lexile::AuthenticationFailed},
       {status: 404, ex: Lexile::NotFound},
+      {status: 429, ex: Lexile::TooManyRequests},
       {status: 500, ex: Lexile::ServerError},
       {status: 502, ex: Lexile::Unavailable},
-      {status: 503, ex: Lexile::RateLimited},
-      {status: 504, ex: Lexile::RateLimited},
+      {status: 503, ex: Lexile::Unavailable},
+      {status: 504, ex: Lexile::Unavailable},
       {status: 999, ex: Lexile::UnknownStatusCode}
     ].each do |test_args|
       it "should raise #{test_args[:ex].name} when status code is #{test_args[:status]}" do
-        client.class.stub(:get){ mock = double; mock.stub(:code){test_args[:status]}; mock }
+        mock = double
+        mock.stub(:code){test_args[:status]}
+        mock.stub(:headers){ "Some Headers From The  Request"}
+        client.class.stub(:get){ mock }
         expect{
           client.get("/something")
         }.to raise_error test_args[:ex]

data/spec/lexile/errors_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 describe Lexile::HTTPError do
   let(:response){
     mock_response = double()
-    mock_response.stub(:code){ 259 }
-    mock_response.stub(:body){"<html><head></head><body>Hello World!</body></html>"}
+    mock_response.stub(:code){ 429 }
+    mock_response.stub(:headers){ "Some Headers" }
     mock_response
   }
 
@@ -12,7 +12,7 @@ describe Lexile::HTTPError do
 
   it "should format correctly as a string" do
     subject.to_s.should match /Lexile::HTTPError/
-    subject.to_s.should match /259/
-    subject.to_s.should match /Hello World/
+    subject.to_s.should match /429/
+    subject.to_s.should match /Some Headers/
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lexile
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Mauricio Alvarez