relaton-cli 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bd6e317d9d7a6e68ddd69415cb603725984a91b3203f903cb92809e8e34a90a
-  data.tar.gz: 5d6832c5016afe1d0d45371eb94aeea3866fa1d512d0877e9f517b51725a28e4
+  metadata.gz: b73f1ac92117d1c3426a66fbe8ece05535b4441696a62a84f9aa5ce93379900f
+  data.tar.gz: fb5ceb3383573256860f22af4eea6a2699b7a04e5d014b4764d1d9b4964674d6
 SHA512:
-  metadata.gz: 7437bae620dc49e6ab0399af8281adfa41653628b94bf8b6c9926ecf4077195a007ff0432b0e7dfe745eab95101ec3cf2adccdf0e988c30140833b7d1cc8c139
-  data.tar.gz: e11fff9015de3be53557b3fbb420d4b6d48be3d4dba04d864f7aeeeb9bb678e739f2785487a967ee0983684540aed73a0fdccd13b61ca1ac0243f3720b9ecab6
+  metadata.gz: f3274a54be270c3e9bd72aac19590a78a783015a0b1963b16cea1de3bc7f03924e11399c10324506119f384bdb5ea78392074b43c1666f832ec4eb58bd273b32
+  data.tar.gz: 99351248582ea4313b872ddcb59ead76c41f6fc4fd1dabde7666b9dae14516d889f734d81d08bf8ceb562dd87fcedb34570c3f18255ee316b35ee6d326650c1d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    relaton-cli (0.1.6)
+    relaton-cli (0.1.7)
       liquid
       relaton (~> 0.3)
       thor
@@ -9,9 +9,9 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
-    algoliasearch (1.24.0)
+    algoliasearch (1.25.2)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     byebug (10.0.2)
@@ -35,7 +35,7 @@ GEM
       isoics (~> 0.1.6)
       nokogiri (~> 1.8.4)
       ruby_deep_clone (~> 0.8.0)
-    isobib (0.4.2)
+    isobib (0.4.3)
       algoliasearch
       iecbib (~> 0.2.1)
       iso-bib-item (~> 0.4.2)
@@ -86,7 +86,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 2.0.1)
   byebug (~> 10.0)
   equivalent-xml (~> 0.6)
   pry
@@ -97,4 +97,4 @@ DEPENDENCIES
   rspec-core (~> 3.4)
 
 BUNDLED WITH
-   1.17.2
+   2.0.1

data/lib/relaton/bibdata.rb

@@ -62,13 +62,28 @@ module Relaton
 
     def self.from_xml(source)
 
+      datetype = "circulated"
+
       # bib.relaton_xml_path = URI.escape("#{relaton_root}/#{id_code}.xml")
       revdate = source.at(ns("./date[@type = 'published']")) ||
-        source.at(ns("./date[@type = 'circulated']")) || source.at(ns("./date"))
-      datetype = "circulated"
-      datetype = revdate["type"] if revdate
+        source.at(ns("./date[@type = 'circulated']")) ||
+        source.at(ns("./date"))
+      revdate_value = revdate&.at(ns("./on")) || revdate&.at(ns("./from"))
+
+      if revdate && revdate_value
+        datetype = revdate["type"]
+        revdate = begin
+          Date.parse(revdate_value.text.strip).to_s
+        rescue
+          warn "[relaton] parsing published date '#{revdate.text}' failed."
+          revdate_value.text.strip
+        end || nil
+      else
+        revdate = nil
+      end
+
 
-      new({
+      options = {
         uri: source.at(ns("./uri[not(@type)]"))&.text,
         xml: source.at(ns("./uri[@type='xml']"))&.text,
         pdf: source.at(ns("./uri[@type='pdf']"))&.text,
@@ -81,7 +96,7 @@ module Relaton
         stage: source.at(ns("./status"))&.text,
         technical_committee: source.at(ns("./editorialgroup/technical-committee"))&.text,
         abstract: source.at(ns("./abstract"))&.text,
-        revdate: revdate ? Date.parse(revdate.text) : nil,
+        revdate: revdate,
         language: source.at(ns("./language"))&.text,
         script: source.at(ns("./script"))&.text,
         edition: source.at(ns("./edition"))&.text,
@@ -92,7 +107,9 @@ module Relaton
         contributor_publisher_role: source.at(ns("./contributor/role[@type='publisher']"))&.text,
         contributor_publisher_organization: source.at(ns("./contributor/role[@type='publisher']"))&.parent&.at(ns("./organization/name"))&.text,
         datetype: datetype
-      })
+      }
+
+      new(options)
     end
 
     def to_xml

data/lib/relaton/cli/command.rb

@@ -16,7 +16,7 @@ module Relaton
         io.puts(fetch_document(code, options) || supported_type_message)
       end
 
-      desc "extract Metanorma-XML-Directory Relaton-XML-Directory", "Extract Relaton XML from folder of Metanorma XML"
+      desc "extract Metanorma-XML-File / Directory Relaton-XML-Directory", "Extract Relaton XML from Metanorma XML file / directory"
       option :extension, aliases: :x, desc: "File extension of Relaton XML files, defaults to 'rxl'"
 
       def extract(source_dir, outdir)

data/lib/relaton/cli/relaton_file.rb

@@ -21,10 +21,11 @@ module Relaton
 
       # Extract files
       #
-      # This interface expect us to provide a source directory, output
-      # directory and custom configuration options. Then it wll extract
-      # Relaton XML files to output directory from the source directory
-      # During this process it will use custom options when available.
+      # This interface expect us to provide a source file / directory,
+      # output directory and custom configuration options. Then it wll
+      # extract Relaton XML file / files to output directory from the
+      # source file / directory. During this process it will use custom
+      # options when available.
       #
       # @param source [Dir] The source directory for files
       # @param outdir [Dir] The output directory for files
@@ -71,8 +72,16 @@ module Relaton
         Nokogiri.XML(document)
       end
 
+      def select_source_files
+        if File.file?(source)
+          [source]
+        else
+          select_files_with("xml")
+        end
+      end
+
       def extract_and_write_to_files
-        select_files_with("xml").each do |file|
+        select_source_files.each do |file|
           xml = nokogiri_document(nil, file)
           xml.remove_namespaces!
 

data/lib/relaton/cli/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Cli
-    VERSION = "0.1.6".freeze
+    VERSION = "0.1.7".freeze
   end
 end

data/relaton-cli.gemspec

@@ -15,16 +15,16 @@ Gem::Specification.new do |spec|
   spec.license       = "BSD-2-Clause"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
+    f.match(%r{^(test|spec|features|docs)/})
   end
-  spec.extra_rdoc_files = %w[README.adoc LICENSE]
+  spec.extra_rdoc_files = %w[docs/README.adoc LICENSE]
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = ">= 2.3.0"
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler", "~> 2.0.1"
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "byebug", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2019-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -171,7 +171,7 @@ executables:
 - relaton
 extensions: []
 extra_rdoc_files:
-- README.adoc
+- docs/README.adoc
 - LICENSE
 files:
 - ".gitignore"
@@ -181,9 +181,9 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE
-- README.adoc
 - Rakefile
 - bin/rspec
+- docs/README.adoc
 - exe/relaton
 - i18n.yaml
 - lib/relaton/bibcollection.rb