metacrunch-mab2 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4778eeae582a8416053b470b2bd54827cb7e68a
-  data.tar.gz: 1e96e0e40130e5d1b91b186f061ea06ad8900c34
+  metadata.gz: 1f3f60e61efdc2d800bb156ef2af37b56f005d97
+  data.tar.gz: d08b0a6f38b526dbbc29c301c84461b30e7e41f7
 SHA512:
-  metadata.gz: 6ad51835a53f4ab698b2c5f822ddee0470a00b775e8881b3aba0becfff6ed0e38b1e231eef89b91e1ef6d6b0e17438a91b8044ddb6fd27b06a4007021451bf45
-  data.tar.gz: c6a51e069b36d2d9060e12d762e82fbf7c96b9c15f16314075c9621a96de5b9bf6b570752102712e2019a1f3008eab4bbed24171328a78ff5ff443da1d767cd8
+  metadata.gz: 8e727ba7003c508232814161f26ffad6b5a496d20376a82bb35e7bc30256535730a6b2e9a74a09e833565654dcb76950d04a76cf9234743be386fbae19dcac5d
+  data.tar.gz: 9cd3dfaf0acf24f3a9c581380a07477c7280df0e964e17c9bd7ec53db0b8d3e0db67cee4ca7eed12de2088417056aeb11d7ec22cb510c064c0bc8a0f406787b4

data/lib/metacrunch/mab2/document/jruby/mab_xml_parser.rb

@@ -0,0 +1,45 @@
+module Metacrunch
+  module Mab2
+    class Document
+      class MabXmlParser
+
+        def parse(mab_xml)
+          xml = Nokogiri::XML(mab_xml.try(:strip))
+          xml.remove_namespaces!
+
+          html_entities = HTMLEntities.new
+          document = Document.new
+
+          xml.xpath("//metadata/record").children.each do |node|
+            if node.name == "controlfield"
+              controlfield = Metacrunch::Mab2::Document::Controlfield.new
+              controlfield.tag = node.attributes["tag"].value
+              controlfield.values = node.content
+              document.add_controlfield(controlfield)
+            elsif node.name == "datafield" then
+              datafield = Metacrunch::Mab2::Document::Datafield.new
+              datafield.tag = node.attributes["tag"].value
+              datafield.ind1 = node.attributes["ind1"].try(:value)
+              datafield.ind2 = node.attributes["ind2"].try(:value)
+
+              node.children.each do |subnode|
+                if subnode.name == "subfield"
+                  subfield = Metacrunch::Mab2::Document::Subfield.new
+                  subfield.code = subnode.attributes["code"].value
+                  value = subnode.content
+                  subfield.value = value.include?("&") ? html_entities.decode(value) : value
+                  datafield.add_subfield(subfield)
+                end
+              end
+
+              document.add_datafield(datafield)
+            end
+          end
+
+          document
+        end
+
+      end
+    end
+  end
+end

data/lib/metacrunch/mab2/document/{aleph_mab_xml_parser.rb → mab_xml_parser.rb}

@@ -1,16 +1,11 @@
-require "htmlentities"
 require "ox"
-require_relative "../document"
 
 module Metacrunch
   module Mab2
     class Document
-      class AlephMabXmlParser < Ox::Sax
-        def self.parse(aleph_mab_xml)
-          new.parse(aleph_mab_xml)
-        end
+      class MabXmlParser < Ox::Sax
 
-        def parse(io_or_string)
+        def parse(mab_xml)
           # initialize state machine
           @in_controlfield = @in_datafield = @in_subfield = false
 
@@ -18,11 +13,9 @@ module Metacrunch
           @document = Document.new
           @html_entities_coder = HTMLEntities.new
 
-          io = io_or_string.is_a?(IO) ? io_or_string : StringIO.new(io_or_string)
-
           # convert_special tells ox to convert some html entities already during
           # parsing, which minifies the amount of entities we have to decode ourself
-          Ox.sax_parse(self, io, convert_special: true)
+          Ox.sax_parse(self, mab_xml, convert_special: true)
 
           return @document
         end

data/lib/metacrunch/mab2/document.rb

@@ -1,12 +1,17 @@
 module Metacrunch
   module Mab2
     class Document
-      require_relative "./document/aleph_mab_xml_parser"
-      require_relative "./document/controlfield"
-      require_relative "./document/datafield"
-      require_relative "./document/datafield_set"
-      require_relative "./document/subfield"
-      require_relative "./document/subfield_set"
+      if RUBY_PLATFORM == "java"
+        require_relative "document/jruby/mab_xml_parser"
+      else
+        require_relative "document/mab_xml_parser"
+      end
+
+      require_relative "document/controlfield"
+      require_relative "document/datafield"
+      require_relative "document/datafield_set"
+      require_relative "document/subfield"
+      require_relative "document/subfield_set"
 
       # ------------------------------------------------------------------------------
       # Parsing
@@ -17,7 +22,7 @@ module Metacrunch
       # @return [Metacrunch::Mab2::Document]
       #
       def self.from_aleph_mab_xml(xml)
-        AlephMabXmlParser.parse(xml)
+        MabXmlParser.new.parse(xml)
       end
 
       def initialize

data/lib/metacrunch/mab2/version.rb

@@ -1,5 +1,5 @@
 module Metacrunch
   module Mab2
-    VERSION = "1.2.0"
+    VERSION = "1.2.1"
   end
 end

data/lib/metacrunch/mab2.rb

@@ -1,8 +1,9 @@
 require "rubygems"
 require "active_support"
 require "active_support/core_ext"
-require "ox"
 require "htmlentities"
+require "nokogiri"
+require "ox" unless RUBY_PLATFORM == "java"
 
 module Metacrunch
   module Mab2

data/metacrunch-mab2.gemspec

@@ -20,7 +20,14 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport",   "~> 4.2"
   spec.add_dependency "htmlentities",    "~> 4.3"
   spec.add_dependency "nokogiri",        "~> 1.6"
-  spec.add_dependency "ox",              "~> 2.1"
   spec.add_dependency "self_enumerable", "~> 0.2"
+
+  if RUBY_PLATFORM != "java"
+    spec.add_dependency "ox", "~> 2.1"
+  end
+
+  if RUBY_PLATFORM == "java"
+    spec.platform = Gem::Platform::CURRENT
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metacrunch-mab2
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - René Sprotte
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-22 00:00:00.000000000 Z
+date: 2016-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -55,33 +55,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: ox
+  name: self_enumerable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: self_enumerable
+  name: ox
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '2.1'
 description: 
 email: r.sprotte@ub.uni-paderborn.de
 executables: []
@@ -100,10 +100,11 @@ files:
 - lib/metacrunch/mab2/builder.rb
 - lib/metacrunch/mab2/cli.rb
 - lib/metacrunch/mab2/document.rb
-- lib/metacrunch/mab2/document/aleph_mab_xml_parser.rb
 - lib/metacrunch/mab2/document/controlfield.rb
 - lib/metacrunch/mab2/document/datafield.rb
 - lib/metacrunch/mab2/document/datafield_set.rb
+- lib/metacrunch/mab2/document/jruby/mab_xml_parser.rb
+- lib/metacrunch/mab2/document/mab_xml_parser.rb
 - lib/metacrunch/mab2/document/subfield.rb
 - lib/metacrunch/mab2/document/subfield_set.rb
 - lib/metacrunch/mab2/version.rb