bolognese 1.3.22 → 1.3.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f0b3ae062da59208e0933c28aa7fc266c158e5ded512fc498e07b55898713e4
-  data.tar.gz: e9202fc2dc2a88cbbc258e7081c1a25f4197f970a9f126c63d42fbdef9521a02
+  metadata.gz: 38e5618ef936043343d626fd3d2132f434b77d6a3d804050729298d9802d229f
+  data.tar.gz: 5bdcf0488f713a428f5a233b2c1e6609530bf235dd04f63230b79573ca99b308
 SHA512:
-  metadata.gz: a3fc245466c70cdc2851c8419a79d807281f7b3413ae9b77816b32136f87a36b61ee4f74254a41352d5f27de9dc01492d95e9bf9addc822c39ae6c5f4f610cf8
-  data.tar.gz: 4c4f11a09dc1d0f6fee3ec0011f7e1bcdd1f58818b4acf36ae4d0761cfaa20c06b671f3efea02bd3a1bb3dcb90eaa42dde249a1af510c1b25713c8b165bef26d
+  metadata.gz: e240077996789a428a196e177791aa01b619277fd85795ac0d39afe31c6e91519d175bf8f8673788d1f506bad01b11ee8b8ec0ff3a54d3c9d35e2226d8a01623
+  data.tar.gz: d700ea3fce0f63573f03e71bb8107f7c5e5fee4fa8fe9eba2797f6e2aaf056444009b6d37507d2238e8e72eeea2b15fb7ca6ab3358a184dbaf084ece83828f9b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (1.3.22)
+    bolognese (1.3.23)
       activesupport (>= 4.2.5, < 6)
       benchmark_methods (~> 0.7)
       bibtex-ruby (~> 4.1)
@@ -50,7 +50,7 @@ GEM
     concurrent-ruby (1.0.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    crass (1.0.4)
+    crass (1.0.5)
     csl (1.5.0)
       namae (~> 1.0)
     csl-styles (1.0.1.9)

data/lib/bolognese/metadata.rb

@@ -37,6 +37,7 @@ module Bolognese
         hsh = @from.present? ? send("get_" + @from, id: id, sandbox: options[:sandbox]) : {}
         string = hsh.fetch("string", nil)
       elsif input.present? && File.exist?(input)
+        filename = File.basename(input)
         ext = File.extname(input)
         if %w(.bib .ris .xml .json).include?(ext)
           hsh = { 
@@ -48,7 +49,7 @@ module Bolognese
             "client_id" => options[:client_id],
             "content_url" => options[:content_url] }
           string = IO.read(input)
-          @from = from || find_from_format(string: string, ext: ext)
+          @from = from || find_from_format(string: string, filename: filename, ext: ext)
         else
           $stderr.puts "File type #{ext} not supported"
           exit 1

data/lib/bolognese/utils.rb

@@ -322,11 +322,11 @@ module Bolognese
       "WebSite" => "misc"
     }
 
-    def find_from_format(id: nil, string: nil, ext: nil)
+    def find_from_format(id: nil, string: nil, ext: nil, filename: nil)
       if id.present?
         find_from_format_by_id(id)
       elsif ext.present?
-        find_from_format_by_ext(string, ext: ext)
+        find_from_format_by_filename(filename) || find_from_format_by_ext(string, ext: ext)
       elsif string.present?
         find_from_format_by_string(string)
       else
@@ -349,6 +349,12 @@ module Bolognese
       end
     end
 
+    def find_from_format_by_filename(filename)
+      if filename == "package.json"
+        "npm"
+      end
+    end
+
     def find_from_format_by_ext(string, options={})
       if options[:ext] == ".bib"
         "bibtex"

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "1.3.22"
+  VERSION = "1.3.23"
 end

data/lib/bolognese/writers/codemeta_writer.rb

@@ -5,10 +5,10 @@ module Bolognese
     module CodemetaWriter
       def codemeta
         return nil unless valid? || show_errors
-
+        
         hsh = {
           "@context" => id.present? ? "https://raw.githubusercontent.com/codemeta/codemeta/master/codemeta.jsonld" : nil,
-          "@type" => types["schemaOrg"],
+          "@type" => types.present? ? types["schemaOrg"] : nil,
           "@id" => normalize_doi(doi),
           "identifier" => to_schema_org_identifiers(identifiers),
           "codeRepository" => url,

data/lib/bolognese/writers/schema_org_writer.rb

@@ -5,11 +5,11 @@ module Bolognese
     module SchemaOrgWriter
       def schema_hsh
         { "@context" => "http://schema.org",
-          "@type" => types["schemaOrg"],
+          "@type" => types.present? ? types["schemaOrg"] : nil,
           "@id" => normalize_doi(doi),
           "identifier" => to_schema_org_identifiers(identifiers),
           "url" => url,
-          "additionalType" => types["resourceType"],
+          "additionalType" => types.present? ? types["resourceType"] : nil,
           "name" => parse_attributes(titles, content: "title", first: true),
           "author" => to_schema_org_creators(creators),
           "editor" => to_schema_org_contributors(contributors),
@@ -35,8 +35,8 @@ module Bolognese
           "@reverse" => reverse.presence,
           "contentUrl" => Array.wrap(content_url).unwrap,
           "schemaVersion" => schema_version,
-          "periodical" => (types["schemaOrg"] != "Dataset") && container.present? ? to_schema_org(container) : nil,
-          "includedInDataCatalog" => (types["schemaOrg"] == "Dataset") && container.present? ? to_schema_org_container(container, type: "Dataset") : nil,
+          "periodical" => types.present? ? ((types["schemaOrg"] != "Dataset") && container.present? ? to_schema_org(container) : nil) : nil,
+          "includedInDataCatalog" => types.present? ? ((types["schemaOrg"] == "Dataset") && container.present? ? to_schema_org_container(container, type: "Dataset") : nil) : nil,
           "publisher" => publisher.present? ? { "@type" => "Organization", "name" => publisher } : nil,
           "funder" => to_schema_org_funder(funding_references),
           "provider" => agency.present? ? { "@type" => "Organization", "name" => agency } : nil

data/spec/find_from_format_spec.rb

@@ -50,6 +50,17 @@ describe Bolognese::CLI do
     end
   end
 
+  context "find_from_format_by_filename" do
+    let(:subject) do
+      described_class.new
+    end
+
+    it "npm" do
+      filename = "package.json"
+      expect(subject.find_from_format_by_filename(filename)).to eq("npm")
+    end
+  end
+
   context "find_from_format_by_string" do
     let(:subject) do
       described_class.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 1.3.22
+  version: 1.3.23
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-15 00:00:00.000000000 Z
+date: 2019-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma