cdmbl 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e4edefbc109630c2c965cac2ecbc4dfa93399fe
-  data.tar.gz: dc79ca43d1b603932825e87365bf7f7f5ad6fdf0
+  metadata.gz: 417415def1b0f28a66e6640201a3c53becf43737
+  data.tar.gz: 36d22cc2acaab58453bb908877af79f2fe93ddba
 SHA512:
-  metadata.gz: 1e3285e35c278e7e92f9a5d04b2256d8e226e895e5876ca4d58408c49ddd7460b4146c35ac075d94779f5916237a7864508ecfb6c10de6f502a0250e80f68eaf
-  data.tar.gz: 8a534da15b06660e5d804058dd0174038650ddd2fc3540cd281aa9d6c1d4b702e9bf99d55616132565ca6c042c35cf9f140e752518a8d9634aabd99fccefcd3d
+  metadata.gz: 6a4a95dbdf25f2cfd26d2d037b900d07850bf4be2c50112319bcfd220cbddcf7e0325b62ff45267b9cddb0fc135291d946509e8bfe5a78486c5231e1665f7354
+  data.tar.gz: bc2795036b04aed45ac8be18829450001c08091b2df7c7af089b7faf1779d422ffb14e0610d5a9c3306b981bcbedcb584ef3b89b70a8fcdf94a81ff6dcd55752

data/lib/cdmbl.rb

@@ -9,7 +9,6 @@ require 'cdmbl/record_transformer'
 require 'cdmbl/transformer'
 require 'cdmbl/default_solr'
 require 'cdmbl/loader'
-require 'cdmbl/etl_run'
 require 'cdmbl/etl_worker'
 require 'cdmbl/default_completed_callback'
 require 'cdmbl/default_cdm_notification'

data/lib/cdmbl/oai_filter.rb

@@ -11,7 +11,7 @@ module CDMBL
     end
 
     def deletable_ids
-      deletables.map { |deletable| deletable.join('/')}
+      deletables.map { |deletable| deletable.join(':')}
     end
 
     private

data/lib/cdmbl/tasks/etl.rake

@@ -1,6 +1,24 @@
 require 'cdmbl'
 
 namespace :cdmbl do
+
+
+
+  desc 'Ingest a Collection Syncronously'
+  task :collection_sync do
+    # config = etl.config
+    # raise etl.config.keys.inspect
+    CDMBL::ETLWorker.new.perform(
+      'solr_config' => {:url=>"http://solr:8983/solr/mdl-1"},
+      'oai_endpoint' => 'http://cdm16022.contentdm.oclc.org/oai/oai.php',
+      'cdm_endpoint' => 'https://server16022.contentdm.oclc.org/dmwebservices/index.php',
+      'set_spec' => 'mpls',
+      'batch_size' => 10,
+      'max_compounds' => 10
+    )
+  end
+
+
   desc 'Launch a background job to index metadata from CONTENTdm to Solr.'
   task :batch, [
     :solr_url,

data/lib/cdmbl/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cdmbl
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - chadfennell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-14 00:00:00.000000000 Z
+date: 2019-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hash_at_path
@@ -219,7 +219,6 @@ files:
 - lib/cdmbl/default_oai_notification.rb
 - lib/cdmbl/default_solr.rb
 - lib/cdmbl/etl_by_set_specs.rb
-- lib/cdmbl/etl_run.rb
 - lib/cdmbl/etl_worker.rb
 - lib/cdmbl/extract_worker.rb
 - lib/cdmbl/extractor.rb

data/lib/cdmbl/etl_run.rb

@@ -1,65 +0,0 @@
-module CDMBL
-  # TODO: extract params into a an ETL Profile and delegate
-  class ETLRun
-    attr_reader :oai_endpoint,
-                :cdm_endpoint,
-                :resumption_token,
-                :field_mappings,
-                :minimum_date,
-                :set_spec,
-                :oai_requester,
-                :extractor,
-                :transformer,
-                :loader,
-                :solr_client
-    def initialize(oai_endpoint: '',
-                   cdm_endpoint: '',
-                   resumption_token: false,
-                   field_mappings: false,
-                   minimum_date: nil,
-                   set_spec: false,
-                   oai_requester: OaiRequest,
-                   extractor: Extractor,
-                   transformer: Transformer,
-                   loader: Loader,
-                   solr_client: SolrClient.new)
-
-      @oai_endpoint     = oai_endpoint
-      @cdm_endpoint     = cdm_endpoint
-      @resumption_token = resumption_token
-      @field_mappings   = field_mappings
-      @oai_requester    = oai_requester
-      @minimum_date     = minimum_date
-      @set_spec         = set_spec
-      @extractor        = extractor
-      @transformer      = transformer
-      @loader           = loader
-      @solr_client      = solr_client
-    end
-
-    def extract
-      @extraction ||= extractor.new(oai_request: oai_request,
-                                    cdm_endpoint: cdm_endpoint)
-    end
-
-    def transform(sets, records)
-      @transformation ||= transformer.new(cdm_records: records,
-                                          oai_sets: sets,
-                                          field_mappings: field_mappings)
-    end
-
-    def load!(deletables, records)
-      loader.new(records: records,
-                 deletable_ids: deletables,
-                 solr_client: solr_client).load!
-    end
-
-    def oai_request
-      @oai_request ||= oai_requester.new(base_uri: oai_endpoint,
-                                         resumption_token: resumption_token,
-                                         from: minimum_date,
-                                         set: set_spec)
-    end
-  end
-
-end