dmao-generic-ingesters 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14515f70a6f8d85f46287efdda0215af1bc1dda9
-  data.tar.gz: 4b358a91f560c57d6e44918cd15bcad63cb26147
+  metadata.gz: 9638acab4b7d6a95530831b63d34343c12c4be18
+  data.tar.gz: cc6cdc638125bb133ea3f0df7f8576acdf6f6b87
 SHA512:
-  metadata.gz: fa75f4a64f4b4e86003162acdb220327ee33140b05c3beccf03784a376d3651d5198bd860fc1d3267414031dd6c3a9bba0475daa41a782b1d5bdc2690735e8a5
-  data.tar.gz: 2f75e695c3b0d19ce70cbb754a40e1a656d687ec36c9360663e5296dc547c197cea30a1b493c6f94766610338767cb7147058022179eec7444f6e99dc2fbfa25
+  metadata.gz: 5d94d17e706c4e19f20247b0d89c4a7406ae08fb31cdc45af2eb692db922e0bff151155449199be49620a1d371ae02b312c9cdf56817adf9eba3c1a6841a4ef5
+  data.tar.gz: 96941dcc369fa5830d532ddb3f4881e4e8fbc476734bc6e97e32fcbba474ceacd99d03a13fa72df82600ec734145b5fd5ecd435a869231872d21625ccb390e5f

data/lib/dmao/ingesters/errors/ingest_project_error.rb

@@ -0,0 +1,17 @@
+require 'dmao/ingesters/errors/ingest_entity_error'
+
+module DMAO
+  module Ingesters
+    module Errors
+
+      class IngestProjectError < IngestEntityError
+
+        def initialize(msg="Error ingesting project.")
+          super(msg)
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -14,6 +14,7 @@ module DMAO
         ENTITY_ERROR = nil
         INVALID_ENTITY_ERROR = nil
         ENTITY_ERROR_MESSAGE = nil
+        ERROR_HANDLING = nil
 
         def initialize(api_url=nil, api_token=nil, institution_id=nil)
 
@@ -34,13 +35,19 @@ module DMAO
           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 generic_errors
+          {
+              "DMAO::API::Errors::InstitutionNotFound" => "Institution not found, cannot ingest #{self.class.entity_name} to non-existent institution",
+              "DMAO::API::Errors::EntityNotFound" => "#{self.class.entity_name.capitalize} not found, cannot update #{self.class.entity_name} that does not exist"
+          }
+        end
+
         def ingest
           raise DMAO::Ingesters::Errors::GenericIngester.new("Calling ingest on generic ingester is not allowed.")
         end
@@ -86,27 +93,40 @@ module DMAO
 
         private
 
-        def add_entity attributes={}
+        def perform_entity_action action, arguments
+
+          errors_to_handle = self.class::ERROR_HANDLING.nil? ? generic_errors : self.class::ERROR_HANDLING
 
           begin
-            self.class::ENTITY.create attributes
-          rescue DMAO::API::Errors::InstitutionNotFound
-            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
+            self.class::ENTITY.send(action, *arguments)
+          rescue ingest_errors(errors_to_handle) => e
+            error_message = errors_to_handle[e.class.to_s].nil? ? errors_to_handle[(e.class.ancestors.map {|a| a.to_s} & errors_to_handle.keys).first] : errors_to_handle[e.class.to_s]
+            raise self.class::ENTITY_ERROR.new(error_message)
+          rescue self.class::ENTITY::INVALID_ENTITY_CLASS => e
             parse_unprocessable_errors(e.errors)
           end
 
         end
 
+        def ingest_errors(errors={})
+          Class.new do
+            def self.===(other)
+              !(other.class.ancestors.map {|a| a.to_s} & @errors.keys).empty?
+            end
+          end.tap do |c|
+            c.instance_variable_set(:@errors, errors)
+          end
+        end
+
+        def add_entity attributes={}
+
+          perform_entity_action "create", [attributes]
+
+        end
+
         def update_entity entity_id, attributes={}
 
-          begin
-            self.class::ENTITY.update entity_id, attributes
-          rescue DMAO::API::Errors::EntityNotFound
-            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
+          perform_entity_action "update", [entity_id, attributes]
 
         end
 

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

@@ -15,6 +15,11 @@ module DMAO
         ENTITY = DMAO::API::OrganisationUnit
         ENTITY_ERROR = DMAO::Ingesters::Errors::IngestOrganisationUnitError
         ENTITY_ERROR_MESSAGE = "Invalid organisation unit details"
+        ERROR_HANDLING = {
+            "DMAO::API::Errors::OrganisationUnitNotFound" => "Organisation unit not found, cannot update organisation unit that does not exist",
+            "DMAO::API::Errors::InstitutionNotFound" => "Institution not found, cannot ingest organisation unit to non-existent institution",
+            "DMAO::API::Errors::InvalidParentId" => "Parent ID not found in DMA Online, cannot link organisation unit to non-existent parent"
+        }
 
         def link_child_to_parent child_system_uuid, parent_system_uuid
 
@@ -29,46 +34,8 @@ module DMAO
 
         end
 
-        def add_organisation_unit attributes
-
-          begin
-            DMAO::API::OrganisationUnit.create attributes
-          rescue DMAO::API::Errors::InstitutionNotFound
-            raise DMAO::Ingesters::Errors::IngestOrganisationUnitError.new("Institution not found, cannot ingest organisation unit to non-existent institution")
-          rescue DMAO::API::Errors::InvalidParentId
-            raise DMAO::Ingesters::Errors::IngestOrganisationUnitError.new("Parent ID not found in DMA Online, cannot link organisation unit to non-existent parent")
-          rescue DMAO::API::Errors::InvalidOrganisationUnit => e
-            parse_unprocessable_errors(e.errors)
-          end
-
-        end
-
-        def update_organisation_unit id, attributes
-
-          begin
-
-            DMAO::API::OrganisationUnit.update id, attributes
-
-          rescue DMAO::API::Errors::OrganisationUnitNotFound
-            raise DMAO::Ingesters::Errors::IngestOrganisationUnitError.new("Organisation unit not found, cannot update organisation unit that does not exist")
-          rescue DMAO::API::Errors::InvalidParentId
-            raise DMAO::Ingesters::Errors::IngestOrganisationUnitError.new("Parent ID not found in DMA Online, cannot link organisation unit to non-existent parent")
-          rescue DMAO::API::Errors::InvalidOrganisationUnit => e
-            parse_unprocessable_errors(e.errors)
-          end
-
-        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/projects_ingester.rb

@@ -0,0 +1,23 @@
+require 'dmao/ingesters/generic/ingester'
+require 'dmao/ingesters/errors/ingest_project_error'
+
+module DMAO
+  module Ingesters
+    module Generic
+
+      class ProjectsIngester < Ingester
+
+        ENTITY = DMAO::API::Project
+        ENTITY_ERROR = DMAO::Ingesters::Errors::IngestProjectError
+        ENTITY_ERROR_MESSAGE = "Invalid project details"
+        ERROR_HANDLING = {
+            "DMAO::API::Errors::ProjectNotFound" => "Project not found, cannot update project that does not exist",
+            "DMAO::API::Errors::InstitutionNotFound" => "Institution not found, cannot ingest project to non-existent institution",
+            "DMAO::API::Errors::InvalidOrganisationUnitID" => "Organisation unit not found, cannot ingest project linked to non-existent organisation unit"
+        }
+
+      end
+
+    end
+  end
+end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dmao-generic-ingesters
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Stephen Robinson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-19 00:00:00.000000000 Z
+date: 2017-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dmao_api
@@ -129,12 +129,14 @@ files:
 - lib/dmao/ingesters/errors/ingest_funder_error.rb
 - lib/dmao/ingesters/errors/ingest_organisation_unit_error.rb
 - lib/dmao/ingesters/errors/ingest_person_error.rb
+- lib/dmao/ingesters/errors/ingest_project_error.rb
 - lib/dmao/ingesters/errors/link_organisation_unit_error.rb
 - lib/dmao/ingesters/generic.rb
 - lib/dmao/ingesters/generic/funders_ingester.rb
 - lib/dmao/ingesters/generic/ingester.rb
 - lib/dmao/ingesters/generic/organisation_ingester.rb
 - lib/dmao/ingesters/generic/people_ingester.rb
+- lib/dmao/ingesters/generic/projects_ingester.rb
 - lib/dmao/ingesters/generic/version.rb
 homepage: https://github.com/lulibrary/DMAO-Generic-Ingesters
 licenses: