metacrunch-mab2 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e58083a8b10b6796906050c64d31ed1e3b565b92
-  data.tar.gz: e76670a16196f8c9ab0d1ed7aa4be9592f6fe79d
+  metadata.gz: 3d18a21ab3c3dbd48cacdeb4385d022cff0a2f2a
+  data.tar.gz: bfb0dd9ee58c7c2e8bc9ca47381dc8ce729b71f2
 SHA512:
-  metadata.gz: 6facef45723b7ae6d4c7af8f6e32ddbc4ec9a34fa81e5b80e253556fe9b4ccfe2a2058c82f3874ba945c2fea59f8ef1188c8c6785460c93fec11356d77e7b801
-  data.tar.gz: 22a9eb459fd762b0a597bdb6472e3484dd8c5ec96fd28465ac07ec5907d0461aa1f49800f985fb68ed2fdc05fbc7a9466feeadb9125bfbb18a3c9f5ae6d6edd7
+  metadata.gz: d9791c95b98fba1533bf925363fe6508e985ce6edad30ca744834a281ad4bd199aa5e8f565f0b307242c635ee33cc4735fd959079b3756d4f66a23c55f03a1c1
+  data.tar.gz: ea69883558fa5b81adce0b51cbdc52ca2c928579174981ab6349b4fc4abd73767ba0f1517c9f04c0add14ebc0449fe82620aa01388973c0e35da6bb5506555cd

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

@@ -55,6 +55,14 @@ module Metacrunch
           @values.at(index)
         end
 
+        # ------------------------------------------------------------------------------
+        # Serialization
+        # ------------------------------------------------------------------------------
+
+        def to_xml(builder)
+          builder.controlfield(values.join("|"), tag: tag)
+        end
+
       private
 
         def string2values(string)

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

@@ -48,6 +48,18 @@ module Metacrunch
           subfields_struct[subfield.code] = subfield_set
         end
 
+        # ------------------------------------------------------------------------------
+        # Serialization
+        # ------------------------------------------------------------------------------
+
+        def to_xml(builder)
+          builder.datafield(tag: tag, ind1: ind1, ind2: ind2) do
+            subfields_struct.values.each do |_subfield_set|
+              _subfield_set.to_xml(builder)
+            end
+          end
+        end
+
       end
     end
   end

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

@@ -40,6 +40,16 @@ module Metacrunch
             set
           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

@@ -12,6 +12,14 @@ module Metacrunch
             @value = value
           end
 
+          # ------------------------------------------------------------------------------
+          # Serialization
+          # ------------------------------------------------------------------------------
+
+          def to_xml(builder)
+            builder.subfield(code: code, value: value)
+          end
+
         end
       end
     end

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

@@ -34,6 +34,20 @@ module Metacrunch
               @subfields.map{ |subfield| subfield.value }
             end
 
+            def first_value
+              values.find{ |v| v.present? }
+            end
+
+            # ------------------------------------------------------------------------------
+            # Serialization
+            # ------------------------------------------------------------------------------
+
+            def to_xml(builder)
+              self.each do |_subfield|
+                _subfield.to_xml(builder)
+              end
+            end
+
           end
         end
       end

data/lib/metacrunch/mab2/document.rb

@@ -79,10 +79,11 @@ module Metacrunch
         return set if set.empty?
 
         if ind1 || ind2
-          filtered_datafields = set.select do |_datafield|
-            (!ind1 || _datafield.ind1 == ind1) && (!ind2 || _datafield.ind2 == 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)
         else
           set
@@ -101,6 +102,24 @@ module Metacrunch
         datafields_struct[datafield.tag] = datafield_set
       end
 
+      # ------------------------------------------------------------------------------
+      # Serialization
+      # ------------------------------------------------------------------------------
+
+      def to_xml
+        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|
+            _datafield_set.to_xml(builder)
+          end
+        end
+      end
+
     end
   end
 end

data/lib/metacrunch/mab2/version.rb

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

data/spec/document/document_spec.rb

@@ -37,7 +37,7 @@ describe Metacrunch::Mab2::Document do
       subject { document.datafields("100") }
 
       it "returns only datafields with tag=100" do
-        expect(subject.count).to eq(2)
+        expect(subject.count).to eq(3)
       end
     end
 
@@ -64,6 +64,14 @@ describe Metacrunch::Mab2::Document do
         expect(subject.count).to eq(1)
       end
     end
+
+    context "given tag=100 and ind1=:blank" do
+      subject { document.datafields("100", ind1: :blank) }
+
+      it "returns only datafields with tag=100 and ind1=' ' or ind1=-" do
+        expect(subject.count).to eq(2)
+      end
+    end
   end
 
 private
@@ -88,6 +96,11 @@ private
     datafield.add_subfield(create_subfield("9", "123456789"))
     document.add_datafield(datafield)
 
+    datafield = create_datafield("100", ind1: " ", ind2: "1")
+    datafield.add_subfield(create_subfield("p", "Sievers, Michael"))
+    datafield.add_subfield(create_subfield("9", "123456789"))
+    document.add_datafield(datafield)
+
     datafield = create_datafield("331", ind1: "-", ind2: "1")
     datafield.add_subfield(create_subfield("a", "<<The>> art of MAB processing"))
     document.add_datafield(datafield)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metacrunch-mab2
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - René Sprotte
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metacrunch
@@ -116,4 +116,3 @@ test_files:
 - spec/document/control_field_spec.rb
 - spec/document/document_spec.rb
 - spec/spec_helper.rb
-has_rdoc: