relaton-gb 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87629d5d68e9798b8e251cdfd3c5248676cc93dd
-  data.tar.gz: 94c3a025a0db145fb4433fe12259cd8001ffdd9c
+  metadata.gz: '08660ea6761c9bcf3be4f3876838dc33b19bf25d'
+  data.tar.gz: '02690d3dd1ee0c0396a86a9e3e360ffd52468822'
 SHA512:
-  metadata.gz: 553214749bbd2b4ba9e046f7e4a3d36201a219bb90c865ea42c2d09c995f7291281a249812a589984a8a713b8a2996d1819a911e96618534debf468c10040667
-  data.tar.gz: 2282a0d505cdd6a7499d0ab5e9ae91e8a1bbf8b2ab0ab8342331b14e9cb9d13a5d6b34bf4a7af76cfd861abfe2c63b489951329eec728aae92610bfc8bc70a51
+  metadata.gz: 23d003d2e3cdb41c3f3fc573dac0258c74eaaa00a4cc096f5eef3354f8538a19ddc72cab102bc60a61991ac66c8f2e2739e7ac742ade485835b9dc19cb0465bf
+  data.tar.gz: 86d5166d5e78449170184e9673fed3be8b7900832362279d2bc55d3b0e2596bad1e9e0286da64eb7a77069355f92bca5e37a5493aa87155ce9dfda263993fdb3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    relaton-gb (0.6.0)
+    relaton-gb (0.6.1)
       cnccs (~> 0.1.1)
       gb-agencies (~> 0.0.1)
       relaton-iso-bib (~> 0.3.0)
@@ -36,10 +36,10 @@ GEM
       pry (~> 0.10)
     public_suffix (3.1.1)
     rake (10.5.0)
-    relaton-bib (0.3.0)
+    relaton-bib (0.3.2)
       addressable
       nokogiri (~> 1.10)
-    relaton-iso-bib (0.3.0)
+    relaton-iso-bib (0.3.2)
       isoics (~> 0.1.6)
       relaton-bib (~> 0.3.0)
       ruby_deep_clone (~> 0.8.0)

data/README.adoc

@@ -108,6 +108,21 @@ hit_collection.first.fetch.date
 => [#<RelatonBib::BibliographicDate:0x007f975a0207d0 @from=nil, @on=2006-03-10 00:00:00 +0100, @to=nil, @type="published">]
 ----
 
+=== Create bibliographic item form YAML
+[source,ruby]
+----
+hash = YAML.load_file 'spec/examples/gb_bib_item.yml'
+=> {"id"=>"JB/T13368",
+...
+
+bib_hash = RelatonGb::HashConverter.hash_to_bib hash
+=> {:id=>"JB/T13368",
+...
+
+RelatonGb::GbBibliographicItem.new bib_hash
+=> <RelatonGb::GbBibliographicItem:0x007fc680802700>
+----
+
 === Serialization
 
 [source,ruby]

data/lib/relaton_gb/gb_bibliographic_item.rb

@@ -5,6 +5,7 @@ require "cnccs"
 require "relaton_gb/gb_technical_committee"
 require "relaton_gb/gb_standard_type"
 require "relaton_gb/xml_parser"
+require "relaton_gb/hash_converter"
 
 module RelatonGb
   # GB bibliographic item class.
@@ -30,7 +31,7 @@ module RelatonGb
     def initialize(**args)
       super
       args[:committee] && @committee = GbTechnicalCommittee.new(args[:committee])
-      @ccs = args[:ccs].map { |c| Cnccs.fetch c }
+      @ccs = args[:ccs].map { |c| c.is_a?(Cnccs::Ccs) ? c : Cnccs.fetch(c) }
       @gbtype = GbStandardType.new args[:gbtype]
       @type = args[:type]
       @gbplannumber = args[:gbplannumber] || structuredidentifier&.project_number

data/lib/relaton_gb/hash_converter.rb

@@ -0,0 +1,45 @@
+require "yaml"
+
+module RelatonGb
+  class HashConverter < RelatonIsoBib::HashConverter
+    class << self
+      # @override RelatonBib::HashConverter.hash_to_bib
+      # @param args [Hash]
+      # @param nested [TrueClass, FalseClass]
+      # @return [Hash]
+      def hash_to_bib(args, nested = false)
+        ret = super
+        return if ret.nil?
+
+        committee_hash_to_bib(ret)
+        ccs_hash_to_bib(ret)
+        ret
+      end
+
+      private
+
+      def committee_hash_to_bib(ret)
+        return unless ret[:title]
+
+        ret[:title] = array(ret[:title])
+        ret[:title] = ret[:title].map do |t|
+          titleparts = {}
+          titleparts = split_title(t) unless t.is_a?(Hash)
+          if t.is_a?(Hash) && t[:content]
+            titleparts = split_title(t[:content], t[:language], t[:script])
+          end
+          if t.is_a?(Hash) then t.merge(titleparts)
+          else
+            { content: t, language: "en", script: "Latn", format: "text/plain", type: "main" }
+          end
+        end
+      end
+
+      def ccs_hash_to_bib(ret)
+        ret[:ccs] = ret.fetch(:ccs, []).map do |ccs|
+          ccs[:code] ? Cnccs.fetch(ccs[:code]) : Cnccs.fetch(ccs)
+        end
+      end
+    end
+  end
+end

data/lib/relaton_gb/scrapper.rb

@@ -73,7 +73,7 @@ module RelatonGb
         { language: "en", content: gb_en.standard_agency1(gbtype[:scope], name, gbtype[:mandate]) },
         { language: "zh", content: gb_zh.standard_agency1(gbtype[:scope], name, gbtype[:mandate]) },
       ]
-      [{ entity: entity, role: ["publisher"] }]
+      [{ entity: entity, role: [type: "publisher"] }]
     end
 
     # @param doc [Nokogiri::HTML::Document]

data/lib/relaton_gb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RelatonGb
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-gb
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-24 00:00:00.000000000 Z
+date: 2019-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -192,6 +192,7 @@ files:
 - lib/relaton_gb/gb_scrapper.rb
 - lib/relaton_gb/gb_standard_type.rb
 - lib/relaton_gb/gb_technical_committee.rb
+- lib/relaton_gb/hash_converter.rb
 - lib/relaton_gb/hit.rb
 - lib/relaton_gb/hit_collection.rb
 - lib/relaton_gb/scrapper.rb