stash-sword 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af0fd967341aed3754e732ab4d6b80f9a7b3b45e
-  data.tar.gz: 2e5df91999db5694b01df4b796a5a709e3f9fad2
+  metadata.gz: 3b9630eb6e13c298e5510adc24a284f80cd2782d
+  data.tar.gz: c84b4010037183af57468e22b0b33032f989cedd
 SHA512:
-  metadata.gz: 91af61a83ee80da3d08043c8dfcf6a6058324dbdcf6c3e4645a8cfd68e1aef7ed53a01447a1ab911c9fec31a6bdbcdef1d374552eb0f002c33ba2230e3bc96db
-  data.tar.gz: 6aab871185203aee75de2fce19dd54090000d478a96134b6e19fe732261048ed49ce4ef33760e01cb00c904ab2f82bf608935088e0561c0c56aecd69fb423af6
+  metadata.gz: 1ab2af3fea1f8d220075abe287baeb531265a4483814a7aae7766721c649d5a62099368d943a550e6a0ff6bebc04a36e250d9390df7952bb1f6089624de67e6d
+  data.tar.gz: ee6a6857b1c898f73312b60086a6cd3cb0af2ca9a177dbcdeca489ab60af8f9cd1c0bd04a9b2f9b61d17ffb77eee24abe56768b062ea680010b875f9b9d3141b

data/CHANGES.md

@@ -1,3 +1,7 @@
+## 0.1.3 (15 August 2016)
+
+- Use 2.0.0 release version of `rest-client` to fix issues with cookie handling in redirection
+
 ## 0.1.2 (11 July 2016)
 
 - Use `Content-disposition: attachment` (per [SWORD spec](http://swordapp.github.io/SWORDv2-Profile/SWORDProfile.html))

data/lib/stash/sword/client.rb

@@ -55,6 +55,7 @@ module Stash
       #
       # @param edit_iri [URI, String] the Atom Edit-IRI
       # @param zipfile [String] the zipfile path
+      # @return [Integer] the response code (if the request succeeds)
       def update(edit_iri:, zipfile:)
         log.debug("Stash::Sword::Client.update(edit_iri: #{edit_iri}, zipfile: #{zipfile})")
         uri = to_uri(edit_iri).to_s

data/lib/stash/sword/module_info.rb

@@ -4,7 +4,7 @@ module Stash
     NAME = 'stash-sword'.freeze
 
     # The version of this gem
-    VERSION = '0.1.2'.freeze
+    VERSION = '0.1.3'.freeze
 
     # The copyright notice for this gem
     COPYRIGHT = 'Copyright (c) 2016 The Regents of the University of California'.freeze

data/spec/unit/stash/sword2/client_spec.rb

@@ -53,8 +53,19 @@ module Stash
         it 'returns the entry'
         it "gets the entry from the Edit-IRI in the Location: header if it isn't returned in the body"
         it 'forwards a success response'
-        it 'forwards a 4xx error'
-        it 'forwards a 5xx error'
+
+        it 'forwards a 4xx error' do
+          authorized_uri = collection_uri.sub('http://', "http://#{username}:#{password}@")
+          stub_request(:post, authorized_uri).to_return(status: [403, 'Forbidden'])
+          expect { client.create(zipfile: zipfile, doi: doi) }.to raise_error(RestClient::Forbidden)
+        end
+
+        it 'forwards a 5xx error' do
+          authorized_uri = collection_uri.sub('http://', "http://#{username}:#{password}@")
+          stub_request(:post, authorized_uri).to_return(status: [500, 'Internal Server Error'])
+          expect { client.create(zipfile: zipfile, doi: doi) }.to raise_error(RestClient::InternalServerError)
+        end
+
         it 'forwards an internal exception'
       end
 
@@ -65,7 +76,8 @@ module Stash
 
           stub_request(:put, authorized_uri)
 
-          client.update(edit_iri: edit_iri, zipfile: zipfile)
+          code = client.update(edit_iri: edit_iri, zipfile: zipfile)
+          expect(code).to eq(200)
 
           md5 = Digest::MD5.file(zipfile).to_s
 
@@ -105,8 +117,21 @@ module Stash
 
         it 'does something clever and asynchronous'
         it 'forwards a success response'
-        it 'forwards a 4xx error'
-        it 'forwards a 5xx error'
+
+        it 'forwards a 4xx error' do
+          edit_iri = "http://merritt.cdlib.org/sword/v2/object/#{doi}"
+          authorized_uri = edit_iri.sub('http://', "http://#{username}:#{password}@")
+          stub_request(:put, authorized_uri).to_return(status: [403, 'Forbidden'])
+          expect { client.update(edit_iri: edit_iri, zipfile: zipfile) }.to raise_error(RestClient::Forbidden)
+        end
+
+        it 'forwards a 5xx error' do
+          edit_iri = "http://merritt.cdlib.org/sword/v2/object/#{doi}"
+          authorized_uri = edit_iri.sub('http://', "http://#{username}:#{password}@")
+          stub_request(:put, authorized_uri).to_return(status: [500, 'Internal Server Error'])
+          expect { client.update(edit_iri: edit_iri, zipfile: zipfile) }.to raise_error(RestClient::InternalServerError)
+        end
+
         it 'forwards an internal exception'
       end
 

data/stash-sword.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'rest-client', '2.0.0.rc2'
+  spec.add_dependency 'rest-client', '~> 2.0', '2.0.0'
   spec.add_dependency 'typesafe_enum', '~> 0.1', '>= 0.1.7'
   spec.add_dependency 'xml-mapping_extensions', '~> 0.4', '>= 0.4.1'
 

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: stash-sword
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - David Moles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2016-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc2
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc2
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: typesafe_enum
   requirement: !ruby/object:Gem::Requirement
@@ -224,8 +230,6 @@ files:
 - lib/stash/sword/module_info.rb
 - lib/stash/sword/namespace.rb
 - lib/stash/sword/sequence_io.rb
-- notes/Dash_Submission_To_Merritt.txt
-- notes/service-document.xml
 - spec/.rubocop.yml
 - spec/data/deposit_receipt_merritt.xml
 - spec/data/deposit_receipt_spec.xml

data/notes/Dash_Submission_To_Merritt.txt

@@ -1,40 +0,0 @@
-Status of submission is tracked - merritt_response {PROCESSING, “User not authorized for Merritt submission”, 
-
-How is dublincore called?  
-
-Review & Submit button —> record.review()
-creates datacite.xml file and places it in the uploads/<local_id>/ directory
-
-Submit button —>  record.send_archive_to_merritt
-
-Set up the user_email request headers 
-Create a new thread
-Record.Generate Merritt Zip()
-Record.Send Archive to Merritt
-Create a submission Log 
-
-
-If submission successful, remove files from local storage and add logging information
-Record.Purge_Files()
-
-Generate_Merritt_Zip()
-set file path to uploads_dir - this is a linked directory shared/uploads so it will stay persistent across releases
-local_id is used to name the uploads directory for a dataset.
-calls self.review
-calls self.dublincore
-calls self.dataone
-creates the zip file 
-purges all temp files, etc
-
-Record.Send_Archive_to_merritt
-gets info to send in curl command from MERRITT_CONFIG and user and camps
-sends curl command - no notification sent if no email
-No DOI/EZID is not created.  Merritt does this.
-returns sys_output
-
-
-SWORD - Slug identifier is the local_id
-
-
-
-   if @user_email.nil?
      sys_output = "curl --insecure --verbose -u #{merritt_username}:#{merritt_password} -F \"file=@./#{DATASHARE_CONFIG['uploads_dir']}/#{self.local_id}/#{self.local_id}.zip\" -F \"type=container\" -F \"submitter=Dash/#{external_id}\" -F \"responseForm=xml\" -F \"profile=#{merritt_profile}\" -F \"localIdentifier=#{self.local_id}\" #{merritt_endpoint} 2>&1"
    else
      sys_output = "curl --insecure --verbose -u #{merritt_username}:#{merritt_password} -F \"file=@./#{DATASHARE_CONFIG['uploads_dir']}/#{self.local_id}/#{self.local_id}.zip\" -F \"notification=#{@user_email}\" -F \"type=container\" -F \"submitter=Dash/#{external_id}\" -F \"responseForm=xml\" -F \"profile=#{merritt_profile}\" -F \"localIdentifier=#{self.local_id}\" #{merritt_endpoint} 2>&1"
    end

data/notes/service-document.xml

@@ -1,15 +0,0 @@
-<service xmlns="http://www.w3.org/2007/app" xmlns:atom="http://www.w3.org/2005/Atom">
-  <workspace>
-    <atom:title type="text">Merritt</atom:title>
-    <collection href="http://merritt.cdlib.org/sword/v2/dash_ucb">
-      <atom:title type="text">UCB Dash</atom:title>
-      <accept>*/*</accept>
-      <accept alternate="multipart-related">*/*</accept>
-      <mediation xmlns="http://purl.org/net/sword/terms/">true</mediation>
-      <acceptPackaging xmlns="http://purl.org/net/sword/terms/">http://purl.org/net/sword/package/SimpleZip</acceptPackaging>
-    </collection>
-  </workspace>
-  <generator xmlns="http://www.w3.org/2005/Atom" uri="http://www.swordapp.org/" version="2.0" />
-  <version xmlns="http://purl.org/net/sword/terms/">2.0</version>
-  <maxUploadSize xmlns="http://purl.org/net/sword/terms/">10000000</maxUploadSize>
-</service>