Fixes #251- Implement the delete function and migrate to SHARE version 2 API.

Author: hweng

Gemfile

@@ -7,7 +7,7 @@ gem 'active-fedora', '~> 6.7.8' # locked
 gem 'solrizer', '~> 3.1.0' # locked
 gem 'blacklight_advanced_search', '~> 2.2.0' # locked
 gem 'kaminari', '~> 0.15.1' # locked (0.16.0+ breaks pagination)
-gem 'share_notify', '~> 0.2.0'
+gem 'share_notify', github: 'samvera-labs/share_notify', branch: 'master'
 
 # private fork of solrizer-fedora with auto-commit disabled
 #gem 'solrizer-fedora', '3.0.0.pre1' # PRE-LOCK

Gemfile.lock

@@ -1,3 +1,12 @@
+GIT
+  remote: git://github.com/samvera-labs/share_notify.git
+  revision: 96c16ab13c596f479f83cb55c70b27309f4d5f2d
+  branch: master
+  specs:
+    share_notify (0.2.0)
+      activesupport
+      httparty
+
 GIT
   remote: git://github.com/ucsdlib/solrizer-fedora.git
   revision: 87c2d35e89df19bb4535e1f713a68b0dc469498a
@@ -152,8 +161,7 @@ GEM
       uber (~> 0.0.4)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
-    httparty (0.13.7)
-      json (~> 1.8)
+    httparty (0.16.1)
       multi_xml (>= 0.5.2)
     hydra-access-controls (6.5.2)
       active-fedora (~> 6.7)
@@ -212,7 +220,7 @@ GEM
     mini_portile2 (2.3.0)
     minitest (5.10.2)
     multi_json (1.12.1)
-    multi_xml (0.5.5)
+    multi_xml (0.6.0)
     multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
@@ -368,9 +376,6 @@ GEM
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
-    share_notify (0.2.0)
-      activesupport
-      httparty
     simplecov (0.14.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
@@ -480,7 +485,7 @@ DEPENDENCIES
   rubyzip (= 1.2.1)
   sass-rails (~> 5.0.5)
   selenium-webdriver (= 3.4.0)
-  share_notify (~> 0.2.0)
+  share_notify!
   simplecov (~> 0.14.1)
   sitemap_generator (~> 5.3.1)
   solrizer (~> 3.1.0)
@@ -493,4 +498,4 @@ DEPENDENCIES
   unicorn (~> 5.3.0)
 
 BUNDLED WITH
-   1.14.3
+   1.16.1

app/controllers/dams_resource_controller.rb

@@ -209,33 +209,44 @@ def osf_data
     render :json => @document
   end
 
+  def osf_delete
+    @document = get_single_doc_via_search(1, {:q => "id:#{params[:id]}"} )
+    authorize! :show, @document
+    document = ShareNotify::PushDocument.new("http://library.ucsd.edu/dc/collection/#{params[:id]}", osf_date(@document))
+    document.title = osf_title(@document)
+    document.delete
+    share_upload(document)
+    redirect_to dams_collection_path(params[:id]), notice: "Your record has been deleted from OSF Share."
+  end
+
   def osf_push
     @document = get_single_doc_via_search(1, {:q => "id:#{params[:id]}"} )
     authorize! :show, @document
     document = ShareNotify::PushDocument.new("http://library.ucsd.edu/dc/collection/#{params[:id]}", osf_date(@document))
     document.title = osf_title(@document)
-    document.description = osf_description(@document)
-    document.publisher = osf_publisher
-    document.languages = osf_languages(@document)
-    document.tags = osf_mads_fields(@document)
     osf_contributors(@document).each do |contributor|
       document.add_contributor(contributor)
     end
-
+    
     if document.valid?
-      @headers = {'Authorization' => "Token #{share_config.fetch('token')}", 
-                 'Content-Type'  => 'application/json'
-                }
-
-      @route = "#{share_config.fetch('host')}api/v1/share/data"
-      @response = with_timeout { HTTParty.post(@route, body: document.to_share.to_json, headers: @headers)}
+      share_upload(document)
       redirect_to dams_collection_path(params[:id]), notice: "Your record has been pushed to OSF Share."
     else
       redirect_to dams_collection_path(params[:id]), alert: "Your record is not valid."
     end
   end
 
   private
+    def share_upload(document)
+      @headers = {
+        'Authorization' => "Bearer #{share_config.fetch('token')}",
+        'Content-Type'  => 'application/vnd.api+json'
+        }
+      @route = "#{share_config.fetch('host')}api/v2/normalizeddata/" 
+      @body = ShareNotify::Graph.new(document).to_share_v2.to_json
+      @response = with_timeout { HTTParty.post(@route, body: @body, headers: @headers)}
+    end
+
     def share_config
       env = Rails.env || 'test'
       @config ||= YAML.load(ERB.new(IO.read(File.join(Rails.root, 'config', 'share_notify.yml'))).result)[env].with_indifferent_access

app/views/dams_collections/_show_editor_tools.html.erb

@@ -8,7 +8,7 @@
   </li>
   <% } %>
   <% if can? :edit, @document['id'] %>
-    <% links = { "ezid" => "Mint DOI", "osf_push" => "Push to OSF" }
+    <% links = { "ezid" => "Mint DOI", "osf_push" => "Push to OSF", "osf_delete" => "Delete from OSF" }
       links.each { |key,label| %>
     <li><%= link_to "<i class='icon-plus-sign'></i> #{label}".html_safe,
         send("#{key}_dams_collection_path".to_sym, @document['id']),

app/views/dams_objects/show.html.erb

@@ -54,7 +54,7 @@
               </li>
               <% } %>
               <% if can_edit then %>
-                <% links = { "ezid" => "Mint DOI", "osf_push" => "Push to OSF" }
+                <% links = { "ezid" => "Mint DOI", "osf_push" => "Push to OSF", "osf_delete" => "Delete from OSF" }
                    links.each { |key,label| %>
                      <li><%= link_to "<i class='icon-plus-sign'></i> #{label}".html_safe,
                        send("#{key}_dams_collection_path".to_sym, @document['id']),

config/routes.rb

@@ -23,6 +23,7 @@
       get 'rdf_ttl'
       get 'osf_api'
       get 'osf_push'
+      get 'osf_delete'
       get 'osf_data'
     end
   end

config/share_notify.yml

@@ -1,5 +1,5 @@
 defaults: &defaults
-  host: <%= ENV.fetch('APPS_DHH_STAGING_SHARE_NOTIFY_HOST'){'https://staging.osf.io/'}%>
+  host: <%= ENV.fetch('APPS_DHH_STAGING_SHARE_NOTIFY_HOST'){'https://staging-share.osf.io/'}%>
   token: <%= ENV.fetch('APPS_DHH_STAGING_NOTIFY_TOKEN'){'share_token'}%> 
 
 development:
@@ -21,10 +21,9 @@ demo:
   <<: *defaults
 
 test:
-  host: "https://staging.osf.io/"
+  host: "https://staging-share.osf.io/"
   token: "share_token"
 
 production:
-  host: <%= ENV.fetch('APPS_DHH_PROD_SHARE_NOTIFY_HOST'){'https://share-registration.osf.io/'}%>
-  token: <%= ENV.fetch('APPS_DHH_PROD_SHARE_NOTIFY_TOKEN'){'share_token'}%>
+  <<: *defaults
 

spec/controllers/dams_collections_controller_spec.rb

@@ -1,11 +1,29 @@
 require 'spec_helper'
 
 describe DamsCollectionsController do
+  before(:all) do
+    @unit = DamsUnit.create name: "Test Unit", description: "Test Description", code: "tu", uri: "http://example.com/" 
+    @provCollection = DamsProvenanceCollection.create titleValue: "Sample Provenance Collection", visibility: "public"
+      @provCollection.save!
+      solr_index (@provCollection.pid) 
+  end
+  after(:all) do
+    @provCollection.delete
+  end
+
+  describe "osf_delete" do
+    it "should delete a record from SHARE OSF" do
+      sign_in User.create({:provider => 'developer'})
+      get :osf_delete, { id: @provCollection.pid }
+      expect(flash[:notice]).to include "Your record has been deleted from OSF Share."
+    end 
+  end
+
   describe "share_config" do
     it "should load config file" do
       @controller = DamsCollectionsController.new
       @controller.send(:share_config).fetch('token').should == "share_token"  
-      @controller.send(:share_config).fetch('host').should == "https://staging.osf.io/"  
+      @controller.send(:share_config).fetch('host').should == "https://staging-share.osf.io/"  
     end
   end 
 end

spec/features/dams_collections_spec.rb

@@ -204,17 +204,19 @@
     expect(page).to have_link('Data View', data_dams_collection_path(@provCollection.pid))
     expect(page).to have_link('DAMS 4.2 Preview', dams42_dams_collection_path(@provCollection.pid))
   end
-  scenario "with dams_curator role should not see Mint DOI and Push to OSF" do
+  scenario "with dams_curator role should not see Mint DOI and Push/Delete to/from OSF" do
     sign_in_curator
     visit dams_collection_path @provCollection
     expect(page).not_to have_content("Mint DOI");
     expect(page).not_to have_content("Push to OSF");
+    expect(page).not_to have_content("Delete from OSF")
   end
   scenario "with dams_editor role should see Mint DOI and Push to OSF" do
     sign_in_developer
     visit dams_collection_path @provCollection
     expect(page).to have_content("Mint DOI");
     expect(page).to have_content("Push to OSF");
+    expect(page).to have_content("Delete from OSF");
   end
 end
 

spec/features/dams_object_spec.rb

@@ -84,17 +84,19 @@
       expect(page).to have_link('Data View', data_dams_object_path(@o.pid))
       expect(page).to have_link('DAMS 4.2 Preview', dams42_dams_object_path(@o.pid))
     end
-    it "with dams_curator role should not see Mint DOI and Push to OSF" do
+    it "with dams_curator role should not see Mint DOI and Push/Delete to/from OSF" do
       sign_in_curator
       visit dams_object_path @o
       expect(page).not_to have_content("Mint DOI");
       expect(page).not_to have_content("Push to OSF");
+      expect(page).not_to have_content("Delete from OSF")
     end
     it "with dams_editor role should see Mint DOI and Push to OSF" do
       sign_in_developer
       visit dams_object_path @o
       expect(page).to have_content("Mint DOI");
       expect(page).to have_content("Push to OSF");
+      expect(page).to have_content("Delete from OSF");
     end
   end