cdmbl 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 213955e102d8ea7d3297acbd197665be36444305
-  data.tar.gz: 6e6157fa118ac1bf33ce8713063478dfc3773685
+  metadata.gz: c1a2f19c0067241fa3a48fae51ef1037eaff9eae
+  data.tar.gz: 0d7976ba3295a2bd5a078f6ce82b332346f4e585
 SHA512:
-  metadata.gz: 3d44c11d1a889e9c53807562ff4b97c0d61e1069ba62cdaad2ff1569c667e5d85fe98d11e9bb8d78a40a31e03d2cba92c92755010e27bf738a505a9cc524f40f
-  data.tar.gz: 3a410e460ace3fe256c99b67abc4bbb557c6d0708c58d893a30f132de4774c5df2c683d60c8815bee9d73b7e470d37d3eb7c3732b03993feb7cb9f8b5529d289
+  metadata.gz: 43df324f1b75b2d86ea15b170450cf57fc1a304968f0174716074749865f39d5f8c99a46a560b7842361abeb61053e76fdb2835b4600912284804d712a6d04bc
+  data.tar.gz: f7f1ecaf33619f6bdad8a50d5cef9f92a35c543f2758e2eb396214e04510268cf320141f22f0f2ec0761f38ef4912972d02e1698dfcf46d0b58d24a66be79f42

data/lib/cdmbl/default_cdm_notification.rb

@@ -0,0 +1,8 @@
+module CDMBL
+  # An example callback
+  class DefaultCdmNotification
+    def self.call!(collection, id, endpoint)
+      puts "A CCONTENTdm API request notification"
+    end
+  end
+end

data/lib/cdmbl/{default_callback.rb → default_completed_callback.rb}

@@ -1,6 +1,6 @@
 module CDMBL
   # An example callback
-  class DefaultCallback
+  class DefaultCompletedCallback
     def self.call!(solr_client)
       puts "A callback task"
     end

data/lib/cdmbl/default_oai_notification.rb

@@ -0,0 +1,8 @@
+module CDMBL
+  # An example callback
+  class DefaultOaiNotification
+    def self.call!(solr_client)
+      puts "An OAI callback task"
+    end
+  end
+end

data/lib/cdmbl/etl_worker.rb

@@ -11,7 +11,7 @@ module CDMBL
       if etl_run.next_resumption_token && recursive
         ETLWorker.perform_async(solr_config, next_etl_config)
       else
-        CDMBL::Callback.call!(solr_client)
+        CDMBL::CompletedCallback.call!(solr_client)
       end
     end
 

data/lib/cdmbl/extractor.rb

@@ -65,7 +65,7 @@ module CDMBL
     end
 
     def cdm_request(collection, id)
-      Rails.logger.info("CDMBL: Requesting #{collection}/#{id} from #{cdm_endpoint}")
+      CDMBL::CdmNotification.call!(collection, id, cdm_endpoint)
       cdm_item.new(base_url: cdm_endpoint, collection: collection, id: id).metadata
     end
 

data/lib/cdmbl/formatters.rb

@@ -7,6 +7,12 @@ module CDMBL
       value
     end
   end
+
+  class IDFormatter
+    def self.format(value)
+      value.split('/').join(':')
+    end
+  end
   
   class Titlieze
     def self.format(value)

data/lib/cdmbl/hooks.rb

@@ -2,8 +2,12 @@ module CDMBL
   def self.const_missing(name)
     if name.to_s == 'Solr'
       hook(pattern: name.to_s, default: DefaultSolr)
-    elsif name.to_s == 'Callback'
-      hook(pattern: name.to_s, default: DefaultCallback)
+    elsif name.to_s == 'CompletedCallback'
+      hook(pattern: name.to_s, default: DefaultCompletedCallback)
+    elsif name.to_s == 'OaiNotification'
+      hook(pattern: name.to_s, default: DefaultOaiNotification)
+    elsif name.to_s == 'CdmNotification'
+      hook(pattern: name.to_s, default: DefaultCdmNotification)
     end
   end
 

data/lib/cdmbl/oai_request.rb

@@ -34,7 +34,7 @@ module CDMBL
       end
 
       def request(location)
-        Rails.logger.info("CDMBL: Requesting Identifiers from #{location}")
+        CDMBL::OaiNotification.call!(location)
         client.get_response(URI(location)).body
       end
     end

data/lib/cdmbl/transformer.rb

@@ -48,7 +48,7 @@ module CDMBL
     def self.default_mappings
       [
         {dest_path: 'location_llsi', origin_path: '/', formatters: [LocationFormatter]},
-        {dest_path: 'id', origin_path: 'id', formatters: [StripFormatter]},
+        {dest_path: 'id', origin_path: 'id', formatters: [StripFormatter, IDFormatter]},
         {dest_path: 'setspec_ssi', origin_path: '/', formatters: [AddSetSpecFormatter, SetSpecFormatter]},
         {dest_path: 'collection_name_ssi', origin_path: '/', formatters: [AddSetSpecFormatter, CollectionNameFormatter]},
         {dest_path: 'collection_name_tei', origin_path: '/', formatters: [AddSetSpecFormatter, CollectionNameFormatter]},

data/lib/cdmbl/version.rb

@@ -1,3 +1,3 @@
 module CDMBL
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/cdmbl.rb

@@ -11,6 +11,8 @@ require 'cdmbl/default_solr'
 require 'cdmbl/loader'
 require 'cdmbl/etl_run'
 require 'cdmbl/etl_worker'
-require 'cdmbl/default_callback'
+require 'cdmbl/default_completed_callback'
+require 'cdmbl/default_cdm_notification'
+require 'cdmbl/default_oai_notification'
 require 'cdmbl/hooks'
 require 'cdmbl/oai_filter'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cdmbl
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - chadfennell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-19 00:00:00.000000000 Z
+date: 2016-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hash_at_path
@@ -208,7 +208,9 @@ files:
 - bin/setup
 - cdmbl.gemspec
 - lib/cdmbl.rb
-- lib/cdmbl/default_callback.rb
+- lib/cdmbl/default_cdm_notification.rb
+- lib/cdmbl/default_completed_callback.rb
+- lib/cdmbl/default_oai_notification.rb
 - lib/cdmbl/default_solr.rb
 - lib/cdmbl/etl_run.rb
 - lib/cdmbl/etl_worker.rb