logstash-filter-ezproxy 0.2.0 → 0.3.0

data/lib/logstash/filters/{scopus.rb → ezproxy_providers/scopus.rb}

@@ -1,6 +1,7 @@
+require_relative '../ezproxy_providers'
 
-module Scopus
-  def Scopus.parse (path, params)
+class EzproxyProviders::Scopus
+  def self.parse (path, params)
 
     data = {
       "provider" => "scopus"

data/lib/logstash/filters/{springer.rb → ezproxy_providers/springer.rb}

@@ -1,8 +1,8 @@
 require 'uri'
-require 'cgi'
+require_relative '../ezproxy_providers'
 
-module Springer
-  def Springer.parse (path, params)
+class EzproxyProviders::Springer
+  def self.parse (path, params)
 
     data = {
       "provider" => "springer"

data/lib/logstash/filters/{tandf.rb → ezproxy_providers/tandf.rb}

@@ -1,9 +1,7 @@
+require_relative '../ezproxy_providers'
 
-require 'uri'
-require 'cgi'
-
-module TandF
-  def TandF.parse (path, params)
+class EzproxyProviders::TandF
+  def self.parse (path, params)
 
     data = {
         "provider" => "tandf"

data/lib/logstash/filters/{webofknowledge.rb → ezproxy_providers/webofknowledge.rb}

@@ -1,5 +1,7 @@
-module WebOfKnowledge
-  def WebOfKnowledge.parse (path, params)
+require_relative '../ezproxy_providers'
+
+class EzproxyProviders::WebOfKnowledge
+  def self.parse (path, params)
 
     data = {
         "provider" => "dawsonera"

data/lib/logstash/filters/ezproxy_providers/westlaw.rb

@@ -0,0 +1,18 @@
+require_relative '../ezproxy_providers'
+
+class EzproxyProviders::Westlaw
+  def self.parse (path, params)
+
+    data = {
+        "provider" => "westlaw"
+    }
+
+    if params.key?('docguid')
+      data['unit_id'] = params['docguid'][0]
+      data['title_id'] = params['docguid'][0]
+    end
+
+    return data
+
+  end
+end

data/lib/logstash/filters/{wiley.rb → ezproxy_providers/wiley.rb}

@@ -1,7 +1,7 @@
-require 'uri'
+require_relative '../ezproxy_providers'
 
-module Wiley
-  def Wiley.parse (path, params)
+class EzproxyProviders::Wiley
+  def self.parse (path, params)
 
     data = {
       "provider" => "wiley"

data/lib/logstash/helpers/param_helper.rb

@@ -19,14 +19,6 @@ module ParamHelper
       end
     end
 
-    # params.each do |key, value|
-    #   params_hash[key] = value
-    # end
-
-    # unless params.empty?
-    #   data['params'] = JSON::generate(params)
-    # end
-
     return data
   end
 end

data/logstash-filter-ezproxy.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-filter-ezproxy'
-  s.version       = '0.2.0'
+  s.version       = '0.3.0'
   s.licenses      = ['Apache-2.0']
   s.summary       = 'Write a short summary, because Rubygems requires one.'
   s.authors       = ['Dom Belcher']
-  s.email         = 'dominic.belcher@gmail.com'
+  s.email         = 'd.belcher@lancaster.ac.uk'
   s.require_paths = ['lib']
 
   # Files

data/spec/filters/cambridge/cambridge_spec.rb

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

data/spec/filters/dawsonera/dawsonera_spec.rb

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

data/spec/filters/{proquest/proquest_spec.rb → ebookcentral/ebookcentral.rb}

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

data/spec/filters/ebscohost/ebscohost_spec.rb

@@ -1,8 +1,8 @@
-require 'logstash/filters/ebscohost'
+require 'logstash/filters/ezproxy_providers/ebscohost'
 require 'logstash/helpers/url_parser'
 require 'csv'
 
-RSpec.describe Ebscohost do
+RSpec.describe EzproxyProviders::Ebscohost do
     CSV.foreach('spec/filters/ebscohost/ebscohost.2014-08-21.csv', { :col_sep => ';', headers: true }) do |row|
         parsed_url = URLParser::parse(row[11])
         uri = parsed_url['uri']
@@ -11,7 +11,7 @@ RSpec.describe Ebscohost do
 
         name = "tests a URL " + row[11]
         it name do
-            data = Ebscohost.parse(path, params, uri)
+            data = EzproxyProviders::Ebscohost.parse(path, params, uri)
             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/elsevier/elsevier.2018-02-20.csv

@@ -0,0 +1,3 @@
+out-unitid;out-titleid;in-url
+illustrated-textbooks-paediatrics;illustrated-textbooks-paediatrics;https://elsevierelibrary.co.uk:443/pdfreader/illustrated-textbooks-paediatrics
+kumar-clarks-clinical-medicine80515;kumar-clarks-clinical-medicine80515;http://elsevierelibrary.co.uk:80/product/kumar-clarks-clinical-medicine80515

data/spec/filters/elsevier/elsevier_spec.rb

@@ -0,0 +1,18 @@
+require 'logstash/filters/ezproxy_providers/elsevier'
+require 'csv'
+require 'logstash/helpers/url_parser'
+
+RSpec.describe EzproxyProviders::Elsevier do
+    CSV.foreach('spec/filters/elsevier/elsevier.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::Elsevier.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/emerald/emerald_spec.rb

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

data/spec/filters/ft/ft_spec.rb

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

data/spec/filters/gale/gale_spec.rb

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

data/spec/filters/heinonline/heinonline_spec.rb

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

data/spec/filters/ieee/ieee_spec.rb

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

data/spec/filters/jstor/jstor_spec.rb

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

data/spec/filters/lexis_webanalytics/lexis_webanalytics_spec.rb

@@ -1,8 +1,8 @@
-require 'logstash/filters/lexis_webanalytics'
+require 'logstash/filters/ezproxy_providers/lexis_webanalytics'
 require 'csv'
 require 'logstash/helpers/url_parser'
 
-RSpec.describe LexisWebAnalytics do
+RSpec.describe EzproxyProviders::LexisWebAnalytics do
     CSV.foreach('spec/filters/lexis_webanalytics/lexis360.2017-04-28.csv', { :col_sep => ';', headers: true }) do |row|
         parsed_url = URLParser::parse(row[4])
         path = parsed_url['path']
@@ -11,7 +11,7 @@ RSpec.describe LexisWebAnalytics do
 
         name = "tests a URL " + row[4]
         it name do
-            data = LexisWebAnalytics.parse(path, params, uri)
+            data = EzproxyProviders::LexisWebAnalytics.parse(path, params, uri)
             expect(data["title_id"]).to eq(row[0])
             expect(data["unit_id"]).to eq(row[1])
             expect(data["rtype"]).to eq(row[2])

data/spec/filters/lexisnexis/lexisnexis_spec.rb

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

data/spec/filters/myilibrary/myilibrary_spec.rb

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

data/spec/filters/oxford/oxford_spec.rb

@@ -1,8 +1,8 @@
-require 'logstash/filters/oxford'
+require 'logstash/filters/ezproxy_providers/oxford'
 require 'csv'
 require 'logstash/helpers/url_parser'
 
-RSpec.describe Oxford do
+RSpec.describe EzproxyProviders::Oxford do
     CSV.foreach('spec/filters/oxford/oxford.2018-02-15.csv', { :col_sep => ';', headers: true }) do |row|
         parsed_url = URLParser::parse(row[5])
         path = parsed_url['path']
@@ -10,7 +10,7 @@ RSpec.describe Oxford do
 
         name = "tests a URL " + row[5]
         it name do
-            data = Oxford.parse(path, params)
+            data = EzproxyProviders::Oxford.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/proquest-search/proquest-search.2018-02-19.csv

@@ -0,0 +1,4 @@
+out-unitid;out-title-id;out-mime;in-url
+868915501;868915501;PDF;https://search.proquest.com:443/docview/868915501/fulltextPDF?accountid=11979
+899707879;899707879;;https://search.proquest.com:443/docview/899707879/1CB6445015894B84PQ/1?accountid=11979
+1762049797;1762049797;;https://search.proquest.com:443/docview.headertitle:imagecheck?t:ac=1762049797

data/spec/filters/proquest-search/proquest-search_spec.rb

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