logstash-filter-ezproxy 0.2.0 → 0.3.0

data/spec/filters/sage/sage_spec.rb

@@ -1,8 +1,8 @@
-require 'logstash/filters/sage'
+require 'logstash/filters/ezproxy_providers/sage'
 require 'logstash/helpers/url_parser'
 require 'csv'
 
-RSpec.describe Sage do
+RSpec.describe EzproxyProviders::Sage do
     CSV.foreach('spec/filters/sage/sagej.2016-12-05.csv', { :col_sep => ';', headers: true }) do |row|
         parsed_url = URLParser::parse(row[5])
         path = parsed_url['path']
@@ -10,7 +10,7 @@ RSpec.describe Sage do
 
         name = "tests a URL " + row[5]
         it name do
-            data = Sage.parse(path, params)
+            data = EzproxyProviders::Sage.parse(path, params)
             expect(data["title_id"]).to eq(row[0])
             expect(data["unit_id"]).to eq(row[1])
             expect(data["doi"]).to eq(row[2])

data/spec/filters/sciencedirect/sciencedirect_spec.rb

@@ -1,8 +1,8 @@
-require 'logstash/filters/sciencedirect'
+require 'logstash/filters/ezproxy_providers/sciencedirect'
 require 'logstash/helpers/url_parser'
 require 'csv'
 
-RSpec.describe ScienceDirect do
+RSpec.describe EzproxyProviders::ScienceDirect do
     CSV.foreach('spec/filters/sciencedirect/sd.2013-01-09.csv', { :col_sep => ';', headers: true }) do |row|
         parsed_url = URLParser::parse(row[6])
         path = parsed_url['path']
@@ -10,7 +10,7 @@ RSpec.describe ScienceDirect do
 
         name = "tests a URL " + row[6]
         it name do
-            data = ScienceDirect.parse(path, params)
+            data = EzproxyProviders::ScienceDirect.parse(path, params)
             expect(data["pii"]).to eq(row[0])
             expect(data["print_identifier"]).to eq(row[1])
             expect(data["title_id"]).to eq(row[2])

data/spec/filters/scopus/scopus_spec.rb

@@ -1,8 +1,8 @@
-require 'logstash/filters/scopus'
+require 'logstash/filters/ezproxy_providers/scopus'
 require 'csv'
 require 'logstash/helpers/url_parser'
 
-RSpec.describe Scopus do
+RSpec.describe EzproxyProviders::Scopus do
     CSV.foreach('spec/filters/scopus/scopus.2016-07-18.csv', { :col_sep => ';', headers: true }) do |row|
         parsed_url = URLParser::parse(row[3])
         path = parsed_url['path']
@@ -10,7 +10,7 @@ RSpec.describe Scopus do
 
         name = "tests a URL " + row[3]
         it name do
-            data = Scopus.parse(path, params)
+            data = EzproxyProviders::Scopus.parse(path, params)
             expect(data["unit_id"]).to eq(row[0])
             expect(data["rtype"]).to eq(row[1])
             expect(data["mime"]).to eq(row[2])

data/spec/filters/springer/springer_spec.rb

@@ -1,8 +1,8 @@
-require 'logstash/filters/springer'
+require 'logstash/filters/ezproxy_providers/springer'
 require 'logstash/helpers/url_parser'
 require 'csv'
 
-RSpec.describe Springer do
+RSpec.describe EzproxyProviders::Springer do
     CSV.foreach('spec/filters/springer/springer.2013-01-31.csv', { :col_sep => ';', headers: true }) do |row|
         parsed_url = URLParser::parse(row[7])
         path = parsed_url['path']
@@ -10,7 +10,7 @@ RSpec.describe Springer do
 
         name = "tests a URL " + row[7]
         it name do
-            data = Springer.parse(path, params)
+            data = EzproxyProviders::Springer.parse(path, params)
             expect(data["online_identifier"]).to eq(row[0])
             expect(data["doi"]).to eq(row[1])
             expect(data["print_identifier"]).to eq(row[2])

data/spec/filters/tandf/tandf_spec.rb

@@ -1,8 +1,8 @@
-require 'logstash/filters/tandf'
+require 'logstash/filters/ezproxy_providers/tandf'
 require 'logstash/helpers/url_parser'
 require 'csv'
 
-RSpec.describe TandF do
+RSpec.describe EzproxyProviders::TandF do
     CSV.foreach('spec/filters/tandf/tandf.2015-03-25.csv', { :col_sep => ';', headers: true }) do |row|
         parsed_url = URLParser::parse(row[6])
         path = parsed_url['path']
@@ -10,7 +10,7 @@ RSpec.describe TandF do
 
         name = "tests a URL " + row[6]
         it name do
-            data = TandF.parse(path, params)
+            data = EzproxyProviders::TandF.parse(path, params)
             expect(data["title_id"]).to eq(row[0])
             expect(data["doi"]).to eq(row[1])
             expect(data["print_identifier"]).to eq(row[2])

data/spec/filters/webofknowledge/webofknowledge_spec.rb

@@ -1,8 +1,8 @@
-require 'logstash/filters/webofknowledge'
+require 'logstash/filters/ezproxy_providers/webofknowledge'
 require 'csv'
 require 'logstash/helpers/url_parser'
 
-RSpec.describe WebOfKnowledge do
+RSpec.describe EzproxyProviders::WebOfKnowledge do
     CSV.foreach('spec/filters/webofknowledge/wos.2017-01-13.csv', { :col_sep => ';', headers: true }) do |row|
         parsed_url = URLParser::parse(row[5])
         path = parsed_url['path']
@@ -10,7 +10,7 @@ RSpec.describe WebOfKnowledge do
 
         name = "tests a URL " + row[5]
         it name do
-            data = WebOfKnowledge.parse(path, params)
+            data = EzproxyProviders::WebOfKnowledge.parse(path, params)
             expect(data["publication_title"]).to eq(row[0])
             expect(data["title_id"]).to eq(row[1])
             expect(data["unit_id"]).to eq(row[2])

data/spec/filters/westlaw/westlaw.2018-02-20.csv

@@ -0,0 +1,3 @@
+out-unitid;out-titleid;in-url
+I3F5A3F1079A211E5961097E2115E3605;I3F5A3F1079A211E5961097E2115E3605;https://login.westlaw.co.uk:443/maf/wluk/app/document?src=doc&linktype=ref&context=57&crumb-action=replace&docguid=I3F5A3F1079A211E5961097E2115E3605
+I33A61C80E42811DA8FC2A0F0355337E9;I33A61C80E42811DA8FC2A0F0355337E9;https://login.westlaw.co.uk:443/maf/wluk/app/document?&srguid=i0ad69f8e0000015fc41cc0da60e1e413&docguid=I33A61C80E42811DA8FC2A0F0355337E9&hitguid=I33A61C80E42811DA8FC2A0F0355337E9&rank=10&spos=10&epos=10&td=20&crumb-action=append&context=3&resolvein=true

data/spec/filters/westlaw/westlaw_spec.rb

@@ -0,0 +1,18 @@
+require 'logstash/filters/ezproxy_providers/westlaw'
+require 'csv'
+require 'logstash/helpers/url_parser'
+
+RSpec.describe EzproxyProviders::Westlaw do
+    CSV.foreach('spec/filters/westlaw/westlaw.2018-02-20.csv', { :col_sep => ';', headers: true }) do |row|
+        parsed_url = URLParser::parse(row[2])
+        path = parsed_url['path']
+        params = parsed_url['params']
+
+        name = "tests a URL " + row[2]
+        it name do
+            data = EzproxyProviders::Westlaw.parse(path, params)
+            expect(data["unit_id"]).to eq(row[0])
+            expect(data["title_id"]).to eq(row[1])
+        end
+    end
+end

data/spec/filters/wiley/wiley_spec.rb

@@ -1,8 +1,8 @@
-require 'logstash/filters/wiley'
+require 'logstash/filters/ezproxy_providers/wiley'
 require 'logstash/helpers/url_parser'
 require 'csv'
 
-RSpec.describe Wiley do
+RSpec.describe EzproxyProviders::Wiley do
     CSV.foreach('spec/filters/wiley/wiley.2013-04-15.csv', { :col_sep => ';', headers: true }) do |row|
         parsed_url = URLParser::parse(row[8])
         path = parsed_url['path']
@@ -10,7 +10,7 @@ RSpec.describe Wiley do
 
         name = "tests a URL " + row[8]
         it name do
-            data = Wiley.parse(path, params)
+            data = EzproxyProviders::Wiley.parse(path, params)
             expect(data["online_identifier"]).to eq(row[0])
             expect(data["publication_date"]).to eq(row[1])
             expect(data["print_identifier"]).to eq(row[2])
@@ -29,7 +29,7 @@ RSpec.describe Wiley do
 
         name = "tests a URL " + row[8]
         it name do
-            data = Wiley.parse(path, params)
+            data = EzproxyProviders::Wiley.parse(path, params)
             expect(data["online_identifier"]).to eq(row[0])
             expect(data["doi"]).to eq(row[1])
             expect(data["issue"]).to eq(row[2])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-ezproxy
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Dom Belcher
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-02-16 00:00:00.000000000 Z
+date: 2018-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -45,7 +45,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description:
-email: dominic.belcher@gmail.com
+email: d.belcher@lancaster.ac.uk
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -56,28 +56,32 @@ files:
 - Gemfile
 - LICENSE
 - README.md
-- lib/logstash/filters/cambridge.rb
-- lib/logstash/filters/dawsonera.rb
-- lib/logstash/filters/ebscohost.rb
-- lib/logstash/filters/emerald.rb
 - lib/logstash/filters/ezproxy.rb
-- lib/logstash/filters/ft.rb
-- lib/logstash/filters/gale.rb
-- lib/logstash/filters/heinonline.rb
-- lib/logstash/filters/ieee.rb
-- lib/logstash/filters/jstor.rb
-- lib/logstash/filters/lexis_webanalytics.rb
-- lib/logstash/filters/lexisnexis.rb
-- lib/logstash/filters/myilibrary.rb
-- lib/logstash/filters/oxford.rb
-- lib/logstash/filters/proquest.rb
-- lib/logstash/filters/sage.rb
-- lib/logstash/filters/sciencedirect.rb
-- lib/logstash/filters/scopus.rb
-- lib/logstash/filters/springer.rb
-- lib/logstash/filters/tandf.rb
-- lib/logstash/filters/webofknowledge.rb
-- lib/logstash/filters/wiley.rb
+- lib/logstash/filters/ezproxy_providers.rb
+- lib/logstash/filters/ezproxy_providers/cambridge.rb
+- lib/logstash/filters/ezproxy_providers/dawsonera.rb
+- lib/logstash/filters/ezproxy_providers/ebookcentral.rb
+- lib/logstash/filters/ezproxy_providers/ebscohost.rb
+- lib/logstash/filters/ezproxy_providers/elsevier.rb
+- lib/logstash/filters/ezproxy_providers/emerald.rb
+- lib/logstash/filters/ezproxy_providers/ft.rb
+- lib/logstash/filters/ezproxy_providers/gale.rb
+- lib/logstash/filters/ezproxy_providers/heinonline.rb
+- lib/logstash/filters/ezproxy_providers/ieee.rb
+- lib/logstash/filters/ezproxy_providers/jstor.rb
+- lib/logstash/filters/ezproxy_providers/lexis_webanalytics.rb
+- lib/logstash/filters/ezproxy_providers/lexisnexis.rb
+- lib/logstash/filters/ezproxy_providers/myilibrary.rb
+- lib/logstash/filters/ezproxy_providers/oxford.rb
+- lib/logstash/filters/ezproxy_providers/proquest-search.rb
+- lib/logstash/filters/ezproxy_providers/sage.rb
+- lib/logstash/filters/ezproxy_providers/sciencedirect.rb
+- lib/logstash/filters/ezproxy_providers/scopus.rb
+- lib/logstash/filters/ezproxy_providers/springer.rb
+- lib/logstash/filters/ezproxy_providers/tandf.rb
+- lib/logstash/filters/ezproxy_providers/webofknowledge.rb
+- lib/logstash/filters/ezproxy_providers/westlaw.rb
+- lib/logstash/filters/ezproxy_providers/wiley.rb
 - lib/logstash/helpers/mime_helper.rb
 - lib/logstash/helpers/param_helper.rb
 - lib/logstash/helpers/url_parser.rb
@@ -86,8 +90,12 @@ files:
 - spec/filters/cambridge/cambridge_spec.rb
 - spec/filters/dawsonera/dawsonera.2014-09-03.csv
 - spec/filters/dawsonera/dawsonera_spec.rb
+- spec/filters/ebookcentral/ebookcentral.2018-02-09.csv
+- spec/filters/ebookcentral/ebookcentral.rb
 - spec/filters/ebscohost/ebscohost.2014-08-21.csv
 - spec/filters/ebscohost/ebscohost_spec.rb
+- spec/filters/elsevier/elsevier.2018-02-20.csv
+- spec/filters/elsevier/elsevier_spec.rb
 - spec/filters/emerald/emerald.2015-08-11.csv
 - spec/filters/emerald/emerald_spec.rb
 - spec/filters/ezproxy_spec.rb
@@ -109,8 +117,8 @@ files:
 - spec/filters/myilibrary/myilibrary_spec.rb
 - spec/filters/oxford/oxford.2018-02-15.csv
 - spec/filters/oxford/oxford_spec.rb
-- spec/filters/proquest/proquest.2018-02-09.csv
-- spec/filters/proquest/proquest_spec.rb
+- spec/filters/proquest-search/proquest-search.2018-02-19.csv
+- spec/filters/proquest-search/proquest-search_spec.rb
 - spec/filters/sage/sage_spec.rb
 - spec/filters/sage/sagej.2016-12-05.csv
 - spec/filters/sciencedirect/sciencedirect_spec.rb
@@ -123,6 +131,8 @@ files:
 - spec/filters/tandf/tandf_spec.rb
 - spec/filters/webofknowledge/webofknowledge_spec.rb
 - spec/filters/webofknowledge/wos.2017-01-13.csv
+- spec/filters/westlaw/westlaw.2018-02-20.csv
+- spec/filters/westlaw/westlaw_spec.rb
 - spec/filters/wiley/wiley.2013-04-15.csv
 - spec/filters/wiley/wiley.2018-02-07.csv
 - spec/filters/wiley/wiley_spec.rb
@@ -158,8 +168,12 @@ test_files:
 - spec/filters/cambridge/cambridge_spec.rb
 - spec/filters/dawsonera/dawsonera.2014-09-03.csv
 - spec/filters/dawsonera/dawsonera_spec.rb
+- spec/filters/ebookcentral/ebookcentral.2018-02-09.csv
+- spec/filters/ebookcentral/ebookcentral.rb
 - spec/filters/ebscohost/ebscohost.2014-08-21.csv
 - spec/filters/ebscohost/ebscohost_spec.rb
+- spec/filters/elsevier/elsevier.2018-02-20.csv
+- spec/filters/elsevier/elsevier_spec.rb
 - spec/filters/emerald/emerald.2015-08-11.csv
 - spec/filters/emerald/emerald_spec.rb
 - spec/filters/ezproxy_spec.rb
@@ -181,8 +195,8 @@ test_files:
 - spec/filters/myilibrary/myilibrary_spec.rb
 - spec/filters/oxford/oxford.2018-02-15.csv
 - spec/filters/oxford/oxford_spec.rb
-- spec/filters/proquest/proquest.2018-02-09.csv
-- spec/filters/proquest/proquest_spec.rb
+- spec/filters/proquest-search/proquest-search.2018-02-19.csv
+- spec/filters/proquest-search/proquest-search_spec.rb
 - spec/filters/sage/sage_spec.rb
 - spec/filters/sage/sagej.2016-12-05.csv
 - spec/filters/sciencedirect/sciencedirect_spec.rb
@@ -195,6 +209,8 @@ test_files:
 - spec/filters/tandf/tandf_spec.rb
 - spec/filters/webofknowledge/webofknowledge_spec.rb
 - spec/filters/webofknowledge/wos.2017-01-13.csv
+- spec/filters/westlaw/westlaw.2018-02-20.csv
+- spec/filters/westlaw/westlaw_spec.rb
 - spec/filters/wiley/wiley.2013-04-15.csv
 - spec/filters/wiley/wiley.2018-02-07.csv
 - spec/filters/wiley/wiley_spec.rb