mab2 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14bac691353f086cfbed41622955c11ca4ff06a2
-  data.tar.gz: 8277e15586b7f2df280b65081e8def54082b1b34
+  metadata.gz: cbecb44d9edd1e649510ee35cc401277ba3cff9d
+  data.tar.gz: 9aabd361f1ba9b69727b08435176d8a2e9c37d37
 SHA512:
-  metadata.gz: 971bb7293817bf77fb0de53a486a3200b1530c1d07a60ff9279ab1e7c00ecdb36fc990e6e9266afac1487f97787d870ec5e92c40587b34d7a05d66f6155f9e80
-  data.tar.gz: d4985798177570de52a038c6d53c47cfa628ee8360968a95aa0fe638de732255a4819e0aa6cdc2aefb52d1a4338dceabbd622a3586a8bb6549a1fb547e3e6ee5
+  metadata.gz: a3f6292cd094c7a5834cd34e63e5983b9f47de5eef2520f1d47dc8dc4f6da073545052b2b570e7e36892c467dba377694cac7756eb8edbe00437d9e26907b680
+  data.tar.gz: e696b3d6612c4f1840db905eed35a0873de66c2c684806e1f5e245b2eac55b436f5ba0c80b86e8d59c0cc89887aea1c64d8bc5682c7a7641e6019283ca5cbd44

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
+gem 'badgerfish', path: '~/github/msievers/badgerfish'
+
 # Specify your gem's dependencies in mab2.gemspec
 gemspec

data/lib/mab2/document.rb

@@ -1,23 +1,22 @@
-require 'badgerfish'
 require 'mab2/document_scope'
+require 'nokogiri'
 
 module Mab2
   class Document
 
+    attr_accessor :nokogiri_document
+
     # we assume someone calls us like this Mab2::Document.new('<xml>...'</xml>')
     def initialize(xml)
-      badgerfish_representation = Badgerfish::Parser.new.load(xml)
-
-      @controlfield = controlfield_from_badgerfish(badgerfish_representation)
-      @datafield = datafield_from_badgerfish(badgerfish_representation)
+      @nokogiri_document = Nokogiri::XML(xml).remove_namespaces!.css('OAI-PMH ListRecords record metadata record')
     end
 
     def controlfield(tag)
-      @controlfield[tag].chars
+      Mab2::DocumentScope.new(self).controlfield(tag)
     end
 
     def datafield(tag, options = {})
-      Mab2::DocumentScope.new(self).datafield(tag, options)  
+      Mab2::DocumentScope.new(self).datafield(tag, options)
     end
 
     # mabmapper uses field instead of datafield
@@ -25,45 +24,5 @@ module Mab2
       datafield(tag, options)
     end
 
-    private
-
-    def controlfield_from_badgerfish(badgerfish)
-      hash = {}
-
-      badgerfish['OAI-PMH']['ListRecords']['record']['metadata']['record']['controlfield'].each do |controlfield|
-        hash[controlfield["@tag"]] = controlfield["$"]
-      end
-
-      hash
-    end
-
-    def datafield_from_badgerfish(badgerfish)
-      hash = {}
-
-      badgerfish['OAI-PMH']['ListRecords']['record']['metadata']['record']['datafield'].each do |datafield|
-        if hash[datafield["@tag"]].nil?
-          hash[datafield["@tag"]] = { datafield["@ind1"] => { datafield["@ind2"] => {} } }
-        elsif hash[datafield["@tag"]].is_a?(Hash)
-          hash[datafield["@tag"]] = [ hash[datafield["@tag"]] ]
-        end
-
-        if hash[datafield["@tag"]].is_a?(Array)
-          hash[datafield["@tag"]].push({ datafield["@ind1"] => { datafield["@ind2"] => {} } })
-        end
-
-        subfields = datafield['subfield'].is_a?(Array) ? datafield['subfield'] : [datafield['subfield']]
-
-        subfields.each do |subfield|
-          if hash[datafield["@tag"]].is_a?(Array)
-            hash[datafield["@tag"]].last[datafield["@ind1"]][datafield["@ind2"]][subfield["@code"]] = subfield["$"]
-          else
-            hash[datafield["@tag"]][datafield["@ind1"]][datafield["@ind2"]][subfield["@code"]] = subfield["$"]
-          end
-        end
-      end
-
-      hash
-    end
-
   end
 end

data/lib/mab2/document_scope.rb

@@ -1,62 +1,64 @@
-require 'active_support/core_ext'
+class Mab2::DocumentScope
 
-module Mab2
-  class DocumentScope
-
-    attr_accessor :datafield, :document
-
-    def initialize(document)
-      @document = document
-    end
+  def initialize(scoped_document)
+    @doc = scoped_document.nokogiri_document
+  end
 
-    def datafield(tag, options = {})
-      @datafield = tag
-      @ind1 = options[:ind1] unless options[:ind1].nil?
-      @ind2 = options[:ind2] unless options[:ind2].nil?
-      self
-    end
+  def controlfield(tag)
+    @doc.css("controlfield[tag='#{tag}']").text.chars
+  end
 
-    def get
-      self
-    end
+  def datafield(tag, indicators)
+    @tag = tag
+    @indicators = indicators.inject({}) { |hash, (k, v)| hash[k] = (v.is_a?(Array) ? v : [v]); hash }
+    self
+  end
 
-    def subfield(code)
-      @subfield = code
-      self
-    end
+  def get
+    self
+  end
 
-    def value
-      datafield = @document.instance_variable_get(:@datafield)
-      ind1 = ind1_accessor
-      ind2 = ind2_accessor
-      subfield = subfield_accessor
+  def subfield(subfield_codes)
+    @subfield_codes = subfield_codes.is_a?(Array) ? subfield_codes : [subfield_codes]
+    self
+  end
 
-      # handle case where ind1/ind2/subfield are arrays -> since we are in .value, simple grab the first non-nill one
-      ind1 = ind1.select { |indicator| !datafield.try(:[], @datafield).try(:[], indicator).nil? }.first if ind1.is_a?(Array)
-      ind2 = ind2.select { |indicator| !datafield.try(:[], @datafield).try(:[], ind1).try(:[], indicator).nil? }.first if ind2.is_a?(Array)
-      subfield = subfield.select { |_subfield| !datafield.try(:[], @datafield).try(:[], ind1).try(:[], ind2).try(:[], _subfield).nil? }.first if subfield.is_a?(Array)
+  def value
+    values.first
+  end
 
-      if !(datafield.nil? || ind1.nil? || ind2.nil? || subfield.nil?)
-        datafield.try(:[], @datafield).try(:[], ind1).try(:[], ind2).try(:[], subfield)
+  def values
+    datafield_selectors = []
+    
+    if @indicators[:ind1].present? && @indicators[:ind2].blank?
+      @indicators[:ind1].each do |ind1_value|
+        datafield_selectors.push("datafield[tag='#{@tag}'][ind1='#{ind1_value}']")
       end
+    elsif @indicators[:ind1].blank? && @indicators[:ind2].present?
+      @indicators[:ind2].each do |ind2_value|
+        datafield_selectors.push("datafield[tag='#{@tag}'][ind2='#{ind2_value}']")
+      end
+    elsif @indicators[:ind1].present? && @indicators[:ind2].present?
+      @indicators[:ind1].each do |ind1_value|
+        @indicators[:ind2].each do |ind2_value|
+          datafield_selectors.push("datafield[tag='#{@tag}'][ind1='#{ind1_value}'][ind2='#{ind2_value}']")
+        end
+      end
+    else
+      datafield_selectors.push("datafield[tag='#{@tag}']")
     end
 
-    def values
-    end
-
-  protected
-
-    def ind1_accessor
-      @ind1 || @document.instance_variable_get(:@datafield)[@datafield].keys.first unless @datafield.nil?
-    end
-
-    def ind2_accessor
-      @ind2 || @document.instance_variable_get(:@datafield)[@datafield][ind1_accessor].keys.first unless @datafield.nil? && ind1_accessor.nil?
-    end
-
-    def subfield_accessor
-      @subfield || @document.instance_variable_get(:@datafield)[@datafield][ind1_accessor][ind2_accessor].keys.first unless @datafield.nil? && ind1_accessor.nil? && ind2_accessor.nil?
-    end
+    css_selector = if @subfield_codes.present?
+      datafield_selectors.map do |selector|
+        @subfield_codes.map do |subfield_code|
+          "#{selector} subfield[code='#{subfield_code}']"
+        end
+      end
+    else
+      indicator_selectors
+    end.flatten.join(', ')
 
+    @doc.css(css_selector).map(&:text)
   end
+
 end

data/lib/mab2/version.rb

@@ -1,3 +1,3 @@
 module Mab2
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/mab2.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'badgerfish', '~> 0.0.3'
+  spec.add_dependency 'nokogiri', '~> 1.6.0'
 
   spec.add_development_dependency 'activesupport', '>= 3.2.0', '< 5.0.0'
   spec.add_development_dependency 'bundler',       '~> 1.3'

data/test/mab2/test_datafield.rb

@@ -14,7 +14,7 @@ module TestDatafield
 
   def test_datafield_3
     doc = Mab2::Document.new(load_mab('PAD01.000978177.PRIMO.xml'))
-    w = doc.field('PPE').subfield(['a', 'p']).get.values
+    assert_equal ["Bajme, Klaus", "Beyme, Klaus", "Beyme, K. <<von>>", "Bajme, Klaus", "Beyme, Klaus", "Beyme, K. <<von>>"], doc.field('PPE').subfield(['a', 'p']).get.values
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mab2
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Michael Sievers
@@ -11,19 +11,19 @@ cert_chain: []
 date: 2013-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: badgerfish
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement