libis-services 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ce00b4bcc3a7510bba4c67012c0a1552952d952
-  data.tar.gz: 96428f5da531d60378045967800aeeab05091a5d
+  metadata.gz: e86c48659570ebc77fd13a1c4186f4d794351efe
+  data.tar.gz: 3d682731a78736379ca16070b52fcbff449d9eec
 SHA512:
-  metadata.gz: a2540a1835aace4888073336db20174a2a06e8073db83e7a6c58f623045d6b102f712f923416bc18e8b23c8e07a3a366322439d92dfd72c9ca720f6a9a441d5a
-  data.tar.gz: 95eb2d53eca5febf20098eaf1f917ec1133f00f4a08589e40bd1052a545bfb7d765a2558fe99d8e93eb3144fb4e5f74b49b7c527d8944d51c8b4b7a8f9c5b515
+  metadata.gz: 7d598c681ee61e44f661d65ef13dfc2977cce7ed6d1e6de3d468aea9ac827913d6633bd6c5cac0fc05cc7aaa32d7648c4fa5975c9dd056d23cb8879c2f252c9f
+  data.tar.gz: 87d1c00e6963419cb380a16321af52412d76f2bc8eab5f1a2df8e3094ece01f6decf31472eb95f257d77399217fd013b39caefbc6287f14046176b914fc4b531

data/lib/libis/services/rosetta/client.rb

@@ -19,6 +19,7 @@ module Libis
         include ::Libis::Tools::Logger
 
         def initialize(section, service, options = {})
+          @clear_soap_action = true
           basic_auth = options.delete(:basic_auth)
           if basic_auth
             options[:basic_auth] = [
@@ -46,16 +47,18 @@ module Libis
 
         protected
 
+        attr_reader :clear_soap_action
+
         def call_raw(operation, args = {})
-          data = if @auth
-                   request operation.to_s.to_sym, args, headers: {'Authorization' => @auth}
-                 else
-                   request operation.to_s.to_sym, args
-                 end
+          opts = {}
+          opts[:soap_action] = nil if clear_soap_action
+          opts[:headers] = {:Authorization => @auth} if @auth
+          data = request operation.to_s.to_sym, args, opts
 
           # remove wrapper
           data = data["#{operation}_response".to_sym]
-          data.delete(:'@xmlns:ns1')
+          data.delete_if {|key, _value| key.to_s =~ /^@/}
+          # data.delete(:'@xmlns:ns1')
 
           # drill down the returned Hash
           data = data.first.last while data.is_a?(Hash) && 1 == data.size

data/lib/libis/services/rosetta/collection_handler.rb

@@ -26,7 +26,8 @@ module Libis
 
         def create(collection_info)
           collection_info = collection_info.to_hash.cleanup if collection_info.is_a? CollectionInfo
-          call :create_collection, pds_handle: @pds_handle, collection: collection_info
+          result = call :create_collection, pds_handle: @pds_handle, collection: collection_info
+          result[:return]
         end
 
         def delete(id)

data/lib/libis/services/rosetta/ie_handler.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'libis/tools/xml_document'
+require 'libis/tools/mets_file'
 require_relative 'client'
 
 module Libis
@@ -15,12 +16,12 @@ module Libis
 
         def get_mets(ie, flags = 0)
           result = call_raw :get_ie, pds_handle: @pds_handle, ie_pid: ie, flags: flags
-          Libis::Tools::MetsFile.parse(result)
+          Libis::Tools::MetsFile.parse(result[:get_ie])
         end
 
         def get_metadata(ie)
           result = call_raw :get_md, pds_handle: @pds_handle, 'PID' => ie
-          Libis::Tools::MetsFile.parse(result)
+          Libis::Tools::MetsFile.parse(result[:get_md])
         end
 
       end

data/lib/libis/services/rosetta/producer.rb

@@ -61,8 +61,9 @@ module Libis
               strip_namespaces: true,
               delete_namespace_attributes: true,
               empty_tag_value: nil,
-              convert_tags_to: lambda { |tag| tag.to_sym }
+              convert_tags_to: lambda(&:to_sym)
           )
+          # noinspection RubyArgCount
           self.new(hash[:producer_info])
         end
       end

data/lib/libis/services/rosetta/producer_agent.rb

@@ -0,0 +1,56 @@
+require 'virtus'
+
+module Libis
+  module Services
+    module Rosetta
+      class ProducerAgent
+        # noinspection RubyResolve
+        include Virtus.model(nullify_blank: true)
+
+        attribute :first_name, String
+        attribute :last_name, String
+        attribute :user_name, String
+        attribute :job_title, String
+        attribute :street, String
+        attribute :suburb, String
+        attribute :city, String
+        attribute :country, String
+        attribute :address_5, String
+        attribute :zip, String
+        attribute :email_address, String
+        attribute :web_site_url, String
+        attribute :telephone_1, String
+        attribute :telephone_2, String
+        attribute :user_group, String
+
+        def to_hash
+          attributes.cleanup
+        end
+
+        def to_xml
+          Libis::Tools::XmlDocument.build do |xml|
+            # noinspection RubyResolve
+            xml.user_info {
+              xml.parent.default_namespace = 'http://www.exlibrisgroup.com/xsd/dps/backoffice/service'
+              self.attributes.each do |name, value|
+                xml.send(name, xmlns: '').text(value) if value
+              end
+            }
+          end.to_xml(save_with: Nokogiri::XML::Node::SaveOptions::DEFAULT_XML | Nokogiri::XML::Node::SaveOptions::NO_DECLARATION)
+        end
+
+        def self.from_xml(xml)
+          xml_doc = Libis::Tools::XmlDocument.parse(xml)
+          hash = xml_doc.to_hash(
+              strip_namespaces: true,
+              delete_namespace_attributes: true,
+              empty_tag_value: nil,
+              convert_tags_to: lambda(&:to_sym)
+          )
+          # noinspection RubyArgCount
+          self.new(hash[:producer_info])
+        end
+      end
+    end
+  end
+end

data/lib/libis/services/rosetta/producer_handler.rb

@@ -2,6 +2,7 @@
 require 'libis/tools/extend/hash'
 require 'libis/tools/xml_document'
 require_relative 'producer'
+require_relative 'producer_agent'
 require_relative 'user'
 
 require_relative 'client'
@@ -39,6 +40,7 @@ module Libis
         end
 
         def new_producer(producer_info)
+          # noinspection RubyArgCount
           producer_info = Rosetta::Producer.new(producer_info) unless producer_info.is_a?(Rosetta::Producer)
           call :create_producer, arg0: @pds_handle, arg1: producer_info.to_xml
         end
@@ -51,17 +53,18 @@ module Libis
           if agent_info
             info = agent(agent_id)
             return nil if info.nil?
-            (agent_info.is_a?(Rosetta::User) ? agent_info.attributes : agent_info).each do |name, value|
+            (agent_info.is_a?(Rosetta::ProducerAgent) ? agent_info.attributes : agent_info).each do |name, value|
               info[name] = value
             end
             call :update_producer_agent, arg0: @pds_handle, arg1: agent_id, arg2: info.to_xml
           else
-            request_object :get_producer_agent, Rosetta::User, arg0: @pds_handle, arg1: agent_id
+            request_object :get_producer_agent, Rosetta::ProducerAgent, arg0: @pds_handle, arg1: agent_id
           end
         end
 
         def new_agent(agent_info)
-          agent_info = Rosetta::User.new(agent_info) unless agent_info.is_a?(Rosetta::User)
+          # noinspection RubyArgCount
+          agent_info = Rosetta::ProducerAgent.new(agent_info) unless agent_info.is_a?(Rosetta::ProducerAgent)
           call :create_producer_agent, arg0: @pds_handle, arg1: agent_info.to_xml
         end
 
@@ -99,6 +102,7 @@ module Libis
         end
 
         def new_contact(contact_info)
+          # noinspection RubyArgCount
           contact_info = Rosetta::User.new(contact_info) unless contact_info.is_a?(Rosetta::User)
           call :create_contact, arg0: @pds_handle, arg1: contact_info.to_xml
         end
@@ -108,6 +112,7 @@ module Libis
         end
 
         def link_contact(contact_id, producer_id, primary = true)
+          # noinspection RubySimplifyBooleanInspection
           call :link_contact_to_producer, arg0: @pds_handle, arg1: producer_id, arg2: contact_id, arg3: (!!primary).to_s.upcase
         end
 

data/lib/libis/services/rosetta/user.rb

@@ -60,8 +60,9 @@ module Libis
               strip_namespaces: true,
               delete_namespace_attributes: true,
               empty_tag_value: nil,
-              convert_tags_to: lambda { |tag| tag.to_sym }
+              convert_tags_to: lambda(&:to_sym)
           )
+          # noinspection RubyArgCount
           self.new(hash[:producer_info])
         end
       end

data/lib/libis/services/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Services
-    VERSION = '1.0.5'
+    VERSION = '1.0.6'
   end
 end

data/spec/ie_data.rb

@@ -24,7 +24,7 @@ def expected_ies
                       "status" => "ACTIVE",
                       "submissionReason" => "Ingest",
                       "IEEntityType" => "KADOC_PhotoAlbum",
-                      "Version" => "100200300",
+                      "Version" => "13",
                       "UserDefinedA" => "AAAA",
                       "UserDefinedB" => "BBBB",
                       "UserDefinedC" => "CCCC"
@@ -65,7 +65,6 @@ def expected_ies
           }
       },
       :dmd => {
-          "text" => "\n        ",
           "title" => "Denemarken 2015"
       },
   }
@@ -542,7 +541,6 @@ def expected_mets
                       }
                   },
                   :dmd => {
-                      "text" => "\n        ",
                       "spatial" => "Sinebjerg",
                       "coverage" => "Denemarken 2015",
                       "subject" => "Jitse"

data/spec/rosetta_collection_spec.rb

@@ -63,10 +63,15 @@ describe 'Rosetta Collection Service' do
     collection_service = Libis::Services::Rosetta::CollectionHandler.new credentials.rosetta_url,
                                                                          log: credentials.debug,
                                                                          log_level: credentials.debug_level
-    collection_service.pds_handle = handle
+    # collection_service.pds_handle = handle
     collection_service
   end
 
+  before :each do
+    # noinspection RubyResolve
+    collection_service.authenticate(credentials.admin.user, credentials.admin.password, credentials.admin.institute)
+  end
+
   context 'existing collections' do
 
     let(:collection_data) { {
@@ -108,7 +113,7 @@ describe 'Rosetta Collection Service' do
   context 'collections CRUD' do
 
     let(:collection_data) { {
-        name: 'New test collection',
+        name: 'Test API collection',
         parent_id: parent_id,
         collection_order: 0,
         md_dc: {
@@ -126,9 +131,7 @@ describe 'Rosetta Collection Service' do
         },
         md_source: [],
         navigate: true,
-        publish: false,
-        external_id: '54321',
-        external_system: 'Scope'
+        publish: false
     } }
 
     let(:new_collection) { collection_service.find(parent_name + '/' + collection_data[:name]) }
@@ -173,8 +176,8 @@ describe 'Rosetta Collection Service' do
     end
 
     it 'retrieve new collection' do
-      puts new_collection.to_hash
-      puts new_collection_data
+      # puts new_collection.to_hash
+      # puts new_collection_data
       expect(new_collection.to_hash).to match_collection(new_collection_data)
     end
 

data/spec/rosetta_ie_spec.rb

@@ -41,7 +41,7 @@ describe 'Rosetta IE Service' do
 
     mets = ie_handler.get_mets('IE403595')
     expect(mets).not_to be_nil
-    ap mets
+    # ap mets
     expect(mets).to deep_include(expected_mets)
     # check_container expected_mets, mets
   end
@@ -50,6 +50,7 @@ describe 'Rosetta IE Service' do
 
     metadata = ie_handler.get_metadata('IE403595')
     expect(metadata).not_to be_nil
+    # ap metadata
     expect(metadata).to deep_include(expected_ies)
     # check_container(expected_ies, metadata)
   end

data/spec/rosetta_producer_spec.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require_relative 'spec_helper'
 require 'yaml'
+require 'awesome_print'
 
 require 'libis/tools/config_file'
 
@@ -43,8 +44,10 @@ describe 'Rosetta Producer Service' do
   end
 
   context 'user info' do
+    # noinspection RubyBlockToMethodReference
     let(:user_id) {admin_uid}
 
+    # noinspection RubyBlockToMethodReference
     let(:user_name) {admin_usr}
 
     it 'gets user id' do
@@ -69,6 +72,7 @@ describe 'Rosetta Producer Service' do
 
     let(:producer_id) {credentials.producer.id}
     let(:producer_data) {credentials.producer.data.to_hash}
+    # noinspection RubyArgCount
     let(:producer_info) {::Libis::Services::Rosetta::Producer.new(producer_data).to_hash}
     let(:updated_info) {{email: 'nomail@mail.com', telephone_2: '0032 16 32 22 22'}}
     let(:new_producer_info) {
@@ -86,6 +90,7 @@ describe 'Rosetta Producer Service' do
 
     it 'get producer' do
       result = producer_handler.producer(producer_id)
+      # ap result
       expect(result).not_to be_nil
       expect(result.to_hash).to match producer_data
       expect(producer_data).to match result.to_hash
@@ -136,19 +141,21 @@ describe 'Rosetta Producer Service' do
         email_address: 'test@mail.com',
         street: 'Willem de Croylaan 54',
         city: 'Heverlee',
-        zip: 3001,
+        zip: '3001',
         country: 'Belgium',
         telephone_1: '0032 16 32 22 66',
         user_group: 'producer_agents'
     }}
     let(:new_agent) {
       data = new_agent_data.dup
-      data[:password] = data[:password_verify] = 'abc123ABC'
-      Libis::Services::Rosetta::User.new(data).to_hash
+      # data[:password] = data[:password_verify] = 'abc123ABC'
+      # noinspection RubyArgCount
+      Libis::Services::Rosetta::ProducerAgent.new(data).to_hash
     }
 
     # noinspection RubyResolve
     let(:agent_data) {credentials.producer_agent.data.to_hash}
+    # noinspection RubyArgCount
     let(:agent) {::Libis::Services::Rosetta::User.new(agent_data)}
     # noinspection RubyResolve
     let(:agent_id) {credentials.producer_agent.user_id}
@@ -163,7 +170,9 @@ describe 'Rosetta Producer Service' do
     it 'get info' do
       result = producer_handler.agent(agent_id)
       expect(result).not_to be_nil
-      expect(result.to_hash).to include agent_data
+      # ap result.to_hash
+      # ap agent_data
+      expect(result.to_hash).to match agent_data
     end
 
     it 'create' do
@@ -176,7 +185,7 @@ describe 'Rosetta Producer Service' do
     it 'get info' do
       result = producer_handler.agent(new_agent_id)
       expect(result).not_to be_nil
-      expect(result.to_hash).to include new_agent_data
+      expect(result.to_hash).to match new_agent_data
     end
 
     it 'update info' do
@@ -205,6 +214,7 @@ describe 'Rosetta Producer Service' do
     it 'get producers' do
       result = producer_handler.agent_producers agent_id, agent_ins
       expect(result).not_to be_nil
+      # noinspection RubyResolve
       expect(result).to eq [{id: credentials.producer.id, description: credentials.producer.data.authoritative_name}]
     end
 
@@ -215,6 +225,7 @@ describe 'Rosetta Producer Service' do
     let(:contact_id) {credentials.contact.user_id}
     let(:contact_info) {credentials.contact.data.to_hash}
     let(:new_contact) {
+      # noinspection RubyArgCount
       ::Libis::Services::Rosetta::User.new(
           first_name: 'New',
           last_name: 'Contact',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-services
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-08 00:00:00.000000000 Z
+date: 2019-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -267,6 +267,7 @@ files:
 - lib/libis/services/rosetta/oai_set.rb
 - lib/libis/services/rosetta/pds_handler.rb
 - lib/libis/services/rosetta/producer.rb
+- lib/libis/services/rosetta/producer_agent.rb
 - lib/libis/services/rosetta/producer_handler.rb
 - lib/libis/services/rosetta/service.rb
 - lib/libis/services/rosetta/sip.rb