relaton-bib 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05365dd34321a3c2f80a6d73fd16abe5c530f3c5
-  data.tar.gz: 5d7fdd3b5eaea30767632c884a803e615e9eea00
+  metadata.gz: 9da202081fac78dc82e84fd1387007c977be6981
+  data.tar.gz: 6ef4319dc738576c1d0aca6972f5f061d27bf1bd
 SHA512:
-  metadata.gz: a88c9d5bc6fc001f6a6f8b13813e5225c662d25f97d0cd6fc852169886480a9210b590c69620c6a2f4ac1eb223328e525c0ef0f0da7b8f730b582c1e66e89882
-  data.tar.gz: b7b48023c0bd6f22e4685a0b8e44d9d07672f37cd82d861ab2dda33c9675b3288d665c712d0308e2c001b738eabec9cb8294b6776ffe8149375f14637c03ba90
+  metadata.gz: 2ec1ef406ba6067a466508200c8c948a342bb39d1a133910b74fb0522fdf0a70c3e1abbf164256f9c2b3a93f1d14b34dafdffdcc46bc12a68b2f9b141cb60d1a
+  data.tar.gz: 3ed3da30cffeae49ef4e7737a76ea64f16823c41026b159c9eafd4a960262dc31cd71d6d627f415bb9d5701828ac2862ea91e764c872189bdb19f731011d04f5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    relaton-bib (0.1.0)
+    relaton-bib (0.1.1)
       nokogiri (~> 1.8.4)
 
 GEM

data/lib/relaton_bib/copyright_association.rb

@@ -15,7 +15,7 @@ module RelatonBib
     # @option owner [String] :abbreviation
     # @option owner [String] :url
     # @param from [String] date
-    # @param to [String] date
+    # @param to [String, NilClass] date
     def initialize(owner:, from:, to: nil)
       @owner = if owner.is_a?(Hash)
                  ContributionInfo.new entity: Organization.new(owner)

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "0.1.0"
+  VERSION = "0.1.1".freeze
 end

data/lib/relaton_bib/xml_parser.rb

@@ -6,37 +6,42 @@ module RelatonBib
       def from_xml(xml)
         doc = Nokogiri::XML(xml)
         bibitem = doc.at "/bibitem"
-        BibliographicItem.new( 
-          id:             bibitem[:id],
-          type:           bibitem[:type],
-          fetched:        bibitem.at("./fetched")&.text,
-          titles:         fetch_titles(bibitem),
-          link:           fetch_link(bibitem),
-          docid:          fetch_docid(bibitem),
-          docnumber:      bibitem.at("./docnumber")&.text,
-          dates:          fetch_dates(bibitem),
-          contributors:   fetch_contributors(bibitem),
-          edition:        bibitem.at("./edition")&.text,
-          version:        fetch_version(bibitem),
-          biblionote:     fetch_note(bibitem),
-          language:       bibitem.xpath("./language").map(&:text),
-          script:         bibitem.xpath("./script").map(&:text),
-          abstract:       fetch_abstract(bibitem),
-          docstatus:      fetch_status(bibitem),
-          copyright:      fetch_copyright(bibitem),
-          relations:      fetch_relations(bibitem),
-          series:         fetch_series(bibitem),
-          medium:         fetch_medium(bibitem),
-          place:          bibitem.xpath("./place").map(&:text),
-          extent:         fetch_extent(bibitem),
-          accesslocation: bibitem.xpath("./accesslocation").map(&:text),
-          classification: fetch_classification(bibitem),
-          validity:       fetch_validity(bibitem),
-        )
+        BibliographicItem.new(item_data(bibitem))
       end
 
       private
 
+      def item_data(bibitem)
+        {
+          id: bibitem[:id],
+          type: bibitem[:type],
+          fetched: bibitem.at("./fetched")&.text,
+          titles: fetch_titles(bibitem),
+          formattedref: fref(bibitem),
+          link: fetch_link(bibitem),
+          docid: fetch_docid(bibitem),
+          docnumber: bibitem.at("./docnumber")&.text,
+          dates: fetch_dates(bibitem),
+          contributors: fetch_contributors(bibitem),
+          edition: bibitem.at("./edition")&.text,
+          version: fetch_version(bibitem),
+          biblionote: fetch_note(bibitem),
+          language: bibitem.xpath("./language").map(&:text),
+          script: bibitem.xpath("./script").map(&:text),
+          abstract: fetch_abstract(bibitem),
+          docstatus: fetch_status(bibitem),
+          copyright: fetch_copyright(bibitem),
+          relations: fetch_relations(bibitem),
+          series: fetch_series(bibitem),
+          medium: fetch_medium(bibitem),
+          place: bibitem.xpath("./place").map(&:text),
+          extent: fetch_extent(bibitem),
+          accesslocation: bibitem.xpath("./accesslocation").map(&:text),
+          classification: fetch_classification(bibitem),
+          validity: fetch_validity(bibitem),
+        }
+      end
+
       def fetch_version(item)
         version = item.at "./version"
         return unless version
@@ -191,16 +196,20 @@ module RelatonBib
           PersonIdentifier.new pi[:type], pi.text
         end
 
-        cname = person.at "./name/completename"
-        completename = cname ? LocalizedString.new(cname.text, cname[:language]) : nil
+        cn = person.at "./name/completename"
+        cname = if cn
+                  LocalizedString.new(cn.text, cn[:language], cn[:script])
+                else
+                  nil
+                end
 
-        sname = person.at "./name/surname"
-        surname = sname ? LocalizedString.new(sname.text, sname[:language]) : nil
+        sn = person.at "./name/surname"
+        sname = sn ? LocalizedString.new(sn.text, sn[:language], sn[:script]) : nil
 
         name = FullName.new(
-          completename: completename, surname: surname,
+          completename: cname, surname: sname,
           initials: name_part(person, "initial"), forenames: name_part(person, "forename"),
-          additions: name_part(person, "addidtion"), prefix: name_part(person, "prefix")
+          additions: name_part(person, "addition"), prefix: name_part(person, "prefix")
         )
 
         Person.new(
@@ -212,7 +221,7 @@ module RelatonBib
       end
 
       def name_part(person, part)
-        additions = person.xpath("./name/#{part}").map do |np|
+        person.xpath("./name/#{part}").map do |np|
           LocalizedString.new np.text, np[:language]
         end
       end
@@ -261,15 +270,12 @@ module RelatonBib
             BibItemLocality.new(
               l[:type],
               LocalizedString.new(l.at("./referenceFrom").text),
-              ref_to
+              ref_to,
             )
           end
-          bibitem = rel&.at "./bibitem"
           DocumentRelation.new(
             type: rel[:type],
-            bibitem: BibliographicItem.new(
-              type: bibitem[:type], formattedref: fref(bibitem), docstatus: fetch_status(bibitem)
-            ),
+            bibitem: BibliographicItem.new(item_data(rel.at("./bibitem"))),
             bib_locality: localities,
           )
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-01 00:00:00.000000000 Z
+date: 2019-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler