giddy 0.0.2 → 0.0.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/Gemfile.lock +1 -1
- data/lib/giddy.rb +1 -0
- data/lib/giddy/client.rb +1 -1
- data/lib/giddy/exceptions.rb +10 -0
- data/lib/giddy/mediator.rb +9 -2
- data/lib/giddy/version.rb +1 -1
- metadata +4 -3
data/Gemfile.lock
CHANGED
data/lib/giddy.rb
CHANGED
data/lib/giddy/client.rb
CHANGED
@@ -20,7 +20,7 @@ module Giddy
|
|
20
20
|
:Query => { :SearchPhrase => attrs[:query] },
|
21
21
|
:ResultOptions => { :ItemCount => attrs[:limit], :ItemStartNumber => attrs[:start] }
|
22
22
|
}
|
23
|
-
attrs = attrs[:additional]
|
23
|
+
attrs = converted.merge(attrs[:additional])
|
24
24
|
Search.new(@mediator).search_for_images(attrs)
|
25
25
|
end
|
26
26
|
|
data/lib/giddy/mediator.rb
CHANGED
@@ -19,7 +19,7 @@ module Giddy
|
|
19
19
|
}
|
20
20
|
result = fetch "session", nil, nil, :CreateSession, data
|
21
21
|
unless result["ResponseHeader"]["Status"] == "success"
|
22
|
-
raise "Error authenticating: #{result["ResponseHeader"]}"
|
22
|
+
raise error_type(result), "Error authenticating: #{result["ResponseHeader"]}"
|
23
23
|
end
|
24
24
|
@token = result["CreateSessionResult"]["Token"]
|
25
25
|
@secure_token = result["CreateSessionResult"]["SecureToken"]
|
@@ -40,10 +40,17 @@ module Giddy
|
|
40
40
|
elsif result["ResponseHeader"]["Status"] == "success"
|
41
41
|
result["#{name}Result"]
|
42
42
|
else
|
43
|
-
raise "Error fetching #{name}: #{result["ResponseHeader"]}"
|
43
|
+
raise error_type(result), "Error fetching #{name}: #{result["ResponseHeader"]}"
|
44
44
|
end
|
45
45
|
end
|
46
46
|
|
47
|
+
def error_type(result)
|
48
|
+
statuses = result["ResponseHeader"]["StatusList"].map { |s| s["Code"] }
|
49
|
+
return ImageNotFound if statuses.include? "ImageNotFound"
|
50
|
+
return InvalidUsernameOrPassword if statuses.include? "InvalidUsernameOrPassword"
|
51
|
+
InvalidRequest
|
52
|
+
end
|
53
|
+
|
47
54
|
def fetch(path, token, bodyname, name, data)
|
48
55
|
body = { :RequestHeader => { :Token => token }, "#{bodyname || name}RequestBody" => data }
|
49
56
|
headers = { 'Content-Type' => 'application/json' }
|
data/lib/giddy/version.rb
CHANGED
metadata
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
name: giddy
|
3
3
|
version: !ruby/object:Gem::Version
|
4
4
|
prerelease:
|
5
|
-
version: 0.0.
|
5
|
+
version: 0.0.3
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
8
8
|
- Brian Muller
|
@@ -78,6 +78,7 @@ files:
|
|
78
78
|
- lib/giddy/config.rb
|
79
79
|
- lib/giddy/download.rb
|
80
80
|
- lib/giddy/endpoint.rb
|
81
|
+
- lib/giddy/exceptions.rb
|
81
82
|
- lib/giddy/image.rb
|
82
83
|
- lib/giddy/mediator.rb
|
83
84
|
- lib/giddy/search.rb
|
@@ -96,7 +97,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
96
97
|
requirements:
|
97
98
|
- - ">="
|
98
99
|
- !ruby/object:Gem::Version
|
99
|
-
hash:
|
100
|
+
hash: 2639415693075167917
|
100
101
|
segments:
|
101
102
|
- 0
|
102
103
|
version: "0"
|
@@ -105,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
105
106
|
requirements:
|
106
107
|
- - ">="
|
107
108
|
- !ruby/object:Gem::Version
|
108
|
-
hash:
|
109
|
+
hash: 2639415693075167917
|
109
110
|
segments:
|
110
111
|
- 0
|
111
112
|
version: "0"
|