giddy 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    giddy (0.0.2)
+    giddy (0.0.3)
       httparty (>= 0.11.0)
       json (>= 1.8.0)
 

data/lib/giddy.rb

@@ -2,6 +2,7 @@ require 'json'
 require 'httparty'
 
 require "giddy/version"
+require "giddy/exceptions"
 require "giddy/endpoint"
 require "giddy/config"
 require "giddy/mediator"

data/lib/giddy/client.rb

@@ -20,7 +20,7 @@ module Giddy
         :Query => { :SearchPhrase =>  attrs[:query] },
         :ResultOptions => { :ItemCount => attrs[:limit], :ItemStartNumber => attrs[:start] }
       }
-      attrs = attrs[:additional].merge(converted)
+      attrs = converted.merge(attrs[:additional])
       Search.new(@mediator).search_for_images(attrs)
     end
 

data/lib/giddy/exceptions.rb

@@ -0,0 +1,10 @@
+module Giddy
+  class ImageNotFound < RuntimeError
+  end
+
+  class InvalidRequest < RuntimeError
+  end
+
+  class InvalidUsernameOrPassword < RuntimeError
+  end
+end

data/lib/giddy/mediator.rb

@@ -19,7 +19,7 @@ module Giddy
       }
       result = fetch "session", nil, nil, :CreateSession, data
       unless result["ResponseHeader"]["Status"] == "success"
-        raise "Error authenticating: #{result["ResponseHeader"]}"
+        raise error_type(result), "Error authenticating: #{result["ResponseHeader"]}"
       end
       @token = result["CreateSessionResult"]["Token"]
       @secure_token = result["CreateSessionResult"]["SecureToken"]
@@ -40,10 +40,17 @@ module Giddy
       elsif result["ResponseHeader"]["Status"] == "success"
         result["#{name}Result"]
       else
-        raise "Error fetching #{name}: #{result["ResponseHeader"]}"
+        raise error_type(result), "Error fetching #{name}: #{result["ResponseHeader"]}"
       end
     end
 
+    def error_type(result)
+      statuses = result["ResponseHeader"]["StatusList"].map { |s| s["Code"] }
+      return ImageNotFound if statuses.include? "ImageNotFound"
+      return InvalidUsernameOrPassword if statuses.include? "InvalidUsernameOrPassword"
+      InvalidRequest
+    end
+
     def fetch(path, token, bodyname, name, data)
       body = { :RequestHeader => { :Token => token }, "#{bodyname || name}RequestBody" => data }
       headers = { 'Content-Type' => 'application/json' }

data/lib/giddy/version.rb

@@ -1,3 +1,3 @@
 module Giddy
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -2,7 +2,7 @@
 name: giddy
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Brian Muller
@@ -78,6 +78,7 @@ files:
 - lib/giddy/config.rb
 - lib/giddy/download.rb
 - lib/giddy/endpoint.rb
+- lib/giddy/exceptions.rb
 - lib/giddy/image.rb
 - lib/giddy/mediator.rb
 - lib/giddy/search.rb
@@ -96,7 +97,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2644968470803126356
+      hash: 2639415693075167917
       segments: 
       - 0
       version: "0"
@@ -105,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2644968470803126356
+      hash: 2639415693075167917
       segments: 
       - 0
       version: "0"