traject_plus 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b27a18435a3547cc2d7e8c89b881b19371312e3abc0670a7648eb25a0eec3ab
-  data.tar.gz: 34a5e4f57e063c19687dfdcb3e5be6fda683e040ce0401450ddd7453cb940522
+  metadata.gz: 3180ce1ed02cce4f3580e9ce8e7ee230d387d6fc231778db6329ce1774a9034f
+  data.tar.gz: a3e91726f5f63c5f1355ada3e7b59cdbd7487bd4d9cb55f33f9ea631c5b027fc
 SHA512:
-  metadata.gz: e31021d1869a7d98f9b4f2f834eb77bcd7f8347d1b492cffd46f2817ea143492b7f3d057047f070a6e7ee3fde27f2b7c8ef5f8b15217b24c3eb10ff97a663829
-  data.tar.gz: 638cefd62dd2bca34952a37ab307a2209a6c5e621c08258647fe6f285ced151084d41af5a3901bfe78284bf0e4ab4136270c3ba16b73ce57f4e4f0aa474aa192
+  metadata.gz: b2041c23e176a5a06a7ae0bf73fef6bc1c96be3848be5c31442f325e76230fcb05ad676f61c347db80eec3b8a55c7b9bd23780b1c2db0cb8b6348de31b1fb401
+  data.tar.gz: 2dc0bb7e2dfafd82ebc35e8380076ceb471189b0411c21f53cafd9deeb4fa50cf8b07aed14ce85aee2d2287d9f062100231de1a01294bd02fd2fc7329ae097a4

data/lib/traject_plus/macros/fgdc.rb

@@ -6,11 +6,9 @@ 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)
-        extract_xpath(xpath, ns: NS)
+      def extract_fgdc(xpath, options = {})
+        extract_xml(xpath, NS, options)
       end
     end
   end

data/lib/traject_plus/macros/mods.rb

@@ -9,11 +9,9 @@ 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)
-        extract_xpath(xpath, ns: NS)
+      def extract_mods(xpath, options = {})
+        extract_xml(xpath, NS, options)
       end
     end
   end

data/lib/traject_plus/macros/tei.rb

@@ -5,11 +5,9 @@ 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)
-        extract_xpath(xpath, ns: NS)
+      def extract_tei(xpath, options = {})
+        extract_xml(xpath, NS, options)
       end
     end
   end

data/lib/traject_plus/macros/xml.rb

@@ -8,8 +8,6 @@ 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.2.1'.freeze
+  VERSION = "1.2.2".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: traject_plus
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-25 00:00:00.000000000 Z
+date: 2019-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport