traject_plus 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c18d033097eab64e2209c9762873526fda99fd42254782e83206fba4ab779890
-  data.tar.gz: feb3cfd62ff34bf7ad9060de0f8810f64e21accc9f67c7701c4cff448b88af25
+  metadata.gz: d0bc939203fafce05e06266e0097c402acb732d565fcb5f0bc22f28a47c30a40
+  data.tar.gz: 3eff7af52a93c94ea62c351bfd37cbefbd8389a62cfbc345c591739d39d1b94b
 SHA512:
-  metadata.gz: ec13570bb0385d5d3c713ef59b690dccea7dfb642bcf6c36b4326182897ea9fe7ad66c6b072acc77c1eecf2ae74d86f26ef1b6768b1748da0113ee17813f18b1
-  data.tar.gz: c5c8b80aff3d829bedde2e05b6cf3e57dbc52f4e3828415492ebbb0f6182081dbd8c0bbd4e608e5f076aa97a62f635a0d9ebb4956161c5617716e88008fce470
+  metadata.gz: a2bf12720706f3f456837b4cbcc7d0d958ae7cdb0e072671d32a5e947b17b2947c37a74b9aee7201d64c6208d9258c8d586207a2c7eb547bfe2f46e783950ebb
+  data.tar.gz: 924dbc06a905607d9da40ab5bb92f65d16edcd217f835b3e8630b1390c9c9420ac3ac92e7134e1fb820b7a3d199adda6a9a1dc474e033ff38586ddacb4297596

data/lib/traject_plus/indexer/step.rb

@@ -61,8 +61,13 @@ module TrajectPlus
           accumulator << context.source_record
         end
 
-        accumulator.map do |record|
-          new_context = Traject::Indexer::Context.new(source_record: record, settings: indexer.settings)
+        accumulator.each_with_index.map do |record, index|
+          new_context = Traject::Indexer::Context.new(
+            source_record: record,
+            settings: indexer.settings,
+            position: index,
+            position_in_input: index
+          )
           new_context.clipboard[:parent] = context
           indexer.map_to_context!(new_context)
           result = new_context.output_hash

data/lib/traject_plus/macros/fgdc.rb

@@ -6,9 +6,13 @@ module TrajectPlus
     module FGDC
       NS = { fgdc: 'http://www.fgdc.gov/metadata/fgdc-std-001-1998.dtd' }.freeze
 
+      def self.extended(mod)
+        mod.extended Traject::Macros::NokogiriMacros
+      end
+
       # @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,13 @@ module TrajectPlus
              dc: 'http://purl.org/dc/elements/1.1/',
              xlink: 'http://www.w3.org/1999/xlink' }.freeze
 
+      def self.extended(mod)
+        mod.extended Traject::Macros::NokogiriMacros
+      end
+
       # @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)
       end
     end
   end

data/lib/traject_plus/macros/tei.rb

@@ -5,9 +5,13 @@ module TrajectPlus
     module Tei
       NS = { tei: 'http://www.tei-c.org/ns/1.0' }.freeze
 
+      def self.extended(mod)
+        mod.extended Traject::Macros::NokogiriMacros
+      end
+
       # @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.1.1".freeze
+  VERSION = "1.2.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: traject_plus
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-12 00:00:00.000000000 Z
+date: 2019-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -178,8 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Extensions to Traject for non-MARC formats