wordnik 4.06.02 → 4.06.04

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    wordnik (4.06.00)
+    wordnik (4.06.03)
       activemodel (>= 3.0.3)
       addressable (>= 2.2.4)
       htmlentities (>= 4.2.4)
@@ -12,20 +12,20 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.8)
-      activesupport (= 3.0.8)
+    activemodel (3.0.9)
+      activesupport (= 3.0.9)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activesupport (3.0.8)
+    activesupport (3.0.9)
     addressable (2.2.4)
     builder (2.1.2)
     crack (0.1.8)
     diff-lcs (1.1.2)
     htmlentities (4.3.0)
     i18n (0.5.0)
-    json (1.5.1)
+    json (1.5.3)
     mime-types (1.16)
-    nokogiri (1.4.4)
+    nokogiri (1.5.0)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)

data/lib/wordnik/response.rb

@@ -15,27 +15,32 @@ module Wordnik
 
     def initialize(raw)
       self.raw = raw
+
+      case self.code
+      when 500..510 then raise(ServerError, self.error_message)
+      when 299..426 then raise(ClientError, self.error_message)
+      end
     end
 
     def code
       raw.code
     end
+    
+    def error_message
+      body['message']
+    rescue
+      body
+    end
 
     # If body is JSON, parse it
     # TODO: If body is XML, parse it
     # Otherwise return raw string
     def body
-
-      if self.code > 399
-        raise AuthorizationError, raw.inspect
-      end
-
       begin
         JSON.parse raw.body
       rescue
         raw.body
       end
-      
     end
 
     def headers

data/lib/wordnik/version.rb

@@ -1,4 +1,4 @@
 module Wordnik
-  VERSION = "4.06.02"
+  VERSION = "4.06.04"
 end
 

data/lib/wordnik.rb

@@ -79,7 +79,7 @@ module Wordnik
       return if Wordnik.authenticated?
       
       if Wordnik.configuration.username.blank? || Wordnik.configuration.password.blank?
-        raise ConfigurationError, "Username and password are required to authenticate."
+        raise ClientError, "Username and password are required to authenticate."
       end
       
       request = Wordnik::Request.new(
@@ -89,21 +89,16 @@ module Wordnik
       )
       
       response_body = request.response.body
-      
-      if response_body.is_a?(Hash) && response_body['userId'].present? && response_body['token'].present?
-        Wordnik.configuration.user_id = response_body['userId']
-        Wordnik.configuration.auth_token = response_body['token']
-      else
-        raise AuthorizationError, request.response.raw.inspect
-      end
+      Wordnik.configuration.user_id = response_body['userId']
+      Wordnik.configuration.auth_token = response_body['token']
     end
 
   end
   
 end
 
-class AuthorizationError < StandardError
+class ServerError < StandardError
 end
 
-class ConfigurationError < StandardError
+class ClientError < StandardError
 end

data/spec/response_spec.rb

@@ -34,18 +34,12 @@ describe Wordnik::Response do
       VCR.use_cassette('unauthorized_response', :record => :new_episodes) do
         @unauthorized_raw = Typhoeus::Request.get("http://beta.wordnik.com/v4/word.json/dog/images/flickr")
       end
-      @response = Wordnik::Response.new(@unauthorized_raw)
-    end
-
-    it "sets a 401 status code" do
-      @response.code.should == 401
     end
     
-    it "raises an error when body is called" do
-      expect { @response.body }.to raise_error(AuthorizationError)
+    it "raises an error when initialized" do
+      expect { Wordnik::Response.new(@unauthorized_raw) }.to raise_error(ClientError)
     end
     
-
   end
 
   describe "format" do
@@ -57,7 +51,7 @@ describe Wordnik::Response do
 
     it "recognizes xml" do
       VCR.use_cassette('xml_response_request', :record => :new_episodes) do
-        @raw = Typhoeus::Request.get("http://beta.wordnik.com/v4/word.xml/help")
+        @raw = Typhoeus::Request.get("http://beta.wordnik.com/v4/word.xml")
       end
       @response = Wordnik::Response.new(@raw)
       @response.format.should == :xml

data/spec/wordnik_spec.rb

@@ -55,7 +55,7 @@ describe Wordnik do
           config.password = 'wrong!'
           config.base_uri = "beta.wordnik.com/v4"
         end
-        lambda { Wordnik.authenticate }.should raise_error(AuthorizationError)
+        expect { Wordnik.authenticate }.to raise_error(ClientError)
         Wordnik.authenticated?.should == false
       end
       
@@ -67,7 +67,7 @@ describe Wordnik do
           config.password = nil
           config.base_uri = "beta.wordnik.com/v4"
         end
-        lambda { Wordnik.authenticate }.should raise_error(ConfigurationError, /username and password are required/i)
+        expect { Wordnik.authenticate }.to raise_error(ClientError, /username and password are required/i)
         Wordnik.authenticated?.should == false
       end
       

metadata

@@ -2,7 +2,7 @@
 name: wordnik
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 4.06.02
+  version: 4.06.04
 platform: ruby
 authors: 
 - Zeke Sikelianos
@@ -11,7 +11,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-12 00:00:00 Z
+date: 2011-07-12 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: typhoeus
@@ -174,6 +175,7 @@ files:
 - spec/spec_helper.rb
 - spec/wordnik_spec.rb
 - wordnik.gemspec
+has_rdoc: true
 homepage: http://developer.wordnik.com
 licenses: []
 
@@ -197,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: wordnik
-rubygems_version: 1.8.5
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: A ruby wrapper for the Wordnik API