stash-sword 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0037ff658b5959ae0dca3bdfed3af072d81a7755
-  data.tar.gz: 6677bb48ecbe7d07e25d1bf27c1737250f4c1ae9
+  metadata.gz: af0fd967341aed3754e732ab4d6b80f9a7b3b45e
+  data.tar.gz: 2e5df91999db5694b01df4b796a5a709e3f9fad2
 SHA512:
-  metadata.gz: 6a0e6a7532fb0e39ae48dd242e9b20f03cae6870f43addbbb20c6d137f49cddcec1510798c9e33fbb516c8a6b71906afafc2c8c647cfdb9bc6cdd97417d28d57
-  data.tar.gz: 0265b3b0cfc3fd3d0ea4eac70bafd83f528632259e9bbc4943cd869b0aa5cd490e1a7e880a749bb73c13e9a400eb7f2c246fbe87a543d8092b8f1ff3517e4866
+  metadata.gz: 91af61a83ee80da3d08043c8dfcf6a6058324dbdcf6c3e4645a8cfd68e1aef7ed53a01447a1ab911c9fec31a6bdbcdef1d374552eb0f002c33ba2230e3bc96db
+  data.tar.gz: 6aab871185203aee75de2fce19dd54090000d478a96134b6e19fe732261048ed49ce4ef33760e01cb00c904ab2f82bf608935088e0561c0c56aecd69fb423af6

data/CHANGES.md

@@ -1,3 +1,8 @@
+## 0.1.2 (11 July 2016)
+
+- Use `Content-disposition: attachment` (per [SWORD spec](http://swordapp.github.io/SWORDv2-Profile/SWORDProfile.html))
+  instead of `form-data`, now that Merritt supports it properly.
+
 ## 0.1.1 (23 June 2016)
 
 - `logger` is now a parameter passed to `Stash::Sword::Client` instead of a global singleton.

data/lib/stash/sword/client.rb

@@ -26,10 +26,8 @@ module Stash
       # @param on_behalf_of [String, nil] the user for whom the original sword package was deposited on behalf of.
       #   Defaults to `username`.
       # @param logger [Logger, nil] the logger to use, or nil to use a default logger
-      def initialize(collection_uri:, username:, password:, on_behalf_of: nil, logger: nil, helper: nil)
-        raise 'no collection URI provided' unless collection_uri
-        raise 'no username provided' unless username
-        raise 'no password provided' unless password
+      def initialize(collection_uri:, username:, password:, on_behalf_of: nil, logger: nil, helper: nil) # rubocop:disable Metrics/ParameterLists
+        validate(collection_uri, password, username)
         @collection_uri = to_uri(collection_uri)
         @username     = username
         @password     = password
@@ -70,6 +68,12 @@ module Stash
 
       private
 
+      def validate(collection_uri, password, username)
+        raise 'no collection URI provided' unless collection_uri
+        raise 'no username provided' unless username
+        raise 'no password provided' unless password
+      end
+
       def maybe_redirect(response)
         return response unless [301, 302, 307].include?(response.code)
         log.debug(response_to_log_msg(response))

data/lib/stash/sword/header_utils.rb

@@ -5,8 +5,8 @@ module Stash
       SIMPLE_ZIP                 = 'http://purl.org/net/sword/package/SimpleZip'.freeze
       APPLICATION_ZIP            = 'application/zip'.freeze
       MULTIPART_RELATED_ATOM_XML = 'multipart/related; type="application/atom+xml"'.freeze
-      # CONTENT_DISPOSITION        = 'attachment'.freeze
-      CONTENT_DISPOSITION        = 'form-data'.freeze
+      CONTENT_DISPOSITION        = 'attachment'.freeze
+      # CONTENT_DISPOSITION        = 'form-data'.freeze
 
       attr_reader :on_behalf_of
 

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.1'.freeze
+    VERSION = '0.1.2'.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

@@ -90,7 +90,7 @@ module Stash
 
           mime_headers = {
             'Packaging' => 'http://purl.org/net/sword/package/SimpleZip',
-            'Content-Disposition' => "#{expected_disposition}; name=payload; filename=\"example.zip\"",
+            'Content-Disposition' => "#{expected_disposition}; name=\"payload\"; filename=\"example.zip\"",
             'Content-Type' => 'application/zip',
             'Content-MD5' => md5
           }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stash-sword
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - David Moles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-24 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client