hydra-remote_identifier 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68f852f82865fce51183e6cf178e7ec15cf7cae4
-  data.tar.gz: 5d453454a68027663297d5ee16548590630c1eeb
+  metadata.gz: cd5ebaf5e75ba163755a2f32c2c68be67356055c
+  data.tar.gz: 044e7aa00ad6079cb05f47251b48782b29061fe3
 SHA512:
-  metadata.gz: 3dda3e9b63f470fae42a7c37fc791045c59f0fe8a36cf8142d3e59a38289d6ee48277888f5c21d308bcfdd89103a34baf3c2e02d33f4cf421917e39c3a354ea7
-  data.tar.gz: c3508551c81a135bb5d33b48b3c378df5e92db3312404753c1f4694f63a553adda1557a5495ffded296d877ec3375676dc977a2a76c3f215295bdc0b34907fce
+  metadata.gz: e3fe0b25361efc0dad12e9cd85587423221412acea745ba7df2145e85ec387108e1518bb929bdc0a05d820fccfe28c77485dc949d58fd89002458d4887531fa6
+  data.tar.gz: ca390ae0f68802254da1839102e468fe69d81ddb21a59a38902ac1c51ffa8a2557d79eae83623d209c67c3fd6ae68a62926651fca457826708cf02fcce97c717

data/README.md

@@ -3,7 +3,6 @@
 [![Gem Version](https://badge.fury.io/rb/hydra-remote_identifier.png)](http://badge.fury.io/rb/hydra-remote_identifier)
 [![Build Status](https://travis-ci.org/jeremyf/hydra-remote_identifier.png)](https://travis-ci.org/jeremyf/hydra-remote_identifier)
 
-
 Coordinate the registration and minting of remote identifiers for persisted
 objects.
 
@@ -42,9 +41,10 @@ end
 ```
 
 If you are using Rails, you can run `rails generate hydra:remote_identifier:install` to
-create a Rails initializer with the above stub file.
+create a Rails initializer with a configuration stub file. Also available is
+`rails generate hydra:remote_identifier:doi`.
 
-In your views allow users to request that a remote identifier be assigned:
+In your views allow users to request that a remote identifier be created/assigned:
 
 ```ruby
 <%= form_for book do |f| %>

data/lib/generators/hydra/remote_identifier/doi_generator.rb

@@ -14,6 +14,7 @@ class Hydra::RemoteIdentifier::DoiGenerator < Rails::Generators::Base
   argument :targets, :type => :array, :default => [], :banner => "class_name class_name"
 
   def insert_doi
+
     inject_into_file(
       "config/initializers/hydra-remote_identifier_config.rb",
       after: /Hydra::RemoteIdentifier.*/

data/lib/hydra/remote_identifier/configuration.rb

@@ -17,7 +17,7 @@ module Hydra::RemoteIdentifier
     attr_reader :remote_services
 
     def find_remote_service(service_name)
-      remote_services.fetch(service_name)
+      remote_services.fetch(service_name.to_sym)
     end
 
     # @param service_name [#to_s]
@@ -25,14 +25,17 @@ module Hydra::RemoteIdentifier
     #
     # @yieldparam [Registration]
     def remote_service(service_name, *args)
-      remote_service = remote_service_class_lookup(service_name).new(*args)
-      remote_services[service_name] = remote_service
+      remote_service = find_or_store_remote_service(service_name, *args)
       registration = registration_builder.new(remote_service)
       yield(registration)
       remote_service
     end
 
     private
+    def find_or_store_remote_service(service_name, *args)
+      remote_services[service_name.to_sym] ||= remote_service_class_lookup(service_name).new(*args)
+      remote_services.fetch(service_name.to_sym)
+    end
 
     def remote_service_class_lookup(string)
       remote_service_class_name = string.to_s.gsub(/(?:^|_)([a-z])/) { $1.upcase }

data/lib/hydra/remote_identifier/minter.rb

@@ -27,6 +27,7 @@ module Hydra::RemoteIdentifier
 
     def update_target(identifier)
       target.set_identifier(identifier)
+      identifier
     end
 
   end

data/lib/hydra/remote_identifier/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module RemoteIdentifier
-    VERSION = "0.5.1"
+    VERSION = "0.5.2"
   end
 end

data/lib/hydra/remote_identifier.rb

@@ -108,12 +108,11 @@ module Hydra::RemoteIdentifier
     # @param target [#registered_remote_identifier_minters]
     def mint(remote_service_name, target)
       return false unless target.respond_to?(:registered_remote_identifier_minters)
-
-      # @TODO - there is a better way to do this but this is "complete/correct"
       remote_service = configuration.find_remote_service(remote_service_name)
-      target.registered_remote_identifier_minters.each do |coordinator|
-        coordinator.call(target) if coordinator.remote_service == remote_service
+      coordinator = target.registered_remote_identifier_minters.detect do |c|
+        c.remote_service.name == remote_service.name
       end
+      coordinator.call(target) if coordinator
     end
 
   end

data/spec/lib/hydra/remote_identifier/minter_spec.rb

@@ -17,7 +17,7 @@ module Hydra::RemoteIdentifier
       it "extracts the target's payload to send to the remote service then updates the target's identifier" do
         service.should_receive(:call).with(payload).and_return(identifier)
         target.should_receive(:set_identifier).with(identifier)
-        subject.call
+        expect(subject.call).to eq(identifier)
       end
     end
 

data/spec/lib/hydra/remote_identifier/minting_coordinator_spec.rb

@@ -9,8 +9,8 @@ module Hydra::RemoteIdentifier
     subject { MintingCoordinator.new(remote_service, mapper_builder, &map) }
     it 'forward delegates call to the minter' do
       minter = double
-      minter.should_receive(:call).with(remote_service, :wrapped_target)
-      subject.call(target, minter)
+      minter.should_receive(:call).with(remote_service, :wrapped_target).and_return(:response)
+      expect(subject.call(target, minter)).to eq(:response)
     end
   end
 end

data/spec/lib/hydra/remote_identifier_spec.rb

@@ -93,6 +93,10 @@ module Hydra::RemoteIdentifier
         }.to change(target, :set_identifier).from(nil).to(expected_doi)
       end
 
+      it 'returns the newly minted identifier', VCR::SpecSupport(record: :new_episodes, cassette_name: 'doi-integration') do
+        expect(Hydra::RemoteIdentifier.mint(:doi, target)).to eq(expected_doi)
+      end
+
       it 'returns false if the target is not configured for identifiers' do
         expect(Hydra::RemoteIdentifier.mint(:doi, double)).to eq(false)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-remote_identifier
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Jeremy Friesen