traject_plus 1.3.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac49598e6fa3578027500a5cb03388b8286d935f8f2910316154e0d1910a0ea3
-  data.tar.gz: 724c5cb095f104ccce9ad2ba9d347bb8db3a3f90fc25d47500198c4163edbfc8
+  metadata.gz: d47d5d02e74d7c07596131245fae67f22216eea3d48c77f4580a901d81725c90
+  data.tar.gz: 71eae5b4ad6ab04b38d0c65e5e27c5541cf90816e415bb278da4a17905ba799c
 SHA512:
-  metadata.gz: 127c5a3e0950802438bf6a3f67adbaf7fede6141b488180b1b71a7c81f025949bd5d40a30f93790ee213d931763ad5da10738bd55f7c8c87021728c82c3f4c00
-  data.tar.gz: 56da44f35bc86dad71bc2701cceb7be653e2926e8729a08b8c47ee6513cf73b2c9cdb3f2a20f576ff18521d67ffa83273fe0e455ddb12460bcbe872a1caf41ff
+  metadata.gz: 9ee90ffd3dc1601c5a5ccdc569127378b08ad9c7b8bb9dce7eca3ec1c15b9c12303bcaf7c0e73bc8d5c5b36bfa467b6cd37d77bd207d397a388862ee418f21ce
+  data.tar.gz: cebf3fda210f12e3e53c9388bbd440ccc2dcd44daf1dcaadc19da2b6ba6283fd06b214b92c5454c8d6cce59203417aa59d42ede8108e144bdfe95dc7435b6d42

data/lib/traject_plus/macros/fgdc.rb

@@ -6,9 +6,11 @@ module TrajectPlus
     module FGDC
       NS = { fgdc: 'http://www.fgdc.gov/metadata/fgdc-std-001-1998.dtd' }.freeze
 
+      include Traject::Macros::NokogiriMacros
+
       # @param xpath [String] the xpath query expression
-      def extract_fgdc(xpath, options = {})
-        extract_xml(xpath, NS, options)
+      def extract_fgdc(xpath)
+        extract_xpath(xpath, ns: NS)
       end
     end
   end

data/lib/traject_plus/macros/mods.rb

@@ -9,9 +9,11 @@ module TrajectPlus
              dc: 'http://purl.org/dc/elements/1.1/',
              xlink: 'http://www.w3.org/1999/xlink' }.freeze
 
+      include Traject::Macros::NokogiriMacros
+
       # @param xpath [String] the xpath query expression
-      def extract_mods(xpath, options = {})
-        extract_xml(xpath, NS, options)
+      def extract_mods(xpath)
+        extract_xpath(xpath, ns: NS)
       end
     end
   end

data/lib/traject_plus/macros/tei.rb

@@ -5,9 +5,11 @@ module TrajectPlus
     module Tei
       NS = { tei: 'http://www.tei-c.org/ns/1.0' }.freeze
 
+      include Traject::Macros::NokogiriMacros
+
       # @param xpath [String] the xpath query expression
-      def extract_tei(xpath, options = {})
-        extract_xml(xpath, NS, options)
+      def extract_tei(xpath)
+        extract_xpath(xpath, ns: NS)
       end
     end
   end

data/lib/traject_plus/macros/xml.rb

@@ -8,6 +8,8 @@ module TrajectPlus
       # @param namespaces [Hash<String,String>] The namespaces for the xpath query
       # @param options [Hash] other options, may include :trim
       def extract_xml(xpath, namespaces, options = {})
+        Deprecation.warn(self, "extract_xml is deprecated and will be removed in the next major release. Use the Traject 3 pipeline instead")
+
         lambda do |xml, accumulator, _context|
           result = xml.xpath(xpath, namespaces).map(&:text)
           unless options.empty?

data/lib/traject_plus/version.rb

@@ -1,3 +1,3 @@
 module TrajectPlus
-  VERSION = '1.3.0'.freeze
+  VERSION = '2.0.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: traject_plus
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Chris Beer