relaton-bib 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dd4730cb860ea6fea05b214a89a7e180acca7cebdfde515924cff5cbc006631
-  data.tar.gz: c71b46fefb288fdc2b3e51122d793cd225431bd5818aad704bbf78dfc8aa36c0
+  metadata.gz: 8ef89450c5deeab8305d50a98218ad8c6b8425904cfdc8918542fed5ee2790e5
+  data.tar.gz: 60dccc2abedbb9f0bc940552d363c67d65b9c31c4bff4bde2d7e99ef3bc9a9a5
 SHA512:
-  metadata.gz: 22616fba5d4a2a502b2f969efacb00a8384e94d69b75147687ea0f086019d1614db7e5393c6b4d2e7ea5eb336332c5a208690ddda0bdd1593ed29b344a48d049
-  data.tar.gz: f2d074312be6ed3194b08dc0b6e5cc2eb6b269216d1b0500b072fb6868b66e47d09fa21abfc5dd43cf2e22fdb82fd948c0597526fec64da5c8ee2e8dc4ae6c85
+  metadata.gz: b5015108cf9f8e97cd39de74eb6db49886aafd43beb048c7a0dadd1013a5de31b565cd6bdd400cfcf068de4b421e593007962cfafbf82262e6f30a7a156e8fc8
+  data.tar.gz: 1bc31977d22338c4491d1b45472746dec975e7b4ead6732437b6e206cb3f52e17ba8070a20ff84fd8cc7b6c69d5d2a4958ce4e1be958bb4ec4ab84495daddf5e

data/lib/relaton_bib/bibliographic_item.rb

@@ -113,6 +113,9 @@ module RelatonBib
     # @return [Date]
     attr_reader :fetched
 
+    # @return [Array<RelatonBib::LocalizedString>]
+    attr_reader :keyword
+
     # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
     # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
@@ -136,6 +139,7 @@ module RelatonBib
     # @param classification [Array<RelatonBib::Classification>]
     # @param validity [RelatonBib:Validity, NilClass]
     # @param fetched [Date, NilClass] default nil
+    # @param keyword [Array<String>]
     #
     # @param copyright [Hash, RelatonBib::CopyrightAssociation, NilClass]
     # @option copyright [Hash, RelatonBib::ContributionInfo] :owner
@@ -222,6 +226,7 @@ module RelatonBib
       @classification = args.fetch :classification, []
       @validity       = args[:validity]
       @fetched        = args.fetch :fetched, nil # , Date.today # we should pass the fetched arg from scrappers
+      @keyword        = (args[:keyword] || []).map { |kw| LocalizedString.new(kw) }
     end
     # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
@@ -303,6 +308,7 @@ module RelatonBib
       hash["classification"] = single_element_array(classification) if classification&.any?
       hash["validity"] = validity.to_hash if validity
       hash["fetched"] = fetched.to_s if fetched
+      hash["keyword"] = single_element_array(keyword) if keyword&.any?
       hash
     end
 
@@ -323,6 +329,7 @@ module RelatonBib
       bibtex_date item
       bibtex_series item
       bibtex_classification item
+      item.keywords = keyword.map(&:content).join(", ") if keyword.any?
       bibtex_docidentifier item
       item.timestamp = fetched.to_s if fetched
       bibtex_link item
@@ -455,7 +462,7 @@ module RelatonBib
       classification.each do |c|
         case c.type
         when "type" then item["type"] = c.value
-        when "keyword" then item.keywords = c.value
+        # when "keyword" then item.keywords = c.value
         when "mendeley" then item["mendeley-tags"] = c.value
         end
       end
@@ -520,6 +527,7 @@ module RelatonBib
         extent.each { |e| builder.extent { e.to_xml builder } }
         accesslocation.each { |al| builder.accesslocation al }
         classification.each { |cls| cls.to_xml builder }
+        keyword.each { |kw| builder.keyword { kw.to_xml(builder) } }
         validity&.to_xml builder
         if block_given?
           yield builder

data/lib/relaton_bib/bibtex_parser.rb

@@ -24,7 +24,8 @@ module RelatonBib
             series: fetch_series(bt),
             link: fetch_link(bt),
             language: fetch_language(bt),
-            classification: fetch_classification(bt)
+            classification: fetch_classification(bt),
+            keyword: fetch_keyword(bt)
           )
           h
         end
@@ -225,12 +226,18 @@ module RelatonBib
       def fetch_classification(bibtex)
         cls = []
         cls << Classification.new(type: "type", value: bibtex["type"].to_s) if bibtex["type"]
-        cls << Classification.new(type: "keyword", value: bibtex.keywords.to_s) if bibtex["keywords"]
+        # cls << Classification.new(type: "keyword", value: bibtex.keywords.to_s) if bibtex["keywords"]
         if bibtex["mendeley-tags"]
-        cls << Classification.new(type: "mendeley", value: bibtex["mendeley-tags"].to_s)
+          cls << Classification.new(type: "mendeley", value: bibtex["mendeley-tags"].to_s)
         end
         cls
       end
+
+      # @param bibtex [BibTeX::Entry]
+      # @return [Array<String>]
+      def fetch_keyword(bibtex)
+        bibtex["keywords"]&.split(", ") || []
+      end
     end
   end
 end

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "0.5.2".freeze
+  VERSION = "0.6.0".freeze
 end

data/lib/relaton_bib/xml_parser.rb

@@ -42,6 +42,7 @@ module RelatonBib
           extent: fetch_extent(bibitem),
           accesslocation: bibitem.xpath("./accesslocation").map(&:text),
           classification: fetch_classification(bibitem),
+          keyword: fetch_keyword(bibitem),
           validity: fetch_validity(bibitem),
         }
       end
@@ -124,6 +125,10 @@ module RelatonBib
         end
       end
 
+      def fetch_keyword(item)
+        item.xpath("keyword").map &:text
+      end
+
       def fetch_validity(item)
         vl = item.at("./validity")
         return unless vl

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-12 00:00:00.000000000 Z
+date: 2020-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -218,7 +218,6 @@ files:
 - lib/relaton_bib/formatted_ref.rb
 - 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

data/lib/relaton_bib/hash_to_bib.rb

@@ -1,70 +0,0 @@
-module RelatonBib
-  class << self
-    def hash_to_bib(args, nested = false)
-      return nil unless args.is_a?(Hash)
-      ret = Marshal.load(Marshal.dump(symbolize(args))) # deep copy
-      timestamp_hash(ret) unless nested
-      title_hash_to_bib(ret)
-      link_hash_to_bib(ret)
-      language_hash_to_bib(ret)
-      script_hash_to_bib(ret)
-      dates_hash_to_bib(ret)
-      docid_hash_to_bib(ret)
-      version_hash_to_bib(ret)
-      biblionote_hash_to_bib(ret)
-      abstract_hash_to_bib(ret)
-      formattedref_hash_to_bib(ret)
-      docstatus_hash_to_bib(ret)
-      contributors_hash_to_bib(ret)
-      relations_hash_to_bib(ret)
-      series_hash_to_bib(ret)
-      medium_hash_to_bib(ret)
-      place_hash_to_bib(ret)
-      extent_hash_to_bib(ret)
-      accesslocation_hash_to_bib(ret)
-      classification_hash_to_bib(ret)
-      validity_hash_to_bib(ret)
-      ret
-    end
-
-    def timestamp_hash(ret)
-      ret[:fetched] ||= Date.today.to_s
-    end
-
-    def symbolize(obj)
-      obj.is_a? Hash and
-        return obj.inject({}){|memo,(k,v)| memo[k.to_sym] =  symbolize(v); memo}
-      obj.is_a? Array and
-        return obj.inject([]){|memo,v    | memo           << symbolize(v); memo}
-      return obj
-    end
-
-    def array(a)
-      return [] unless a
-      return [].push(a) unless a.is_a?(Array)
-      a
-    end
-
-    def localname(f, c)
-      return nil if f.nil?
-      f.is_a?(Hash) and lang = f[:language] 
-      lang ||= c[:name][:language] 
-      f.is_a?(Hash) and script = f[:script] 
-      script ||= c[:name][:script]
-      f.is_a?(Hash) ?
-        RelatonBib::LocalizedString.new(f[:content], lang, script) :
-        RelatonBib::LocalizedString.new(f, lang, script)
-    end
-
-    def localizedstring(f)
-      f.is_a?(Hash) ?
-        RelatonBib::LocalizedString.new(f[:content], f[:language], f[:script]) :
-        RelatonBib::LocalizedString.new(f)
-    end
-
-    def formattedref(f)
-      f.is_a?(Hash) ? RelatonBib::FormattedRef.new(f) :
-        RelatonBib::FormattedRef.new(content: f)
-    end
-  end
-end