ebsco-discovery-service-api 1.1.6 → 1.1.8

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- MzQzMzQ2ODI5OWRjMTk5OWMyMWE4M2JlMDQyOTJhOTBkMzI5NWI1Zg==
4
+ YWUzZWE2OGM1M2U5YzQ4YzI0NmRjZGVlYzQ2ZDFjY2ZhMjQ2YWNkZg==
5
5
  data.tar.gz: !binary |-
6
- ZDZhMWEyYjljMmQzZGRlODcyYmNiYzgwZjNkMjY0OGI2NjM3MmE2YQ==
6
+ N2RlY2EyMjU5ZDMwOTk4NzhkYmQ1ZmMxZDM0YWVmZDVjMjQ5ZGE0OQ==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- MDM2NjMxMzE0YWU1ZDRlYWUwMjU1MmJjYmNhNjNiOGI4NzBjNDUyMjY2NzUy
10
- YWJlMTM4YTEwYjMzMmRkYTgyOGFmM2M4NzMwZDg2MTk1MzM2ZDg4NWRkMzc1
11
- OGY5MGM0NzM2MDk1ZjFlZWY5NGMzODA1ODhjMDY3MjgwNGQzYmI=
9
+ MGU3MDJjNTgwNTEwM2M2NGU3ZmRmOWQ0ZWYwNGMyM2ExNzY5MTY1ZjIzNDU1
10
+ MDE1ZTBiMTdmN2Y2MmU1M2E3MzIwNjNjN2VjZGIwMzY2MWQzZjNjNThmOTI2
11
+ MzM3YTMwY2M0NmRhNmU5NzRmNjQ0Y2E5ZGE0YmE4NzFhYTkwMmQ=
12
12
  data.tar.gz: !binary |-
13
- ODJlZDllYWJmNWJjNWZhY2RhNmMwNDU3NWYzMDdhYzFkOTliZDg0ZTc0OWE3
14
- NDdmMjllZmMwZGEzMjdiYTg2MjU5YzEwMjk1YmIxMGM1ZjBkZjg2MzE5OTJj
15
- YWU3MTA3MGZhYTUzMTMzMmMzMzkxNGQyODRjNWI0MjNhOWI0OWY=
13
+ YTE0ODI1NGRhZDAyYjE5OWJiMjViMGVmYTcxYTA1MWQ0Y2U1MWQzZjQwYjkw
14
+ ZjJlZTFkZGRhNzgwNDRjNTExOGRhZWYxNzViOWI3ZWE5NDZkOWRiZWQ0N2E2
15
+ MzA5YTkxYzMxZjNjZWViOTE4YzE3ODc4ZDU4YjcwOTFkNjVlODQ=
@@ -51,7 +51,7 @@ module EDSApi
51
51
  about "No response from server"
52
52
  end
53
53
  if doc.has_key?('ErrorNumber')
54
- abort "Bad response from server - error code #{result['ErrorNumber']}"
54
+ raise "Bad response from server - error code #{result['ErrorNumber']}"
55
55
  else
56
56
  @auth_token = doc['AuthToken']
57
57
  end
@@ -67,7 +67,7 @@ module EDSApi
67
67
  begin
68
68
  doc = JSON.parse(https.request(req).body)
69
69
  rescue Timeout::Error, Net::ReadTimeout, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
70
- abort "No response from server"
70
+ raise "No response from server"
71
71
  end
72
72
  @auth_token = doc['AuthToken']
73
73
  end
@@ -86,7 +86,7 @@ module EDSApi
86
86
  begin
87
87
  return http.request(req).body
88
88
  rescue Timeout::Error, Net::ReadTimeout, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
89
- abort "No response from server"
89
+ raise "No response from server"
90
90
  end
91
91
  }
92
92
  end
@@ -99,7 +99,7 @@ module EDSApi
99
99
  begin
100
100
  http.request(req)
101
101
  rescue Timeout::Error, Net::ReadTimeout, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
102
- abort "No response from server"
102
+ raise "No response from server"
103
103
  end
104
104
  }
105
105
  return true
@@ -118,15 +118,22 @@ module EDSApi
118
118
  begin
119
119
  return http.request(req).body
120
120
  rescue Timeout::Error, Net::ReadTimeout, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
121
- abort "No response from server"
121
+ raise "No response from server"
122
122
  end
123
123
  }
124
124
  end
125
125
  # Retrieve specific information
126
- def retrieve(dbid, an, highlightterms = "", ebookpreferredformat = "ebook-epub", format = :xml)
127
- uri = URI "#{API_URL}edsapi/rest/retrieve?dbid=#{dbid}&an=#{an}&ebookpreferredformat=#{ebookpreferredformat}"
126
+ def retrieve(dbid, an, highlightterms = "", ebookpreferredformat = "", format = :xml)
127
+ uri = URI "#{API_URL}edsapi/rest/retrieve?dbid=#{dbid}&an=#{an}"
128
128
  if highlightterms != ""
129
- uri = URI "#{API_URL}edsapi/rest/retrieve?dbid=#{dbid}&an=#{an}&highlightterms=#{highlightterms}&ebookpreferredformat=#{ebookpreferredformat}"
129
+ updateURI = uri.to_s
130
+ updateURI = updateURI + "&highlightterms=#{highlightterms}"
131
+ uri = URI updateURI
132
+ end
133
+ if ebookpreferredformat != ""
134
+ updateURI = uri.to_s
135
+ updateURI = updateURI + "&ebookpreferredformat=#{ebookpreferredformat}"
136
+ uri = URI updateURI
130
137
  end
131
138
  req = Net::HTTP::Get.new(uri.request_uri)
132
139
  req['x-authenticationToken'] = @auth_token
@@ -137,7 +144,7 @@ module EDSApi
137
144
  begin
138
145
  return http.request(req).body
139
146
  rescue Timeout::Error, Net::ReadTimeout, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
140
- abort "No response from server"
147
+ raise "No response from server"
141
148
  end
142
149
  }
143
150
  end
@@ -152,7 +159,7 @@ module EDSApi
152
159
  begin
153
160
  return http.request(req).body
154
161
  rescue Timeout::Error, Net::ReadTimeout, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
155
- abort "No response from server"
162
+ raise "No response from server"
156
163
  end
157
164
  }
158
165
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ebsco-discovery-service-api
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.6
4
+ version: 1.1.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Eric Frierson