orcid 0.1.1 → 0.8.0

data/spec/controllers/orcid/profile_requests_controller_spec.rb

@@ -4,7 +4,7 @@ module Orcid
   describe ProfileRequestsController do
     def self.it_prompts_unauthenticated_users_for_signin(method, action)
       context 'unauthenticated user' do
-        it "should redirect for sign in" do
+        it 'should redirect for sign in' do
           send(method, action, use_route: :orcid)
           expect(response).to redirect_to(main_app.new_user_session_path)
         end
@@ -15,14 +15,14 @@ module Orcid
       context 'user has existing orcid_profile' do
         it 'should redirect to home_path' do
           sign_in(user)
-          orcid_profile = double("Orcid::Profile", orcid_profile_id: '1234-5678-0001-0002')
+          orcid_profile = double('Orcid::Profile', orcid_profile_id: '1234-5678-0001-0002')
           Orcid.should_receive(:profile_for).with(user).and_return(orcid_profile)
 
           send(method, action, use_route: :orcid)
 
           expect(response).to redirect_to(main_app.root_path)
           expect(flash[:notice]).to eq(
-            I18n.t("orcid.requests.messages.previously_connected_profile", orcid_profile_id: orcid_profile.orcid_profile_id)
+            I18n.t('orcid.requests.messages.previously_connected_profile', orcid_profile_id: orcid_profile.orcid_profile_id)
           )
         end
       end
@@ -39,7 +39,7 @@ module Orcid
       context 'authenticated and authorized user' do
         before { sign_in(user) }
         let(:profile_request_id) { '1234' }
-        let(:profile_request) { FactoryGirl.build_stubbed(:orcid_profile_request, user: user)}
+        let(:profile_request) { FactoryGirl.build_stubbed(:orcid_profile_request, user: user) }
 
         it 'should render the existing profile request' do
           Orcid::ProfileRequest.should_receive(:find_by_user).
@@ -58,7 +58,7 @@ module Orcid
 
           get :show, use_route: :orcid
 
-          expect(flash[:notice]).to eq(I18n.t("orcid.requests.messages.existing_request_not_found"))
+          expect(flash[:notice]).to eq(I18n.t('orcid.requests.messages.existing_request_not_found'))
           expect(response).to redirect_to(orcid.new_profile_request_path)
         end
       end
@@ -82,7 +82,7 @@ module Orcid
         it 'should guard against duplicate requests' do
           Orcid::ProfileRequest.should_receive(:find_by_user).with(user).and_return(Orcid::ProfileRequest.new)
           get :new, use_route: :orcid
-          expect(flash[:notice]).to eq(I18n.t("orcid.requests.messages.existing_request"))
+          expect(flash[:notice]).to eq(I18n.t('orcid.requests.messages.existing_request'))
           expect(response).to redirect_to(orcid.profile_request_path)
         end
       end
@@ -98,15 +98,27 @@ module Orcid
           Orcid::ProfileRequest.should_receive(:find_by_user).with(user).and_return(nil)
           Orcid.should_receive(:enqueue).with(an_instance_of(Orcid::ProfileRequest))
 
-          post :create, profile_request: profile_request_attributes, use_route: :orcid
-          expect(response).to be_redirect
+          expect do
+            post :create, profile_request: profile_request_attributes, use_route: :orcid
+          end.to change { Orcid::ProfileRequest.count }.by(1)
+          expect(response).to redirect_to(orcid.profile_request_path)
+        end
+
+        it 'should handle invalid data' do
+          Orcid::ProfileRequest.should_receive(:find_by_user).with(user).and_return(nil)
+          Orcid.should_not_receive(:enqueue)
+
+          expect do
+            post :create, profile_request: {}, use_route: :orcid
+          end.to change { Orcid::ProfileRequest.count }.by(0)
+          expect(response).to render_template('new')
         end
 
         it 'should guard against duplicate requests' do
           Orcid::ProfileRequest.should_receive(:find_by_user).with(user).and_return(Orcid::ProfileRequest.new)
           post :create, profile_request: profile_request_attributes, use_route: :orcid
 
-          expect(flash[:notice]).to eq(I18n.t("orcid.requests.messages.existing_request"))
+          expect(flash[:notice]).to eq(I18n.t('orcid.requests.messages.existing_request'))
           expect(response).to redirect_to(orcid.profile_request_path)
         end
 

data/spec/features/public_api_query_spec.rb

@@ -28,6 +28,12 @@ describe 'public api query', requires_net_connect: true do
     Then { expect(result.size).to be > 0 }
   end
 
+  context 'with bogus text query' do
+    Given(:parameters) { { text: 'orcid@sufia.org' } }
+    When(:result) { runner.call(parameters) }
+    Then { expect(result.size).to eq 0 }
+  end
+
   context 'with a compound text query' do
     Given(:parameters) { { email: "nobody@gmail.com", text: '"Jeremy+Friesen"' } }
     When(:result) { runner.call(parameters) }

data/spec/fixtures/orcid-remote-profile_query_service-response_parser/multiple-responses-without-valid-response.json

@@ -0,0 +1,258 @@
+{
+  "message-version": "1.1",
+  "orcid-search-results": {
+    "orcid-search-result": [
+      {
+        "relevancy-score": {
+          "value": 0.016482107
+        },
+        "orcid-profile": {
+          "orcid": null,
+          "orcid-bio": {
+            "personal-details": {
+              "given-names": {
+                "value": "Reserved For Claim"
+              }
+            },
+            "keywords": null,
+            "delegation": null,
+            "applications": null,
+            "scope": null
+          },
+          "orcid-activities": {
+            "affiliations": null
+          },
+          "type": null,
+          "group-type": null,
+          "client-type": null
+        }
+      },
+      {
+        "relevancy-score": {
+          "value": 0.016482107
+        },
+        "orcid-profile": {
+          "orcid": null,
+          "orcid-bio": {
+            "personal-details": {
+              "given-names": {
+                "value": "Reserved For Claim"
+              }
+            },
+            "keywords": null,
+            "delegation": null,
+            "applications": null,
+            "scope": null
+          },
+          "orcid-activities": {
+            "affiliations": null
+          },
+          "type": null,
+          "group-type": null,
+          "client-type": null
+        }
+      },
+      {
+        "relevancy-score": {
+          "value": 0.016482107
+        },
+        "orcid-profile": {
+          "orcid": null,
+          "orcid-bio": {
+            "personal-details": {
+              "given-names": {
+                "value": "Reserved For Claim"
+              }
+            },
+            "keywords": null,
+            "delegation": null,
+            "applications": null,
+            "scope": null
+          },
+          "orcid-activities": {
+            "affiliations": null
+          },
+          "type": null,
+          "group-type": null,
+          "client-type": null
+        }
+      },
+      {
+        "relevancy-score": {
+          "value": 0.016482107
+        },
+        "orcid-profile": {
+          "orcid": null,
+          "orcid-bio": {
+            "personal-details": {
+              "given-names": {
+                "value": "Reserved For Claim"
+              }
+            },
+            "keywords": null,
+            "delegation": null,
+            "applications": null,
+            "scope": null
+          },
+          "orcid-activities": {
+            "affiliations": null
+          },
+          "type": null,
+          "group-type": null,
+          "client-type": null
+        }
+      },
+      {
+        "relevancy-score": {
+          "value": 0.016482107
+        },
+        "orcid-profile": {
+          "orcid": null,
+          "orcid-bio": {
+            "personal-details": {
+              "given-names": {
+                "value": "Reserved For Claim"
+              }
+            },
+            "keywords": null,
+            "delegation": null,
+            "applications": null,
+            "scope": null
+          },
+          "orcid-activities": {
+            "affiliations": null
+          },
+          "type": null,
+          "group-type": null,
+          "client-type": null
+        }
+      },
+      {
+        "relevancy-score": {
+          "value": 0.016482107
+        },
+        "orcid-profile": {
+          "orcid": null,
+          "orcid-bio": {
+            "personal-details": {
+              "given-names": {
+                "value": "Reserved For Claim"
+              }
+            },
+            "keywords": null,
+            "delegation": null,
+            "applications": null,
+            "scope": null
+          },
+          "orcid-activities": {
+            "affiliations": null
+          },
+          "type": null,
+          "group-type": null,
+          "client-type": null
+        }
+      },
+      {
+        "relevancy-score": {
+          "value": 0.016482107
+        },
+        "orcid-profile": {
+          "orcid": null,
+          "orcid-bio": {
+            "personal-details": {
+              "given-names": {
+                "value": "Reserved For Claim"
+              }
+            },
+            "keywords": null,
+            "delegation": null,
+            "applications": null,
+            "scope": null
+          },
+          "orcid-activities": {
+            "affiliations": null
+          },
+          "type": null,
+          "group-type": null,
+          "client-type": null
+        }
+      },
+      {
+        "relevancy-score": {
+          "value": 0.016482107
+        },
+        "orcid-profile": {
+          "orcid": null,
+          "orcid-bio": {
+            "personal-details": {
+              "given-names": {
+                "value": "Reserved For Claim"
+              }
+            },
+            "keywords": null,
+            "delegation": null,
+            "applications": null,
+            "scope": null
+          },
+          "orcid-activities": {
+            "affiliations": null
+          },
+          "type": null,
+          "group-type": null,
+          "client-type": null
+        }
+      },
+      {
+        "relevancy-score": {
+          "value": 0.016482107
+        },
+        "orcid-profile": {
+          "orcid": null,
+          "orcid-bio": {
+            "personal-details": {
+              "given-names": {
+                "value": "Reserved For Claim"
+              }
+            },
+            "keywords": null,
+            "delegation": null,
+            "applications": null,
+            "scope": null
+          },
+          "orcid-activities": {
+            "affiliations": null
+          },
+          "type": null,
+          "group-type": null,
+          "client-type": null
+        }
+      },
+      {
+        "relevancy-score": {
+          "value": 0.016482107
+        },
+        "orcid-profile": {
+          "orcid": null,
+          "orcid-bio": {
+            "personal-details": {
+              "given-names": {
+                "value": "Reserved For Claim"
+              }
+            },
+            "keywords": null,
+            "delegation": null,
+            "applications": null,
+            "scope": null
+          },
+          "orcid-activities": {
+            "affiliations": null
+          },
+          "type": null,
+          "group-type": null,
+          "client-type": null
+        }
+      }
+    ],
+    "num-found": 0
+  }
+}

data/spec/fixtures/orcid-remote-profile_query_service-response_parser/single-response-with-orcid-valid-profile.json

@@ -0,0 +1,71 @@
+{
+  "message-version": "1.1",
+  "orcid-search-results": {
+    "orcid-search-result": [
+      {
+        "relevancy-score": {
+          "value": 14.298138
+        },
+        "orcid-profile": {
+          "orcid": null,
+          "orcid-identifier": {
+            "value": null,
+            "uri": "http://orcid.org/MY-ORCID-PROFILE-ID",
+            "path": "MY-ORCID-PROFILE-ID",
+            "host": "orcid.org"
+          },
+          "orcid-bio": {
+            "personal-details": {
+              "given-names": {
+                "value": "Corwin"
+              },
+              "family-name": {
+                "value": "Amber"
+              }
+            },
+            "biography": {
+              "value": "MY-ORCID-BIOGRAPHY",
+              "visibility": null
+            },
+            "contact-details": {
+              "email": [
+                {
+                  "value": "MY-ORCID-EMAIL",
+                  "primary": true,
+                  "current": true,
+                  "verified": true,
+                  "visibility": null,
+                  "source": null
+                }
+              ],
+              "address": {
+                "country": {
+                  "value": "US",
+                  "visibility": null
+                }
+              }
+            },
+            "keywords": {
+              "keyword": [
+                {
+                  "value": "Lord of Amber"
+                }
+              ],
+              "visibility": null
+            },
+            "delegation": null,
+            "applications": null,
+            "scope": null
+          },
+          "orcid-activities": {
+            "affiliations": null
+          },
+          "type": null,
+          "group-type": null,
+          "client-type": null
+        }
+      }
+    ],
+    "num-found": 1
+  }
+}

data/spec/lib/orcid/configuration/provider_spec.rb

@@ -13,6 +13,7 @@ module Orcid
         'ORCID_AUTHORIZE_URL' => '_AUTHORIZE_URL',
         'ORCID_APP_ID' => '_APP_ID',
         'ORCID_APP_SECRET' => '_APP_SECRET',
+        'ORCID_HOST_URL' => '_HOST_URL',
       }
     }
 
@@ -22,6 +23,7 @@ module Orcid
     its(:site_url) { should eq storage.fetch('ORCID_SITE_URL') }
     its(:token_url) { should eq storage.fetch('ORCID_TOKEN_URL') }
     its(:signin_via_json_url) { should eq storage.fetch('ORCID_REMOTE_SIGNIN_URL') }
+    its(:host_url) { should eq storage.fetch('ORCID_HOST_URL') }
     its(:authorize_url) { should eq storage.fetch('ORCID_AUTHORIZE_URL') }
     its(:id) { should eq storage.fetch('ORCID_APP_ID') }
     its(:secret) { should eq storage.fetch('ORCID_APP_SECRET') }
@@ -32,6 +34,7 @@ module Orcid
       And { expect(provider.site_url).to be_an_instance_of(String) }
       And { expect(provider.token_url).to be_an_instance_of(String) }
       And { expect(provider.signin_via_json_url).to be_an_instance_of(String) }
+      And { expect(provider.host_url).to be_an_instance_of(String) }
       And { expect(provider.authorize_url).to be_an_instance_of(String) }
       And { expect { provider.id }.to raise_error Orcid::ConfigurationError }
       And { expect { provider.secret }.to raise_error Orcid::ConfigurationError }

data/spec/lib/orcid_spec.rb

@@ -85,6 +85,14 @@ describe Orcid do
     end
   end
 
+  context '.url_for_orcid_id' do
+    it 'should render a valid uri' do
+      profile_id = '123-456'
+      uri = URI.parse(Orcid.url_for_orcid_id(profile_id))
+      expect(uri.path).to eq('/123-456')
+    end
+  end
+
 =begin
   context '#authenticated_orcid' do
     it 'should be authenticated' do

data/spec/models/orcid/profile_connection_spec.rb

@@ -1,16 +1,18 @@
 require 'spec_helper'
 
+# :nodoc:
 module Orcid
   describe ProfileConnection do
-    let(:email) { 'test@hello.com'}
+    let(:email) { 'test@hello.com' }
+    let(:dois) { '123' }
     let(:user) { FactoryGirl.build_stubbed(:user) }
-    let(:profile_query_service) { double("Profile Lookup Service") }
+    let(:profile_query_service) { double('Profile Lookup Service') }
 
-    subject {
-      Orcid::ProfileConnection.new(email: email, user: user).tap { |pc|
+    subject do
+      Orcid::ProfileConnection.new(email: email, user: user).tap do |pc|
         pc.profile_query_service = profile_query_service
-      }
-    }
+      end
+    end
 
     its(:email) { should eq email }
     its(:to_model) { should eq subject }
@@ -22,11 +24,20 @@ module Orcid
       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 { Orcid::ProfileConnection.new(email: email, user: user)}
-      its(:query_attributes) { should eq(email: email, text: nil) }
+      subject do
+        Orcid::ProfileConnection.new(
+          email: email, user: user, digital_object_ids: dois
+        )
+      end
+      its(:query_attributes) do
+        should eq(
+          'email' => email, 'text' => nil, 'digital-object-ids' => dois
+        )
+      end
     end
 
     context '#query_requested?' do
@@ -35,27 +46,30 @@ 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(email: email, user: user) }
         its(:query_requested?) { should eq true }
       end
     end
 
     context '#save' do
       let(:orcid_profile_id) { '1234-5678' }
-      let(:persister) { double("Persister") }
+      let(:persister) { double('Persister') }
 
       it 'should call the persister when valid' do
         subject.orcid_profile_id = orcid_profile_id
-        persister.should_receive(:call).with(user, orcid_profile_id).and_return(:persisted)
+        persister.should_receive(:call).
+          with(user, orcid_profile_id).
+          and_return(:persisted)
+
         expect(subject.save(persister: persister)).to eq(:persisted)
       end
 
       it 'should NOT call the persister and add errors when not valid' do
         subject.user = nil
         subject.orcid_profile_id = nil
-        expect {
-          subject.save(persister: persister)
-        }.to change { subject.errors.count }.by(2)
+
+        expect { subject.save(persister: persister) }.
+          to change { subject.errors.count }.by(2)
       end
     end
 
@@ -64,8 +78,14 @@ module Orcid
 
         it 'should yield the query response' do
           subject.email = email
-          profile_query_service.should_receive(:call).with(subject.query_attributes).and_return(:query_response)
-          expect {|b| subject.with_orcid_profile_candidates(&b) }.to yield_with_args(:query_response)
+
+          profile_query_service.
+            should_receive(:call).
+            with(subject.query_attributes).
+            and_return(:query_response)
+
+          expect { |b| subject.with_orcid_profile_candidates(&b) }.
+            to yield_with_args(:query_response)
         end
       end
 
@@ -73,7 +93,9 @@ module Orcid
         it 'should not yield' do
           subject.email = nil
           profile_query_service.stub(:call).and_return(:query_response)
-          expect {|b| subject.with_orcid_profile_candidates(&b) }.to_not yield_control
+
+          expect { |b| subject.with_orcid_profile_candidates(&b) }.
+            to_not yield_control
         end
       end
 

data/spec/models/orcid/profile_status_spec.rb

@@ -0,0 +1,73 @@
+require 'spec_helper'
+require 'orcid/profile_status'
+
+module Orcid
+  describe ProfileStatus do
+    Given(:user) { nil }
+    Given(:profile_finder) { double('ProfileFinder') }
+    Given(:request_finder) { double('RequestFinder') }
+    Given(:callback) { StubCallback.new }
+    Given(:callback_config) do
+      callback.configure(
+        :unknown,
+        :authenticated_connection,
+        :pending_connection,
+        :profile_request_pending
+      )
+    end
+    Given(:subject) do
+      described_class.new(user, profile_finder: profile_finder, request_finder: request_finder, &callback_config)
+    end
+
+    context '.for' do
+      Given(:user) { nil }
+      When(:response) { described_class.for(user, &callback_config) }
+      Then { expect(response).to eq :unknown }
+      And { expect(callback.invoked).to eq [:unknown] }
+    end
+
+    context '#status' do
+      context 'user is nil' do
+        Given(:user) { nil }
+        When(:status) { subject.status }
+        Then { expect(status).to eq :unknown }
+      end
+
+      context 'user is not nil' do
+        Given(:user) { double('User') }
+        Given(:profile_finder) { double('ProfileFinder', call: nil) }
+        Given(:request_finder) { double('RequestFinder', call: nil) }
+        context 'and has a profile' do
+          Given(:profile_finder) { double('ProfileFinder', call: profile) }
+          context 'that they have remotely authenticated' do
+            Given(:profile) { double('Profile', verified_authentication?: true) }
+            When(:status) { subject.status }
+            Then { expect(status).to eq :authenticated_connection }
+            And { expect(callback.invoked).to eq [:authenticated_connection, profile] }
+          end
+          context 'that they have not remotely authenticated' do
+            Given(:profile) { double('Profile', verified_authentication?: false) }
+            When(:status) { subject.status }
+            Then { expect(status).to eq :pending_connection }
+            And { expect(callback.invoked).to eq [:pending_connection, profile] }
+          end
+        end
+
+        context 'and does not have a profile' do
+          context 'but has submitted a request' do
+            Given(:request) { double('ProfileRequest') }
+            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] }
+          end
+          context 'user does not have a request' do
+            When(:status) { subject.status }
+            Then { expect(status).to eq :unknown }
+            And { expect(callback.invoked).to eq [:unknown] }
+          end
+        end
+      end
+    end
+  end
+end

data/spec/routing/orcid/profile_request_routing_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe 'Routes for Orcid::ProfileRequest' do
+  routes { Orcid::Engine.routes }
+  let(:persisted_profile) { Orcid::ProfileRequest.new(id: 2) }
+  it 'generates a conventional URL' do
+    expect(profile_request_path).
+      to(eq('/orcid/profile_request'))
+  end
+
+  it 'treats the input profile_request as the :format parameter' do
+    expect(profile_request_path(persisted_profile)).
+      to(eq("/orcid/profile_request.#{persisted_profile.to_param}"))
+  end
+end