iso-bib-item 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 423970a46ac3548707c24f614d31e459ede59b5cf402ed4d073dccf405f40920
-  data.tar.gz: 91540a5d39dd4f2a522bf47d584de113bf66218c393ef6e9b04b054b9933bc20
+  metadata.gz: 6152b8b2dac4f1407c12f429da08f38a998fb370a0365daf0244b83c1cf11aa1
+  data.tar.gz: 2e2c14cd1a79aad12de2188bda4fe184182a1969ea5fb61acba618d2a51b8528
 SHA512:
-  metadata.gz: f63914c86938dbf6279e1d04830fabbc6229bbcbd92bd1800927a70af0c2936856ef0a9aa3aae5ca84e323e9f0ffb462629561386b291fa56c520285e76b9078
-  data.tar.gz: 0c7a2f6acf70632d5d75e1a9dde3a36b0c5a583f20eea2725e150ccfec4961db6cb3f6933fdd2d5dafa231c2e5dd1fd90c0b92c4506eb044ae4482f4b3ae06f0
+  metadata.gz: 8717fbba17d12177e540244ecc56623ff7160093e3316bb760dc493798a4d2129f03aeb0e1d6fc1e2bb7c246806be4a0773068e0a90d95338e03872515e66436
+  data.tar.gz: 3366b6defa16b2cdea5ca407cfeb18b8adbd83e7ec52e2958d9e711c4819540b152146bc2469d608299dce56d8690cc4a63d75773091d93211c68e8107cfd5a5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    iso-bib-item (0.2.4)
+    iso-bib-item (0.2.5)
       isoics (~> 0.1.6)
       nokogiri (~> 1.8.4)
       ruby_deep_clone (~> 0.8.0)
@@ -15,7 +15,7 @@ GEM
     docile (1.3.1)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    isoics (0.1.6)
+    isoics (0.1.7)
     json (2.1.0)
     method_source (0.9.0)
     mini_portile2 (2.3.0)

data/LICENSE.txt

@@ -1,21 +1,25 @@
-The MIT License (MIT)
+BSD 2-Clause License
 
-Copyright (c) 2018 Andrei Kislichenko
+Copyright (c) 2018, Ribose
+All rights reserved.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/iso-bib-item.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.summary       = %(IsoBibItem: Ruby ISOXMLDOC impementation.)
   spec.description   = %(IsoBibItem: Ruby ISOXMLDOC impementation.)
   spec.homepage      = 'https://github.com/riboseinc/gdbib'
-  spec.license       = 'MIT'
+  spec.license       = 'BSD-2-Clause'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})

data/lib/iso_bib_item/contributor.rb

@@ -84,7 +84,7 @@ module IsoBibItem
 
     # @params builder [Nokogiri::XML::Builder]
     def to_xml(builder)
-      builder.affilation do
+      builder.affiliation do
         builder.name { name.to_xml builder } if name
         description.each { |d| builder.description { d.to_xml builder } }
         organization.to_xml builder

data/lib/iso_bib_item/from_xml.rb

@@ -26,13 +26,20 @@ module IsoBibItem
     private
 
     def fetch_docid(doc)
-      did = doc.at('/bibitem/docidentifier')
-      return unless did
-      did.text == "IEV" and return IsoBibItem::IsoDocumentId.new(project_number: "IEV", part_number: nil, prefix: nil)
-      id = did.text.match(/(?<project>\d+)(?<hyphen>-)?(?(<hyphen>)(?<part>\d*))/)
-      IsoBibItem::IsoDocumentId.new(project_number: id.nil? ? nil : id[:project],
-                                    part_number:    id.nil? ? nil : id[:part],
-                                    prefix:         nil)
+      ret = []
+      doc.xpath("/bibitem/docidentifier").each do |did|
+        #did = doc.at('/bibitem/docidentifier')
+        type = did.at("./@type")
+        if did.text == "IEV" then ret << IsoBibItem::IsoDocumentId.new(project_number: "IEV", part_number: nil, prefix: nil)
+        else
+          id = did.text.match(/^(?<project>.*\d+)(?<hyphen>-)?(?(<hyphen>)(?<part>\d*))$/)
+          ret << IsoBibItem::IsoDocumentId.new(project_number: id.nil? ? did.text : id[:project],
+                                               part_number:    id.nil? ? nil : id[:part],
+                                               prefix:         nil,
+                                               type:           type&.text)
+        end
+      end
+      ret
     end
 
     def fetch_titles(doc)
@@ -123,7 +130,7 @@ module IsoBibItem
       abbr   = org&.at('abbreviation')&.text
       url    = org&.at('uri')&.text
       entity = Organization.new(name: name, abbreviation: abbr, url: url)
-      from   = cp.at('from').text
+      from   = cp.at('from')&.text
       to     = cp.at('to')&.text
       owner  = ContributionInfo.new entity: entity
       CopyrightAssociation.new(owner: owner, from: from, to: to)

data/lib/iso_bib_item/iso_bibliographic_item.rb

@@ -32,12 +32,16 @@ module IsoBibItem
     # @return [Prefix]
     attr_reader :prefix
 
+    # @return [Prefix]
+    attr_reader :type
+
     # @param project_number [Integer]
     # @param part_number [Integer]
-    def initialize(project_number:, part_number:, prefix:)
+    def initialize(project_number:, part_number:, prefix:, type: nil)
       @project_number = project_number
       @part_number    = part_number
       @prefix         = prefix
+      @type           = type
     end
 
     def remove_part
@@ -45,7 +49,9 @@ module IsoBibItem
     end
 
     def to_xml(builder)
-      builder.docidentifier(project_number + '-' + part_number)
+      attrs = {}
+      attrs[:type] = @type if @type
+      builder.docidentifier project_number + '-' + part_number, **attrs
     end
   end
 
@@ -133,9 +139,10 @@ module IsoBibItem
         ].include? k
       end
       super(super_args)
-      @docidentifier = if args[:docid].is_a?(Hash)
-                         IsoDocumentId.new(args[:docid])
-                       else args[:docid] end
+      args[:docid] = [args[:docid]] unless args[:docid].is_a?(Array)
+      @docidentifier = args[:docid].map do |t|
+        t.is_a?(Hash) ?  IsoDocumentId.new(t) : t
+      end
       @edition = args[:edition]
       @title   = args[:titles].map do |t|
         t.is_a?(Hash) ? IsoLocalizedTitle.new(t) : t
@@ -172,7 +179,7 @@ module IsoBibItem
 
       @title.each(&:remove_part)
       @abstract = []
-      @docidentifier.remove_part
+      @docidentifier.each(&:remove_part)
       @all_parts = true
     end
 
@@ -201,14 +208,14 @@ module IsoBibItem
 
     # @todo need to add ISO/IEC/IEEE
     # @return [String]
-    def shortref(**opts)
+    def shortref(identifier, **opts)
       pubdate = dates.select { |d| d.type == "published" }
       year = if opts[:no_year] || pubdate.empty? then ""
              else ':' + pubdate&.first&.on&.year&.to_s
              end
       year += ": All Parts" if opts[:all_parts] || @all_parts
 
-      "#{id(false, ' ')}#{year}"
+      "#{makeid(identifier, false, ' ')}#{year}"
     end
 
     # @param type [Symbol] type of url, can be :src/:obp/:rss
@@ -237,20 +244,22 @@ module IsoBibItem
       end
     end
 
-    def id(attribute, delim = '')
+    def makeid(id, attribute, delim = '')
       return nil if attribute && !@id_attribute
-      contribs = publishers.map { |p| p&.entity&.abbreviation }.join '/'
-      idstr = "#{contribs}#{delim}#{@docidentifier.project_number}"
-      idstr = "IEV" if @docidentifier.project_number == "IEV"
-      if @docidentifier.part_number&.size&.positive?
-        idstr << "-#{@docidentifier.part_number}"
+      id = @docidentifier.reject { |i| i.type == "DOI" }[0] unless id
+      #contribs = publishers.map { |p| p&.entity&.abbreviation }.join '/'
+      #idstr = "#{contribs}#{delim}#{id.project_number}"
+      idstr = id.project_number.to_s
+      idstr = "IEV" if id.project_number == "IEV"
+      if id.part_number&.size&.positive?
+        idstr += "-#{id.part_number}"
       end
       idstr.strip
     end
 
     def xml_attrs(type)
       attrs = { type: type }
-      attr_id = id(true)
+      attr_id = makeid(nil, true)&.gsub(/ /, "")
       attrs[:id] = attr_id if attr_id
       attrs
     end
@@ -260,7 +269,11 @@ module IsoBibItem
         title.each { |t| t.to_xml builder }
         link.each { |s| s.to_xml builder }
         # docidentifier.to_xml builder
-        builder.docidentifier shortref(opts.merge(no_year: true))
+        @docidentifier.each do |i|
+          attrs = {}
+          attrs[:type] = i.type if i.type
+          builder.docidentifier shortref(i, opts.merge(no_year: true)), **attrs
+        end
         dates.each { |d| d.to_xml builder, opts }
         contributors.each do |c|
           builder.contributor do
@@ -280,7 +293,7 @@ module IsoBibItem
           builder.note("ISO DATE: #{opts[:note]}", format: 'text/plain')
         end
         ics.each { |i| i.to_xml builder }
-        builder.allParts 'true' if @all_parts
+        builder.allparts 'true' if @all_parts
         yield(builder) if block_given?
       end
     end

data/lib/iso_bib_item/person.rb

@@ -81,17 +81,17 @@ module IsoBibItem
     attr_accessor :name
 
     # @return [Array<IsoBibItem::Affilation>]
-    attr_accessor :affilation
+    attr_accessor :affiliation
 
     # @return [Array<IsoBibItem::PersonIdentifier>]
     attr_accessor :identifiers
 
     # @param name [IsoBibItem::FullName]
-    # @param affilation [Array<IsoBibItem::Affilation>]
-    def initialize(name:, affilation: [], contacts:)
+    # @param affiliation [Array<IsoBibItem::Affiliation>]
+    def initialize(name:, affiliation: [], contacts:)
       super(contacts: contacts)
       @name        = name
-      @affilation  = affilation
+      @affiliation  = affiliation
       @identifiers = []
     end
 
@@ -99,7 +99,7 @@ module IsoBibItem
     def to_xml(builder)
       builder.person do
         name.to_xml builder
-        affilation.each { |a| a.to_xml builder }
+        affiliation.each { |a| a.to_xml builder }
         contacts.each { |contact| contact.to_xml builder }
       end
     end

data/lib/iso_bib_item/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: false
 
 module IsoBibItem
-  VERSION = '0.2.4'.freeze
+  VERSION = '0.2.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iso-bib-item
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-31 00:00:00.000000000 Z
+date: 2018-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -175,7 +175,7 @@ files:
 - lib/iso_bib_item/version.rb
 homepage: https://github.com/riboseinc/gdbib
 licenses:
-- MIT
+- BSD-2-Clause
 metadata: {}
 post_install_message: 
 rdoc_options: []