bolognese 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a97afd214e3aceac748c30b3b350d230eca0dfb
-  data.tar.gz: 80436c321a4cd0655fd44a2b7648280251e6869b
+  metadata.gz: 4c34a24e63743974fc6a09dca95d8dbdef85f592
+  data.tar.gz: a12199e846b5c1598e181126d6c20f9c40341a79
 SHA512:
-  metadata.gz: a2e388b9fb5f4e59ff38874bb1370483d3bc2f79ea1b156fcd95c0b11949c06d4786b3308ea7fca169d88eadba9a99a7cc1b272bfd4494a537a9ba2f0f435456
-  data.tar.gz: 3a9f34c02b0c261a1e0ee2c17f6cffaf0be849b30580892ff01ba7af811499135857e368cd499eb584ae0a7d61bee98ce3bb72454ecf4c04ce620a3b46d0c0db
+  metadata.gz: b4fab385944d35dd6da5b1c39732e3196f88dc1c673e83ecc0c815256f66c2a8dd902fe6ea7eb9e8ff5f9dc0105a1cca3f17a68524a98b16e94ffbc99696202b
+  data.tar.gz: 75783a83adabd791461eefb29b5810f636b848c1578daeecff977a650820339ef3bb62cb718e1f9201e7c1d619ccbe5d18f8414a65e5f6897c88ababd737d118

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (0.6.1)
+    bolognese (0.6.2)
       activesupport (~> 4.2, >= 4.2.5)
       bibtex-ruby (~> 4.1)
       builder (~> 3.2, >= 3.2.2)

data/lib/bolognese/cli.rb

@@ -30,19 +30,8 @@ module Bolognese
     def read(id)
       id = normalize_id(id)
       provider = find_provider(id)
-      output = options[:as] || "schema_org"
 
-      if provider.present?
-        p = case provider
-            when "crossref" then Crossref.new(id: id)
-            when "datacite" then Datacite.new(id: id, schema_version: options[:schema_version])
-            else SchemaOrg.new(id: id)
-            end
-
-        puts p.send(output)
-      else
-        puts "not implemented"
-      end
+      set_metadata(id: id, provider: provider, as: options[:as], schema_version: options[:schema_version])
     end
 
     desc "open file", "read metadata from file"
@@ -54,22 +43,11 @@ module Bolognese
         $stderr.puts "File type #{ext} not supported"
         exit 1
       end
+
       string = IO.read(file)
       provider = "bibtex"
-      output = options[:as] || "schema_org"
 
-      if provider.present?
-        p = case provider
-            when "crossref" then Crossref.new(id: id)
-            when "datacite" then Datacite.new(id: id, schema_version: options[:schema_version])
-            when "bibtex" then Bibtex.new(string: string)
-            else SchemaOrg.new(id: id)
-            end
-
-        puts p.send(output)
-      else
-        puts "not implemented"
-      end
+      set_metadata(string: string, provider: provider, as: options[:as], schema_version: options[:schema_version])
     end
   end
 end

data/lib/bolognese/crossref.rb

@@ -183,8 +183,8 @@ module Bolognese
     end
 
     def funder
-      f = Array.wrap(program_metadata).find { |a| a["name"] == "fundref" } || {}
-      Array.wrap(f.fetch("assertion", [])).select { |a| a["name"] == "fundgroup" }.map do |f|
+      fundref = Array.wrap(program_metadata).find { |a| a["name"] == "fundref" } || {}
+      Array.wrap(fundref.fetch("assertion", [])).select { |a| a["name"] == "fundgroup" }.map do |f|
         { "@type" => "Organization",
           "@id" => normalize_id(f.dig("assertion", "assertion", "__content__")),
           "name" => f.dig("assertion", "__content__").strip }.compact

data/lib/bolognese/utils.rb

@@ -1,5 +1,22 @@
 module Bolognese
   module Utils
+    def set_metadata(id: nil, string: nil, provider: nil, **options)
+      output = options[:as] || "schema_org"
+
+      if provider.present?
+        p = case provider
+            when "crossref" then Crossref.new(id: id)
+            when "datacite" then Datacite.new(id: id, schema_version: options[:schema_version])
+            when "bibtex" then Bibtex.new(string: string)
+            else SchemaOrg.new(id: id)
+            end
+
+        puts p.send(output)
+      else
+        puts "not implemented"
+      end
+    end
+    
     def orcid_from_url(url)
       Array(/\Ahttp:\/\/orcid\.org\/(.+)/.match(url)).last
     end

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

metadata

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