metacrunch-mab2 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d18a21ab3c3dbd48cacdeb4385d022cff0a2f2a
-  data.tar.gz: bfb0dd9ee58c7c2e8bc9ca47381dc8ce729b71f2
+  metadata.gz: 60d656f23a0579c4c1e0a01c23aec38904fbe529
+  data.tar.gz: 84aeda9371bedc709734eade5d5ae5111d88c76b
 SHA512:
-  metadata.gz: d9791c95b98fba1533bf925363fe6508e985ce6edad30ca744834a281ad4bd199aa5e8f565f0b307242c635ee33cc4735fd959079b3756d4f66a23c55f03a1c1
-  data.tar.gz: ea69883558fa5b81adce0b51cbdc52ca2c928579174981ab6349b4fc4abd73767ba0f1517c9f04c0add14ebc0449fe82620aa01388973c0e35da6bb5506555cd
+  metadata.gz: 74fabeef356246a5e3eb56961f4a3fabd7b89e915bed639e2f9e08b9bf3676b34c5231a451ad791044f4d21de76e2679b50ccb90e61aab9ad42c4d2c6db4415c
+  data.tar.gz: f263ffe68b46f4c8bf85bf66514b761452b529c924bd675367349825d6eccea8c6b4afda9cd2593c08ae64cef8671964b86e46334710b44778a134bfc9e84095

data/.gitignore

@@ -1,5 +1,24 @@
 .DS_Store
-/Gemfile.lock
-/.yardoc
 /doc
-/*.gem
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+*.bundle
+*.so
+*.o
+*.a
+mkmf.log

data/Gemfile

@@ -4,10 +4,22 @@ gemspec
 
 gem "metacrunch", ">= 2.1.0", github: "ubpb/metacrunch", branch: "master"
 
-gem "rake"
-gem "pry-byebug",    "~> 3.1.0"
-gem "rspec",         "~> 3.2.0"
-gem "benchmark-ips", "~> 2.1"
+group :development do
+  gem "benchmark-ips"
+  gem "bundler"
+  gem "rake"
+  gem "rspec",           ">= 3.0.0",  "< 4.0.0"
+  gem "simplecov",       ">= 0.8.0"
+
+  if !ENV["CI"]
+    gem "hashdiff"
+    gem "pry",                "~> 0.9.12.6"
+    gem "pry-byebug",         "<= 1.3.2"
+    gem "pry-rescue",         "~> 1.4.2"
+    gem "pry-stack_explorer", "~> 0.4.9.1"
+    gem "pry-syntax-hacks",   "~> 0.0.6"
+  end
+end
 
 # for benchmarking
-gem "mabmapper", github: "ubpb/mabmapper", branch: "master"
+# gem "mabmapper", github: "ubpb/mabmapper", branch: "master"

data/Rakefile

@@ -1,3 +1,4 @@
+require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)

data/bin/console

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "metacrunch/mab2"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+require "pry"
+Pry.start

data/bin/setup

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/lib/metacrunch/mab2.rb

@@ -2,15 +2,11 @@ require "metacrunch"
 require "ox"
 require "htmlentities"
 
-begin
-  require "pry"
-rescue LoadError ; end
-
 module Metacrunch
   module Mab2
-    require_relative "./mab2/version"
-    require_relative "./mab2/document"
+    require_relative "./mab2/builder"
     require_relative "./mab2/cli"
-    require_relative "./mab2/aleph_mab_xml_document_factory"
+    require_relative "./mab2/document"
+    require_relative "./mab2/version"
   end
 end

data/lib/metacrunch/mab2/builder.rb

@@ -0,0 +1,52 @@
+require_relative "./document"
+
+module Metacrunch
+  module Mab2
+    class Builder
+
+      attr_reader :document
+
+      def self.build(&block)
+        builder = new
+        document = builder.instance_eval(&block) if block_given?
+        document || Document.new
+      end
+
+      def initialize
+        @document = Document.new
+      end
+
+      def controlfield(tag, values)
+        controlfield = Document::Controlfield.new(tag, values)
+        @document.add_controlfield(controlfield)
+        @document
+      end
+
+      def datafield(tag, ind1:nil, ind2:nil, &block)
+        datafield = Document::Datafield.new(tag, ind1: ind1, ind2: ind2)
+        @document.add_datafield(datafield)
+
+        if block_given?
+          subfield_builder = SubfieldBuilder.new(datafield)
+          subfield_builder.instance_eval(&block)
+        end
+
+        @document
+      end
+
+
+      class SubfieldBuilder
+        def initialize(datafield)
+          @datafield = datafield
+        end
+
+        def subfield(code, value)
+          subfield = Document::Subfield.new(code, value)
+          @datafield.add_subfield(subfield)
+          subfield
+        end
+      end
+
+    end
+  end
+end

data/lib/metacrunch/mab2/document.rb

@@ -1,6 +1,7 @@
 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"
@@ -16,31 +17,26 @@ module Metacrunch
       # @return [Metacrunch::Mab2::Document]
       #
       def self.from_aleph_mab_xml(xml)
-        AlephMabXmlDocumentFactory.new(xml).to_document
+        AlephMabXmlParser.parse(xml)
+      end
+
+      def initialize
+        @controlfields = {}
+        @datafields = {}
       end
 
       # ------------------------------------------------------------------------------
       # Control fields
       # ------------------------------------------------------------------------------
 
-      #
-      # @return [Hash{String => Metacrunch::Mab2::Document::Controlfield}]
-      # @private
-      #
-      def controlfields_struct
-        @controlfields_struct ||= {}
-      end
-      private :controlfields_struct
-
       #
       # Returns the control field matching the given tag.
       #
       # @param [String] tag of the control field
-      # @return [Controlfield, nil] control field with the given tag. Is nil
-      #  if the control field doesn't exists.
+      # @return [Controlfield] control field with the given tag.
       #
       def controlfield(tag)
-        controlfields_struct[tag]
+        @controlfields[tag] || Controlfield.new(tag)
       end
 
       #
@@ -49,44 +45,35 @@ module Metacrunch
       # @param [Metacrunch::Mab2::Document::Controlfield] controlfield
       #
       def add_controlfield(controlfield)
-        controlfields_struct[controlfield.tag] = controlfield
+        @controlfields[controlfield.tag] = controlfield
       end
 
       # ------------------------------------------------------------------------------
       # Data fields
       # ------------------------------------------------------------------------------
 
-      #
-      # @return [Hash{String => Metacrunch::Mab2::Document::Datafield::Set}]
-      # @private
-      #
-      def datafields_struct
-        @datafields_struct ||= {}
-      end
-      private :datafields_struct
-
       #
       # Returns the data fields matching the given tag and ind1/ind2.
       #
-      # @param [String] tag of the data field
-      # @param [String, nil] ind1 filter for ind1. Can be nil to match any.
-      # @param [String, nil] ind2 filter for ind2. Can be nil to match any.
-      # @return [Metacrunch::Mab2::Document::Datafield::Set] data field with the given tag and ind1/ind2.
+      # @param [String, nil] tag of the data field. Can be nil to match any data field.
+      # @param [String, nil] ind1 filter for ind1. Can be nil to match any indicator 1.
+      # @param [String, nil] ind2 filter for ind2. Can be nil to match any indicator 2.
+      # @return [Metacrunch::Mab2::Document::DatafieldSet] data field with the given tag and ind1/ind2.
       #  The set is empty if a matching field with the tag and/or ind1/ind2 doesn't exists.
       #
-      def datafields(tag, ind1: nil, ind2: nil)
-        set = datafields_struct[tag] || Datafield::Set.new
-        return set if set.empty?
-
-        if ind1 || ind2
-          filtered_datafields = set.select do |datafield|
-            (!ind1 || (ind1 == :blank ? datafield.ind1 == " " || datafield.ind1 == "-" : datafield.ind1 == ind1)) &&
-            (!ind2 || (ind2 == :blank ? datafield.ind2 == " " || datafield.ind2 == "-" : datafield.ind2 == ind2))
-          end
-
-          Datafield::Set.new(filtered_datafields)
+      def datafields(tag = nil, ind1: nil, ind2: nil)
+        if tag.nil?
+          DatafieldSet.new(@datafields.values.flatten(1))
         else
-          set
+          set = DatafieldSet.new(@datafields[tag] || [])
+          return set if set.empty? || (ind1.nil? && ind2.nil?)
+
+          ind1 = map_indicator(ind1)
+          ind2 = map_indicator(ind2)
+
+          set.select do |_datafield|
+            check_indicator(ind1, _datafield.ind1) && check_indicator(ind2, _datafield.ind2)
+          end
         end
       end
 
@@ -96,10 +83,7 @@ module Metacrunch
       # @param [Metacrunch::Mab2::Document::Datafield] datafield
       #
       def add_datafield(datafield)
-        datafield_set  = datafields(datafield.tag)
-        datafield_set << datafield
-
-        datafields_struct[datafield.tag] = datafield_set
+        (@datafields[datafield.tag] ||= []) << datafield
       end
 
       # ------------------------------------------------------------------------------
@@ -107,19 +91,39 @@ module Metacrunch
       # ------------------------------------------------------------------------------
 
       def to_xml
-        builder = Builder::XmlMarkup.new(indent: 2)
+        builder = ::Builder::XmlMarkup.new(indent: 2)
         builder.instruct!(:xml, :encoding => "UTF-8")
         builder.mab_xml do
           controlfields_struct.values.each do |_controlfield|
             _controlfield.to_xml(builder)
           end
 
-          datafields_struct.values.each do |_datafield_set|
+          @datafields.values.each do |_datafield_set|
             _datafield_set.to_xml(builder)
           end
         end
       end
 
+    private
+
+      def map_indicator(ind)
+        ind.is_a?(Array) ? ind.map { |_el| _el == :blank ? [" ", "-", nil] : _el }.flatten(1) : ind
+      end
+
+      def check_indicator(requested_ind, datafield_ind)
+        if !requested_ind
+          true
+        elsif requested_ind == :blank && (datafield_ind == " " || datafield_ind == "-" || datafield_ind.nil?)
+          true
+        elsif requested_ind == datafield_ind
+          true
+        elsif requested_ind.is_a?(Array) && requested_ind.include?(datafield_ind)
+          true
+        else
+          false
+        end
+      end
+
     end
   end
 end

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

@@ -1,22 +1,15 @@
 require "htmlentities"
 require "ox"
-require_relative "./document"
+require_relative "../document"
 
 module Metacrunch
   module Mab2
-    class AlephMabXmlDocumentFactory
-
-      def initialize(aleph_mab_xml)
-        @aleph_mab_xml = aleph_mab_xml
-      end
-
-      def to_document
-        @document ||= Parser.new.parse(@aleph_mab_xml)
-      end
-
-    private
+    class Document
+      class AlephMabXmlParser < Ox::Sax
+        def self.parse(aleph_mab_xml)
+          new.parse(aleph_mab_xml)
+        end
 
-      class Parser < Ox::Sax
         def parse(io_or_string)
           # initialize state machine
           @in_controlfield = @in_datafield = @in_subfield = false
@@ -37,13 +30,13 @@ module Metacrunch
         def start_element(name)
           if name == :subfield
             @in_subfield = true
-            @subfield = Document::Datafield::Subfield.new
+            @subfield = Metacrunch::Mab2::Document::Subfield.new
           elsif name == :datafield
             @in_datafield = true
-            @datafield = Document::Datafield.new
+            @datafield = Metacrunch::Mab2::Document::Datafield.new
           elsif name == :controlfield
             @in_controlfield = true
-            @controlfield = Document::Controlfield.new
+            @controlfield = Metacrunch::Mab2::Document::Controlfield.new
           end
         end
 

data/lib/metacrunch/mab2/document/controlfield.rb

@@ -60,7 +60,7 @@ module Metacrunch
         # ------------------------------------------------------------------------------
 
         def to_xml(builder)
-          builder.controlfield(values.join("|"), tag: tag)
+          builder.controlfield(values2string, tag: tag)
         end
 
       private
@@ -69,11 +69,11 @@ module Metacrunch
           string.chars.to_a.map{ |e| (e=="|") ? nil : e }
         end
 
-        def array2values(values)
-          values.map do |v|
+        def array2values(array)
+          array.map do |v|
             if v.present?
               v = v.to_s
-              raise ArgumentError, "invalid value of controlfield #{tag}: #{values}" if v.length > 1
+              raise ArgumentError, "invalid value of controlfield #{tag}: #{array}" if v.length > 1
               v
             else
               nil
@@ -81,6 +81,10 @@ module Metacrunch
           end
         end
 
+        def values2string
+          values.map{|c| c.blank? ? "|" : c}.join
+        end
+
       end
     end
   end

data/lib/metacrunch/mab2/document/datafield.rb

@@ -10,42 +10,45 @@ module Metacrunch
           @tag  = tag
           @ind1 = ind1
           @ind2 = ind2
+          @subfields = {}
+        end
+
+        def value
+          subfields.value
         end
 
         # ------------------------------------------------------------------------------
         # Sub fields
         # ------------------------------------------------------------------------------
 
-        #
-        # @return [Hash{String => Metacrunch::Mab2::Document::Datafield::Subfield::Set}]
-        # @private
-        #
-        def subfields_struct
-          @subfields_struct ||= {}
-        end
-        private :subfields_struct
-
         #
         # Returns the sub field matching the given code.
         #
         # @param [String] code of the sub field
-        # @return [Metacrunch::Mab2::Document::Datafield::Subfield::Set] sub field with the given code. The set
+        # @return [Metacrunch::Mab2::Document::SubfieldSet] sub field with the given code. The set
         #  is empty if the sub field doesn't exists.
         #
-        def subfields(code)
-          subfields_struct[code] || Subfield::Set.new
+        def subfields(code = nil)
+          result =  Metacrunch::Mab2::Document::SubfieldSet.new
+
+          if code.nil?
+            result.concat(@subfields.values.flatten(1))
+          elsif _subfields = @subfields[code]
+            result.concat(_subfields)
+          elsif (codes = code).is_a?(Array)
+            result.concat(codes.map { |_code| @subfields[_code] }.compact.flatten(1))
+          end
+
+          result
         end
 
         #
         # Adds a new sub field.
         #
-        # @param [Metacrunch::Mab2::Document::Datafield::Subfield] subfield
+        # @param [Metacrunch::Mab2::Document::Subfield] subfield
         #
         def add_subfield(subfield)
-          subfield_set  = subfields(subfield.code)
-          subfield_set << subfield
-
-          subfields_struct[subfield.code] = subfield_set
+          (@subfields[subfield.code] ||= []) << subfield
         end
 
         # ------------------------------------------------------------------------------
@@ -54,7 +57,7 @@ module Metacrunch
 
         def to_xml(builder)
           builder.datafield(tag: tag, ind1: ind1, ind2: ind2) do
-            subfields_struct.values.each do |_subfield_set|
+            @subfields.values.each do |_subfield_set|
               _subfield_set.to_xml(builder)
             end
           end

data/lib/metacrunch/mab2/document/datafield_set.rb

@@ -1,56 +1,66 @@
+require "self_enumerable"
+
 module Metacrunch
   module Mab2
     class Document
-      class Datafield
-        class Set
-          include Enumerable
+      class DatafieldSet
+        include SelfEnumerable
 
-          def initialize(datafields = [])
-            @datafields = datafields
-          end
+        def initialize(datafields = [])
+          @datafields = datafields
+        end
 
-          def each
-            block_given? ? @datafields.each { |_datafield| yield _datafield } : to_enum
-          end
+        def each
+          block_given? ? @datafields.each { |_datafield| yield _datafield } : to_enum
+        end
 
-          def <<(datafield)
-            @datafields << datafield
-          end
+        def <<(datafield)
+          @datafields << datafield
+        end
 
-          def concat(datafield_set)
-            @datafields.concat(datafield_set.to_a)
-          end
+        def concat(datafield_set)
+          @datafields.concat(datafield_set.to_a)
+          self
+        end
 
-          def to_a
-            @datafields
-          end
+        def value
+          @datafields.find { |_datafield| _datafield.value }.try(:value)
+        end
+        alias_method :first_value, :value
 
-          def empty?
-            @datafields.empty?
-          end
+        def to_a
+          @datafields
+        end
+
+        def empty?
+          @datafields.empty?
+        end
 
-          # @return [Metacrunch::Mab2::Document::Datafield::Subfield::Set]
-          def subfields(name)
-            set = Subfield::Set.new
+        def present?
+          !empty?
+        end
 
-            @datafields.each do |datafield|
-              set.concat(datafield.subfields(name))
-            end
+        # @return [Metacrunch::Mab2::Document::SubfieldSet]
+        def subfields(code = nil)
+          result = Metacrunch::Mab2::Document::SubfieldSet.new
 
-            set
+          @datafields.each do |_datafield|
+            result.concat(_datafield.subfields(code))
           end
 
-          # ------------------------------------------------------------------------------
-          # Serialization
-          # ------------------------------------------------------------------------------
+          result
+        end
 
-          def to_xml(builder)
-            self.each do |_datafield|
-              _datafield.to_xml(builder)
-            end
-          end
+        # ------------------------------------------------------------------------------
+        # Serialization
+        # ------------------------------------------------------------------------------
 
+        def to_xml(builder)
+          self.each do |_datafield|
+            _datafield.to_xml(builder)
+          end
         end
+
       end
     end
   end

data/lib/metacrunch/mab2/document/subfield.rb

@@ -1,28 +1,25 @@
 module Metacrunch
   module Mab2
     class Document
-      class Datafield
-        class Subfield
+      class Subfield
 
-          attr_accessor :code
-          attr_accessor :value
+        attr_accessor :code
+        attr_accessor :value
 
-          def initialize(code = nil, value = nil)
-            @code  = code
-            @value = value
-          end
-
-          # ------------------------------------------------------------------------------
-          # Serialization
-          # ------------------------------------------------------------------------------
+        def initialize(code = nil, value = nil)
+          @code  = code
+          @value = value
+        end
 
-          def to_xml(builder)
-            builder.subfield(code: code, value: value)
-          end
+        # ------------------------------------------------------------------------------
+        # Serialization
+        # ------------------------------------------------------------------------------
 
+        def to_xml(builder)
+          builder.subfield(value, code: code)
         end
+
       end
     end
   end
 end
-

data/lib/metacrunch/mab2/document/subfield_set.rb

@@ -1,55 +1,58 @@
+require "self_enumerable"
+
 module Metacrunch
   module Mab2
     class Document
-      class Datafield
-        class Subfield
-          class Set
-            include Enumerable
+      class SubfieldSet
+        include SelfEnumerable
 
-            def initialize(subfields = [])
-              @subfields = subfields
-            end
+        def initialize(subfields = [])
+          @subfields = subfields
+        end
 
-            def each
-              block_given? ? @subfields.each { |_subfield| yield _subfield } : to_enum
-            end
+        def each
+          block_given? ? @subfields.each { |_subfield| yield _subfield } : to_enum
+        end
 
-            def <<(subfield)
-              @subfields << subfield
-            end
+        def <<(subfield)
+          @subfields << subfield
+        end
 
-            def concat(subfield_set)
-              @subfields.concat(subfield_set.to_a)
-            end
+        def concat(subfield_set)
+          @subfields.concat(subfield_set.to_a)
+        end
 
-            def to_a
-              @subfields
-            end
+        def to_a
+          @subfields
+        end
 
-            def empty?
-              @subfields.empty?
-            end
+        def empty?
+          @subfields.empty?
+        end
 
-            def values
-              @subfields.map{ |subfield| subfield.value }
-            end
+        def present?
+          !empty?
+        end
 
-            def first_value
-              values.find{ |v| v.present? }
-            end
+        def value
+          values.find{ |v| v.present? }
+        end
+        alias_method :first_value, :value
 
-            # ------------------------------------------------------------------------------
-            # Serialization
-            # ------------------------------------------------------------------------------
+        def values
+          @subfields.map{ |subfield| subfield.value }
+        end
 
-            def to_xml(builder)
-              self.each do |_subfield|
-                _subfield.to_xml(builder)
-              end
-            end
+        # ------------------------------------------------------------------------------
+        # Serialization
+        # ------------------------------------------------------------------------------
 
+        def to_xml(builder)
+          self.each do |_subfield|
+            _subfield.to_xml(builder)
           end
         end
+
       end
     end
   end

data/lib/metacrunch/mab2/version.rb

@@ -1,5 +1,5 @@
 module Metacrunch
   module Mab2
-    VERSION = "1.0.1"
+    VERSION = "1.1.0"
   end
 end

data/lib/metacrunch/mab2/xml_builder.rb

@@ -0,0 +1,48 @@
+require "nokogiri"
+require_relative "../mab2"
+
+class Metacrunch::Mab2::XmlBuilder
+  def initialize(identifier = nil, &block)
+    @builder =
+    Nokogiri::XML::Builder.new do
+      send(
+        :"OAI-PMH",
+        "xmlns" => "http://www.openarchives.org/OAI/2.0/",
+        "xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance",
+        "xsi:schemaLocation" => "http://www.openarchives.org/OAI/2.0/ http://www.openarchives.org/OAI/2.0/OAI-PMH.xsd"
+      ) do
+        ListRecords do
+          record do
+            if identifier
+              header do |_xml|
+                _xml.identifier identifier
+              end
+            end
+
+            metadata do
+              record("xmlns" => "http://www.ddb.de/professionell/mabxml/mabxml-1.xsd") do
+                define_singleton_method(:controlfield) do |_tag, _text|
+                  send(:method_missing, :controlfield, _text, tag: _tag)
+                end
+
+                define_singleton_method(:datafield) do |_tag, _attributes = {}, &_block|
+                  send(:method_missing, :datafield, {tag: _tag}.merge(_attributes), &_block)
+                end
+
+                define_singleton_method(:subfield) do |_code, _text|
+                  send(:method_missing, :subfield, _text, code: _code)
+                end
+
+                instance_eval(&block)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+
+  def to_xml
+    @builder.to_xml
+  end
+end

data/metacrunch-mab2.gemspec

@@ -19,5 +19,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "metacrunch",   "~> 2.1"
   s.add_dependency "htmlentities", "~> 4.3"
+  s.add_dependency "nokogiri",     "~> 1.6"
   s.add_dependency "ox",           "~> 2.1"
+  s.add_dependency "self_enumerable"
 end

data/spec/{document → metacrunch/mab2/document}/control_field_spec.rb

@@ -1,6 +1,6 @@
 describe Metacrunch::Mab2::Document::Controlfield do
 
-  describe ".initialize" do
+  describe "#initialize" do
     it "creates a new control field when using String values" do
       field = Metacrunch::Mab2::Document::Controlfield.new("050", "a||b")
       expect(field.tag).to eq("050")
@@ -14,7 +14,7 @@ describe Metacrunch::Mab2::Document::Controlfield do
     end
   end
 
-  describe ".values=" do
+  describe "#values=" do
     let(:field) { Metacrunch::Mab2::Document::Controlfield.new("050", nil) }
 
     it "sets field values using String" do

data/spec/{document → metacrunch/mab2}/document_spec.rb

@@ -1,16 +1,33 @@
 describe Metacrunch::Mab2::Document do
 
-  describe "#from_aleph_mab_xml" do
+  describe ".from_aleph_mab_xml" do
     let(:xml) { default_test_xml }
     let(:document) { Metacrunch::Mab2::Document.from_aleph_mab_xml(xml) }
+
     subject { document }
 
-    it "should create a Document from Aleph MAB XML" do
+    it "should return a Mab2::Document" do
       expect(subject).to be_instance_of(Metacrunch::Mab2::Document)
     end
+
+    it "should find 2 data fields with tag 070" do
+      expect(subject.datafields("070").count).to be(2)
+    end
+
+    it "should find 1 data field with tag 100" do
+      expect(subject.datafields("100").first).not_to be_nil
+    end
+
+    it "sub field p of data field 100 is not nil" do
+      expect(subject.datafields("100").first.subfields("p").first.value).not_to be_nil
+    end
+
+    it "decodes html entities" do
+      expect(subject.datafields("331").subfields("a").values.first).to eq("<<Das>> Linux für Studenten")
+    end
   end
 
-  describe ".add_controlfield" do
+  describe "#add_controlfield" do
     let(:document) { empty_document }
 
     it "should add control fields" do
@@ -19,7 +36,7 @@ describe Metacrunch::Mab2::Document do
     end
   end
 
-  describe ".controlfield" do
+  describe "#controlfield" do
     let(:document) { default_test_document }
     subject { document.controlfield("050") }
 
@@ -30,7 +47,7 @@ describe Metacrunch::Mab2::Document do
     end
   end
 
-  describe ".datafields" do
+  describe "#datafields" do
     let(:document) { default_test_document }
 
     context "given tag=100" do
@@ -72,6 +89,14 @@ describe Metacrunch::Mab2::Document do
         expect(subject.count).to eq(2)
       end
     end
+
+    context "given tag=100 and ind1=[:blank, 'a']" do
+      subject { document.datafields("100", ind1: [:blank, "a"]) }
+
+      it "returns only datafield with tag=100 and ind1=(:blank || 'a')" do
+        expect(subject.count).to eq(3)
+      end
+    end
   end
 
 private
@@ -121,7 +146,7 @@ private
   end
 
   def create_subfield(code, value)
-    Metacrunch::Mab2::Document::Datafield::Subfield.new(code, value)
+    Metacrunch::Mab2::Document::Subfield.new(code, value)
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metacrunch-mab2
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - René Sprotte
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-15 00:00:00.000000000 Z
+date: 2015-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metacrunch
@@ -40,6 +40,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.3'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: ox
   requirement: !ruby/object:Gem::Requirement
@@ -54,9 +68,25 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: self_enumerable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: MAB2 tools for metacrunch
 email: r.sprotte@ub.uni-paderborn.de
-executables: []
+executables:
+- console
+- setup
 extensions: []
 extra_rdoc_files: []
 files:
@@ -69,22 +99,25 @@ files:
 - Readme.md
 - benchmarks/mab2_document_parsing.rb
 - benchmarks/mab2_document_query.rb
+- bin/console
+- bin/setup
 - lib/metacrunch/mab2.rb
-- lib/metacrunch/mab2/aleph_mab_xml_document_factory.rb
+- 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/subfield.rb
 - lib/metacrunch/mab2/document/subfield_set.rb
 - lib/metacrunch/mab2/version.rb
+- lib/metacrunch/mab2/xml_builder.rb
 - lib/metacrunch_plugin.rb
 - metacrunch-mab2.gemspec
 - spec/assets/aleph_mab_xml/file1.xml
-- spec/document/aleph_mab_xml_document_factory_spec.rb
-- spec/document/control_field_spec.rb
-- spec/document/document_spec.rb
+- spec/metacrunch/mab2/document/control_field_spec.rb
+- spec/metacrunch/mab2/document_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/ubpb/metacrunch-mab2
 licenses:
@@ -106,13 +139,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: MAB2 tools for metacrunch
 test_files:
 - spec/assets/aleph_mab_xml/file1.xml
-- spec/document/aleph_mab_xml_document_factory_spec.rb
-- spec/document/control_field_spec.rb
-- spec/document/document_spec.rb
+- spec/metacrunch/mab2/document/control_field_spec.rb
+- spec/metacrunch/mab2/document_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

data/spec/document/aleph_mab_xml_document_factory_spec.rb

@@ -1,37 +0,0 @@
-describe Metacrunch::Mab2::AlephMabXmlDocumentFactory do
-
-  context "with default test xml file" do
-    let(:factory) { Metacrunch::Mab2::AlephMabXmlDocumentFactory.new(default_test_xml) }
-
-    describe ".to_document" do
-      subject { factory.to_document }
-
-      it "should return a Mab2::Document" do
-        expect(subject).to be_instance_of(Metacrunch::Mab2::Document)
-      end
-
-      it "should find 2 data fields with tag 070" do
-        expect(subject.datafields("070").count).to be(2)
-      end
-
-      it "should find 1 data field with tag 100" do
-        expect(subject.datafields("100").first).not_to be_nil
-      end
-
-      it "sub field p of data field 100 is not nil" do
-        expect(subject.datafields("100").first.subfields("p").first.value).not_to be_nil
-      end
-
-      it "decodes html entities" do
-        expect(subject.datafields("331").subfields("a").values.first).to eq("<<Das>> Linux für Studenten")
-      end
-    end
-  end
-
-private
-
-  def default_test_xml
-    File.read(File.join(RSpec.root, "assets", "aleph_mab_xml", "file1.xml"))
-  end
-
-end