iso-bib-item 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6152b8b2dac4f1407c12f429da08f38a998fb370a0365daf0244b83c1cf11aa1
-  data.tar.gz: 2e2c14cd1a79aad12de2188bda4fe184182a1969ea5fb61acba618d2a51b8528
+  metadata.gz: 9151a606d6472ed717dd72355de133f60267115db58ad044487e90c6dd8121f0
+  data.tar.gz: 582951ceb750e9a04249adce617003dfa0ae0846d6b2d26c2325e06fea3daf85
 SHA512:
-  metadata.gz: 8717fbba17d12177e540244ecc56623ff7160093e3316bb760dc493798a4d2129f03aeb0e1d6fc1e2bb7c246806be4a0773068e0a90d95338e03872515e66436
-  data.tar.gz: 3366b6defa16b2cdea5ca407cfeb18b8adbd83e7ec52e2958d9e711c4819540b152146bc2469d608299dce56d8690cc4a63d75773091d93211c68e8107cfd5a5
+  metadata.gz: 326360eeb3139af52a7fd7fe7f839ce72c9c20b33bc3ac73a4427e6167e047a48e13536bd4894ea1da638bbd7657d0cbb570af43c05349a896163b291cddc5bb
+  data.tar.gz: 587f9215a2668f7170e269305e90b9601c5963560fb5eb7871961f3e5016843954eba2041b3f525ecfde9d776b0ff79a13e4306ad44b94d3a38070bdf756b08e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    iso-bib-item (0.2.5)
+    iso-bib-item (0.3.0)
       isoics (~> 0.1.6)
       nokogiri (~> 1.8.4)
       ruby_deep_clone (~> 0.8.0)
@@ -28,19 +28,19 @@ GEM
       byebug (~> 10.0)
       pry (~> 0.10)
     rake (10.5.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
     ruby_deep_clone (0.8.0)
     simplecov (0.16.1)
       docile (~> 1.1)

data/lib/iso_bib_item/from_xml.rb

@@ -36,6 +36,7 @@ module IsoBibItem
           ret << IsoBibItem::IsoDocumentId.new(project_number: id.nil? ? did.text : id[:project],
                                                part_number:    id.nil? ? nil : id[:part],
                                                prefix:         nil,
+                                               id:             did.text,
                                                type:           type&.text)
         end
       end

data/lib/iso_bib_item/iso_bibliographic_item.rb

@@ -29,6 +29,9 @@ module IsoBibItem
     # @return [Integer]
     attr_reader :part_number
 
+    # @return [String]
+    attr_reader :id
+
     # @return [Prefix]
     attr_reader :prefix
 
@@ -37,21 +40,41 @@ module IsoBibItem
 
     # @param project_number [Integer]
     # @param part_number [Integer]
-    def initialize(project_number:, part_number:, prefix:, type: nil)
+    def initialize(project_number:, part_number:, prefix:, id:, type: nil)
       @project_number = project_number
       @part_number    = part_number
       @prefix         = prefix
       @type           = type
+      @id             = id
     end
 
+    # in docid manipulations, assume ISO as the default: id-part:year
     def remove_part
       @part_number = nil
+      case @type
+      when "Chinese Standard" then @id = @id.sub(/\.\d+/, "")
+      else 
+        @id = @id.sub(/-\d+/, "")
+      end
+    end
+
+    def remove_date
+      case @type
+      when "Chinese Standard" then @id = @id.sub(/-[12]\d\d\d/, "")
+      else
+        @id = @id.sub(/:[12]\d\d\d/, "")
+      end
+    end
+
+    def all_parts
+      @id = @id + " (all parts)"
     end
 
     def to_xml(builder)
       attrs = {}
       attrs[:type] = @type if @type
-      builder.docidentifier project_number + '-' + part_number, **attrs
+      # builder.docidentifier project_number + '-' + part_number, **attrs
+      builder.docidentifier id, **attrs
     end
   end
 
@@ -172,14 +195,13 @@ module IsoBibItem
 
     # remove title part components and abstract  
     def to_all_parts
-      #me = Duplicate.duplicate(self)
       me = DeepClone.clone(self)
       me.disable_id_attribute
       @relations << DocumentRelation.new(type: "partOf", identifier: nil, url: nil, bibitem: me)
-
       @title.each(&:remove_part)
       @abstract = []
       @docidentifier.each(&:remove_part)
+      @docidentifier.each(&:all_parts)
       @all_parts = true
     end
 
@@ -188,12 +210,12 @@ module IsoBibItem
     # date of publication, abstracts. Make dated reference Instance relation
     # of the redacated document
     def to_most_recent_reference
-      #me = Duplicate.duplicate(self)
       me = DeepClone.clone(self)
       me.disable_id_attribute
       @relations << DocumentRelation.new(type: "instance", identifier: nil, url: nil, bibitem: me)
       @abstract = []
       @dates = []
+      @docidentifier.each(&:remove_date)
     end
 
     # @param lang [String] language code Iso639
@@ -206,7 +228,6 @@ module IsoBibItem
       end
     end
 
-    # @todo need to add ISO/IEC/IEEE
     # @return [String]
     def shortref(identifier, **opts)
       pubdate = dates.select { |d| d.type == "published" }
@@ -249,11 +270,10 @@ module IsoBibItem
       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.project_number.to_s
+      idstr = id.id.gsub(/:/, "-")
       idstr = "IEV" if id.project_number == "IEV"
-      if id.part_number&.size&.positive?
-        idstr += "-#{id.part_number}"
-      end
+      #if id.part_number&.size&.positive? then idstr += "-#{id.part_number}"
       idstr.strip
     end
 
@@ -272,7 +292,8 @@ module IsoBibItem
         @docidentifier.each do |i|
           attrs = {}
           attrs[:type] = i.type if i.type
-          builder.docidentifier shortref(i, opts.merge(no_year: true)), **attrs
+          # builder.docidentifier shortref(i, opts.merge(no_year: true)), **attrs
+          builder.docidentifier i.id, **attrs
         end
         dates.each { |d| d.to_xml builder, opts }
         contributors.each do |c|

data/lib/iso_bib_item/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iso-bib-item
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-25 00:00:00.000000000 Z
+date: 2018-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler