orcid 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c728b248c54177678ba9f6b1156a67ef1388d19b
-  data.tar.gz: 08212ff1cfdaced97466dc240884f5d585f29e8a
+  metadata.gz: d66cd54bd576ea08eb376f44610131ac480ba6b5
+  data.tar.gz: f483169f3bd055e2fb58b6328e8e9e553965a630
 SHA512:
-  metadata.gz: f733188e685634db34d65ebeb625f4c557672bfcdb2e0e88339be06c9c3d8cd079f90461ec7ba7ad10eb6e9e73323aafd6c0a8c3ed26b5ddf683b1592494d256
-  data.tar.gz: e6026908e32f9e3cdf23c4646af60b1c2716155d6fadfac3b06b11cf19f979c9cfcd0928dbbdc1c2fd6cb9b0b19d05bfdf4909c71ca8710aaac63e35a7f3aa2a
+  metadata.gz: 414235bdc885e4223581f787f078e417d83428c6363cd370a4535c5cc9577cee21ac6dbe049e437541f3b3fe6f864055a8f078e6c89e5ad3c040dad211f265af
+  data.tar.gz: a91a0f0236f4e29b988db18d947c057a917ae4a6e70a16dbd294101aa50c6cead16fcea0bddbf2c9d08d49ebfc9b00943629d2af4157f148b652fa1ff07e399d

data/README.md

@@ -4,6 +4,7 @@
 [![Build Status](https://travis-ci.org/projecthydra-labs/orcid.png?branch=master)](https://travis-ci.org/projecthydra-labs/orcid)
 [![Code Climate](https://codeclimate.com/github/projecthydra-labs/orcid.png)](https://codeclimate.com/github/projecthydra-labs/orcid)
 [![Coverage Status](https://img.shields.io/coveralls/projecthydra-labs/orcid.svg)](https://coveralls.io/r/projecthydra-labs/orcid)
+[![Documentation Status](http://inch-ci.org/github/projecthydra-labs/orcid.svg?branch=master)](http://inch-ci.org/github/projecthydra-labs/orcid)
 [![API Docs](http://img.shields.io/badge/API-docs-blue.svg)](http://rubydoc.info/gems/orcid/0.8.0/frames)
 [![APACHE 2 License](http://img.shields.io/badge/APACHE2-license-blue.svg)](./LICENSE)
 [![Contributing Guidelines](http://img.shields.io/badge/CONTRIBUTING-Guidelines-blue.svg)](./CONTRIBUTING.md)

data/app/controllers/orcid/application_controller.rb

@@ -1,6 +1,13 @@
 module Orcid
   # The foundation for Orcid controllers. A few helpful accessors.
   class ApplicationController < Orcid.parent_controller.constantize
+    # Providing a mechanism for overrding the default path in an implementing
+    # application
+    def path_for(named_path, *args)
+      return send(named_path, *args).to_s if respond_to?(named_path)
+      yield(*args)
+    end
+
     private
 
     def redirecting_because_user_has_connected_orcid_profile
@@ -9,7 +16,7 @@ module Orcid
           'orcid.requests.messages.previously_connected_profile',
           orcid_profile_id: orcid_profile.orcid_profile_id
         )
-        redirect_to main_app.root_path
+        redirect_to path_for(:orcid_settings_path) { main_app.root_path }
         return true
       else
         return false

data/app/controllers/orcid/profile_connections_controller.rb

@@ -72,7 +72,8 @@ module Orcid
         'orcid.connections.messages.verified_profile_connection_exists',
         orcid_profile_id: orcid_profile.orcid_profile_id
       )
-      redirect_to('/', flash: { notice: notice })
+      location = path_for(:orcid_settings_path) { main_app.root_path }
+      redirect_to(location, flash: { notice: notice })
     end
   end
 end

data/app/controllers/orcid/profile_requests_controller.rb

@@ -36,12 +36,29 @@ module Orcid
       #
       # Thus we need to pass the location.
       if new_profile_request.valid?
-        respond_with(orcid, location: orcid.profile_request_path)
+        flash[:notice] = I18n.t(
+          'orcid.requests.messages.profile_request_created'
+        )
+
+        location = path_for(:after_successful_orcid_profile_request_path) do
+          orcid.profile_request_path
+        end
+
+        respond_with(orcid, location: location)
       else
         respond_with(orcid, new_profile_request)
       end
     end
 
+    def destroy
+      existing_profile_request.destroy if existing_profile_request
+      flash[:notice] = I18n.t('orcid.requests.messages.profile_request_destroyed')
+      location = path_for(:after_orcid_profile_request_destroyed_path) do
+        orcid.new_profile_request_path
+      end
+      respond_with(orcid, location: location)
+    end
+
     protected
 
     def redirecting_because_no_profile_request_was_found

data/app/models/orcid/profile_connection.rb

@@ -11,7 +11,7 @@ module Orcid
 
     # See: http://support.orcid.org/knowledgebase/articles/132354-tutorial-searching-with-the-api
     class_attribute :available_query_attribute_names
-    self.available_query_attribute_names = [:email, :text, :digital_object_ids]
+    self.available_query_attribute_names = [:text]
 
     available_query_attribute_names.each do |attribute_name|
       attribute attribute_name

data/app/models/orcid/profile_request.rb

@@ -4,6 +4,7 @@ module Orcid
   # * submitting a request for an ORCID Profile
   # * handling the response for the ORCID Profile creation
   class ProfileRequest < ActiveRecord::Base
+    ERROR_STATUS = 'error'.freeze
     def self.find_by_user(user)
       where(user: user).first
     end
@@ -25,8 +26,15 @@ module Orcid
       end
     end
 
-    def validation_error_on_profile_creation(error_message)
+    def error_on_profile_creation(error_message)
       update_column(:response_text, error_message)
+      update_column(:response_status, ERROR_STATUS)
+    end
+
+    alias_attribute :error_message, :response_text
+
+    def error_on_profile_creation?
+      error_message.present? || response_status == ERROR_STATUS
     end
 
   end

data/app/models/orcid/profile_status.rb

@@ -41,7 +41,11 @@ module Orcid
       else
         request = request_finder.call(user)
         if request
-          return callback(:profile_request_pending, request)
+          if request.error_on_profile_creation?
+            return callback(:profile_request_in_error, request)
+          else
+            return callback(:profile_request_pending, request)
+          end
         else
           return callback(:unknown)
         end

data/app/services/orcid/profile_request_coordinator.rb

@@ -34,8 +34,8 @@ module Orcid
       payload = xml_payload(profile_request)
       remote_service.call(payload) do |on|
         on.success { |orcid_profile_id| profile_request.successful_profile_creation(orcid_profile_id) }
-        on.failure { }
-        on.orcid_validation_error { |error_message| profile_request.validation_error_on_profile_creation(error_message) }
+        on.failure { profile_request }
+        on.orcid_validation_error { |error_message| profile_request.error_on_profile_creation(error_message) }
       end
     end
 
@@ -45,8 +45,8 @@ module Orcid
       if !request.respond_to?(:user) || !request.user.present?
         fail MissingUserForProfileRequest, request
       end
-      if !request.respond_to?(:validation_error_on_profile_creation)
-        raise ProfileRequestMethodExpectedError.new(request, :validation_error_on_profile_creation)
+      if !request.respond_to?(:error_on_profile_creation)
+        raise ProfileRequestMethodExpectedError.new(request, :error_on_profile_creation)
       end
       if !request.respond_to?(:successful_profile_creation)
         raise ProfileRequestMethodExpectedError.new(request, :successful_profile_creation)

data/app/views/orcid/profile_connections/_authenticated_connection.html.erb

@@ -1,5 +1,3 @@
 <div class="authenticated-connection">
-  <p>
-    Your ORCID (<a class="orcid-profile-id" href="<%= Orcid.url_for_orcid_id(authenticated_connection.orcid_profile_id)%>" ><%= authenticated_connection.orcid_profile_id %></a>) has been authenticated for this application.
-  </p>
+  <%= t('orcid.views.authenticated_connection', orcid_profile_url: Orcid.url_for_orcid_id(authenticated_connection.orcid_profile_id), orcid_profile_id: authenticated_connection.orcid_profile_id).html_safe %>
 </div>

data/app/views/orcid/profile_connections/_orcid_connector.html.erb

@@ -1,7 +1,10 @@
 <% defined?(status_processor) || status_processor = Orcid::ProfileStatus.method(:for) %>
 <div class='orcid-connector'>
-  <h3><i class="icon-user"></i> <%= link_to t('orcid.verbose_name'), 'http://orcid.org/' %></h3>
+  <h3><i class="icon-user"></i> <%= link_to t('orcid.verbose_name'), Orcid.provider.host_url %></h3>
   <% status_processor.call(current_user) do |on|%>
+    <% on.profile_request_in_error do |pending_request| %>
+      <%= render partial: 'orcid/profile_connections/profile_request_in_error', object: pending_request %>
+    <% end %>
     <% on.profile_request_pending do |pending_request| %>
       <%= render partial: 'orcid/profile_connections/profile_request_pending', object: pending_request %>
     <% end %>

data/app/views/orcid/profile_connections/_pending_connection.html.erb

@@ -1,11 +1,10 @@
 <div class="pending-connection">
-  <p>
-    You have an ORCID (<a class="orcid-profile-id" href="<%= Orcid.url_for_orcid_id(pending_connection.orcid_profile_id)%>" ><%= pending_connection.orcid_profile_id %></a>).
-  </p>
-  <p>However, your ORCID has not been verified by this system. There are a few possibilities:
-    <ul>
-      <li>You may not have claimed your ORCID. <a class="find-out-more" href="http://support.orcid.org/knowledgebase/articles/164480-creating-claiming-new-records">Find out more about claiming your ORCID.</a></li>
-      <li>You have claimed your ORCID, but have not used it to <%= link_to('sign into this application', user_omniauth_authorize_path(provider: 'orcid'), class: 'signin-via-orcid') %>.</li>
-    </ul>
-  </p>
+  <%= t(
+    'orcid.views.pending_connection',
+    orcid_profile_url: Orcid.url_for_orcid_id(pending_connection.orcid_profile_id),
+    orcid_profile_id: pending_connection.orcid_profile_id,
+    application_orcid_authorization_href: user_omniauth_authorize_path(provider: 'orcid'),
+    application_orcid_authorization_text: 'sign into this application'
+  ).html_safe
+  %>
 </div>

data/app/views/orcid/profile_connections/_profile_request_in_error.html.erb

@@ -0,0 +1,30 @@
+<div class="profile-request-error">
+  <div class="orcid-request">
+    <h3>We have the following request on record</h3>
+    <dl>
+      <dt>Given Names</dt>
+      <dd><%= profile_request_in_error.given_names %></dd>
+      <dt>Family Name</dt>
+      <dd><%= profile_request_in_error.family_name %></dd>
+      <dt>Primary Email</dt>
+      <dd><%= profile_request_in_error.primary_email %></dd>
+      <dt>Reqeusted At</dt>
+      <dd><time datetime='<%= profile_request_in_error.created_at.in_time_zone %>'><%= time_ago_in_words(profile_request_in_error.created_at) %></time> ago.</dd>
+      <dt>Requested By</dt>
+      <dd><%= profile_request_in_error.user %></dd>
+    </dl>
+  </div>
+
+  <div class="orcid-response">
+    <h3>ORCID responded with</h3>
+    <blockquote class="error-message"><%= profile_request_in_error.error_message %></blockquote
+  </div>
+
+  <div class="orcid-actions">
+    <%= link_to(
+        t('orcid/profile_connection.profile_request_destroy', scope: 'helpers.label'),
+        orcid.profile_request_path ,
+        class: 'btn cancel-profile-request', method: :delete
+      ) %>
+  </div>
+</div>

data/app/views/orcid/profile_connections/_profile_request_pending.html.erb

@@ -1,5 +1,8 @@
 <div class="profile-request-pending">
-  <p>We are processing your ORCID Profile Request. It was submitted
-    <time datetime="<%= profile_request_pending.created_at.in_time_zone %>"><%= time_ago_in_words(profile_request_pending.created_at) %></time> ago.
-  </p>
+  <%= t(
+      'orcid.views.profile_request_pending',
+      datetime: profile_request_pending.created_at.in_time_zone,
+      time_ago_in_words: time_ago_in_words(profile_request_pending.created_at)
+    ).html_safe
+  %>
 </div>

data/app/views/orcid/profile_connections/new.html.erb

@@ -1,17 +1,17 @@
 <%= simple_form_for(profile_connection, as: :profile_connection, url: orcid.new_profile_connection_path, method: :get, html: {class: 'search-form'}) do |f| %>
-  <%= field_set_tag("Search ORCID Profiles") do %>
+  <%= field_set_tag(t('orcid.views.profile_connections.fieldsets.search_orcid_profiles')) do %>
     <% profile_connection.available_query_attribute_names.each do |field_name| %>
       <%= f.input field_name, as: :search %>
     <% end %>
   <% end %>
   <button type="submit" class="search-submit btn btn-primary" id="keyword-search-submit" tabindex="2">
-    <i class="icon-search icon-white"></i><span>Search</span>
+    <i class="icon-search icon-white"></i><span><%= t('orcid.views.profile_connections.buttons.search') %></span>
   </button>
 <% end %>
 
 <% profile_connection.with_orcid_profile_candidates do |candidates| %>
   <%= simple_form_for(profile_connection, as: :profile_connection, url: orcid.profile_connections_path,) do |f| %>
-    <%= field_set_tag("Select an ORCID Profile") do %>
+    <%= field_set_tag(t('orcid.views.profile_connections.fieldsets.select_an_orcid_profile')) do %>
       <%= f.collection_radio_buttons :orcid_profile_id, candidates, :id, :label %>
     <% end %>
     <%= f.submit %>

data/app/views/orcid/profile_requests/show.html.erb

@@ -1,5 +1 @@
-<p><strong>Requestor:</strong> <%= profile_request.user %></p>
-<p><strong>Given names:</strong> <%= profile_request.given_names %></p>
-<p><strong>Family name:</strong> <%= profile_request.family_name %></p>
-<p><strong>Primary email:</strong> <%= profile_request.primary_email %></p>
-<p><strong>ORCID Profile ID:</strong> <%= profile_request.orcid_profile_id %></p>
+<% render partial: 'orcid/profile_connections/profile_request_in_error', object: profile_request %>

data/config/locales/orcid.en.yml

@@ -23,14 +23,33 @@ en:
   orcid:
     requests:
       messages:
-        existing_request_not_found: "Unable to find an existing Orcid Profile request. Go ahead and create one."
-        existing_request: "You have already submitted an Orcid Profile request."
-        previously_connected_profile: "You have already connected to an Orcid Profile (%{orcid_profile_id})."
+        existing_request_not_found: "Unable to find an existing orcid Profile request. Go ahead and create one."
+        existing_request: "You have already submitted an ORCID Profile request."
+        previously_connected_profile: "You have already connected to an ORCID Profile (%{orcid_profile_id})."
+        profile_request_created: "Your ORCID profile request has been submitted. Check your email for more information from ORCID."
+        profile_request_created: "Your ORCID profile request has been submitted. Check your email for more information from ORCID."
+        profile_request_destroyed: "Your ORCID profile request has been cancelled."
     connections:
       messages:
-        profile_connection_not_found: "Unable to find an existing Orcid Profile connection."
-        verified_profile_connection_exists: "You have already connected and verified your Orcid Profile (%{orcid_profile_id})."
+        profile_connection_not_found: "Unable to find an existing ORCID Profile connection."
+        verified_profile_connection_exists: "You have already connected and verified your ORCID Profile (%{orcid_profile_id})."
     verbose_name: Open Researcher and Contributor ID (ORCID)
+    views:
+      profile_connections:
+        fieldsets:
+          search_orcid_profiles: "Search ORCID Profiles"
+          select_an_orcid_profile: "Select an ORCID Profile"
+        buttons:
+          search: 'Search'
+      authenticated_connection: "<p>Your ORCID (<a class='orcid-profile-id' href='%{orcid_profile_url}'>%{orcid_profile_id}</a>) has been authenticated for this application.</p>"
+      profile_request_pending: "<p>We are processing your ORCID Profile Request. It was submitted <time datetime='%{datetime}'>%{time_ago_in_words}</time> ago.</p>"
+      pending_connection: >
+        <p>You have an ORCID (<a class="orcid-profile-id" href="%{orcid_profile_url}">%{orcid_profile_id}</a>).</p>
+        <p>However, your ORCID has not been verified by this system. There are a few possibilities:</p>
+        <ul>
+          <li>You may not have claimed your ORCID. <a class="find-out-more" href="http://support.orcid.org/knowledgebase/articles/164480-creating-claiming-new-records">Find out more about claiming your ORCID.</a></li>
+          <li>You have claimed your ORCID, but have not used it to <a class="signin-via-orcid" href="%{application_orcid_authorization_href}">%{application_orcid_authorization_text}</a>.</li>
+        </ul>
   helpers:
     label:
       orcid/profile_connection:
@@ -38,3 +57,4 @@ en:
         create_an_orcid: Create an ORCID
         look_up_your_existing_orcid: Look up your existing ORCID
         connect_button_text: Connect
+        profile_request_destroy: Cancel your ORCID request

data/config/routes.rb

@@ -1,6 +1,6 @@
 Orcid::Engine.routes.draw do
   scope module: 'orcid' do
-    resource :profile_request, only: [:show, :new, :create]
+    resource :profile_request, only: [:show, :new, :create, :destroy]
     resources :profile_connections, only: [:new, :create, :index]
   end
 end

data/lib/orcid.rb

@@ -62,6 +62,12 @@ module Orcid
     return false
   end
 
+  def disconnect_user_and_orcid_profile(user)
+    authentication_model.where(provider: 'orcid', user: user).destroy_all
+    Orcid::ProfileRequest.where(user: user).destroy_all
+    true
+  end
+
   def profile_for(user)
     auth = authentication_model.where(provider: 'orcid', user: user).first
     auth && Orcid::Profile.new(auth.uid)

data/lib/orcid/version.rb

@@ -1,3 +1,3 @@
 module Orcid
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

data/orcid.gemspec

@@ -47,6 +47,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec-html-matchers', '~> 0.5.0'
   s.add_development_dependency 'capybara'
   s.add_development_dependency 'capybara-webkit'
+  s.add_development_dependency 'headless'
   s.add_development_dependency 'webmock'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'rest_client'

data/spec/controllers/orcid/application_controller_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Orcid::ApplicationController, type: :controller do
+  context '#path_for' do
+    it 'yields when the provided symbol is not a method' do
+      path_for = controller.path_for(:__obviously_missing_method__, '123') { |arg| "/abc/#{arg}" }
+      expect(path_for).to eq('/abc/123')
+    end
+
+    it 'calls the named method' do
+      path_for = controller.path_for(:to_s) { "/abc/#{arg}" }
+      expect(path_for).to eq(controller.to_s)
+    end
+  end
+end

data/spec/controllers/orcid/profile_requests_controller_spec.rb

@@ -101,6 +101,7 @@ module Orcid
           expect do
             post :create, profile_request: profile_request_attributes, use_route: :orcid
           end.to change { Orcid::ProfileRequest.count }.by(1)
+          expect(flash[:notice]).to eq(I18n.t('orcid.requests.messages.profile_request_created'))
           expect(response).to redirect_to(orcid.profile_request_path)
         end
 
@@ -124,5 +125,22 @@ module Orcid
 
       end
     end
+
+    context 'DELETE #destroy' do
+      it_prompts_unauthenticated_users_for_signin(:delete, :destroy)
+      context 'authenticated and authorized user' do
+        before { sign_in(user) }
+
+        it 'should destroy any pending profile requests' do
+          profile_request = double(destroy: true)
+          Orcid::ProfileRequest.should_receive(:find_by_user).with(user).and_return(profile_request)
+
+          delete :destroy, use_route: :orcid
+          expect(flash[:notice]).to eq(I18n.t('orcid.requests.messages.profile_request_destroyed'))
+          expect(profile_request).to have_received(:destroy)
+          expect(response).to redirect_to(orcid.new_profile_request_path)
+        end
+      end
+    end
   end
 end

data/spec/features/non_ui_based_interactions_spec.rb

@@ -131,6 +131,7 @@ describe 'non-UI based interactions' , requires_net_connect: true do
   def mailinator_requests(uri)
     base_sleep_duration = ENV.fetch('MAILINATOR_SECONDS_TO_RETRY', 120).to_i
     retry_attempts = ENV.fetch('MAILINATOR_RETRY_ATTEMPTS', 6).to_i
+    $stdout.print "\n=-=-= Fetching the mail from #{uri}"
     (0...retry_attempts).each do |attempt|
       sleep_duration = base_sleep_duration * (attempt +1)
       $stdout.print "\n=-=-= Connecting to Mailinator. Attempt #{attempt+1}\n\tWaiting #{sleep_duration} seconds to connect: "

data/spec/lib/orcid_spec.rb

@@ -60,6 +60,23 @@ describe Orcid do
     end
   end
 
+  context '.disconnect_user_and_orcid_profile' do
+    it 'changes the authentication count' do
+      Orcid.connect_user_and_orcid_profile(user, orcid_profile_id)
+      expect { Orcid.disconnect_user_and_orcid_profile(user) }.
+        to change(Orcid.authentication_model, :count).by(-1)
+    end
+
+    it 'deletes any profile request' do
+      Orcid::ProfileRequest.create!(
+        user: user, given_names: 'Hello', family_name: 'World',
+        primary_email: 'hello@world.com', primary_email_confirmation: 'hello@world.com'
+      )
+      expect { Orcid.disconnect_user_and_orcid_profile(user) }.
+        to change(Orcid::ProfileRequest, :count).by(-1)
+    end
+  end
+
   context '.access_token_for' do
     let(:client) { double("Client")}
     let(:token) { double('Token') }

data/spec/models/orcid/profile_connection_spec.rb

@@ -4,21 +4,21 @@ require 'orcid/profile_connection'
 # :nodoc:
 module Orcid
   describe ProfileConnection do
-    let(:email) { 'test@hello.com' }
+    let(:text) { 'test@hello.com' }
     let(:dois) { '123' }
     let(:user) { double('User') }
     let(:profile_query_service) { double('Profile Lookup Service') }
     let(:persister) { double('Persister') }
 
     subject do
-      Orcid::ProfileConnection.new(email: email, user: user).tap do |pc|
+      Orcid::ProfileConnection.new(text: text, user: user).tap do |pc|
         pc.persister = persister
         pc.profile_query_service = profile_query_service
       end
     end
 
     its(:default_persister) { should respond_to(:call) }
-    its(:email) { should eq email }
+    its(:text) { should eq text }
     its(:to_model) { should eq subject }
     its(:user) { should eq user }
     its(:persisted?) { should eq false }
@@ -26,20 +26,18 @@ module Orcid
 
     context '.available_query_attribute_names' do
       subject { Orcid::ProfileConnection.new.available_query_attribute_names }
-      it { should include(:email) }
       it { should include(:text) }
-      it { should include(:digital_object_ids) }
     end
 
     context '#query_attributes' do
       subject do
         Orcid::ProfileConnection.new(
-          email: email, user: user, digital_object_ids: dois
+          text: text, user: user, digital_object_ids: dois
         )
       end
       its(:query_attributes) do
         should eq(
-          'email' => email, 'text' => nil, 'digital-object-ids' => dois
+          'text' => text
         )
       end
     end
@@ -50,7 +48,7 @@ module Orcid
         its(:query_requested?) { should eq false }
       end
       context 'with attribute set' do
-        subject { Orcid::ProfileConnection.new(email: email, user: user) }
+        subject { Orcid::ProfileConnection.new(text: text, user: user) }
         its(:query_requested?) { should eq true }
       end
     end
@@ -76,10 +74,10 @@ module Orcid
     end
 
     context '#with_orcid_profile_candidates' do
-      context 'with an email' do
+      context 'with an text' do
 
         it 'should yield the query response' do
-          subject.email = email
+          subject.text = text
 
           profile_query_service.
             should_receive(:call).
@@ -91,9 +89,9 @@ module Orcid
         end
       end
 
-      context 'without an email' do
+      context 'without an text' do
         it 'should not yield' do
-          subject.email = nil
+          subject.text = nil
           profile_query_service.stub(:call).and_return(:query_response)
 
           expect { |b| subject.with_orcid_profile_candidates(&b) }.

data/spec/models/orcid/profile_request_spec.rb

@@ -37,12 +37,20 @@ module Orcid
       end
     end
 
-    context '#validation_error_on_profile_creation' do
+    context '#error_on_profile_creation' do
       it 'should update profile request' do
         error_message = '123'
         # Don't want to hit the database
         subject.should_receive(:update_column).with(:response_text, error_message)
-        subject.validation_error_on_profile_creation(error_message)
+        subject.should_receive(:update_column).with(:response_status, ProfileRequest::ERROR_STATUS)
+        subject.error_on_profile_creation(error_message)
+      end
+    end
+
+    context '#error_on_profile_creation?' do
+      it 'should be true if there is a response text' do
+        subject.response_status = ProfileRequest::ERROR_STATUS
+        expect(subject.error_on_profile_creation?).to be_truthy
       end
     end
   end

data/spec/models/orcid/profile_status_spec.rb

@@ -12,7 +12,8 @@ module Orcid
         :unknown,
         :authenticated_connection,
         :pending_connection,
-        :profile_request_pending
+        :profile_request_pending,
+        :profile_request_in_error
       )
     end
     Given(:subject) do
@@ -55,11 +56,22 @@ module Orcid
 
         context 'and does not have a profile' do
           context 'but has submitted a request' do
-            Given(:request) { double('ProfileRequest') }
+            Given(:request) { double('ProfileRequest', :error_on_profile_creation? => error_on_creation) }
             Given(:request_finder) { double('RequestFinder', call: request) }
-            When(:status) { subject.status }
-            Then { expect(status).to eq :profile_request_pending }
-            And { expect(callback.invoked).to eq [:profile_request_pending, request] }
+
+            context "and there weren't problems with the request" do
+              Given(:error_on_creation) { false }
+              When(:status) { subject.status }
+              Then { expect(status).to eq :profile_request_pending }
+              And { expect(callback.invoked).to eq [:profile_request_pending, request] }
+            end
+
+            context "and there were problems with the request" do
+              Given(:error_on_creation) { true }
+              When(:status) { subject.status }
+              Then { expect(status).to eq :profile_request_in_error }
+              And { expect(callback.invoked).to eq [:profile_request_in_error, request] }
+            end
           end
           context 'user does not have a request' do
             When(:status) { subject.status }

data/spec/services/orcid/profile_request_coordinator_spec.rb

@@ -8,7 +8,7 @@ module Orcid
     end
     Given(:logger) { double('Logger', notice: true) }
     Given(:user) { 'user' }
-    Given(:profile_request) { double('ProfileRequest', user: user, successful_profile_creation: true, validation_error_on_profile_creation: true) }
+    Given(:profile_request) { double('ProfileRequest', user: user, successful_profile_creation: true, error_on_profile_creation: true) }
     Given(:remote_service) { double('Remote Service') }
     Given(:callback_responder) do
       double('Responder', unknown: true, authenticated_connection: true, profile_request_pending: true, pending_connection: true)
@@ -39,7 +39,7 @@ module Orcid
       Given(:remote_service_handler) { double('Handler', success: true, failure: true, orcid_validation_error: true) }
       Given(:attributes) { { given_names: 'Given', family_name: 'Family', primary_email: 'email@email.email' } }
       Given(:profile_request) do
-        double('ProfileRequest', user: user, attributes: attributes, successful_profile_creation: true, validation_error_on_profile_creation: true)
+        double('ProfileRequest', user: user, attributes: attributes, successful_profile_creation: true, error_on_profile_creation: true)
       end
       before do
         callback_responder.stub(:profile_request_pending).and_yield(profile_request)
@@ -60,7 +60,7 @@ module Orcid
         end
         Given(:error_message) { 'Error Message' }
         When { coordinator.call }
-        Then { expect(profile_request).to have_received(:validation_error_on_profile_creation).with(error_message) }
+        Then { expect(profile_request).to have_received(:error_on_profile_creation).with(error_message) }
       end
     end
 
@@ -70,14 +70,14 @@ module Orcid
       Then { expect(instantiation).to have_failed(MissingUserForProfileRequest) }
     end
 
-    context 'requires a validation_error_on_profile_creation for the profile_request' do
+    context 'requires a error_on_profile_creation for the profile_request' do
       Given(:profile_request) { double('ProfileRequest', user: 'user') }
       When(:instantiation) { described_class.new(profile_request) }
       Then { expect(instantiation).to have_failed(ProfileRequestMethodExpectedError) }
     end
 
-    context 'requires a validation_error_on_profile_creation for the profile_request' do
-      Given(:profile_request) { double('ProfileRequest', user: 'user', validation_error_on_profile_creation: true) }
+    context 'requires a error_on_profile_creation for the profile_request' do
+      Given(:profile_request) { double('ProfileRequest', user: 'user', error_on_profile_creation: true) }
       When(:instantiation) { described_class.new(profile_request) }
       Then { expect(instantiation).to have_failed(ProfileRequestMethodExpectedError) }
     end

data/spec/spec_helper.rb

@@ -33,6 +33,18 @@ require 'rspec-html-matchers'
 require 'webmock/rspec'
 require 'capybara'
 require 'capybara-webkit'
+require 'headless'
+
+Capybara.register_driver :webkit do |app|
+  Capybara::Webkit::Driver.new(app, :ignore_ssl_errors => true)
+end
+
+Capybara.javascript_driver = :webkit
+
+if ENV['TRAVIS'] || ENV['JENKINS']
+  headless = Headless.new
+  headless.start
+end
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.

data/spec/views/orcid/profile_connections/_orcid_connector.html.erb_spec.rb

@@ -10,7 +10,8 @@ describe 'orcid/profile_connections/_orcid_connector.html.erb' do
       profile_request_pending: true,
       unknown: true,
       authenticated_connection: true,
-      pending_connection: true
+      pending_connection: true,
+      profile_request_in_error: true
     )
   end
   def render_with_params
@@ -42,6 +43,16 @@ describe 'orcid/profile_connections/_orcid_connector.html.erb' do
       expect(rendered).to have_tag('.orcid-connector')
     end
   end
+  context 'with :profile_request_in_error status' do
+    let(:pending_request) { Orcid::ProfileRequest.new(created_at: Time.now) }
+    it 'renders the options to view the pending profile request' do
+      expect(handler).to receive(:profile_request_in_error).and_yield(pending_request)
+      render_with_params
+
+      expect(view).to render_template(partial: 'orcid/profile_connections/_profile_request_in_error')
+      expect(rendered).to have_tag('.orcid-connector')
+    end
+  end
   context 'with :authenticated_connection status' do
     let(:profile) { double('Profile', orcid_profile_id: '123-456') }
     it 'renders the options to view the authenticated connection' do

data/spec/views/orcid/profile_connections/_profile_request_in_error.html.erb_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe 'orcid/profile_connections/_profile_request_in_error.html.erb' do
+  Given(:profile_request) { Orcid::ProfileRequest.new(error_message: 'Ouch!', created_at: created_at) }
+  Given(:created_at) { Date.today }
+
+  When(:rendered) do
+    render(
+      partial: 'orcid/profile_connections/profile_request_in_error',
+      object: profile_request
+    )
+  end
+
+  Then do
+    expect(rendered).to have_tag('.profile-request-error') do
+      with_tag('.error-message', text: 'Ouch!')
+      with_tag('.cancel-profile-request', with: { :href => orcid.profile_request_path, 'data-method' => 'delete' })
+    end
+  end
+
+end

metadata

@@ -1,377 +1,391 @@
 --- !ruby/object:Gem::Specification
 name: orcid
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-27 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: figaro
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: devise-multi_auth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
   name: omniauth-orcid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mappy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: email_validator
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.99'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-html-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara-webkit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: headless
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rest_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-given
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.99'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.99'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.99'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.99'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-activemodel-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A Rails engine for orcid.org integration.
@@ -381,11 +395,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coveralls.yml"
-- ".gitignore"
-- ".hound.yml"
-- ".mailmap"
-- ".travis.yml"
+- .coveralls.yml
+- .gitignore
+- .hound.yml
+- .mailmap
+- .travis.yml
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
@@ -419,6 +433,7 @@ files:
 - app/views/orcid/profile_connections/_options_to_connect_orcid_profile.html.erb
 - app/views/orcid/profile_connections/_orcid_connector.html.erb
 - app/views/orcid/profile_connections/_pending_connection.html.erb
+- app/views/orcid/profile_connections/_profile_request_in_error.html.erb
 - app/views/orcid/profile_connections/_profile_request_pending.html.erb
 - app/views/orcid/profile_connections/new.html.erb
 - app/views/orcid/profile_requests/new.html.erb
@@ -444,6 +459,7 @@ files:
 - lib/tasks/orcid_tasks.rake
 - orcid.gemspec
 - script/fast_specs
+- spec/controllers/orcid/application_controller_spec.rb
 - spec/controllers/orcid/profile_connections_controller_spec.rb
 - spec/controllers/orcid/profile_requests_controller_spec.rb
 - spec/factories/orcid_profile_requests.rb
@@ -487,6 +503,7 @@ files:
 - spec/views/orcid/profile_connections/_options_to_connect_orcid_profile.html.erb_spec.rb
 - spec/views/orcid/profile_connections/_orcid_connector.html.erb_spec.rb
 - spec/views/orcid/profile_connections/_pending_connection.html.erb_spec.rb
+- spec/views/orcid/profile_connections/_profile_request_in_error.html.erb_spec.rb
 - spec/views/orcid/profile_connections/_profile_request_pending.html.erb_spec.rb
 - spec/views/orcid/profile_connections/new.html.erb_spec.rb
 - spec/views/orcid/profile_requests/new.html.erb_spec.rb
@@ -501,12 +518,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -516,6 +533,7 @@ signing_key:
 specification_version: 4
 summary: A Rails engine for orcid.org integration.
 test_files:
+- spec/controllers/orcid/application_controller_spec.rb
 - spec/controllers/orcid/profile_connections_controller_spec.rb
 - spec/controllers/orcid/profile_requests_controller_spec.rb
 - spec/factories/orcid_profile_requests.rb
@@ -559,6 +577,7 @@ test_files:
 - spec/views/orcid/profile_connections/_options_to_connect_orcid_profile.html.erb_spec.rb
 - spec/views/orcid/profile_connections/_orcid_connector.html.erb_spec.rb
 - spec/views/orcid/profile_connections/_pending_connection.html.erb_spec.rb
+- spec/views/orcid/profile_connections/_profile_request_in_error.html.erb_spec.rb
 - spec/views/orcid/profile_connections/_profile_request_pending.html.erb_spec.rb
 - spec/views/orcid/profile_connections/new.html.erb_spec.rb
 - spec/views/orcid/profile_requests/new.html.erb_spec.rb