handle doi parameter for events. #262

app/models/concerns/modelable.rb

@@ -0,0 +1,12 @@
+module Modelable
+  extend ActiveSupport::Concern
+
+  module ClassMethods
+    def doi_from_url(url)
+      if /\A(?:(http|https):\/\/(dx\.)?(doi.org|handle.test.datacite.org)\/)?(doi:)?(10\.\d{4,5}\/.+)\z/.match(url)
+        uri = Addressable::URI.parse(url)
+        uri.path.gsub(/^\//, '').downcase
+      end
+    end
+  end
+end

app/models/event.rb

@@ -1,4 +1,7 @@
 class Event
+  # include helper module for PORO models
+  include Modelable
+
   def self.find_by_id(id)
     return { errors: [{ "title" => "No id provided"} ] } unless id.present?
 
@@ -19,10 +22,12 @@ def self.find_by_id(id)
 
   def self.query(query, options={})
     size = options[:limit] || 100
+    doi = options[:doi].present? ? doi_from_url(options[:doi]) : nil
 
     url = "https://api.datacite.org/events?page[size]=#{size}"
     url += "&relation-type-id=#{options[:relation_type_id]}" if options[:relation_type_id].present?
     url += "&source-id=#{options[:source_id]}" if options[:source_id].present?
+    url += "&doi=#{doi}" if doi.present?
 
     response = Maremma.get(url, accept: "application/vnd.api+json; version=2")
 

app/models/funder.rb

@@ -1,4 +1,7 @@
 class Funder
+  # include helper module for PORO models
+  include Modelable
+
   def self.find_by_id(id)
     doi = doi_from_url(id)
     return [] unless doi.present?
@@ -47,11 +50,4 @@ def self.parse_message(id: nil, message: nil)
       country: message["location"],
       date_modified: "2019-04-18T00:00:00Z" }.compact
   end
-
-  def self.doi_from_url(url)
-    if /\A(?:(http|https):\/\/(dx\.)?(doi.org|handle.test.datacite.org)\/)?(doi:)?(10\.\d{4,5}\/.+)\z/.match(url)
-      uri = Addressable::URI.parse(url)
-      uri.path.gsub(/^\//, '').downcase
-    end
-  end
 end