dmao-generic-ingesters 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a71389705fcf4841e99d08ff0095a27663f0502
-  data.tar.gz: 998ac6edd53d0b9cb88d634825e33d6540221789
+  metadata.gz: 14515f70a6f8d85f46287efdda0215af1bc1dda9
+  data.tar.gz: 4b358a91f560c57d6e44918cd15bcad63cb26147
 SHA512:
-  metadata.gz: b2f670e91b1df80c0fbbf1ecae5f0e1ee3f89cc834b91eb8ab6cda7cd0b8d8da5f543151af1bf25358b6f420125001a5aabf16adbba2c016bddf942db2ff9c79
-  data.tar.gz: 35a6f05547877fd292b65af83ba9e1ca2a63f8f09338e5243bc0d7d5ca236cd51a9f9c6bbf55f0e0f32f4517cc64a8b0e6c94927ba102ab99b06b06639cb5231
+  metadata.gz: fa75f4a64f4b4e86003162acdb220327ee33140b05c3beccf03784a376d3651d5198bd860fc1d3267414031dd6c3a9bba0475daa41a782b1d5bdc2690735e8a5
+  data.tar.gz: 2f75e695c3b0d19ce70cbb754a40e1a656d687ec36c9360663e5296dc547c197cea30a1b493c6f94766610338767cb7147058022179eec7444f6e99dc2fbfa25

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "generic/ingesters"
+require "dmao/ingesters/generic/ingester"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/lib/dmao/ingesters/generic/funders_ingester.rb

@@ -13,20 +13,6 @@ module DMAO
         INVALID_ENTITY_ERROR = DMAO::API::Errors::InvalidFunder
         ENTITY_ERROR_MESSAGE = "Invalid funder details"
 
-        def ingest_funder attributes={}
-          ingest_entity attributes
-        end
-
-        private
-
-        def add_funder attributes
-          add_entity attributes
-        end
-
-        def update_funder id, attributes
-          update_entity id, attributes
-        end
-
       end
 
     end

data/lib/dmao/ingesters/generic/ingester.rb

@@ -16,11 +16,29 @@ module DMAO
         ENTITY_ERROR_MESSAGE = nil
 
         def initialize(api_url=nil, api_token=nil, institution_id=nil)
+
           DMAO::API.configure do |config|
             config.base_url = api_url
             config.api_token = api_token
             config.institution_id = institution_id
           end
+
+          if self.class::ENTITY.nil?
+            raise "Entity not set"
+          end
+
+          add_method_name = "add_#{self.class.entity_name.tr(' ', '_')}"
+          update_method_name = "update_#{self.class.entity_name.tr(' ', '_')}"
+          ingest_method_name = "ingest_#{self.class.entity_name.tr(' ', '_')}"
+
+          self.class.send(:define_method, add_method_name, Proc.new {|attributes| add_entity(attributes)}) unless self.respond_to?(add_method_name, include_all: true)
+          self.class.send(:define_method, update_method_name, Proc.new {|id, attributes| update_entity(id, attributes)}) unless self.respond_to?(update_method_name, include_all: true)
+          self.class.send(:define_method, ingest_method_name, Proc.new {|attributes={}| ingest_entity(attributes)}) unless self.respond_to?(ingest_method_name, include_all: true)
+
+        end
+
+        def self.entity_name
+          self::ENTITY.to_s.split('::')[-1].gsub(/[A-Z]/, " \\0").downcase.strip
         end
 
         def ingest
@@ -29,7 +47,7 @@ module DMAO
 
         def ingest_entity attributes = {}
 
-          raise DMAO::Ingesters::Errors::EmptyAttributes.new("Cannot ingest #{entity_name} without attributes.") if attributes.nil? || attributes.empty?
+          raise DMAO::Ingesters::Errors::EmptyAttributes.new("Cannot ingest #{self.class.entity_name} without attributes.") if attributes.nil? || attributes.empty?
 
           begin
 
@@ -45,7 +63,7 @@ module DMAO
           rescue DMAO::API::Errors::EntityNotFound
             add_entity attributes
           rescue DMAO::API::Errors::InvalidResponseLength
-            raise self.class::ENTITY_ERROR.new("More than one #{entity_name} returned for system uuid #{attributes[:system_uuid]}.")
+            raise self.class::ENTITY_ERROR.new("More than one #{self.class.entity_name} returned for system uuid #{attributes[:system_uuid]}.")
           end
 
         end
@@ -66,12 +84,14 @@ module DMAO
 
         end
 
+        private
+
         def add_entity attributes={}
 
           begin
             self.class::ENTITY.create attributes
           rescue DMAO::API::Errors::InstitutionNotFound
-            raise self.class::ENTITY_ERROR.new("Institution not found, cannot ingest #{entity_name} to non-existent institution")
+            raise self.class::ENTITY_ERROR.new("Institution not found, cannot ingest #{self.class.entity_name} to non-existent institution")
           rescue self.class::INVALID_ENTITY_ERROR => e
             parse_unprocessable_errors(e.errors)
           end
@@ -83,17 +103,13 @@ module DMAO
           begin
             self.class::ENTITY.update entity_id, attributes
           rescue DMAO::API::Errors::EntityNotFound
-            raise self.class::ENTITY_ERROR.new("#{entity_name.capitalize} not found, cannot update #{entity_name} that does not exist")
+            raise self.class::ENTITY_ERROR.new("#{self.class.entity_name.capitalize} not found, cannot update #{self.class.entity_name} that does not exist")
           rescue self.class::INVALID_ENTITY_ERROR => e
             parse_unprocessable_errors(e.errors)
           end
 
         end
 
-        def entity_name
-          self.class::ENTITY.to_s.split('::')[-1].gsub(/[A-Z]/, " \\0").strip.downcase
-        end
-
       end
 
     end

data/lib/dmao/ingesters/generic/organisation_ingester.rb

@@ -16,10 +16,6 @@ module DMAO
         ENTITY_ERROR = DMAO::Ingesters::Errors::IngestOrganisationUnitError
         ENTITY_ERROR_MESSAGE = "Invalid organisation unit details"
 
-        def ingest_organisation_unit attributes={}
-          ingest_entity attributes
-        end
-
         def link_child_to_parent child_system_uuid, parent_system_uuid
 
           child_unit = find_unit_or_raise_link_error child_system_uuid, "Organisation unit not found for child system uuid #{child_system_uuid}"
@@ -33,16 +29,6 @@ module DMAO
 
         end
 
-        private
-
-        def add_entity attributes
-          add_organisation_unit attributes
-        end
-
-        def update_entity id, attributes
-          update_organisation_unit id, attributes
-        end
-
         def add_organisation_unit attributes
 
           begin
@@ -73,6 +59,16 @@ module DMAO
 
         end
 
+        protected
+
+        def add_entity attributes
+          add_organisation_unit attributes
+        end
+
+        def update_entity id, attributes
+          update_organisation_unit id, attributes
+        end
+
         def find_unit_or_raise_link_error unit_system_uuid, error_message
 
           begin

data/lib/dmao/ingesters/generic/people_ingester.rb

@@ -17,20 +17,6 @@ module DMAO
         INVALID_ENTITY_ERROR = DMAO::API::Errors::InvalidPerson
         ENTITY_ERROR_MESSAGE = "Invalid person details"
 
-        def ingest_person attributes={}
-          ingest_entity attributes
-        end
-
-        private
-
-        def add_person attributes
-          add_entity attributes
-        end
-
-        def update_person id, attributes
-          update_entity id, attributes
-        end
-
       end
 
     end

data/lib/dmao/ingesters/generic/version.rb

@@ -1,7 +1,7 @@
 module DMAO
   module Ingesters
     module Generic
-      VERSION = "0.4.0"
+      VERSION = "0.5.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dmao-generic-ingesters
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Stephen Robinson