alma_rest_api 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03ab118590c4736f9b951740be856a4fd159f5af
-  data.tar.gz: e3ffca9161f15c71891d519158045f2804d587a3
+  metadata.gz: de85edc1bceed958e81d0ef5c116903719ac0ba8
+  data.tar.gz: 03c0660e3762d8327ca1ed7c0fc2030a6d20a939
 SHA512:
-  metadata.gz: 2349e7d150592d9cb9b4082bd5801a13e2b615b02ae4bb14f22f65d5faca1ecc1f0539ae62055b26870c290b0ecd024c830a2ac70f92ba960702dfa3e004136b
-  data.tar.gz: 3082871dbdc36f6f6b67f214ecf0f8a6492e9503b5fc2919bc78729404798a3c5519f1b0740a1623a12ec5cc89e5cf43c57bc648d05a610a8a5d0997d21f370b
+  metadata.gz: 7b547ba6dd80c5931d200e525653e7df602c643ae08ca6a395297c666f87445bb93628af78cddf307e5cffaf11ffb9c72b7a72cf730c44552bd76112779e02f2
+  data.tar.gz: ea85f51c9c5065a6808dce7d5ecb90e470ac1ef7184e3fbf26901300ae655018f96cd8f12712b99bb1a899bcb940a149ee3ec808e22fcb30310867f3147c0837

data/lib/alma_rest_api.rb

@@ -11,56 +11,59 @@ module AlmaRestApi
     end
 
     def configure
-      self.configuration ||= Configuration.new
       yield(configuration)
     end      
 
     def get(uri)
+      check_config
       begin
         response = 
          RestClient.get uri(uri),
             accept: :json, 
-            authorization: 'apikey ' + AlmaRestApi.configuration.api_key
+            authorization: 'apikey ' + configuration.api_key
         return JSON.parse(response.body)
       rescue => e
-        raise parse_error e.response
+        raise AlmaApiError, parse_error(e.response)
       end 
     end
     
     def put(uri, data)
+      check_config
       begin
         response =
          RestClient.put uri(uri),
           data.to_json,
           accept: :json, 
-          authorization: 'apikey ' + AlmaRestApi.configuration.api_key,
+          authorization: 'apikey ' + configuration.api_key,
           content_type: :json
         return JSON.parse(response.body)   
       rescue => e
-        raise parse_error e.response
+        raise AlmaApiError, parse_error(e.response)
       end 
     end
     
     def post(uri, data)
+      check_config
       begin
         response =
          RestClient.post uri(uri),
           data.to_json,
           accept: :json, 
-          authorization: 'apikey ' + AlmaRestApi.configuration.api_key,
+          authorization: 'apikey ' + configuration.api_key,
           content_type: :json
         return JSON.parse(response.body)  
       rescue => e
-        raise parse_error e.response
+        raise AlmaApiError, parse_error(e.response)
       end         
     end 
     
     def delete(uri)
+      check_config
       begin
         RestClient.delete uri(uri),
-          authorization: 'apikey ' + AlmaRestApi.configuration.api_key
+          authorization: 'apikey ' + configuration.api_key
       rescue => e
-       raise parse_error e.response
+       raise AlmaApiError, parse_error(e.response)
       end   
     end 
 
@@ -72,16 +75,31 @@ module AlmaRestApi
       end
     end
 
+    def check_config
+      raise NoApiKeyError if configuration.api_key.nil? || configuration.api_key.empty?
+    end
+
     def parse_error(err)
       begin
-        error = JSON.parse(err)
-        if error["web_service_result"] #500
-          return error["web_service_result"]["errorList"]["error"]["errorMessage"]
-        else #400
-          return error["errorList"]["error"][0]["errorMessage"]
+        if err[0] == '<'
+          msg = err.match(/<errorMessage>(.*)<\/errorMessage>/)
+          return msg ? msg[1] : ''
+        elsif err[0] == '{'
+          begin
+            error = JSON.parse(err)
+            if error["web_service_result"] #500
+              return error["web_service_result"]["errorList"]["error"]["errorMessage"]
+            else #400
+              return error["errorList"]["error"][0]["errorMessage"]
+            end
+          rescue JSON::ParserError
+            return "Unknown error from Alma"
+          end            
+        else
+          return err          
         end
-      rescue JSON::ParserError
-        return "Unknown error from Alma"
+      rescue
+        return err
       end
     end
   end 
@@ -96,3 +114,16 @@ class Configuration
     @api_path = ENV['ALMA_API_PATH'] || "https://api-na.hosted.exlibrisgroup.com/almaws/v1"
   end
 end
+
+class NoApiKeyError < StandardError
+  def initialize(msg="No API key defined")
+    super
+  end
+end
+
+class AlmaApiError < StandardError
+  def initialize(msg)
+    msg = "Unknown error from Alma" if msg.empty?
+    super
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alma_rest_api
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Josh Weisman