alma 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a61f0bfe79181cdb4d99e0eca51ba16b1be6550f
-  data.tar.gz: 8f024c368175b3a8ac0fe2e6eb836f436516a566
+  metadata.gz: 3bcedc3a4e5136aa43268412c062c91dc2d905dd
+  data.tar.gz: 37f3892ff4a0fc27e8c6a79a540ea52f0f5199d4
 SHA512:
-  metadata.gz: 58b8bcfbe9b5c4f6ccd688df845bfb86e3fe8115199b06862c03b6faeaf31e08e4f9a33cca5209c082fa69f8416461dc9c45bef34a9c57179a48d4f29f7b2397
-  data.tar.gz: 60e8ea0221d2dce2001e53afd41d0f046cb822e56c74f2e07ecffcacc7fa9e94ce9c4730572f79cd0463d12c09506e64a4af9b52ed871cefa2be625a650e6cbb
+  metadata.gz: 120bef80c621c53709475f2c54dd2a7b3379fe307ac0f1227adb1f0a8627e064ea19f87260432a5a45ad65d342623fbc314e5079aea7fae930a0ac719bbf5f7c
+  data.tar.gz: 2e190810b76aa0b0041b021364d5879cff6a6122ee9f0c17be212cc69bb1d1c2af63059c801752754f6b711ec4e948777d2a1285ef428b1838a7ce1c6fc5eb80

data/.ruby-version

@@ -1 +1 @@
-ruby-2.3.3
+ruby-2.4.1

data/README.md

@@ -36,27 +36,20 @@ end
 Now you can access those configuration attributes with `Alma.configuration.apikey`
 
 ### Making Requests
-
-#### Get a list of Users
-```ruby
- users = Alma::User.find
- 
- users.total count
- > 402
- 
- users.list.first.id 
- > 123456789
-```
  
 #### Get a Single user
 ```ruby
- user = Alma::User.find({:user_id => 123456789})
+ user = Alma::User.find(123456789)
  
  user.first_name
  > Chad
  
  user.email
  > chad.nelson@fictional.edu
+ 
+ user.keys
+ >{first_name: "Chad",
+ ...}
 ```
  
 #### Get details on a users fines
@@ -69,18 +62,18 @@ Now you can access those configuration attributes with `Alma.configuration.apike
  fines.total_record_count
  > "2"
  
- fines.list
+ fines
  > [#<Alma::AlmaRecord:0x000000038b7b50
     ...>,
     #<Alma::AlmaRecord:0x000000038b7b28
      ...>]
  
- fines.list.first.title
+ fines.first.title
  > "Practical Object Oriented Design with Ruby"
  
 ```
 
-Each fine object reflects the available fields in the returned XML,[as documented on the Ex Libris Api docs](https://developers.exlibrisgroup.com/alma/apis/xsd/rest_fees.xsd?tags=GET)
+Each fine object reflects the available fields in the returned JSON,[as documented on the Ex Libris Api docs](https://developers.exlibrisgroup.com/alma/apis/xsd/rest_fees.xsd?tags=GET)
 
 #### Get details on a users loans
  
@@ -90,37 +83,23 @@ loans = user.loans
 loans.total_record_count
 > "2"
  
-loans.list
+loans
 > [#<Alma::Loan:0x000000038c6b79
   ...>,
   #<Alma::Loan:0x000000038c6b34
    ...>]
  
-loans.list.first.title
+loans.first.title
  > "Javascript: The Good Parts"
  
-loans.list.first.due_date
+loans.first.due_date
 "2016-12-26z
  
 ```
 Each loan object reflects the available fields in the returned XML,[as documented on the Ex Libris Api docs](https://developers.exlibrisgroup.com/alma/apis/xsd/rest_item_loans.xsd?tags=GET)
 
-To renew an item you can can call the Loan objects renew method
-
-```ruby
-renewal = loans.list.first.renew
-
-renewal.renewed?
-> True
-
-renewal.message 
-> "Javascript: The Good Parts is now due 02-20-17"
-
-```
-
-
 
-#### Get details on a users requests
+#### Get details on a users requests - WIP
 ```ruby
 requests = user.requests
 
@@ -160,7 +139,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/alma. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/tulibraries/alma_rb. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 
 ## License

data/alma.gemspec

@@ -22,6 +22,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'ezwadl'
+  spec.add_dependency 'httparty'
+  spec.add_dependency 'xml-simple'  
+
+  
 
 
   spec.add_development_dependency "bundler", "~> 1.13"

data/lib/alma.rb

@@ -15,45 +15,12 @@ require 'alma/bib_set'
 require 'alma/request_set'
 require 'alma/renewal_response'
 require 'alma/availability_response'
+require 'alma/bib_items'
 
 module Alma
 
   ROOT = File.dirname __dir__
   WADL_DIR = File.join(Alma::ROOT, 'lib','alma','wadl')
 
-  INVENTORY_TO_SUBFIELD_TO_FIELDNAME =
-   {
-      'AVA' => {
-          'INVENTORY_TYPE' => 'physical',
-          'a' => 'institution',
-          'b' => 'library_code',
-          'c' => 'location',
-          'd' => 'call_number',
-          'e' => 'availability',
-          'f' => 'total_items',
-          'g' => 'non_available_items',
-          'j' => 'location_code',
-          'k' => 'call_number_type',
-          'p' => 'priority',
-          'q' => 'library',
-      },
-      'AVD' => {
-          'INVENTORY_TYPE' => 'digital',
-          'a' => 'institution',
-          'b' => 'representations_id',
-          'c' => 'representation',
-          'd' => 'repository_name',
-          'e' => 'label',
-      },
-      'AVE' => {
-          'INVENTORY_TYPE' => 'electronic',
-          'l' => 'library_code',
-          'm' => 'collection',
-          'n' => 'public_note',
-          's' => 'coverage_statement',
-          't' => 'interface_name',
-          'u' => 'link_to_service_page',
-      }
-  }
 
 end

data/lib/alma/availability_response.rb

@@ -1,3 +1,5 @@
+require 'xmlsimple'
+
 module Alma
   class AvailabilityResponse
 
@@ -6,45 +8,84 @@ module Alma
 
     def initialize(response)
       @availability = parse_bibs_data(response.list)
-
     end
 
+    # Data structure for holdings information of bib records.    
+    # A hash with mms ids as keys, with values of an array of
+    # one or more hashes of holdings info
     def parse_bibs_data(bibs)
-
-      bibs.map do |bib|
-        record = Hash.new
-
-        record['mms_id'] = bib.id
-        record['holdings'] = build_holdings_for(bib)
-
-        record
-      end.reduce(Hash.new) do |acc, avail|
-        acc[avail['mms_id']] = avail.select { |k, v| k != 'mms_id' }
-        acc
-      end
+      bibs.reduce(Hash.new) { |acc, bib|
+        acc.merge({"#{bib.id}" => {holdings: build_holdings_for(bib)}})
+      }
     end
 
-
     def build_holdings_for(bib)
-
       get_inventory_fields_for(bib).map do |inventory_field|
-        subfield_codes_to_fieldnames = Alma::INVENTORY_TO_SUBFIELD_TO_FIELDNAME[inventory_field['tag']]
-
-        # make sure subfields is always an Array (which isn't the case if there's only one subfield element)
-        subfields = [inventory_field.fetch('subfield', [])].flatten(1)
-
-        holding = subfields.reduce(Hash.new) do |acc, subfield|
-          fieldname = subfield_codes_to_fieldnames[subfield['code']]
-          acc[fieldname] = subfield['__content__']
-          acc
-        end
-        holding['inventory_type'] = subfield_codes_to_fieldnames['INVENTORY_TYPE']
-        holding
+        # Use the mapping for this inventory type
+        subfield_codes = Alma::INVENTORY_SUBFIELD_MAPPING[inventory_field['tag']]
+         
+        inventory_field.
+          # Get all the subfields for this inventory field
+          fetch('subfield', []).
+          # Limit to only subfields codes for which we have a mapping
+          select {|sf| subfield_codes.key? sf['code'] }.
+          # Transform the array of subfields into a hash with mapped code as key 
+          reduce(Hash.new) { |acc, subfield| 
+            acc.merge({"#{subfield_codes[subfield['code']]}" => subfield['content']})
+           }.
+          # Include the inventory type
+          merge({'inventory_type' => subfield_codes['INVENTORY_TYPE']})
       end
     end
 
     def get_inventory_fields_for(bib)
-      bib.record.fetch('datafield', []).select { |df| Alma::INVENTORY_TO_SUBFIELD_TO_FIELDNAME.key?(df['tag']) } || []
+      # Return only the datafields with tags AVA, AVD, or AVE  
+      bib.record
+        .fetch('datafield', [])
+        .select { |df| Alma::INVENTORY_SUBFIELD_MAPPING.key?(df['tag']) }
     end
   end
+
+  INVENTORY_SUBFIELD_MAPPING =
+  {
+     'AVA' => {
+         'INVENTORY_TYPE' => 'physical',
+         'a' => 'institution',
+         'b' => 'library_code',
+         'c' => 'location',
+         'd' => 'call_number',
+         'e' => 'availability',
+         'f' => 'total_items',
+         'g' => 'non_available_items',
+         'j' => 'location_code',
+         'k' => 'call_number_type',
+         'p' => 'priority',
+         'q' => 'library',
+         't' => 'holding_info',
+         '8' => 'holding_id',  
+     },
+     'AVD' => {
+         'INVENTORY_TYPE' => 'digital',
+         'a' => 'institution',
+         'b' => 'representations_id',
+         'c' => 'representation',
+         'd' => 'repository_name',
+         'e' => 'label',
+     },
+     'AVE' => {
+         'INVENTORY_TYPE' => 'electronic',
+         'c' => 'collection_id',
+         'e' => 'activation_status',
+         'l' => 'library_code',
+         'm' => 'collection',
+         'n' => 'public_note',
+         's' => 'coverage_statement',
+         't' => 'interface_name',
+         'u' => 'link_to_service_page',
+         '8' => 'portfolio_pid',
+     }
+ }
+
+
+
 end

data/lib/alma/bib.rb

@@ -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

data/lib/alma/bib_items.rb

@@ -0,0 +1,49 @@
+module Alma
+  class BibItems
+    extend Forwardable
+
+    attr_accessor :items
+    def_delegators :items, :[], :[]=, :has_key?, :keys, :to_json
+
+    attr_reader :raw_response
+    def_delegators :raw_response, :response, :request
+
+    def initialize(response)
+      @raw_response = response
+      @items = JSON.parse(response.body)
+    end
+
+    PERMITTED_ARGS  = [
+      :limit, :offset, :expand, :user_id, :current_library,
+      :current_location, :q, :order_by, :direction
+    ]
+
+    def self.find(mms_id, options={})
+      holding_id = options.delete(:holding_id) || "ALL"
+      options.select! {|k,_| PERMITTED_ARGS.include? k }
+      url = "#{bibs_base_path}/#{mms_id}/holdings/#{holding_id}/items"
+      response = HTTParty.get(url, headers: headers, query: options)
+      new(response)
+    end
+
+    private
+
+    def self.region
+      Alma.configuration.region
+    end
+
+    def self.bibs_base_path
+      "#{region}/almaws/v1/bibs"
+    end
+
+    def self.headers
+      { "Authorization": "apikey #{apikey}",
+       "Accept": "application/json",
+       "Content-Type": "application/json" }
+    end
+
+    def self.apikey
+      Alma.configuration.apikey
+    end
+  end
+end

data/lib/alma/bib_set.rb

@@ -1,21 +1,30 @@
 module Alma
-  class BibSet < ResultSet
+  class BibSet
 
-    def top_level_key
-      'bibs'
+    extend Forwardable
+    include Enumerable
+    #include Alma::Error
+
+    attr_reader :response
+    def_delegators :list, :each, :size
+    def_delegators :response, :[], :fetch
+
+    def initialize(response_body_hash)
+      @response = response_body_hash
     end
 
-    def response_records_key
-      'bib'
+    def list
+      @list ||= response.fetch(key, []).map do |record|
+        Alma::Bib.new(record)
+      end
     end
 
-    def single_record_class
-      Alma::Bib
+    def key
+      'bib'
     end
 
-    # Doesn't seem to actually return a total record count as documented.
     def total_record_count
-      (response_records.is_a? Array) ? size : 1
+      size
     end
 
   end

data/lib/alma/fine_set.rb

@@ -1,21 +1,39 @@
 module Alma
-  class FineSet < ResultSet
+  class FineSet
+    extend Forwardable
+    include Enumerable
+    #include Alma::Error
 
-    def top_level_key
-      'fees'
+    attr_reader :response
+    def_delegators :list, :each, :size
+    def_delegators :response, :[], :fetch
+
+    def initialize(response_body_hash)
+      @response = response_body_hash
     end
 
-    def response_records_key
+    def key
       'fee'
     end
 
+    def list
+      fetch(key, [])
+    end
+
     def sum
-      @response[top_level_key].fetch('total_sum', 0)
+      fetch('total_sum', 0)
     end
+    alias :total_sum :sum
 
     def currency
-      @response[top_level_key].fetch('currency', nil)
+      fetch('currency', nil)
     end
 
+    def total_record_count
+      fetch('total_record_count', 0)
+    end
+    alias :total_records :total_record_count
+
+
   end
-end
+end

data/lib/alma/loan_set.rb

@@ -1,18 +1,29 @@
 module Alma
-  class LoanSet < ResultSet
+  class LoanSet
+    extend Forwardable
+    include Enumerable
+    #include Alma::Error
 
+    attr_reader :response
+    def_delegators :list, :each, :size
+    def_delegators :response, :[], :fetch
 
-    def top_level_key
-      'item_loans'
+    def initialize(response_body_hash)
+      @response = response_body_hash
     end
 
-    def response_records_key
+    def list
+      fetch(key, [])
+    end
+
+    def key
       'item_loan'
     end
 
-    def single_record_class
-      Alma::Loan
+    def total_record_count
+      fetch('total_record_count', 0)
     end
+    alias :total_records :total_record_count
 
   end
 end

data/lib/alma/renewal_response.rb

@@ -1,20 +1,19 @@
 module Alma
   class RenewalResponse
 
-    include Alma::Error
+
 
     def initialize(response)
       @response = response
-      @success  = response.fetch('item_loan', {})
-      @renewed  = error.empty?
+      @success  = response.has_key?('loan_id')
     end
 
     def renewed?
-      @renewed
+      @success
     end
 
     def due_date
-      @success.fetch('due_date', '')
+      @response.fetch('dueDate', '')
     end
 
 
@@ -23,20 +22,24 @@ module Alma
     end
 
     def item_title
-      if @success
-        @success['title']
+      if renewed?
+        @response['title']
       else
         'This Item'
       end
     end
 
     def message
-      if @success
+      if renewed?
         "#{item_title} is now due #{due_date}"
       else
         "#{item_title} could not be renewed."
       end
     end
 
+    def error_message
+        @response unless renewed?
+    end
+
   end
-end
+end

data/lib/alma/request_set.rb

@@ -1,14 +1,29 @@
 module Alma
-  class RequestSet < ResultSet
+  class RequestSet
+    extend Forwardable
+    include Enumerable
+    #include Alma::Error
 
+    attr_reader :response
+    def_delegators :list, :each, :size
+    def_delegators :response, :[], :fetch
 
-    def top_level_key
-      'user_requests'
+    def initialize(response_body_hash)
+      @response = response_body_hash
     end
 
-    def response_records_key
+    def list
+      fetch(key, [])
+    end
+
+    def total_record_count
+      fetch('total_record_count', 0)
+    end
+    alias :total_records :total_record_count
+
+    def key
       'user_request'
     end
 
   end
-end
+end

data/lib/alma/user.rb

@@ -1,141 +1,177 @@
 module Alma
-  class  User < AlmaRecord
-    extend Alma::Api
+  class  User
+    extend Forwardable
+
+      def self.find(user_id)
+        response = HTTParty.get("#{self.users_base_path}/#{user_id}", headers: headers)
+        if response.code == 200
+          Alma::User.new JSON.parse(response.body)
+        else
+          raise StandardError, parse(response.body)
+        end
+      end
+
+      # Authenticates a Alma user with their Alma Password
+      # @param [Hash] args
+      # @option args [String] :user_id The unique id of the user
+      # @option args [String] :password The users local alma password
+      # @return [Boolean] Whether or not the user Successfully authenticated
+      def self.authenticate(args)
+        user_id = args.delete(:user_id) { raise ArgumentError }
+        args.merge!({op: 'auth'})
+        response = HTTParty.post("#{users_base_path}/#{user_id}", query: args, headers: headers)
+        response.code == 204
+      end
 
-    attr_accessor :id
 
-    def post_initialize
-      @id = response['primary_id'].to_s
+    # The User object can respond directly to Hash like access of attributes
+    def_delegators :response, :[], :[]=, :has_key?, :keys, :to_json
+
+    def initialize(response_body)
+      @response = response_body
       @recheck_loans = true
     end
 
+    def response
+      @response
+    end
+
+    def id
+      self['primary_id']
+    end
+
+
+    # Access the top level JSON attributes as object methods
+    def method_missing(name)
+      return response[name.to_s] if has_key?(name.to_s)
+      super.method_missing name
+    end
+
+    def respond_to_missing?(name, include_private = false)
+      has_key?(name.to_s) || super
+    end
+
+
+    # Persist the user in it's current state back to Alma
+    def save!
+      response = HTTParty.put("#{users_base_path}/#{id}", headers: headers, body: to_json)
+      get_body_from(response)
+    end
+
+
     def fines
-      self.class.get_fines({user_id: self.id})
+      response = HTTParty.get("#{users_base_path}/#{id}/fees", headers: headers)
+      if response.code == 200
+        Alma::FineSet.new get_body_from(response)
+      else
+        raise StandardError, get_body_from(response)
+      end
+    end
+
+    def requests
+      #TODO Handle Additional Parameters
+      #TODO Handle Pagination
+      #TODO Handle looping through all results
+      response = HTTParty.get("#{users_base_path}/#{id}/requests", headers: headers)
+      Alma::RequestSet.new(get_body_from(response))
     end
 
+
     def loans
       unless @loans && !recheck_loans?
-        @loans = self.class.get_loans({user_id: self.id})
+        @loans = send_loans_request
         @recheck_loans = false
       end
       @loans
     end
 
     def renew_loan(loan_id)
-      response = self.class.renew_loan({user_id: self.id, loan_id: loan_id})
+      response = send_loan_renewal_request({user_id: id, loan_id: loan_id})
       if response.renewed?
         @recheck_loans ||= true
       end
-      response
+      get_body_from response
     end
 
+
     def renew_multiple_loans(loan_ids)
       loan_ids.map { |id| renew_loan(id) }
     end
 
+
     def renew_all_loans
       renew_multiple_loans(loans.map(&:loan_id))
     end
 
+
     def recheck_loans?
       @recheck_loans
     end
 
-    def requests
-      self.class.get_requests({user_id:self.id})
+
+    def preferred_email
+      self["contact_info"]["email"].select { |k, v| k["preferred"] }.first["email_address"]
     end
 
-    class << self
-      # Static methods that do the actual querying
 
-      def find(args = {})
-        #TODO Handle Search Queries
-        #TODO Handle Pagination
-        #TODO Handle looping through all results
+    def email
+      self["contact_info"]["email"].map { |e| e["email_address"] }
+    end
 
-        return find_by_id(user_id: args[:user_id]) if args.fetch(:user_id, nil)
-        params = query_merge args
-        response = resources.almaws_v1_users.get(params)
-        Alma::UserSet.new(response)
-      end
 
-      def find_by_id(user_id_hash)
-        params = query_merge user_id_hash
-        response = resources.almaws_v1_users.user_id.get(params)
-        User.new(response['user'])
-      end
+    private
 
-      def get_fines(args)
-        #TODO Handle Additional Parameters
-        #TODO Handle Pagination
-        #TODO Handle looping through all results
-        params = query_merge args
-        response = resources.almaws_v1_users.user_id_fees.get(params)
-        Alma::FineSet.new(response)
-      end
+    def send_loans_request
+      #TODO Handle Additional Parameters
+      #TODO Handle Pagination
+      #TODO Handle looping through all results
+      response = HTTParty.get("#{users_base_path}/#{id}/loans", headers: headers)
+      Alma::LoanSet.new(get_body_from(response))
+    end
 
-      def get_loans(args)
-        #TODO Handle Additional Parameters
-        #TODO Handle Pagination
-        #TODO Handle looping through all results
-        params = query_merge args
-        response = resources.almaws_v1_users.user_id_loans.get(params)
-        Alma::LoanSet.new(response)
-      end
+    # Attempts to renew a single item for a user
+    # @param [Hash] args
+    # @option args [String] :user_id The unique id of the user
+    # @option args [String] :loan_id The unique id of the loan
+    # @option args [String] :user_id_type Type of identifier being used to search. OPTIONAL
+    # @return [RenewalResponse] Object indicating the renewal message
+    def send_loan_renewal_request(args)
+      user_id = args.delete(:user_id) { raise ArgumentError }
+      loan_id = args.delete(:loan_id) { raise ArgumentError }
+      params = {op: 'renew'}
+      response = HTTParty.post("#{users_base_path}/#{id}/loans/#{loan_id}", query: params, headers: headers)
+      RenewalResponse.new(get_body_from(response))
+    end
 
-      def get_requests(args)
-        #TODO Handle Additional Parameters
-        #TODO Handle Pagination
-        #TODO Handle looping through all results
-        params = query_merge args
-        response = resources.almaws_v1_users.user_id_requests.get(params)
-        Alma::RequestSet.new(response)
-      end
 
-      def authenticate(args)
-        # Authenticates a Alma user with their Alma Password
-        args.merge!({op: 'auth'})
-        params = query_merge args
-        response = resources.almaws_v1_users.user_id.post(params)
-        response.code == 204
-      end
+    def get_body_from(response)
+      JSON.parse(response.body)
+    end
 
-      # Attempts to renew a single item for a user
-      # @param [Hash] args
-      # @option args [String] :user_id The unique id of the user
-      # @option args [String] :loan_id The unique id of the loan
-      # @option args [String] :user_id_type Type of identifier being used to search. OPTIONAL
-      # @return [RenewalResponse] Object indicating the renewal message
-      def renew_loan(args)
-        args.merge!({op: 'renew'})
-        params = query_merge args
-        response = resources.almaws_v1_users.user_id_loans_loan_id.post(params)
-        RenewalResponse.new(response)
-      end
 
-      # Attempts to renew a multiple items for a user
-      # @param [Hash] args
-      # @option args [String] :user_id The unique id of the user
-      # @option args [Array<String>] :loan_ids Array of loan ids
-      # @option args [String] :user_id_type Type of identifier being used to search. OPTIONAL
-      # @return [Array<RenewalResponse>] Object indicating the renewal message
-      def renew_multiple_loans(args)
-
-        if args.fetch(:loans_ids, nil).respond_to? :map
-          args.delete(:loan_ids).map do |loan_id|
-            renew_loan(args.merge(loan_id: loan_id))
-          end
-        else
-          []
-        end
-      end
+    def self.users_base_path
+      "https://api-na.hosted.exlibrisgroup.com/almaws/v1/users"
+    end
 
+    def users_base_path
+      self.class.users_base_path
+    end
 
+    def self.headers
+      { "Authorization": "apikey #{self.apikey}",
+      "Accept": "application/json",
+      "Content-Type": "application/json" }
+    end
 
 
-      def set_wadl_filename
-        'user.wadl'
-      end
+    def headers
+      self.class.headers
+    end
+
+
+    def self.apikey
+      Alma.configuration.apikey
+    end
+
     end
   end
-end

data/lib/alma/version.rb

@@ -1,3 +1,3 @@
 module Alma
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alma
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Chad Nelson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-08 00:00:00.000000000 Z
+date: 2018-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ezwadl
@@ -24,6 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: xml-simple
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -119,6 +147,7 @@ files:
 - lib/alma/api.rb
 - lib/alma/availability_response.rb
 - lib/alma/bib.rb
+- lib/alma/bib_items.rb
 - lib/alma/bib_set.rb
 - lib/alma/config.rb
 - lib/alma/error.rb
@@ -153,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Client for Ex Libris Alma Web Services