orcid 0.1.1 → 0.8.0

data/spec/services/orcid/remote/profile_creation_service_spec.rb

@@ -11,30 +11,50 @@ module Orcid::Remote
       { 'Content-Type' => 'application/vdn.orcid+xml', 'Accept' => 'application/xml' }
     }
     Given(:callback) { StubCallback.new }
-    Given(:callback_config) { callback.configure }
+    Given(:callback_config) { callback.configure(:orcid_validation_error) }
 
     Given(:response) {
       double("Response", headers: { location: File.join("/", minted_orcid, "orcid-profile") })
     }
 
-    When(:returned_value) { described_class.call(payload, config, &callback_config) }
 
     context 'with orcid created' do
       Given(:response) {
         double("Response", headers: { location: File.join("/", minted_orcid, "orcid-profile") })
       }
+      When(:returned_value) { described_class.call(payload, config, &callback_config) }
       Then { returned_value.should eq(minted_orcid)}
       And { expect(callback.invoked).to eq [:success, minted_orcid] }
       And { token.should have_received(:post).with(config.fetch(:path), body: payload, headers: request_headers)}
     end
 
-    context 'with orcid created' do
+    context 'with orcid not created' do
       Given(:response) {
         double("Response", headers: { location: "" })
       }
+      When(:returned_value) { described_class.call(payload, config, &callback_config) }
       Then { returned_value.should eq(false)}
       And { expect(callback.invoked).to eq [:failure] }
       And { token.should have_received(:post).with(config.fetch(:path), body: payload, headers: request_headers)}
     end
+
+    context 'with an orcid validation error' do
+      before { token.should_receive(:post).and_raise(error) }
+      Given(:token) { double('Token') }
+      Given(:error_description) { 'My special error' }
+      Given(:response) do
+        double(
+          'Response',
+          :body => "<error-desc>#{error_description}</error-desc>",
+          :parsed => true,
+          :error= => true
+        )
+      end
+      Given(:error) { ::OAuth2::Error.new(response) }
+      When(:returned_value) { described_class.call(payload, config, &callback_config) }
+      Then { returned_value.should eq(false) }
+      And { expect(callback.invoked).to eq [:orcid_validation_error, error_description] }
+    end
+
   end
 end

data/spec/services/orcid/remote/profile_query_service/response_parser_spec.rb

@@ -0,0 +1,43 @@
+require 'ostruct'
+require 'spec_helper'
+require 'orcid/remote/profile_query_service/response_parser'
+
+module Orcid
+  module Remote
+    class ProfileQueryService
+      describe ResponseParser do
+        context '.call' do
+          Given(:response_builder) { OpenStruct }
+          Given(:logger) { double(warn: true) }
+          Given(:document) do
+            File.read(fixture_file(File.join('orcid-remote-profile_query_service-response_parser',response_filename)))
+          end
+          Given(:subject) { described_class.new(response_builder: response_builder, logger: logger) }
+
+          context 'happy path' do
+            let(:response_filename) { 'single-response-with-orcid-valid-profile.json' }
+            When(:response) { subject.call(document) }
+            Then do
+              response.should eq(
+                [
+                  response_builder.new(
+                    id: "MY-ORCID-PROFILE-ID",
+                    label: "Corwin Amber (MY-ORCID-EMAIL) [ORCID: MY-ORCID-PROFILE-ID]",
+                    biography:"MY-ORCID-BIOGRAPHY"
+                  )
+                ]
+              )
+            end
+          end
+
+          context 'unhappy path' do
+            let(:response_filename) { 'multiple-responses-without-valid-response.json' }
+            When(:response) { subject.call(document) }
+            Then { response.should eq [] }
+            And { logger.should have_received(:warn).at_least(1).times }
+          end
+        end
+      end
+    end
+  end
+end

data/spec/services/orcid/remote/profile_query_service_spec.rb

@@ -4,30 +4,24 @@ require 'ostruct'
 
 module Orcid::Remote
   describe ProfileQueryService do
-    Given(:email) { 'corwin@amber.gov' }
-    Given(:biography) { 'King of Amber' }
-    Given(:orcid_profile_id) { '0001-0002' }
+    Given(:parser) { double('Parser', call: parsed_response)}
     Given(:config) {
       {
         token: token,
         path: 'somehwere',
         headers: 'headers',
-        response_builder: OpenStruct,
+        parser: parser,
         query_parameter_builder: query_parameter_builder
       }
     }
-    Given(:query_parameter_builder) { double('Query Builder')}
-    Given(:response) { double("Response", body: response_body)} # See below
+    Given(:query_parameter_builder) { double('Query Builder') }
+    Given(:response) { double("Response", body: 'Response Body') }
     Given(:token) { double("Token") }
-    Given(:json_response) {
-      [
-        OpenStruct.new({ 'id' => orcid_profile_id, 'label' => "Corwin Amber (#{email}) [ORCID: #{orcid_profile_id}]", 'biography' => biography })
-      ]
-    }
     Given(:parameters) { double("Parameters") }
     Given(:normalized_parameters) { double("Normalized Parameters") }
     Given(:callback) { StubCallback.new }
     Given(:callback_config) { callback.configure(:found, :not_found) }
+    Given(:parsed_response) { 'HELLO WORLD!' }
 
     context '.call' do
       before(:each) do
@@ -35,84 +29,8 @@ module Orcid::Remote
         token.should_receive(:get).with(config[:path], headers: config[:headers], params: normalized_parameters).and_return(response)
       end
       When(:result) { described_class.call(parameters, config, &callback_config) }
-      Then { expect(result).to eq(json_response) }
-      And { expect(callback.invoked).to eq [:found, json_response] }
+      Then { expect(result).to eq(parsed_response) }
+      And { expect(callback.invoked).to eq [:found, parsed_response] }
     end
-
-    Given(:response_body) {
-      %(
-        {
-          "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/#{orcid_profile_id}",
-                    "path": "#{orcid_profile_id}",
-                    "host": "orcid.org"
-                  },
-                  "orcid-bio": {
-                    "personal-details": {
-                      "given-names": {
-                        "value": "Corwin"
-                      },
-                      "family-name": {
-                        "value": "Amber"
-                      }
-                    },
-                    "biography": {
-                      "value": "#{biography}",
-                      "visibility": null
-                    },
-                    "contact-details": {
-                      "email": [
-                        {
-                          "value": "#{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
-          }
-        }
-      )
-    }
   end
 end

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

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe 'orcid/profile_connections/_authenticated_connection.html.erb' do
+  Given(:profile) { double('Profile', orcid_profile_id: orcid_profile_id) }
+  Given(:orcid_profile_id) { '123-456' }
+
+  When(:rendered) do
+    render(
+      partial: 'orcid/profile_connections/authenticated_connection',
+      object: profile
+    )
+  end
+
+  Then do
+    expect(rendered).to have_tag('.authenticated-connection') do
+      with_tag('a.orcid-profile-id', text: orcid_profile_id)
+    end
+  end
+
+end

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

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe 'orcid/profile_connections/_options_to_connect_orcid_profile.html.erb' do
+  let(:default_search_text) { '' }
+  it 'renders a form' do
+    render
+    expect(rendered).to(
+      have_tag('.options-to-connect-orcid-profile') do
+        with_tag(
+          'a',
+          with: { href: orcid.new_profile_connection_path(profile_connection: { text: default_search_text }) },
+          text: t('orcid/profile_connection.look_up_your_existing_orcid', scope: 'helpers.label')
+        )
+        with_tag(
+          'a',
+          with: { href: orcid.new_profile_request_path },
+          text: t('orcid/profile_connection.create_an_orcid', scope: 'helpers.label')
+        )
+        with_tag('form', with: { method: 'post', action: orcid.profile_connections_path }) do
+          with_tag('label', text: t('orcid/profile_connection.orcid_profile_id', scope: 'helpers.label'))
+          with_tag('input', with: { type: 'text', name: 'profile_connection[orcid_profile_id]' })
+        end
+      end
+    )
+  end
+end

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

@@ -0,0 +1,65 @@
+require 'spec_helper'
+
+describe 'orcid/profile_connections/_orcid_connector.html.erb' do
+  let(:default_search_text) { 'hello' }
+  let(:current_user) { double('User') }
+  let(:status_processor) { double('Processor') }
+  let(:handler) do
+    double(
+      'Handler',
+      profile_request_pending: true,
+      unknown: true,
+      authenticated_connection: true,
+      pending_connection: true
+    )
+  end
+  def render_with_params
+    render(
+      partial: 'orcid/profile_connections/orcid_connector',
+      locals: { default_search_text: default_search_text, status_processor: status_processor, current_user: current_user }
+    )
+  end
+
+  before do
+    status_processor.should_receive(:call).with(current_user).and_yield(handler)
+  end
+  context 'with :unknown status' do
+    it 'renders the options to connect orcid profile' do
+      expect(handler).to receive(:unknown).and_yield
+      render_with_params
+
+      expect(view).to render_template(partial: 'orcid/profile_connections/_options_to_connect_orcid_profile')
+      expect(rendered).to have_tag('.orcid-connector')
+    end
+  end
+  context 'with :profile_request_pending status' do
+    let(:pending_request) { double('Pending Request', created_at: Time.now) }
+    it 'renders the options to view the pending profile request' do
+      expect(handler).to receive(:profile_request_pending).and_yield(pending_request)
+      render_with_params
+
+      expect(view).to render_template(partial: 'orcid/profile_connections/_profile_request_pending')
+      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
+      expect(handler).to receive(:authenticated_connection).and_yield(profile)
+      render_with_params
+
+      expect(view).to render_template(partial: 'orcid/profile_connections/_authenticated_connection')
+      expect(rendered).to have_tag('.orcid-connector')
+    end
+  end
+  context 'with :pending_connection status' do
+    let(:profile) { double('Profile', orcid_profile_id: '123-456') }
+    it 'renders the options to view the authenticated connection' do
+      expect(handler).to receive(:pending_connection).and_yield(profile)
+      render_with_params
+
+      expect(view).to render_template(partial: 'orcid/profile_connections/_pending_connection')
+      expect(rendered).to have_tag('.orcid-connector')
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe 'orcid/profile_connections/_pending_connection.html.erb' do
+  Given(:profile) { double('Profile', orcid_profile_id: orcid_profile_id) }
+  Given(:orcid_profile_id) { '123-456' }
+
+  When(:rendered) do
+    render(
+      partial: 'orcid/profile_connections/pending_connection',
+      object: profile
+    )
+  end
+
+  Then do
+    expect(rendered).to have_tag('.pending-connection') do
+      with_tag('a.orcid-profile-id', text: orcid_profile_id)
+      with_tag('a.find-out-more')
+      with_tag('a.signin-via-orcid')
+    end
+  end
+
+end

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

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe 'orcid/profile_connections/_profile_request_pending.html.erb' do
+  Given(:profile_request) { double('ProfileRequest', created_at: created_at) }
+  Given(:created_at) { Date.today }
+
+  When(:rendered) do
+    render(
+      partial: 'orcid/profile_connections/profile_request_pending',
+      object: profile_request
+    )
+  end
+
+  Then do
+    expect(rendered).to have_tag('.profile-request-pending') do
+      with_tag(
+        'time',
+        with: { datetime: created_at.in_time_zone.to_s },
+        text: view.time_ago_in_words(created_at)
+      )
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orcid
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-09 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -300,6 +300,7 @@ files:
 - .gitignore
 - .hound.yml
 - .travis.yml
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
@@ -313,6 +314,7 @@ files:
 - app/models/orcid/profile.rb
 - app/models/orcid/profile_connection.rb
 - app/models/orcid/profile_request.rb
+- app/models/orcid/profile_status.rb
 - app/models/orcid/work.rb
 - app/models/orcid/work/xml_parser.rb
 - app/models/orcid/work/xml_renderer.rb
@@ -320,12 +322,17 @@ files:
 - app/services/orcid/remote/profile_creation_service.rb
 - app/services/orcid/remote/profile_query_service.rb
 - app/services/orcid/remote/profile_query_service/query_parameter_builder.rb
+- app/services/orcid/remote/profile_query_service/response_parser.rb
 - app/services/orcid/remote/profile_query_service/search_response.rb
 - app/services/orcid/remote/service.rb
 - app/services/orcid/remote/work_service.rb
 - app/templates/orcid/work.template.v1.1.xml.erb
 - app/views/layouts/orcid/application.html.erb
+- app/views/orcid/profile_connections/_authenticated_connection.html.erb
+- 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_pending.html.erb
 - app/views/orcid/profile_connections/new.html.erb
 - app/views/orcid/profile_requests/new.html.erb
 - app/views/orcid/profile_requests/show.html.erb
@@ -357,6 +364,8 @@ files:
 - spec/features/non_ui_based_interactions_spec.rb
 - spec/features/profile_connection_feature_spec.rb
 - spec/features/public_api_query_spec.rb
+- spec/fixtures/orcid-remote-profile_query_service-response_parser/multiple-responses-without-valid-response.json
+- spec/fixtures/orcid-remote-profile_query_service-response_parser/single-response-with-orcid-valid-profile.json
 - spec/fixtures/orcid_works.xml
 - spec/lib/orcid/configuration/provider_spec.rb
 - spec/lib/orcid/configuration_spec.rb
@@ -365,11 +374,14 @@ files:
 - spec/models/orcid/profile_connection_spec.rb
 - spec/models/orcid/profile_request_spec.rb
 - spec/models/orcid/profile_spec.rb
+- spec/models/orcid/profile_status_spec.rb
 - spec/models/orcid/work/xml_parser_spec.rb
 - spec/models/orcid/work/xml_renderer_spec.rb
 - spec/models/orcid/work_spec.rb
+- spec/routing/orcid/profile_request_routing_spec.rb
 - spec/services/orcid/remote/profile_creation_service_spec.rb
 - spec/services/orcid/remote/profile_query_service/query_parameter_builder_spec.rb
+- spec/services/orcid/remote/profile_query_service/response_parser_spec.rb
 - spec/services/orcid/remote/profile_query_service/search_response_spec.rb
 - spec/services/orcid/remote/profile_query_service_spec.rb
 - spec/services/orcid/remote/service_spec.rb
@@ -379,6 +391,11 @@ files:
 - spec/support/stub_callback.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
+- spec/views/orcid/profile_connections/_authenticated_connection.html.erb_spec.rb
+- 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_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
 homepage: https://github.com/jeremyf/orcid
@@ -414,6 +431,8 @@ test_files:
 - spec/features/non_ui_based_interactions_spec.rb
 - spec/features/profile_connection_feature_spec.rb
 - spec/features/public_api_query_spec.rb
+- spec/fixtures/orcid-remote-profile_query_service-response_parser/multiple-responses-without-valid-response.json
+- spec/fixtures/orcid-remote-profile_query_service-response_parser/single-response-with-orcid-valid-profile.json
 - spec/fixtures/orcid_works.xml
 - spec/lib/orcid/configuration/provider_spec.rb
 - spec/lib/orcid/configuration_spec.rb
@@ -422,11 +441,14 @@ test_files:
 - spec/models/orcid/profile_connection_spec.rb
 - spec/models/orcid/profile_request_spec.rb
 - spec/models/orcid/profile_spec.rb
+- spec/models/orcid/profile_status_spec.rb
 - spec/models/orcid/work/xml_parser_spec.rb
 - spec/models/orcid/work/xml_renderer_spec.rb
 - spec/models/orcid/work_spec.rb
+- spec/routing/orcid/profile_request_routing_spec.rb
 - spec/services/orcid/remote/profile_creation_service_spec.rb
 - spec/services/orcid/remote/profile_query_service/query_parameter_builder_spec.rb
+- spec/services/orcid/remote/profile_query_service/response_parser_spec.rb
 - spec/services/orcid/remote/profile_query_service/search_response_spec.rb
 - spec/services/orcid/remote/profile_query_service_spec.rb
 - spec/services/orcid/remote/service_spec.rb
@@ -436,5 +458,10 @@ test_files:
 - spec/support/stub_callback.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
+- spec/views/orcid/profile_connections/_authenticated_connection.html.erb_spec.rb
+- 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_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