identifiers 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20bb1b38cae83fa5173c1c5a955aa799ccb1dee1
-  data.tar.gz: 5885f3af6e8c0c5fef3b0418105602bdf721a0ee
+  metadata.gz: d5c6a569245a2c9931eb0fd3a4f4e5e234254c6d
+  data.tar.gz: 41d5ea41e4fbf1bc967d27f671e3777991907d3a
 SHA512:
-  metadata.gz: 7ccfe0444e88dcc61b51c17d8ce431318c7854936604843d50fd56a96da88536ca15da90572af3352b853e9506e1c40638418d187fe359b2c8bc5ec6ab2eaa34
-  data.tar.gz: be40a3196e1c7e8f17786b53df685e7b6c4f70a182ad8363d4a1efb5e6d5471d939c2e44e89e7181a6781fab35a928ad874f086585bfa9317491cfbd7518fce8
+  metadata.gz: 08707a69b6d6143e13db5f8b3a4d8e58f54089fd37a7382296898ce4f5ac6b6dcb8ccd7a99535009074ce679d47f85fe0c51737cfb7f3b019b39b3855e000716
+  data.tar.gz: 03d64f650ebe7e4c411ad77c98d83c1a58be7eb3a034183d158cd615584a4d7fd5beb2a7197cdf39ee64450cc9e09c06162f526bef7238b92c811e6704e2dffd

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file. This
 project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.7.0] - 2017-04-10
+### Added
+- Added support for cleaning trailing punctuation from DOIs that also end in punctuation
+
 ## [0.6.0] - 2017-04-08
 ### Added
 - Added support for valid DOIs ending in punctuation
@@ -37,3 +41,4 @@ project adheres to [Semantic Versioning](http://semver.org/).
 [0.4.0]: https://github.com/altmetric/identifiers/releases/tag/v0.4.0
 [0.5.0]: https://github.com/altmetric/identifiers/releases/tag/v0.5.0
 [0.6.0]: https://github.com/altmetric/identifiers/releases/tag/v0.6.0
+[0.7.0]: https://github.com/altmetric/identifiers/releases/tag/v0.7.0

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Altmetric LLP
+Copyright (c) 2016-2017 Altmetric LLP
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -18,7 +18,7 @@ Collection of utilities related to the extraction, validation and normalization
 Add this line to your application's `Gemfile`:
 
 ```ruby
-gem 'identifiers', '~> 0.6'
+gem 'identifiers', '~> 0.7'
 ```
 
 And then execute:
@@ -79,6 +79,6 @@ We also maintain [a version of this library for PHP](https://github.com/altmetri
 
 ## License
 
-Copyright © 2016 Altmetric LLP
+Copyright © 2016-2017 Altmetric LLP
 
 Distributed under the [MIT License](http://opensource.org/licenses/MIT).

data/lib/identifiers/doi.rb

@@ -33,11 +33,21 @@ module Identifiers
         .to_s
         .downcase
         .scan(PATTERN)
-        .map { |doi|
-          next doi if doi =~ VALID_ENDING
+        .map { |doi| strip_punctuation(doi) }
+        .compact
+    end
+
+    def self.extract_one(str)
+      match = str.to_s.downcase[PATTERN]
+      return unless match
+
+      strip_punctuation(match)
+    end
+
+    def self.strip_punctuation(doi)
+      return doi if doi =~ VALID_ENDING
 
-          doi.sub(/\p{Punct}+\z/, '')
-        }
+      extract_one(doi.sub(/\p{Punct}\z/, ''))
     end
   end
 end

data/spec/identifiers/doi_spec.rb

@@ -65,8 +65,8 @@ RSpec.describe Identifiers::DOI do
     expect(described_class.extract(str)).to contain_exactly('10.1130/2013.2502')
   end
 
-  it 'extracts particularly exotic DOIs' do
-    str = 'This is an example of an exotic DOI: 10.1002/(SICI)1096-8644(199601)99:1<135::AID-AJPA8>3.0.CO;2-#'
+  it 'extracts old Wiley DOIs' do
+    str = 'This is an example of an old Wiley DOI: 10.1002/(SICI)1096-8644(199601)99:1<135::AID-AJPA8>3.0.CO;2-#'
 
     expect(described_class.extract(str)).to contain_exactly('10.1002/(sici)1096-8644(199601)99:1<135::aid-ajpa8>3.0.co;2-#')
   end
@@ -76,4 +76,38 @@ RSpec.describe Identifiers::DOI do
 
     expect(described_class.extract(str)).to contain_exactly('10.1130/2013.2502')
   end
+
+  it 'discards trailing punctuation from old Wiley DOIs' do
+    str = 'This is an example of an old Wiley DOI: 10.1002/(SICI)1096-8644(199601)99:1<135::AID-AJPA8>3.0.CO;2-#",'
+
+    expect(described_class.extract(str)).to contain_exactly('10.1002/(sici)1096-8644(199601)99:1<135::aid-ajpa8>3.0.co;2-#')
+  end
+
+  it 'discards trailing punctuation after balanced parentheses' do
+    str = 'This is an example of a DOI: This is an example of a DOI: 10.1130/2013.2502(04).'
+
+    expect(described_class.extract(str)).to contain_exactly('10.1130/2013.2502(04)')
+  end
+
+  it 'discards contiguous trailing punctuation after balanced parentheses' do
+    str = 'This is an example of a DOI: This is an example of a DOI: 10.1130/2013.2502(04).",'
+
+    expect(described_class.extract(str)).to contain_exactly('10.1130/2013.2502(04)')
+  end
+
+  it 'discards trailing Unicode punctuation after balanced parentheses' do
+    str = 'This is an example of a DOI: 10.1130/2013.2502(04)…",'
+
+    expect(described_class.extract(str)).to contain_exactly('10.1130/2013.2502(04)')
+  end
+
+  it 'discards contiguous trailing punctuation after unbalanced parentheses' do
+    str = '(This is an example of a DOI: 10.1130/2013.2502).",'
+
+    expect(described_class.extract(str)).to contain_exactly('10.1130/2013.2502')
+  end
+
+  it 'does not extract DOIs with purely punctuation suffixes' do
+    expect(described_class.extract('10.1130/!).",')).to be_empty
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: identifiers
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Jonathan Hernandez
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-08 00:00:00.000000000 Z
+date: 2017-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: urn