relaton-gb 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '08660ea6761c9bcf3be4f3876838dc33b19bf25d'
-  data.tar.gz: '02690d3dd1ee0c0396a86a9e3e360ffd52468822'
+  metadata.gz: c0978ce217698027cca98e48fcad3fdf3060af8f
+  data.tar.gz: 3f9e4857d33b1b3aee204746098c003816ded415
 SHA512:
-  metadata.gz: 23d003d2e3cdb41c3f3fc573dac0258c74eaaa00a4cc096f5eef3354f8538a19ddc72cab102bc60a61991ac66c8f2e2739e7ac742ade485835b9dc19cb0465bf
-  data.tar.gz: 86d5166d5e78449170184e9673fed3be8b7900832362279d2bc55d3b0e2596bad1e9e0286da64eb7a77069355f92bca5e37a5493aa87155ce9dfda263993fdb3
+  metadata.gz: 6a52a32b85031f0b31005a562fa3c95e630f9a33e353b7b0371eee23ebb8483430cf770bc16f900406357609ecbabae3dcb8dab1af6e2ac5a9151866bb03ceb0
+  data.tar.gz: 9d3ab095b5681268b8113789b53c0b60140e4faf427918f29561460454fec99b9cff46bb9d39d5b6480df341f7d23396c17bcb8258fa95f413965a7f136f4e96

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    relaton-gb (0.6.1)
+    relaton-gb (0.6.2)
       cnccs (~> 0.1.1)
       gb-agencies (~> 0.0.1)
       relaton-iso-bib (~> 0.3.0)
@@ -26,7 +26,7 @@ GEM
     json (2.2.0)
     method_source (0.9.2)
     mini_portile2 (2.4.0)
-    nokogiri (1.10.3)
+    nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
@@ -36,10 +36,10 @@ GEM
       pry (~> 0.10)
     public_suffix (3.1.1)
     rake (10.5.0)
-    relaton-bib (0.3.2)
+    relaton-bib (0.3.5)
       addressable
       nokogiri (~> 1.10)
-    relaton-iso-bib (0.3.2)
+    relaton-iso-bib (0.3.4)
       isoics (~> 0.1.6)
       relaton-bib (~> 0.3.0)
       ruby_deep_clone (~> 0.8.0)

data/lib/relaton_gb/ccs.rb

@@ -0,0 +1,8 @@
+module Cnccs
+  class Ccs
+    # @return [Hash]
+    def to_hash
+      { "code" => code }
+    end
+  end
+end

data/lib/relaton_gb/gb_bibliographic_item.rb

@@ -6,6 +6,7 @@ require "relaton_gb/gb_technical_committee"
 require "relaton_gb/gb_standard_type"
 require "relaton_gb/xml_parser"
 require "relaton_gb/hash_converter"
+require "relaton_gb/ccs"
 
 module RelatonGb
   # GB bibliographic item class.
@@ -49,6 +50,16 @@ module RelatonGb
       end
     end
 
+    # @return [Hash]
+    def to_hash
+      hash = super
+      hash["ccs"] = single_element_array(ccs) if ccs&.any?
+      hash["committee"] = committee.to_hash if committee
+      hash["plannumber"] = gbplannumber if gbplannumber
+      hash["gbtype"] = gbtype.to_hash
+      hash
+    end
+
     # @return [String]
     def inspect
       "<#{self.class}:#{format('%#.14x', object_id << 1)}>"
@@ -97,9 +108,8 @@ module RelatonGb
     # @param builder [Nokogiri::XML::Builder]
     def render_gbxml(builder)
       gbtype.to_xml builder
-      return unless ccs.any?
 
-      ccs.each do |c|
+      ccs&.each do |c|
         builder.ccs do
           builder.code c.code
           builder.text_ c.description

data/lib/relaton_gb/gb_scrapper.rb

@@ -23,7 +23,7 @@ module RelatonGb
           Hit.new pid: h[:pid], title: h.text, scrapper: self
         end
         HitCollection.new hits
-      rescue OpenURI::HTTPError, SocketError
+      rescue OpenURI::HTTPError, SocketError, OpenSSL::SSL::SSLError
         raise RelatonBib::RequestError, "Cannot access http://www.std.gov.cn/search/stdPage"
       end
 
@@ -33,7 +33,7 @@ module RelatonGb
         src = "http://www.std.gov.cn/gb/search/gbDetailed?id=" + pid
         doc = Nokogiri::HTML OpenURI.open_uri(src)
         GbBibliographicItem.new scrapped_data(doc, src: src)
-      rescue OpenURI::HTTPError, SocketError
+      rescue OpenURI::HTTPError, SocketError, OpenSSL::SSL::SSLError
         raise RelatonBib::RequestError, "Cannot access #{src}"
       end
 

data/lib/relaton_gb/gb_standard_type.rb

@@ -26,5 +26,10 @@ module RelatonGb
         builder.gbmandate @mandate
       end
     end
+
+    # @return [Hash]
+    def to_hash
+      { "scope" => scope, "prefix" => prefix, "mandate" => mandate }
+    end
   end
 end

data/lib/relaton_gb/gb_technical_committee.rb

@@ -19,5 +19,10 @@ module RelatonGb
         builder.text @name
       end
     end
+
+    # @return [Hash]
+    def to_hash
+      { "type" => type, "name" => name }
+    end
   end
 end

data/lib/relaton_gb/hash_converter.rb

@@ -11,32 +11,14 @@ module RelatonGb
         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|
+        ret[:ccs] = array(ret[:ccs]).map do |ccs|
           ccs[:code] ? Cnccs.fetch(ccs[:code]) : Cnccs.fetch(ccs)
         end
       end

data/lib/relaton_gb/sec_scrapper.rb

@@ -25,7 +25,8 @@ module RelatonGb
         end
         HitCollection.new hits
       rescue SocketError, Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
-             Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError
+             Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError,
+             OpenSSL::SSL::SSLError
         raise RelatonBib::RequestError, "Cannot access #{uri}"
       end
 
@@ -37,7 +38,8 @@ module RelatonGb
         doc = Nokogiri::HTML Net::HTTP.get(page_uri)
         GbBibliographicItem.new scrapped_data(doc, src: src)
       rescue SocketError, Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
-             Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError
+             Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError,
+             OpenSSL::SSL::SSLError
         raise RelatonBib::RequestError, "Cannot access #{src}"
       end
 

data/lib/relaton_gb/t_scrapper.rb

@@ -30,7 +30,7 @@ module RelatonGb
           Hit.new pid: h[:href].sub(%r{\/$}, ""), title: title, scrapper: self
         end
         HitCollection.new hits
-      rescue OpenURI::HTTPError, SocketError
+      rescue OpenURI::HTTPError, SocketError, OpenSSL::SSL::SSLError
         raise RelatonBib::RequestError, "Cannot access http://www.ttbz.org.cn/Home/Standard"
       end
       # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
@@ -41,7 +41,7 @@ module RelatonGb
         src = "http://www.ttbz.org.cn#{pid}"
         doc = Nokogiri::HTML OpenURI.open_uri(src), nil, Encoding::UTF_8.to_s
         GbBibliographicItem.new scrapped_data(doc, src: src)
-      rescue OpenURI::HTTPError, SocketError
+      rescue OpenURI::HTTPError, SocketError, OpenSSL::SSL::SSLError
         raise RelatonBib::RequestError, "Cannot access #{src}"
       end
 

data/lib/relaton_gb/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-gb
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-02 00:00:00.000000000 Z
+date: 2019-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -187,6 +187,7 @@ files:
 - bin/setup
 - lib/relaton/processor.rb
 - lib/relaton_gb.rb
+- lib/relaton_gb/ccs.rb
 - lib/relaton_gb/gb_bibliographic_item.rb
 - lib/relaton_gb/gb_bibliography.rb
 - lib/relaton_gb/gb_scrapper.rb