bib.rb in alma-0.2.5

- old
+ new
@@ -1,46 +1,87 @@
 module Alma
-  class  Bib < AlmaRecord
-    extend Alma::Api
+  class  Bib
+    extend Forwardable
+    
+    def self.find(ids, args)
+      get_bibs(ids, args)
+    end
 
-    attr_accessor :id, :record
+    def self.get_bibs(ids, args={})
+      response = HTTParty.get(
+        self.bibs_base_path, 
+        query: {mms_id: ids_from_array(ids)}, 
+        headers: headers
+        )
 
-    def post_initialize
-      @id = response['mms_id'].to_s
-      @record = response.fetch('record', {})
+      if response.code == 200
+        Alma::BibSet.new(get_body_from(response))
+      else
+        raise StandardError, get_body_from(response)
+      end  
     end
 
-    class << self
 
-      def get_availability(ids, args={})
-        args.merge!({expand: 'p_avail,e_avail,d_avail'})
-        bibs = get_bibs(ids, args)
+    def self.get_availability(ids, args={})
+      args.merge!({expand: 'p_avail,e_avail,d_avail'})
+      bibs = get_bibs(ids, args)
 
-        return bibs if bibs.has_error?
-        Alma::AvailabilityResponse.new(bibs)
-      end
+      Alma::AvailabilityResponse.new(bibs)
+    end
 
-      def find(ids, args)
-        get_bibs(ids, args)
-      end
 
-      def get_bibs(ids, args={})
-        args[:mms_id] = ids_from_array(ids)
-        params = query_merge(args)
-        response = resources.almaws_v1_bibs.get(params)
 
-        Alma::BibSet.new(response)
-      end
+    attr_accessor :id, :response
 
+    # The User object can respond directly to Hash like access of attributes
+    def_delegators :response, :[], :[]=, :has_key?, :keys, :to_json, :each
+
+    def initialize(response_body)
+      @response = response_body
+      @id = @response['mms_id'].to_s
+    end
+
+    # The raw MARCXML record, converted to a Hash
+    def record
+      @record ||= XmlSimple.xml_in(response['anies'].first)
+    end
+
+
       private
 
-      def ids_from_array(ids)
-        ids.map(&:to_s).map(&:strip).join(',')
+      def self.bibs_base_path
+        "#{self.region}/almaws/v1/bibs"
       end
 
-      def set_wadl_filename
-        'bib.wadl'
+      def bibs_base_path
+        self.class.bibs_base_path
       end
 
-    end
+      def self.headers
+        { "Authorization": "apikey #{self.apikey}",
+        "Accept": "application/json",
+        "Content-Type": "application/json" }
+      end
+  
+  
+      def headers
+        self.class.headers
+      end
+  
+  
+      def self.apikey
+        Alma.configuration.apikey
+      end
+      
+      def self.region
+        Alma.configuration.region
+      end
+
+      def self.get_body_from(response)
+        JSON.parse(response.body)
+      end
+
+      def self.ids_from_array(ids)
+        ids.map(&:to_s).map(&:strip).join(',')
+      end
   end
 end