iso-bib-item 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca79f41d3ca54902184130b6a7412f2fa789f980b02e11fa971f53c09b2198d8
-  data.tar.gz: b7200cc75fe060f999f1bb45b75e88b2fdc9e8b7a53681d18809cecfc2006f96
+  metadata.gz: 93e9e966049ede92822f11ec8edb1af7a01a5a7d19c1ba5ec5db26191a0e6688
+  data.tar.gz: 9b2f5b360649b0ba149b05c5b90276c5a1c031a578fabbf10e822b002c928a17
 SHA512:
-  metadata.gz: 4f77ce607e22d5ae4f3077b8197e6a44086ebeeeb490049be2781f52025e0bbcc2af87d05f9c11e32a372798633d85fc7d9ddcd80b481471f941296157983f89
-  data.tar.gz: 6ce0d5f2ec69c816ecb3df5bb658e01747ec000c7bc2c16280e0c42623510f45c55252330639e088dd4b28a1c93c89b283190ad3d31019cde22c1db83c3f26b4
+  metadata.gz: 5cfcbff5e7d81f2cd893b3fce9a3d56293891ee3c4c7b8650b3b6f8d1d5bcd62c20f6a19354d987f763c442c7147404362fa44f0e6842911b4770abca030fdda
+  data.tar.gz: 5a0a92d527a0be5dc78b31f676a0de8611cc1398c8fe85826259fb82bd7ccc0cdb455ffb816d0d5c8102aa0624f80a5bab4b50a1d4c8fa1734569d8badd74b55

data/.travis.yml

@@ -7,8 +7,8 @@ rvm:
   - 2.3
   - ruby-head
 
-before_install: gem install bundler -v 1.16.1
+before_install: gem install bundler -v 2.0.1
 
 matrix:
   allow_failures:
-    - rvm: ruby-head
+    - rvm: ruby-head

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    iso-bib-item (0.4.4)
+    iso-bib-item (0.4.5)
       isoics (~> 0.1.6)
       nokogiri (~> 1.8.4)
       ruby_deep_clone (~> 0.8.0)
@@ -9,14 +9,14 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    byebug (10.0.2)
+    byebug (11.0.1)
     coderay (1.1.2)
     diff-lcs (1.3)
     docile (1.3.1)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
     isoics (0.1.7)
-    json (2.1.0)
+    json (2.2.0)
     method_source (0.9.2)
     mini_portile2 (2.3.0)
     nokogiri (1.8.5)
@@ -24,8 +24,8 @@ GEM
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
       pry (~> 0.10)
     rake (10.5.0)
     rspec (3.8.0)
@@ -52,7 +52,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 2.0.1)
   equivalent-xml (~> 0.6)
   iso-bib-item!
   pry-byebug
@@ -61,4 +61,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   1.17.1
+   2.0.1

data/README.adoc

@@ -1,10 +1,10 @@
 = IsoBibItem
 
 image:https://img.shields.io/gem/v/iso-bib-item.svg["Gem Version", link="https://rubygems.org/gems/iso-bib-item"]
-image:https://img.shields.io/travis/riboseinc/iso-bib-item/master.svg["Build Status", link="https://travis-ci.org/riboseinc/iso-bib-item"]
-image:https://codeclimate.com/github/riboseinc/iso-bib-item/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/riboseinc/iso-bib-item"]
+image:https://img.shields.io/travis/metanorma/iso-bib-item/master.svg["Build Status", link="https://travis-ci.com/metanorma/iso-bib-item"]
+image:https://codeclimate.com/github/metanorma/iso-bib-item/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/iso-bib-item"]
 
-IsoBib is a Ruby gem that implements the https://github.com/riboseinc/isodoc-models#iso-bibliographic-item[IsoBibliographicItem model].
+IsoBib is a Ruby gem that implements the https://github.com/metanorma/metanorma-model-iso#iso-bibliographic-item[IsoBibliographicItem model].
 
 == Installation
 
@@ -378,7 +378,7 @@ item.to_xml
 
 == BibliographicItem
 
-The ISO standards use a subset of the generic bibliographic fields specified in the https://github.com/riboseinc/isodoc-models#iso-bibliographic-item[IsoBibliographicItem model]:
+The ISO standards use a subset of the generic bibliographic fields specified in the https://github.com/metanorma/metanorma-model-iso#iso-bibliographic-item[IsoBibliographicItem model]:
 
 * Title:
 ** English; French

data/iso-bib-item.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %(IsoBibItem: Ruby ISOXMLDOC impementation.)
   spec.description   = %(IsoBibItem: Ruby ISOXMLDOC impementation.)
-  spec.homepage      = 'https://github.com/riboseinc/iso-bib-item'
+  spec.homepage      = 'https://github.com/metanorma/iso-bib-item'
   spec.license       = 'BSD-2-Clause'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'bundler', '~> 2.0.1'
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'

data/lib/iso_bib_item/bibliographic_date.rb

@@ -28,21 +28,29 @@ module IsoBibItem
       @to   = parse_date to
     end
 
-    # rubocop:disable Metric/AbcSize
+    # rubocop:disable Metrics/AbcSize
 
     # @param builder [Nokogiri::XML::Builder]
     # @return [Nokogiri::XML::Builder]
     def to_xml(builder, **opts)
       builder.date(type: type) do
         if on
-          builder.on(opts[:no_year] ? '--' : on.year)
-        else
-          builder.from(opts[:no_year] ? '--' : from.year)
-          builder.to to.year if to
+          date = opts[:full_date] ? on.strftime("%Y-%m") : on.year
+          builder.on(opts[:no_year] ? '--' : date)
+        elsif from
+          if opts[:full_date]
+            date_form = from.strftime("%Y-%m")
+            date_to = to.strftime("%Y-%m") if to
+          else
+            date_form = from.year
+            date_to = to.year if to
+          end
+          builder.from(opts[:no_year] ? '--' : date_form)
+          builder.to date_to if to
         end
       end
     end
-    # rubocop:enable Metric/AbcSize
+    # rubocop:enable Metrics/AbcSize
 
     private
 

data/lib/iso_bib_item/bibliographic_item.rb

@@ -189,6 +189,11 @@ module IsoBibItem
         a.is_a?(Hash) ? FormattedString.new(a) : a
       end
       @relations = DocRelationCollection.new(args[:relations] || [])
+      if args[:copyright]
+        @copyright = if args[:copyright].is_a?(Hash)
+                       CopyrightAssociation.new args[:copyright]
+                     else args[:copyright] end
+      end
       @link = args[:link].map { |s| s.is_a?(Hash) ? TypedUri.new(s) : s }
       @series = args[:series]
       @fetched = args.fetch :fetched, Date.today
@@ -206,6 +211,28 @@ module IsoBibItem
       end
     end
 
+    def makeid(id, attribute, delim = '')
+      return nil if attribute && !@id_attribute
+      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 = id.id.gsub(/:/, "-")
+      #if id.part_number&.size&.positive? then idstr += "-#{id.part_number}"
+      idstr.strip
+    end
+
+    # @return [String]
+    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
+
+      "#{makeid(identifier, false, ' ')}#{year}"
+    end
+
     # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
 
     # @return [String]
@@ -216,7 +243,7 @@ module IsoBibItem
           title.each { |t| xml.title { t.to_xml xml } }
           link.each { |s| s.to_xml xml }
           docidentifier.each { |di| di.to_xml xml }
-          dates.each { |d| d.to_xml xml }
+          dates.each { |d| d.to_xml xml, full_date: true }
           contributors.each do |c|
             xml.contributor do
               c.role.each { |r| r.to_xml xml }
@@ -224,7 +251,11 @@ module IsoBibItem
             end
           end
           language.each { |l| xml.language l }
-          status&.to_xml xml
+          script.each { |s| xml.script s }
+          abstract.each { |a| xml.abstract { a.to_xml(xml) } }
+          status.to_xml xml if status
+          copyright.to_xml xml if copyright
+          relations.each { |r| r.to_xml xml }
           series.each { |s| s.to_xml xml } if series
         end
       end.doc.root.to_xml

data/lib/iso_bib_item/iso_bibliographic_item.rb

@@ -167,7 +167,7 @@ module IsoBibItem
     def initialize(**args)
       super_args = args.select do |k|
         %i[
-          id language script dates abstract contributors relations link
+          id language script dates abstract contributors relations copyright link
         ].include? k
       end
       super(super_args)
@@ -189,11 +189,6 @@ module IsoBibItem
                      else args[:workgroup] end
       end
       @ics = args[:ics].map { |i| i.is_a?(Hash) ? Ics.new(i) : i }
-      if args[:copyright]
-        @copyright = if args[:copyright].is_a?(Hash)
-                       CopyrightAssociation.new args[:copyright]
-                     else args[:copyright] end
-      end
       @link = args[:link].map { |s| s.is_a?(Hash) ? TypedUri.new(s) : s }
       @id_attribute = true
     end
@@ -237,17 +232,6 @@ module IsoBibItem
       end
     end
 
-    # @return [String]
-    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
-
-      "#{makeid(identifier, false, ' ')}#{year}"
-    end
-
     # @param type [Symbol] type of url, can be :src/:obp/:rss
     # @return [String]
     def url(type = :src)
@@ -311,9 +295,9 @@ module IsoBibItem
         script.each { |s| builder.script s }
         abstract.each { |a| builder.abstract { a.to_xml(builder) } }
         status.to_xml builder
-        copyright&.to_xml builder
+        copyright.to_xml builder if copyright
         relations.each { |r| r.to_xml builder }
-        workgroup&.to_xml builder
+        workgroup.to_xml builder if workgroup
         if opts[:note]
           builder.note("ISO DATE: #{opts[:note]}", format: 'text/plain')
         end

data/lib/iso_bib_item/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iso-bib-item
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-27 00:00:00.000000000 Z
+date: 2019-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -174,7 +174,7 @@ files:
 - lib/iso_bib_item/series.rb
 - lib/iso_bib_item/version.rb
 - lib/iso_bib_item/xml_parser.rb
-homepage: https://github.com/riboseinc/iso-bib-item
+homepage: https://github.com/metanorma/iso-bib-item
 licenses:
 - BSD-2-Clause
 metadata: {}