relaton-bib 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c724b4c6147f9e16ec7af1ec4097134731a812a
-  data.tar.gz: 22c2e36e0b2f775f1e467f687b5145ab6780b915
+  metadata.gz: 2652e6a30640ef8035238e6ae6126063b9057890
+  data.tar.gz: 03f6a59bf6dd3d152578073e55d5d35b235bfc34
 SHA512:
-  metadata.gz: ca64daeace4b61699af94a1447395fa8824f093e676587a81f7e36437dc22c9684b9fdfa2aa19f500932859ebf888f8a37f3228054a1274fab886fdcc86cfdc3
-  data.tar.gz: e2818b0ffce974cbac83e445d7665902696cecbe3b068727caa85065459b710a377b17156a9809150dcdf0574325ae57a7cccd1744458e60a7507907de723308
+  metadata.gz: 6ead52473fc5af8a5c86d9fce36bc048f383c3740c2047a7fd7bfc26cfd3f6211587842a0a5add6cdc7d1060e4d9d1d6f167b4e20fb751f8482f3c2a53be2e68
+  data.tar.gz: 540bccaead183468e59e4ea8b3edc64352d1d1df1c12ca6f3a09e4e8f7c3c2f891681490a5f7d548412833dcdc9c05b96839e8a134306b1e464d92041148e863

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    relaton-bib (0.3.5)
+    relaton-bib (0.3.6)
       addressable
-      nokogiri (~> 1.10)
+      nokogiri
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     byebug (11.0.1)
     debase (0.2.3)
       debase-ruby_core_source (>= 0.10.2)
@@ -22,7 +22,7 @@ GEM
     mini_portile2 (2.4.0)
     nokogiri (1.10.3)
       mini_portile2 (~> 2.4.0)
-    public_suffix (3.1.1)
+    public_suffix (4.0.1)
     rake (10.5.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)

data/lib/relaton_bib.rb

@@ -1,11 +1,31 @@
 require "relaton_bib/version"
 require "relaton_bib/bibliographic_item"
+require "relaton_bib/hit_collection"
+require "relaton_bib/hit"
 
 module RelatonBib
   class Error < StandardError; end
 
   class RequestError < StandardError; end
 
+  class << self
+    # @param date [String]
+    # @return [Date, NilClass]
+    def parse_date(sdate)
+      if /(?<date>\w+\s\d{4})/ =~ sdate # February 2012
+        Date.strptime(date, "%B %Y")
+      elsif /(?<date>\w+\s\d{1,2},\s\d{4})/ =~ sdate # February 11, 2012
+        Date.strptime(date, "%B %d, %Y")
+      elsif /(?<date>\d{4}-\d{2}-\d{2})/ =~ sdate # 2012-02-11
+        Date.parse(date)
+      elsif /(?<date>\d{4}-\d{2})/ =~ sdate # 2012-02
+        Date.strptime date, "%Y-%m"
+      elsif /(?<date>\d{4})/ =~ sdate # 2012
+        Date.strptime date, "%Y"
+      end
+    end
+  end
+
   private
 
   # @param array [Array]

data/lib/relaton_bib/bibliographic_date.rb

@@ -22,18 +22,18 @@ module RelatonBib
     attr_reader :on
 
     # @param type [String] "published", "accessed", "created", "activated"
+    # @param on [String]
     # @param from [String]
     # @param to [String]
     def initialize(type:, on: nil, from: nil, to: nil)
       raise ArgumentError, "expected :on or :from argument" unless on || from
 
-      TYPES.include?(type) or
-        raise ArgumentError, %{Type "#{type}" is invalid.} unless
+      raise ArgumentError, "invalid type: #{type}" unless TYPES.include? type
 
       @type = type
-      @on   = parse_date on
-      @from = parse_date from
-      @to   = parse_date to
+      @on   = RelatonBib.parse_date on
+      @from = RelatonBib.parse_date from
+      @to   = RelatonBib.parse_date to
     end
 
     # rubocop:disable Metrics/AbcSize
@@ -74,19 +74,5 @@ module RelatonBib
       else date.year
       end
     end
-
-    # @params date [String] 'yyyy', 'yyyy-mm', 'yyyy-mm-dd
-    # @return [Date]
-    def parse_date(date)
-      return unless date
-
-      if date =~ /^\d{4}$/
-        Date.strptime date, "%Y"
-      elsif date =~ /^\d{4}-\d{2}$/
-        Date.strptime date, "%Y-%m"
-      elsif date =~ /\d{4}-\d{2}-\d{2}$/
-        Date.strptime date, "%Y-%m-%d"
-      end
-    end
   end
 end

data/lib/relaton_bib/bibliographic_item.rb

@@ -210,7 +210,7 @@ module RelatonBib
       @language       = args.fetch :language, []
       @script         = args.fetch :script, []
       @status         = args[:docstatus]
-      @relation      = DocRelationCollection.new(args[:relation] || [])
+      @relation       = DocRelationCollection.new(args[:relation] || [])
       @link           = args.fetch(:link, []).map { |s| s.is_a?(Hash) ? TypedUri.new(s) : s }
       @series         = args.fetch :series, []
       @medium         = args[:medium]

data/lib/relaton_bib/copyright_association.rb

@@ -29,7 +29,7 @@ module RelatonBib
     # @param builder [Nokogiri::XML::Builder]
     def to_xml(builder)
       builder.copyright do
-        builder.from from ? from.year : "copyright year unknown"
+        builder.from from ? from.year : "unknown"
         builder.to to.year if to
         builder.owner { owner.to_xml builder }
       end

data/lib/relaton_bib/hash_converter.rb

@@ -139,8 +139,8 @@ module RelatonBib
           roles = array(ret[:contributor][i][:role]).map do |r|
             if r.is_a? Hash
               { type: r[:type], description: array(r[:description]) }
-            elsif r.is_a? Array
-              { type: r[0], description: r.fetch(1) }
+            # elsif r.is_a? Array
+            #   { type: r[0], description: r.fetch(1) }
             else
               { type: r }
             end

data/lib/relaton_bib/hit.rb

@@ -0,0 +1,32 @@
+module RelatonBib
+  class Hit
+    # @return [Array<Hash>]
+    attr_reader :hit
+
+    # @param hit [Hash]
+    # @param hit_collection [RelatonNist:HitCollection]
+    def initialize(hit, hit_collection = nil)
+      @hit            = hit
+      @hit_collection = hit_collection
+    end
+
+    # @return [String]
+    def to_s
+      inspect
+    end
+
+    # @return [String]
+    def inspect
+      "<#{self.class}:#{format('%#.14x', object_id << 1)} "\
+      "@text=\"#{@hit_collection&.text}\" "\
+      "@fetched=\"#{!@fetch.nil?}\" "\
+      "@fullIdentifier=\"#{@fetch&.shortref(nil)}\" "\
+      "@title=\"#{@hit[:code]}\">"
+    end
+
+    # @return [String]
+    def to_xml(**opts)
+      fetch.to_xml **opts
+    end
+  end
+end

data/lib/relaton_bib/hit_collection.rb

@@ -0,0 +1,34 @@
+module RelatonBib
+  class HitCollection < Array
+    # @return [TrueClass, FalseClass]
+    attr_reader :fetched
+
+    # @return [String]
+    attr_reader :text
+
+    # @return [String]
+    attr_reader :year
+
+    # @return [Iecbib::HitCollection]
+    def fetch
+      workers = WorkersPool.new 4
+      workers.worker(&:fetch)
+      each do |hit|
+        workers << hit
+      end
+      workers.end
+      workers.result
+      @fetched = true
+      self
+    end
+
+    def to_s
+      inspect
+    end
+
+    # @return [String]
+    def inspect
+      "<#{self.class}:#{format('%#.14x', object_id << 1)} @fetched=#{@fetched}>"
+    end
+  end
+end

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "0.3.5".freeze
+  VERSION = "0.3.6".freeze
 end

data/relaton-bib.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = "RelatonBib: Ruby XMLDOC impementation."
   spec.description   = "RelatonBib: Ruby XMLDOC impementation."
-  spec.homepage      = "https://github.com/metanorma/relaton-item"
+  spec.homepage      = "https://github.com/relaton/relaton-item"
   spec.license       = "BSD-2-Clause"
 
   # Specify which files should be added to the gem when it is released.
@@ -33,5 +33,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "byebug"
 
   spec.add_dependency "addressable"
-  spec.add_dependency "nokogiri", "~> 1.10"
+  spec.add_dependency "nokogiri"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-20 00:00:00.000000000 Z
+date: 2019-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,16 +140,16 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 description: 'RelatonBib: Ruby XMLDOC impementation.'
 email:
 - open.source@ribose.com
@@ -188,6 +188,8 @@ files:
 - lib/relaton_bib/formatted_string.rb
 - lib/relaton_bib/hash_converter.rb
 - lib/relaton_bib/hash_to_bib.rb
+- lib/relaton_bib/hit.rb
+- lib/relaton_bib/hit_collection.rb
 - lib/relaton_bib/localized_string.rb
 - lib/relaton_bib/medium.rb
 - lib/relaton_bib/organization.rb
@@ -200,7 +202,7 @@ files:
 - lib/relaton_bib/workers_pool.rb
 - lib/relaton_bib/xml_parser.rb
 - relaton-bib.gemspec
-homepage: https://github.com/metanorma/relaton-item
+homepage: https://github.com/relaton/relaton-item
 licenses:
 - BSD-2-Clause
 metadata: {}