orcid 0.1.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72fe44a31b834e45dc65efebc06f416ec6452908
-  data.tar.gz: 93a589d4b5992b70e1ca685f1b50b37b9695efe6
+  metadata.gz: cdbf8eaf74801c8b3c9d2325d362d14e7f7e3c8b
+  data.tar.gz: dc2b890ba3958416489f364983885bf6a08a0f85
 SHA512:
-  metadata.gz: c8ce12e869d4935a7e7c563a2b760630a42b8139d3f1fbe8c0d73a66b05d00b4b8be6a7ad1ee97b6baf8744be2606bd39cadf00b7d33c63155c0be9ef77935be
-  data.tar.gz: 04a0d325084d3023aefc595abefe659ce126e57a81aae12d62949c308eec60a00c02bedbee72ccc9e7077795c1084f21ea9a0360adaf0767007ea5892efb6fdb
+  metadata.gz: 18825277ac23c713d06fad1ead3df6565bf1273fcb77cb53e01839cd7a5e443c7fad3f17cc4eefa1c70a73d4a69d7a03e5c1b5999d187a421a40c2ed0f8fd7ed
+  data.tar.gz: 3737282f7a406c4ca10cae3f2d51b315d512278c834680c20c57821f140864d2e0188a888a6a89eb0ff1a6f3f5df9ec0cf93cb9354d493121f19683062a6aa3e

data/.hound.yml

@@ -187,6 +187,7 @@ Documentation:
 
 DotPosition:
   Description: 'Checks the position of the dot in multi-line method calls.'
+  EnforcedStyle: trailing
   Enabled: true
 
 DoubleNegation:
@@ -235,7 +236,7 @@ EvenOdd:
 
 FileName:
   Description: 'Use snake_case for source file names.'
-  Enabled: true
+  Enabled: false
 
 FlipFlop:
   Description: 'Checks for flip flops'

data/CONTRIBUTING.md

@@ -0,0 +1,213 @@
+We want your help to make our project great.
+There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.
+
+* [The Hydra Way](#the-hydra-way)
+* [Reporting Issues](#reporting-issues)
+  * [What is a well written issue?](#what-is-a-well-written-issue)
+* [Making Changes](#making-changes)
+  * [Where to Engage for Help](#where-to-engage-for-help)
+* [Submitting Changes](#submitting-changes)
+  * [Contributor License Agreement](#contributor-license-agreement)
+  * [Coding Guidelines](#coding-guidelines)
+    * [Stating Your Intent](#stating-your-intent)
+    * [Writing Your Specs](#writing-your-specs)
+    * [Writing Your Code](#writing-your-code)
+    * [Ruby File Structure](#ruby-file-structure)
+  * [Well Written Commit Messages](#well-written-commit-messages)
+    * [Hooks into other Subsystems](#hooks-into-other-subsystems)
+* [Reviewing Changes](#reviewing-changes)
+  * [Responsibilities of a Reviewer](#responsibilities-of-a-reviewer)
+  * [Responsibilities of the Submitter](#responsibilities-of-the-submitter)
+* [Merging Changes](#merging-changes)
+
+# The Hydra Way
+
+We strive to…
+
+* Provide a [harassment-free community experience](https://wiki.duraspace.org/display/hydra/Anti-Harassment+Policy)
+* Adhere to our [Hierarchy of Promises](https://wiki.duraspace.org/display/hydra/Hydra+Stack+-+The+Hierarchy+of+Promises)
+* Operate under [Lazy Consensus](http://rave.apache.org/docs/governance/lazyConsensus.html)
+* Encourage community participation as guided by [our community principles](https://wiki.duraspace.org/display/hydra/Hydra+Community+Principles)
+
+# Reporting Issues
+
+Submit a [well written issue](#what-is-a-well-written-issue) to [Github's issue tracker](./issues).
+This will require a [GitHub account](https://github.com/signup/free) *(its free)*.
+
+## What is a well written issue?
+
+* Provide a descriptive summary
+* Reference the version in which you encountered the problem
+* Explain the expected behavior
+* Explain the actual behavior
+* Provide steps to reproduce the actual behavior
+
+# Making Changes
+
+Hydra is an open source project, released under the [APACHE 2 license](LICENSE).
+You are free to clone or [fork the repository](https://help.github.com/articles/fork-a-repo) and modify the code as you see fit.
+
+## Where to Engage for Help
+
+This gem is part of ProjectHydra, so you can [connect via the usual ProjectHydra channels](https://wiki.duraspace.org/pages/viewpage.action?pageId=43910187).
+
+# Submitting Changes
+
+## Contributor License Agreement
+
+**Note: You can submit a pull request before you've signed the Contributor License Agreement, but we won't merge your changes until we have your CLA on file.**
+
+Before any [ProjectHydra project](https://github.com/projecthydra) can accept your contributions we must have a [Contributor License Agreement on file](https://wiki.duraspace.org/display/hydra/Hydra+Project+Intellectual+Property+Licensing+and+Ownership).
+
+All code contributors must have an Individual Contributor License Agreement (iCLA) on file with the Hydra Project Steering Group.
+If the contributor works for an institution, the institution must have a Corporate Contributor License Agreement (cCLA) on file.
+
+[More on the Contributor License Agreements](https://wiki.duraspace.org/display/hydra/Hydra+Project+Intellectual+Property+Licensing+and+Ownership)
+
+## Coding Guidelines
+
+This project is using [HoundCI](https://houndci.com) to help support our agreed upon style guide.
+The style guide is a work in progress, and is declared in the project's `./hound.yml` file.
+
+Hound is a Github integration tool that essentially runs [rubocop](http://rubygems.org/gems/rubocop).
+
+> Automatic Ruby code style checking tool. Aims to enforce the community-driven Ruby Style Guide.
+
+If you want to run `rubocop` with our style guide, first `gem install rubocop` then inside the project:
+
+```bash
+$ rubocop ./path/to/file ./or/path/to/directory -c ./.hound.yml
+```
+**Can I break these guidelines?** Yes.
+But you may need to convince the person merging your changes.
+
+### Stating Your Intent
+
+Think of your written test as a statement of intent.
+The statement of intent can then be used when asking for help or clarity;
+Either from another developer or a stakeholder.
+Someone helping you can then see both what you are trying to do and how you are doing it;
+And that helper may know of a "better" way to do it.
+
+### Writing Your Specs
+
+Your code changes should include supporting tests.
+
+Before you begin writing code, think about the test that will verify the code you plan to write.
+A [well written story with Gherkin syntax](http://pivotallabs.com/well-formed-stories/) can help formulate the pre-conditions (Given), invocation (When), and post-conditions (Then).
+
+*This is the first step of Test Driven Development, and something that we encourage.*
+
+Now write that test; It should be your guidepost for any changes you plan on making.
+The test you just wrote should be executable code;
+If you are uncomfortable with where to put the executable code, a well formed Gherkin-syntax story is a suitable proxy.
+
+### Writing Your Code
+
+We are going to do our best to follow [Sandi Metz' Rules for Developers](http://robots.thoughtbot.com/post/50655960596/sandi-metz-rules-for-developers)
+
+> Here are the rules:
+>
+> * Classes can be no longer than one hundred lines of code.
+> * Methods can be no longer than five lines of code.
+> * Pass no more than four parameters into a method. Hash options are parameters.
+> * Controllers can instantiate only one object. Therefore, views can only know about one instance variable and views should only send messages to that object (`@object.collaborator.value` is not allowed).
+
+## Well Written Commit Messages
+
+**TL;DR**
+
+* First line is 50 characters or less
+* The message body explains what the code changes are about
+* [Reference any Github issues](https://help.github.com/articles/writing-on-github#references) on new lines.
+  * It is helpful if you [close a related issue via the commit message](https://help.github.com/articles/closing-issues-via-commit-messages)
+
+### Terse Example
+
+```
+    Removing Document title validation
+
+    We thought we wanted title validation but that was too complicated.
+
+    Closes #12
+```
+
+### Verbose Example
+
+```
+    Present tense short summary (50 characters or less)
+
+    More detailed description, if necessary. It should be wrapped to 72
+    characters. Try to be as descriptive as you can, even if you think that
+    the commit content is obvious, it may not be obvious to others. You
+    should add such description also if it's already present in bug tracker,
+    it should not be necessary to visit a webpage to check the history.
+
+    Description can have multiple paragraphs and you can use code examples
+    inside, just indent it with 4 spaces:
+
+        class PostsController
+          def index
+            respond_with Post.limit(10)
+          end
+        end
+
+    You can also add bullet points:
+
+    - you can use dashes or asterisks
+
+    - also, try to indent next line of a point for readability, if it's too
+      long to fit in 72 characters
+```
+
+> When appropriate, please squash your commits into logical units of work.
+> This simplifies future cherry picks, and also keeps the git log clean.
+
+### Hooks into other Subsystems
+
+**[ci skip]**: If your commit does not need to go through the Continuous Integration server, add `[ci skip]` to your commit message.
+This is used for updates to the documentation and stylesheet changes.
+
+# Reviewing Changes
+
+The review process is a conversation between the submitter and the team as a whole.
+Please feel free to bring other people into the conversation as necessary.
+
+As either the submitter or reviewer, feel free to assign the Pull Request to a repository contributor.
+This is a way of indicating that you want that repository contributor to review the change.
+
+When you do assign someone to the Pull Request, please make sure to add a comment stating why you assigned it to them.
+
+## Responsibilities of a Reviewer
+
+As a reviewer, it is important that the pull request:
+
+* Has a [well written commit message](#well-written-commit-messages)
+* Has [well written code](#coding-guidelines)
+* All tests pass in the test suite
+* Any questions regarding the pull request are answered
+* Adjudicate if the Pull Request should be squashed into a smaller number of commits
+
+## Responsibilities of the Submitter
+
+**As the submitter**, you should be responsive to the review process:
+
+* answering questions
+* making refinements
+* providing clarification
+* rebasing your commits.
+
+*If your changes are gridlocked please notify [@jeremyf](https://github.com/jeremyf) via a comment on the pull request.*
+
+# Merging Changes
+
+*If a pull request has received at least one Thumbs Up, but has still not been merged, please notify [@jeremyf](https://github.com/jeremyf) via a comment on the pull request.*
+
+**As the submitter,** you should not merge your own pull request.
+That is bad form.
+
+**As the reviewer,** if you are comfortable merge the pull request.
+ Otherwise feel free to assign the pull request to another contributor for final merging.
+
+**As the merger,** once you have merged the pull request, go ahead and delete the pull request's topic branch.
+You are now on the hook for any breaking of the build.

data/README.md

@@ -1,4 +1,4 @@
-# Orcid [![Version](https://badge.fury.io/rb/orcid.png)](http://badge.fury.io/rb/orcid) [![Build Status](https://travis-ci.org/jeremyf/orcid.png?branch=master)](https://travis-ci.org/jeremyf/orcid)
+# Orcid [![Version](https://badge.fury.io/rb/orcid.png)](http://badge.fury.io/rb/orcid) [![Build Status](https://travis-ci.org/projecthydra-labs/orcid.png?branch=master)](https://travis-ci.org/projecthydra-labs/orcid)
 
 A [Rails Engine](https://guides.rubyonrails.org/engines.html) for integrating with [Orcid](https://orcid.org).
 
@@ -9,6 +9,7 @@ To fully interact with the Orcid remote services, you will need to [register you
 * [Registering for an ORCID application profile](#registering-for-an-orcid-application-profile)
 * [Setting up your own ORCIDs in the ORCID Development Sandbox](#setting-up-your-own-orcids-in-the-orcid-development-sandbox)
 * [Running the tests](#running-the-tests)
+* [Contributing to this gem](./CONTRIBUTING.md)
 
 ## Installation
 
@@ -120,7 +121,3 @@ Run the online tests with
 ```console
 $ rake spec:online
 ```
-
-## TODO Items
-
-* When searching for your profile, expose Name and associated DOI as query parameters.

data/app/controllers/orcid/profile_requests_controller.rb

@@ -25,7 +25,17 @@ module Orcid
       return false if redirecting_because_user_has_existing_profile_request
       assign_attributes(new_profile_request)
       create_profile_request(new_profile_request)
-      respond_with(orcid, new_profile_request)
+      # As a named singular resource, url_for(profile_request) treates the
+      # input profile_request as the :format paramter. When you run
+      # `$ rake app:routes` in this gem, there is not a named route for:
+      # GET  /profile_request(.:format)         orcid/profile_requests#show
+      #
+      # Thus we need to pass the location.
+      if new_profile_request.valid?
+        respond_with(orcid, location: orcid.profile_request_path)
+      else
+        respond_with(orcid, new_profile_request)
+      end
     end
 
     protected

data/app/models/orcid/profile_connection.rb

@@ -7,8 +7,9 @@ module Orcid
     include ActiveModel::Conversion
     extend ActiveModel::Naming
 
+    # 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]
+    self.available_query_attribute_names = [:email, :text, :digital_object_ids]
 
     available_query_attribute_names.each do |attribute_name|
       attribute attribute_name
@@ -68,7 +69,16 @@ module Orcid
     private :query_requested?
 
     def query_attributes
-      attributes.slice(*available_query_attribute_names)
+      available_query_attribute_names.each_with_object({}) do |name, mem|
+        orcid_formatted_name = convert_attribute_name_to_orcid_format(name)
+        mem[orcid_formatted_name] = attributes.fetch(name)
+        mem
+      end
+    end
+
+    def convert_attribute_name_to_orcid_format(name)
+      name.to_s.gsub(/_+/, '-')
     end
+    private :convert_attribute_name_to_orcid_format
   end
 end

data/app/models/orcid/profile_status.rb

@@ -0,0 +1,67 @@
+module Orcid
+  # ProfileStatus.status
+  # **:authenticated_connection** - User has authenticated against the Orcid
+  #   remote system
+  # **:pending_connection** - User has indicated there is a connection, but has
+  #   not authenticated against the Orcid remote system
+  # **:profile_request_pending** - User has requested a profile be created on
+  #   their behalf
+  # **:unknown** - None of the above
+  class ProfileStatus
+    def self.for(user, collaborators = {}, &block)
+      new(user, collaborators, &block).status
+    end
+
+    attr_reader :user, :profile_finder, :request_finder, :callback_handler
+
+    def initialize(user, collaborators = {})
+      @user = user
+      @profile_finder = collaborators.fetch(:profile_finder) { default_profile_finder }
+      @request_finder = collaborators.fetch(:request_finder) { default_request_finder }
+      @callback_handler = collaborators.fetch(:callback_handler) { default_callback_handler }
+      yield(callback_handler) if block_given?
+    end
+
+    def status
+      return callback(:unknown) if user.nil?
+      profile = profile_finder.call(user)
+      if profile
+        if profile.verified_authentication?
+          return callback(:authenticated_connection, profile)
+        else
+          return callback(:pending_connection, profile)
+        end
+      else
+        request = request_finder.call(user)
+        if request
+          return callback(:profile_request_pending, request)
+        else
+          return callback(:unknown)
+        end
+      end
+      return callback(:unknown)
+    end
+
+    private
+
+    def callback(name, *args)
+      callback_handler.call(name, *args)
+      name
+    end
+
+    def default_callback_handler
+      require 'orcid/named_callbacks'
+      NamedCallbacks.new
+    end
+
+    def default_profile_finder
+      require 'orcid'
+      Orcid.method(:profile_for)
+    end
+
+    def default_request_finder
+      require 'orcid/profile_request'
+      ProfileRequest.method(:find_by_user)
+    end
+  end
+end

data/app/services/orcid/remote/profile_creation_service.rb

@@ -1,4 +1,6 @@
 require 'orcid/remote/service'
+require 'oauth2/error'
+require 'nokogiri'
 module Orcid
   module Remote
     # Responsible for minting a new ORCID for the given payload.
@@ -20,6 +22,8 @@ module Orcid
       def call(payload)
         response = deliver(payload)
         parse(response)
+      rescue ::OAuth2::Error => e
+        parse_exception(e)
       end
 
       protected
@@ -40,6 +44,17 @@ module Orcid
         end
       end
 
+      def parse_exception(exception)
+        doc = Nokogiri::XML.parse(exception.response.body)
+        error_text = doc.css('error-desc').text
+        if error_text.to_s.size > 0
+          callback(:orcid_validation_error, error_text)
+          false
+        else
+          fail exception
+        end
+      end
+
       def default_headers
         {
           'Accept' => 'application/xml',

data/app/services/orcid/remote/profile_query_service/response_parser.rb

@@ -0,0 +1,53 @@
+require_dependency 'orcid/remote/profile_query_service'
+module Orcid
+  module Remote
+    class ProfileQueryService
+      class ResponseParser
+
+        # A convenience method to expose entry into the ResponseParser function
+        def self.call(document, collaborators = {})
+          new(collaborators).call(document)
+        end
+
+        attr_reader :response_builder, :logger
+
+        def initialize(collaborators = {})
+          @response_builder = collaborators.fetch(:response_builder) do
+            SearchResponse
+          end
+          @logger = collaborators.fetch(:logger) do
+            Rails.logger
+          end
+        end
+
+        def call(document)
+          json = JSON.parse(document)
+          json.fetch('orcid-search-results').fetch('orcid-search-result')
+          .each_with_object([]) do |result, returning_value|
+            profile = result.fetch('orcid-profile')
+            begin
+              identifier = profile.fetch('orcid-identifier').fetch('path')
+              orcid_bio = profile.fetch('orcid-bio')
+              given_names = orcid_bio.fetch('personal-details').fetch('given-names').fetch('value')
+              family_name = orcid_bio.fetch('personal-details').fetch('family-name').fetch('value')
+              emails = []
+              contact_details = orcid_bio['contact-details']
+              if contact_details
+                emails = (contact_details['email'] || []).map {|email| email.fetch('value') }
+              end
+              label = "#{given_names} #{family_name}"
+              label << ' (' << emails.join(', ') << ')' if emails.any?
+              label << " [ORCID: #{identifier}]"
+              biography = ''
+              biography = orcid_bio['biography']['value'] if orcid_bio['biography']
+              returning_value << response_builder.new('id' => identifier, 'label' => label, 'biography' => biography)
+            rescue KeyError => e
+              logger.warn("Unexpected ORCID JSON Response, part of the response has been ignored.\tException Encountered:#{e.class}\t#{e}")
+            end
+            returning_value
+          end
+        end
+      end
+    end
+  end
+end

data/app/services/orcid/remote/profile_query_service.rb

@@ -9,11 +9,12 @@ module Orcid
       end
 
       attr_reader :token, :path, :headers, :response_builder, :query_builder
+      attr_reader :parser
       def initialize(config = {}, &callbacks)
         super(&callbacks)
         @query_builder = config.fetch(:query_parameter_builder) { QueryParameterBuilder }
         @token = config.fetch(:token) { default_token }
-        @response_builder = config.fetch(:response_builder) { SearchResponse }
+        @parser = config.fetch(:parser) { ResponseParser }
         @path = config.fetch(:path) { 'v1.1/search/orcid-bio/' }
         @headers = config.fetch(:headers) { default_headers }
       end
@@ -41,7 +42,7 @@ module Orcid
       end
 
       def issue_callbacks(search_results)
-        if search_results.any?
+        if Array(search_results).flatten.compact.any?
           callback(:found, search_results)
         else
           callback(:not_found)
@@ -54,27 +55,7 @@ module Orcid
       end
 
       def parse(document)
-        json = JSON.parse(document)
-
-        json.fetch('orcid-search-results').fetch('orcid-search-result')
-        .each_with_object([]) do |result, returning_value|
-          profile = result.fetch('orcid-profile')
-          identifier = profile.fetch('orcid-identifier').fetch('path')
-          orcid_bio = profile.fetch('orcid-bio')
-          given_names = orcid_bio.fetch('personal-details').fetch('given-names').fetch('value')
-          family_name = orcid_bio.fetch('personal-details').fetch('family-name').fetch('value')
-          emails = []
-          contact_details = orcid_bio['contact-details']
-          if contact_details
-            emails = (contact_details['email'] || []).map {|email| email.fetch('value') }
-          end
-          label = "#{given_names} #{family_name}"
-          label << ' (' << emails.join(', ') << ')' if emails.any?
-          label << " [ORCID: #{identifier}]"
-          biography = ''
-          biography = orcid_bio['biography']['value'] if orcid_bio['biography']
-          returning_value << response_builder.new('id' => identifier, 'label' => label, 'biography' => biography)
-        end
+        parser.call(document)
       end
 
     end

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

@@ -0,0 +1,5 @@
+<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>
+</div>

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

@@ -0,0 +1,20 @@
+<% profile_connection = Orcid::ProfileConnection.new %>
+<% default_search_text = '' unless defined?(default_search_text) %>
+<div class="options-to-connect-orcid-profile">
+  <p>
+    <%= link_to t('orcid/profile_connection.look_up_your_existing_orcid', scope: 'helpers.label'), orcid.new_profile_connection_path(profile_connection:{text: default_search_text}) %>
+  </p>
+  <p>
+    <%= link_to t('orcid/profile_connection.create_an_orcid', scope: 'helpers.label'), orcid.new_profile_request_path %>
+  </p>
+  <p>
+  <%= form_for(profile_connection, as: :profile_connection, url: orcid.profile_connections_path, method: :post) do |f| %>
+    <%# Note the `scope: 'helpers.label'` option is the default for the label, but I want to call those specifically out %>
+    <%= f.label :orcid_profile_id, t('orcid/profile_connection.orcid_profile_id', scope: 'helpers.label') %>
+    <%= f.text_field :orcid_profile_id, class:"orcid-input" %>
+    <button type="submit" class="search-submit btn btn-primary" id="keyword-search-submit" tabindex="2">
+      <span class="orcid-connect"><%= t('orcid/profile_connection.connect_button_text', scope: 'helpers.label') %></span>
+    </button>
+  <% end %>
+  </p>
+</div>

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

@@ -1,22 +1,19 @@
-<% profile_connection = Orcid::ProfileConnection.new %>
-<% default_search_text = '' unless defined?(default_search_text) %>
+<% 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>
-  <p>
-    <%= link_to t('orcid/profile_connection.look_up_your_existing_orcid', scope: 'helpers.label'), orcid.new_profile_connection_path(profile_connection:{text: default_search_text}) %>
-  </p>
-  <p>
-    <%= link_to t('orcid/profile_connection.create_an_orcid', scope: 'helpers.label'), orcid.new_profile_request_path %>
-  </p>
-  <p>
-  <%= form_for(profile_connection, as: :profile_connection, url: orcid.profile_connections_path, method: :post) do |f| %>
-    <%# Note the `scope: 'helpers.label'` option is the default for the label, but I want to call those specifically out %>
-    <%= f.label :orcid_profile_id, value: t('orcid/profile_connection.connect_button_text', scope: 'helpers.label') %>
-    <%= f.text_field :orcid_profile_id, class:"orcid-input" %>
-    <button type="submit" class="search-submit btn btn-primary" id="keyword-search-submit" tabindex="2">
-      <span class="orcid-connect"><%= t('orcid/profile_connection.connect_button_text', scope: 'helpers.label') %></span>
-    </button>
+  <% status_processor.call(current_user) do |on|%>
+    <% on.profile_request_pending do |pending_request| %>
+      <%= render partial: 'orcid/profile_connections/profile_request_pending', object: pending_request %>
+    <% end %>
+    <% on.authenticated_connection do |profile| %>
+      <%= render partial: 'orcid/profile_connections/authenticated_connection', object: profile %>
+    <% end %>
+    <% on.pending_connection do |profile| %>
+      <%= render partial: 'orcid/profile_connections/pending_connection', object: profile %>
+    <% end %>
+    <% on.unknown do %>
+      <% defined?(default_search_text) || default_search_text = '' %>
+      <%= render template: 'orcid/profile_connections/_options_to_connect_orcid_profile', locals: { default_search_text: default_search_text } %>
+    <% end %>
   <% end %>
-  </p>
 </div>
-

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

@@ -0,0 +1,11 @@
+<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>
+</div>

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

@@ -0,0 +1,5 @@
+<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>
+</div>

data/config/locales/orcid.en.yml

@@ -30,7 +30,7 @@ en:
       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})."
-    verbose_name: Open Researcher and Contributor ID (ORCID)'
+    verbose_name: Open Researcher and Contributor ID (ORCID)
   helpers:
     label:
       orcid/profile_connection:

data/lib/orcid/configuration/provider.rb

@@ -40,6 +40,14 @@ module Orcid
         end
       end
 
+      attr_writer :host_url
+      def host_url
+        @host_url ||= store.fetch('ORCID_HOST_URL') do
+          uri = URI.parse(signin_via_json_url)
+          "#{uri.scheme}://#{uri.host}"
+        end
+      end
+
       attr_writer :authorize_url
       def authorize_url
         @authorize_url ||= store.fetch('ORCID_AUTHORIZE_URL') do

data/lib/orcid/version.rb

@@ -1,3 +1,3 @@
 module Orcid
-  VERSION = '0.1.1'
+  VERSION = '0.8.0'
 end

data/lib/orcid.rb

@@ -71,6 +71,10 @@ module Orcid
     object.run
   end
 
+  def url_for_orcid_id(orcid_profile_id)
+    File.join(provider.host_url, orcid_profile_id)
+  end
+
   def oauth_client
     # passing the site: option as Orcid's Sandbox has an invalid certificate
     # for the api.sandbox.orcid.org