cdmbl 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 417415def1b0f28a66e6640201a3c53becf43737
-  data.tar.gz: 36d22cc2acaab58453bb908877af79f2fe93ddba
+SHA256:
+  metadata.gz: 637df7b53cd7d660727a0a8d55fa7847d7cba6c442f0a5aa44accd652bc1efed
+  data.tar.gz: debd85256ed204a7c58de43e2db284ffeaaaafd4dc63bc59693d965c211f81e8
 SHA512:
-  metadata.gz: 6a4a95dbdf25f2cfd26d2d037b900d07850bf4be2c50112319bcfd220cbddcf7e0325b62ff45267b9cddb0fc135291d946509e8bfe5a78486c5231e1665f7354
-  data.tar.gz: bc2795036b04aed45ac8be18829450001c08091b2df7c7af089b7faf1779d422ffb14e0610d5a9c3306b981bcbedcb584ef3b89b70a8fcdf94a81ff6dcd55752
+  metadata.gz: 2a803c89d9a67faa6f706dd1a6f8cf1c3b8d535cda68dd7ef0d5102b7c5201b08dd84d31cb7d0571a957fed3f1f84e76c54bf117c11ee64e288bbba96a113a2a
+  data.tar.gz: f6878f26d9151558bbde5e0a3a10c8a793123b8c686b3815b543835a42423b87f8f5a3ae01fef834432941a710692d654b6c60052de5121f53454607664180a3

data/cdmbl.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'hash_at_path', '~> 0.1'
-  spec.add_dependency 'contentdm_api', '~> 0.3.11'
+  spec.add_dependency 'contentdm_api', '~> 0.4.1'
   spec.add_dependency 'sidekiq', '>= 3.5'
   spec.add_dependency 'titleize', '~> 1.4'
   spec.add_dependency 'rsolr', '~> 2.0'
@@ -32,6 +32,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'yard', '~> 0.9.0'
-  spec.add_development_dependency 'webmock', '~> 1.24', '>= 1.24.0'
-  spec.add_development_dependency 'vcr', '~> 3.0', '>= 3.0.1'
 end

data/lib/cdmbl/cdm_request_worker.rb

@@ -0,0 +1,90 @@
+require 'sidekiq'
+module CDMBL
+  class CdmRequestWorker
+    include Sidekiq::Worker
+    attr_reader :collection,
+                :id,
+                :set_lookup,
+                :field_mappings
+
+    attr_writer :cdm_api_klass,
+                  :oai_request_klass,
+                  :oai_set_lookup_klass,
+                  :cdm_notification_klass,
+                  :load_worker_klass,
+                  :transformer_klass
+
+    def perform(collection, id)
+
+      @identifiers       = identifiers
+      @solr_config       = solr_config
+      @cdm_endpoint      = cdm_endpoint
+      @oai_endpoint      = oai_endpoint
+      @field_mappings    = field_mappings
+      @extract_compounds = extract_compounds
+      transform_and_load!
+    end
+
+    def oai_set_lookup_klass
+      @oai_set_lookup_klass ||= OAISetLookup
+    end
+
+    def oai_request_klass
+      @oai_request_klass ||= OaiRequest
+    end
+
+    def cdm_api_klass
+      @cdm_api_klass ||= CONTENTdmAPI::Item
+    end
+
+    def cdm_notification_klass
+      @cdm_notification_klass ||= CdmNotification
+    end
+
+    def transformer_klass
+      @transformer_klass ||= Transformer
+    end
+
+    def load_worker_klass
+      @load_worker_klass ||= LoadWorker
+    end
+
+    private
+
+    def transform_and_load!
+      load_worker_klass.perform_async(transformed_records, [], solr_config)
+    end
+
+    def transformed_records
+      @transformation ||=
+        transformer_klass.new(cdm_records: records,
+                              oai_sets: set_lookup,
+                              field_mappings: field_mappings,
+                              extract_compounds: extract_compounds).records
+    end
+
+    def set_lookup
+      oai_set_lookup_klass.new(oai_sets: sets).keyed
+    end
+
+    def records
+      identifiers.map do |identifier|
+        cdm_request(*identifier)
+      end
+    end
+
+    # e.g. local_identifiers.map { |identifier| extractor.cdm_request(*identifier) }
+    def cdm_request(collection, id)
+      cdm_notification_klass.call!(collection, id, cdm_endpoint)
+      cdm_api_klass.new(base_url: cdm_endpoint,
+                        collection: collection,
+                        with_compounds: false,
+                        id: id)
+    end
+
+    def sets
+      @oai_request ||=
+        oai_request_klass.new(base_uri: oai_endpoint).sets
+    end
+  end
+end

data/lib/cdmbl/oai_client.rb

@@ -1,10 +1,12 @@
+
 require 'json'
+require 'http'
 module CDMBL
     class OaiClient
-      attr_reader :base_url, :http_client
-      def initialize(base_url: '', http_client: Net::HTTP)
+      attr_reader :base_url, :client
+      def initialize(base_url: '', client: HTTP)
         @base_url    = base_url
-        @http_client = http_client
+        @client = client
       end
 
       def request(query)
@@ -14,7 +16,7 @@ module CDMBL
       private
 
       def get(url)
-        http_client.get_response(URI(url)).body
+        client.get(url).to_s
       end
 
       def hashify(xml)

data/lib/cdmbl/version.rb

@@ -1,3 +1,3 @@
 module CDMBL
-  VERSION = "0.14.0"
+  VERSION = "0.15.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cdmbl
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - chadfennell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-07 00:00:00.000000000 Z
+date: 2019-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hash_at_path
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.11
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.11
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -150,46 +150,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.24'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.24.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.24'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.24.0
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.1
 description: 
 email:
 - fenne035@umn.edu
@@ -211,6 +171,7 @@ files:
 - lib/cdmbl.rb
 - lib/cdmbl/batch_deleter.rb
 - lib/cdmbl/batch_deleter_worker.rb
+- lib/cdmbl/cdm_request_worker.rb
 - lib/cdmbl/compound_filter.rb
 - lib/cdmbl/compound_lookup.rb
 - lib/cdmbl/default_cdm_notification.rb
@@ -265,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Load CONTENTdm data into a Solr Index. CDMBL expects to run inside a Rails