bolognese 0.9.97 → 0.9.98

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e0934c41291533eceeaf3993f6fa4ea1187f00a803dda629499bcaaac66c927
-  data.tar.gz: 3f6c5a43da5797dc333eff72e5e5e6b195ad4d6c7724e3c17d30ea6e5dbc09f1
+  metadata.gz: cb294ca90277c0d235c480528d0c05ce61aa4f7655805836e144e4a3e02fae2a
+  data.tar.gz: fdba8304216f2bc628cce05e780dfccd0c3f9f2dbf4730ffaf75afc031fef782
 SHA512:
-  metadata.gz: 3b488400d7ac418d56df127c9566f06103cf0ebf5aa4f6ad9465e70ec9d7adb126b486541e9cb840588323d493f1620f4dbcbcab44614da84955430d119a902a
-  data.tar.gz: 1276d995665ffde0d217677306404802fae09b219687bf43845be78948a1ad5606bc94a548737dc9b67d9c536f96d063e8cae9f3f02b8f965a195bb41c8e8b0c
+  metadata.gz: 385f09c0a153de7e10c32ec82acd28f4918eb8d04ea7974eaf7bf4fb2722ea09fde4d7bc8697119ca49df26de7bf65294787af1aa0ee8b1821d8347665964cab
+  data.tar.gz: 731fc45a0776bad14c1e38faa3eca7e59e95b49bb115ba846f942fd1b0d602f6fb1d2f8f9c2ec96d828b5336e7190cccb2c1109a4243d5654099904915a50821

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (0.9.97)
+    bolognese (0.9.98)
       activesupport (>= 4.2.5, < 6)
       benchmark_methods (~> 0.7)
       bibtex-ruby (~> 4.1)

data/lib/bolognese/metadata.rb

@@ -1,58 +1,10 @@
 require_relative 'metadata_utils'
 
-require_relative 'readers/bibtex_reader'
-require_relative 'readers/citeproc_reader'
-require_relative 'readers/codemeta_reader'
-require_relative 'readers/crosscite_reader'
-require_relative 'readers/crossref_reader'
-require_relative 'readers/datacite_json_reader'
-require_relative 'readers/datacite_reader'
-require_relative 'readers/ris_reader'
-require_relative 'readers/schema_org_reader'
-
-require_relative 'writers/bibtex_writer'
-require_relative 'writers/citation_writer'
-require_relative 'writers/citeproc_writer'
-require_relative 'writers/codemeta_writer'
-require_relative 'writers/crosscite_writer'
-require_relative 'writers/crossref_writer'
-require_relative 'writers/datacite_writer'
-require_relative 'writers/datacite_json_writer'
-require_relative 'writers/jats_writer'
-require_relative 'writers/rdf_xml_writer'
-require_relative 'writers/ris_writer'
-require_relative 'writers/schema_org_writer'
-require_relative 'writers/turtle_writer'
-
 module Bolognese
   class Metadata
-    include Bolognese::Readers::BibtexReader
-    include Bolognese::Readers::CiteprocReader
-    include Bolognese::Readers::CodemetaReader
-    include Bolognese::Readers::CrossciteReader
-    include Bolognese::Readers::CrossrefReader
-    include Bolognese::Readers::DataciteReader
-    include Bolognese::Readers::DataciteJsonReader
-    include Bolognese::Readers::RisReader
-    include Bolognese::Readers::SchemaOrgReader
-
-    include Bolognese::Writers::BibtexWriter
-    include Bolognese::Writers::CitationWriter
-    include Bolognese::Writers::CiteprocWriter
-    include Bolognese::Writers::CodemetaWriter
-    include Bolognese::Writers::CrossciteWriter
-    include Bolognese::Writers::CrossrefWriter
-    include Bolognese::Writers::DataciteWriter
-    include Bolognese::Writers::DataciteJsonWriter
-    include Bolognese::Writers::JatsWriter
-    include Bolognese::Writers::RdfXmlWriter
-    include Bolognese::Writers::RisWriter
-    include Bolognese::Writers::SchemaOrgWriter
-    include Bolognese::Writers::TurtleWriter
-
     include Bolognese::MetadataUtils
 
-    attr_writer :id, :provider_id, :client_id, :doi, :b_url, :b_version, 
+    attr_writer :id, :provider_id, :client_id, :doi
 
     def initialize(input: nil, from: nil, **options)
       id = normalize_id(input, options)
@@ -95,13 +47,16 @@ module Bolognese
       @sandbox = options[:sandbox]
 
       # options that come from the datacite database
-      @b_doi = normalize_doi(options[:doi] || input, options)
       @b_url = hsh.to_h["b_url"].presence || options[:b_url].presence
       @state = hsh.to_h["state"].presence
       @date_registered = hsh.to_h["date_registered"].presence
       @date_updated = hsh.to_h["date_updated"].presence
       @provider_id = hsh.to_h["provider_id"].presence
       @client_id = hsh.to_h["client_id"].presence
+
+      # generate name for method to call dynamically
+      @meta = @from.present? ? send("read_" + @from, string: string, sandbox: options[:sandbox]) : {}
+      @identifier = normalize_doi(options[:doi] || input, options) || @meta.fetch("id", nil) || @meta.fetch("identifier", nil)
     end
 
     def id
@@ -112,14 +67,6 @@ module Bolognese
       @doi ||= @identifier.present? ? doi_from_url(@identifier) : meta.fetch("doi", nil)
     end
 
-    def b_url
-      @b_url ||= meta.fetch("b_url", nil)
-    end
-
-    def b_version
-      @b_version ||= meta.fetch("b_version", nil)
-    end
-
     def provider_id
       @provider_id ||= meta.fetch("provider_id", nil)
     end

data/lib/bolognese/metadata_utils.rb

@@ -3,6 +3,30 @@ require_relative 'author_utils'
 require_relative 'datacite_utils'
 require_relative 'utils'
 
+require_relative 'readers/bibtex_reader'
+require_relative 'readers/citeproc_reader'
+require_relative 'readers/codemeta_reader'
+require_relative 'readers/crosscite_reader'
+require_relative 'readers/crossref_reader'
+require_relative 'readers/datacite_json_reader'
+require_relative 'readers/datacite_reader'
+require_relative 'readers/ris_reader'
+require_relative 'readers/schema_org_reader'
+
+require_relative 'writers/bibtex_writer'
+require_relative 'writers/citation_writer'
+require_relative 'writers/citeproc_writer'
+require_relative 'writers/codemeta_writer'
+require_relative 'writers/crosscite_writer'
+require_relative 'writers/crossref_writer'
+require_relative 'writers/datacite_writer'
+require_relative 'writers/datacite_json_writer'
+require_relative 'writers/jats_writer'
+require_relative 'writers/rdf_xml_writer'
+require_relative 'writers/ris_writer'
+require_relative 'writers/schema_org_writer'
+require_relative 'writers/turtle_writer'
+
 module Bolognese
   module MetadataUtils
     # include BenchmarkMethods
@@ -11,15 +35,39 @@ module Bolognese
     include Bolognese::DataciteUtils
     include Bolognese::Utils
 
-    attr_accessor :string, :from, :sandbox, :b_doi, :regenerate, :issue, :contributor,
+    include Bolognese::Readers::BibtexReader
+    include Bolognese::Readers::CiteprocReader
+    include Bolognese::Readers::CodemetaReader
+    include Bolognese::Readers::CrossciteReader
+    include Bolognese::Readers::CrossrefReader
+    include Bolognese::Readers::DataciteReader
+    include Bolognese::Readers::DataciteJsonReader
+    include Bolognese::Readers::RisReader
+    include Bolognese::Readers::SchemaOrgReader
+
+    include Bolognese::Writers::BibtexWriter
+    include Bolognese::Writers::CitationWriter
+    include Bolognese::Writers::CiteprocWriter
+    include Bolognese::Writers::CodemetaWriter
+    include Bolognese::Writers::CrossciteWriter
+    include Bolognese::Writers::CrossrefWriter
+    include Bolognese::Writers::DataciteWriter
+    include Bolognese::Writers::DataciteJsonWriter
+    include Bolognese::Writers::JatsWriter
+    include Bolognese::Writers::RdfXmlWriter
+    include Bolognese::Writers::RisWriter
+    include Bolognese::Writers::SchemaOrgWriter
+    include Bolognese::Writers::TurtleWriter
+
+    attr_accessor :string, :from, :sandbox, :meta, :regenerate, :issue, :contributor,
                   :spatial_coverage
 
     attr_writer :identifier, :author, :title, :publisher, :license,
                 :date_accepted, :date_available, :date_copyrighted, :date_collected,
                 :date_submitted, :date_valid, :date_created, :date_modified, :date_updated, 
-                :journal, :volume, :first_page, :last_page,
+                :journal, :volume, :first_page, :last_page, :b_url, :b_version, :resource_type_general,
                 :keywords, :editor, :description, :alternate_name, :language, :content_size,
-                :schema_version, :has_part, :same_as,
+                :schema_version, :has_part, :same_as, :resource_type_general,
                 :is_previous_version_of, :is_new_version_of, :is_cited_by, :cites,
                 :is_supplement_to, :is_supplemented_by, :is_continued_by, :continues,
                 :has_metadata, :is_metadata_for, :is_referenced_by, :references,
@@ -45,15 +93,6 @@ module Bolognese
       (from == "datacite") && regenerate.blank?
     end
 
-    # generate name for method to call dynamically
-    # the id might change
-    def meta
-      m = from.present? ? send("read_" + from, string: string, sandbox: sandbox) : {}
-      @identifier = b_doi || m.fetch("id", nil) || m.fetch("identifier", nil)
-
-      m
-    end
-
     def type
       @type ||= meta.fetch("type", nil)
     end
@@ -256,6 +295,14 @@ module Bolognese
       relation_types.reduce([]) { |sum, r| sum += related_identifier_hsh(r) }
     end
 
+    def b_url
+      @b_url ||= meta.fetch("b_url", nil)
+    end
+
+    def b_version
+      @b_version ||= meta.fetch("b_version", nil)
+    end
+
     # recognize given name. Can be loaded once as ::NameDetector, e.g. in a Rails initializer
     def name_detector
       @name_detector ||= defined?(::NameDetector) ? ::NameDetector : nil
@@ -283,11 +330,11 @@ module Bolognese
     end
 
     def style
-      @style || "apa"
+      @style ||= "apa"
     end
 
     def locale
-      @locale || "en-US"
+      @locale ||= "en-US"
     end
   end
 end

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "0.9.97"
+  VERSION = "0.9.98"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 0.9.97
+  version: 0.9.98
 platform: ruby
 authors:
 - Martin Fenner