bolognese 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 063f676946258c78127e1d88782896a0b897e8a5
-  data.tar.gz: 3b9f829af641f7aa53394eb79e588a838bc88abb
+  metadata.gz: e7ecdd8495d5c59b4745c4e474f00fdfb43bc689
+  data.tar.gz: c067a911205b6ca30f82ceee7579a3b7e2cfa45f
 SHA512:
-  metadata.gz: 0583e3e9ec72227314e388c395b2d03c9e61421e6b5307b2bfa8254c988dca539cad1ffa3f94f1775d8f3f0ca2848d6fb6e6be808e2089b19657ac30eb17020a
-  data.tar.gz: dd8d205fa555873683f496c5e49572bcc3a953fbb7d128baba3ca062e7ea206e86dc1592080edbea5e982d8fdccdfb042a29f0ad52d009ea7ba85d9c7a70c768
+  metadata.gz: 08628597e24777b6116c7cd6106206e528211444daab260c609fa3f8beb08fd56fc0eba55db6f2d262686601fc9fa190f34cf4f6a0baa8f0607367f22fed7ea3
+  data.tar.gz: 62470519d4523414df33e4b546db7d41057af0f68c62e4b8af537d97c281f972b549a88b02d81660688b0f7418c523a2666d0e8014cdcdf15b43af5908a68443

data/Gemfile.lock

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

data/lib/bolognese/codemeta.rb

@@ -25,7 +25,7 @@ module Bolognese
     end
 
     def doi
-      doi_from_url(id)
+      validate_doi(id)
     end
 
     def id

data/lib/bolognese/doi_utils.rb

@@ -1,11 +1,11 @@
 module Bolognese
   module DoiUtils
     def validate_doi(doi)
-      Array(/\A(?:(http|https):\/\/(dx\.)?doi.org\/)?(doi:)?(10\.\d{4,5}\/.+)\z/.match(doi)).last
+      Array(/\A(?:(http|https):\/(\/)?(dx\.)?doi.org\/)?(doi:)?(10\.\d{4,5}\/.+)\z/.match(doi)).last
     end
 
     def validate_prefix(doi)
-      Array(/\A(?:(http|https):\/\/(dx\.)?doi.org\/)?(doi:)?(10\.\d{4,5})\/.+\z/.match(doi)).last
+      Array(/\A(?:(http|https):\/(\/)?(dx\.)?doi.org\/)?(doi:)?(10\.\d{4,5})\/.+\z/.match(doi)).last
     end
 
     def normalize_doi(doi)

data/lib/bolognese/schema_org.rb

@@ -35,7 +35,7 @@ module Bolognese
     end
 
     def doi
-      doi_from_url(id)
+      validate_doi(id)
     end
 
     def id

data/lib/bolognese/utils.rb

@@ -20,12 +20,12 @@ module Bolognese
     def find_from_format_by_id(id)
       id = normalize_id(id)
 
-      if /\A(?:(http|https):\/\/(dx\.)?doi.org\/)?(doi:)?(10\.\d{4,5}\/.+)\z/.match(id)
+      if /\A(?:(http|https):\/(\/)?(dx\.)?doi.org\/)?(doi:)?(10\.\d{4,5}\/.+)\z/.match(id)
         ra = get_doi_ra(id)
         ra.present? ? ra.downcase : nil
-      elsif /\A(?:(http|https):\/\/orcid\.org\/)?(\d{4}-\d{4}-\d{4}-\d{3}[0-9X]+)\z/.match(id)
+      elsif /\A(?:(http|https):\/(\/)?orcid\.org\/)?(\d{4}-\d{4}-\d{4}-\d{3}[0-9X]+)\z/.match(id)
         "orcid"
-      elsif /\A(http|https):\/\/github\.com\/(.+)\z/.match(id)
+      elsif /\A(http|https):\/(\/)?github\.com\/(.+)\z/.match(id)
         "codemeta"
       else
         "schema_org"

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "0.8.4"
+  VERSION = "0.8.5"
 end

data/spec/doi_utils_spec.rb

@@ -58,6 +58,12 @@ describe Bolognese::Metadata, vcr: true do
       response = subject.normalize_doi(doi)
       expect(response).to be_nil
     end
+
+    it "url with one slash" do
+      doi = "https:/doi.org/10.5061/dryad.8515"
+      response = subject.normalize_doi(doi)
+      expect(response).to eq("https://doi.org/10.5061/dryad.8515")
+    end
   end
 
   context "doi registration agency" do

metadata

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