relaton-cli 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e74bfad8fd8fc91ea7d6edb7d99ae7db0c84098a
-  data.tar.gz: c51255ede446589ffe0ad24fb2f3dbac6e1ab01f
+  metadata.gz: bfce91270bd957a41eb9ef66a7ece0eb1ba02b1f
+  data.tar.gz: e9d98aca4fae3ab0f7c190e3b34c3203ba6f2f9f
 SHA512:
-  metadata.gz: 0cd377d7a23849cc64514c91161f84235d363e08cb707583160cf6b4b5bc8bf6575a34f62bc6438b12a3c8bfc45258612cda977aee1923db5e9c83f8146f2fb3
-  data.tar.gz: 1b40b4e556032a06ea007c170ece4da5aa58f791f05ca3ae42845b027d9054ae2c9b97f93a7d23623570a30fb43b96496efee6b65efe3a73c11c7b016b96ae72
+  metadata.gz: 9750ec75dc8064f8e003973c577ebe4ed3515f4e1069acb9fd09779a019f2fa68e32282403a00318bf823a799af6e717b45737bf3ba8d8ccf04ec87c6a99b4bd
+  data.tar.gz: e662791c6045d76b62e818790fe98fdf98df4374eddd8861c94c6c4313288970a02aa722388121c2819c428a35f9c65e94d498acf4c2eff6bc927517ad48cbc7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    relaton-cli (0.3.4)
+    relaton-cli (0.3.5)
       liquid
       relaton (~> 0.5)
       thor
@@ -9,11 +9,8 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
-    algoliasearch (1.26.1)
-      httpclient (~> 2.8, >= 2.8.3)
-      json (>= 1.5.1)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     byebug (10.0.2)
     cnccs (0.1.3)
     coderay (1.1.2)
@@ -21,55 +18,61 @@ GEM
       debase-ruby_core_source (>= 0.10.2)
     debase-ruby_core_source (0.10.5)
     diff-lcs (1.3)
+    docile (1.3.2)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
+    faraday (0.15.4)
+      multipart-post (>= 1.2, < 3)
     gb-agencies (0.0.5)
-    httpclient (2.8.3)
     isoics (0.1.7)
     json (2.2.0)
     liquid (4.0.3)
     method_source (0.9.2)
     mini_portile2 (2.4.0)
     mixlib-shellout (2.4.4)
+    multipart-post (2.1.1)
     nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    public_suffix (3.1.1)
+    public_suffix (4.0.1)
     rake (12.3.3)
-    relaton (0.5.3)
-      algoliasearch
+    relaton (0.5.4)
       relaton-gb (~> 0.6.0)
       relaton-iec (~> 0.4.0)
       relaton-ietf (~> 0.6.0)
       relaton-iso (~> 0.6.0)
       relaton-itu (~> 0.3.0)
       relaton-nist (~> 0.3.0)
-    relaton-bib (0.3.5)
+      relaton-ogc (~> 0.1.0)
+    relaton-bib (0.3.6)
       addressable
-      nokogiri (~> 1.10)
-    relaton-gb (0.6.2)
+      nokogiri
+    relaton-gb (0.6.3)
       cnccs (~> 0.1.1)
       gb-agencies (~> 0.0.1)
       relaton-iso-bib (~> 0.3.0)
-    relaton-iec (0.4.3)
+    relaton-iec (0.4.4)
       addressable
       relaton-iso-bib (~> 0.3.0)
-    relaton-ietf (0.6.3)
+    relaton-ietf (0.6.4)
       relaton-bib (~> 0.3.0)
-    relaton-iso (0.6.4)
+    relaton-iso (0.6.5)
       relaton-iec (~> 0.4.0)
       relaton-iso-bib (~> 0.3.0)
-    relaton-iso-bib (0.3.4)
+    relaton-iso-bib (0.3.5)
       isoics (~> 0.1.6)
       relaton-bib (~> 0.3.0)
       ruby_deep_clone (~> 0.8.0)
-    relaton-itu (0.3.2)
+    relaton-itu (0.3.3)
       relaton-iso-bib (~> 0.3.0)
-    relaton-nist (0.3.3)
+    relaton-nist (0.3.4)
       relaton-bib (~> 0.3.0)
       rubyzip
+    relaton-ogc (0.1.0)
+      faraday
+      relaton-iso-bib (~> 0.3.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -93,7 +96,12 @@ GEM
     ruby-debug-ide (0.7.0)
       rake (>= 0.8.1)
     ruby_deep_clone (0.8.0)
-    rubyzip (1.2.3)
+    rubyzip (1.2.4)
+    simplecov (0.17.0)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
     thor (0.20.3)
 
 PLATFORMS
@@ -110,6 +118,7 @@ DEPENDENCIES
   rspec-command (~> 1.0.3)
   rspec-core (~> 3.4)
   ruby-debug-ide
+  simplecov
 
 BUNDLED WITH
    2.0.2

data/lib/relaton/bibcollectionnew.rb

@@ -9,7 +9,7 @@ module Relaton
       items
       doctype
       author
-    ]
+    ].freeze
 
     attr_accessor *ATTRIBS
 
@@ -17,17 +17,15 @@ module Relaton
       self.items = []
       ATTRIBS.each do |k|
         value = options[k] || options[k.to_s]
-        self.send("#{k}=", value)
+        send("#{k}=", value)
       end
-      self.items = (self.items || []).inject([]) do |acc,item|
+      self.items = (items || []).reduce([]) do |acc, item|
         acc << if item.is_a?(::Relaton::BibcollectionNew) ||
-          item.is_a?(::RelatonBib::BibliographicItem)
-          item
-        else
-          new_bib_item_class(item)
-        end
+            item.class >= ::RelatonBib::BibliographicItem
+                 item
+               else new_bib_item_class(item)
+               end
       end
-      self
     end
 
     # arbitrary number, must sort after all bib items

data/lib/relaton/cli/base_convertor.rb

@@ -69,7 +69,7 @@ module Relaton
       def item_output(content, format)
         case format.to_sym
         when :to_yaml then content.to_yaml
-        when :to_xml then content.to_xml(date_format: :full)
+        when :to_xml then content.to_xml(date_format: :full, bibdata: true)
         end
       end
 

data/lib/relaton/cli/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Cli
-    VERSION = "0.3.4".freeze
+    VERSION = "0.3.5".freeze
   end
 end

data/lib/relaton/cli/yaml_convertor_new.rb

@@ -9,7 +9,7 @@ module Relaton
         if writable
           convert_and_write(file_content, :to_xml)
         else
-          convert_content(file_content).to_xml(nil, date_format: :full)
+          convert_content(file_content).to_xml(nil, date_format: :full, bibdata: true)
         end
       end
 
@@ -47,20 +47,26 @@ module Relaton
       end
 
       def convert_single_file(content)
-        RelatonBib::BibliographicItem.new(RelatonBib::HashConverter::hash_to_bib(content))
+        docid = content["docid"].is_a?(Array) ? content["docid"][0] : content["docid"]
+        if (processor = Relaton::Registry.instance.by_type(docid["type"]))
+          processor.hash_to_bib content
+        else
+          RelatonBib::BibliographicItem.new(RelatonBib::HashConverter::hash_to_bib(content))
+        end
       end
 
       def convert_collection(content)
         if content.has_key?("root")
           content["root"]["items"] = content["root"]["items"].map do |i|
-            RelatonBib::HashConverter::hash_to_bib(i)
+            # RelatonBib::HashConverter::hash_to_bib(i)
+            convert_single_file(i)
           end
           Relaton::BibcollectionNew.new(content["root"])
         end
       end
 
       def xml_content(_raw_file)
-        convert_content(file_content).to_xml(date_format: :full)
+        convert_content(file_content).to_xml(date_format: :full, bibdata: true)
       end
 
       def convert_content(content)

data/relaton-cli.gemspec

@@ -32,6 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry"
   spec.add_development_dependency "ruby-debug-ide"
   spec.add_development_dependency "debase"
+  spec.add_development_dependency "simplecov"
 
   spec.add_runtime_dependency "relaton", "~> 0.5"
   spec.add_runtime_dependency "thor"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-20 00:00:00.000000000 Z
+date: 2019-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: relaton
   requirement: !ruby/object:Gem::Requirement