stash-sword 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b73e085f5409cc5c2b3a74c703aacb670bffdc46
-  data.tar.gz: d393a54966e95e40d97d6019022781547fecdad2
+  metadata.gz: 1b3e44c8bb4871f84260615f8bead45b3f6488d6
+  data.tar.gz: f04601814a457eef4f365001749d90c03d118704
 SHA512:
-  metadata.gz: 49f4a2eddae1eac20a7b8ee10c707287ca10f2e7390bab19fb7ac17a9e809a049a5f680112aa5059c76f2af6d38336ac297783d42786bb03b35230433e7f9787
-  data.tar.gz: 397fcf71c55dad279545b735274293c108989c0e604baa8ad488679cdc88b5beca0a97dfe15fdbfaf85cbd4f8e64167a44d7bacd954ac7dafd4b5af1fcca6664
+  metadata.gz: 01b28156a2f091609153ee3caab668f5ff3282fcf5716fe20cdfd78d12c00985b106438cbbbb9fc7a19649d255aa8bfc731dc070729a927854c041c5b26ac650
+  data.tar.gz: f6b6d29c0e73c99a87efa9ecc2074ef86f30c8bbf071c0337fbd94763086dd638189ab5a2ef200ad80246ce67b7b2a2b04aaa6d0013799576ad6ea0863130814

data/.gitignore

@@ -32,6 +32,7 @@ db/*.sqlite3
 *.iws
 *.ids
 .rakeTasks
+.idea
 
 # Emacs
 

data/CHANGES.md

@@ -1,3 +1,7 @@
+## 0.1.5 (21 November 2016)
+
+- Pass `read_timeout` and `open_timeout` explicitly for clarity.
+
 ## 0.1.4 (14 November 2016)
 
 - Update to Ruby 2.2.5

data/lib/stash/sword/http_helper.rb

@@ -37,7 +37,7 @@ module Stash
       # @param redirect_limit [Integer] the number of redirects to follow before erroring out
       #   (defaults to {DEFAULT_MAX_REDIRECTS})
       # @param logger [Logger, nil] the logger to use, or nil to use a default logger
-      def initialize(user_agent:, username: nil, password: nil, redirect_limit: DEFAULT_MAX_REDIRECTS, timeout: DEFAULT_TIMEOUT, logger: nil)
+      def initialize(user_agent:, username: nil, password: nil, redirect_limit: DEFAULT_MAX_REDIRECTS, timeout: DEFAULT_TIMEOUT, logger: nil) # rubocop:disable Metrics/ParameterLists
         @user_agent = user_agent
         @redirect_limit = redirect_limit
         @timeout = timeout
@@ -77,20 +77,21 @@ module Stash
         }.freeze
       end
 
-      def do_post_or_put(method:, uri:, payload:, headers:, limit:, timeout:)
+      def do_post_or_put(method:, uri:, payload:, headers:, limit:, timeout:) # rubocop:disable Metrics/ParameterLists
         options = request_options(headers, limit, method, payload, uri, timeout)
         log_hash(options)
         RestClient::Request.execute(**options)
       end
 
-      def request_options(headers, limit, method, payload, uri, timeout)
+      def request_options(headers, limit, method, payload, uri, timeout) # rubocop:disable Metrics/MethodLength, Metrics/ParameterLists
         options = {
           method: method,
           url: uri.to_s,
           payload: payload,
           headers: headers.merge(default_headers),
           max_redirects: limit,
-          timeout: timeout
+          open_timeout: timeout,
+          read_timeout: timeout
         }
         options[:user] = username if username
         options[:password] = password if password

data/lib/stash/sword/log_utils.rb

@@ -68,11 +68,11 @@ module Stash
       def append_response(msg_lines, e)
         return unless e.respond_to?(:response) && e.response
         response = e.response
-        msg_lines.unshift(*[
-                            "code: #{response.code}",
-                            'headers:', hash_to_log_msg(response.headers),
-                            "body:\n#{response.body}"
-                          ])
+        msg_lines.unshift(
+          "code: #{response.code}",
+          'headers:', hash_to_log_msg(response.headers),
+          "body:\n#{response.body}"
+        )
       end
 
       def append_backtrace(msg_lines, e)

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.4'.freeze
+    VERSION = '0.1.5'.freeze
 
     # The copyright notice for this gem
     COPYRIGHT = 'Copyright (c) 2016 The Regents of the University of California'.freeze

data/stash-sword.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'uri'
 require 'stash/sword/module_info'
 
-Gem::Specification.new do |spec|
+Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.name          = Stash::Sword::NAME
   spec.version       = Stash::Sword::VERSION
   spec.authors       = ['David Moles']
@@ -28,12 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'typesafe_enum', '~> 0.1', '>= 0.1.7'
   spec.add_dependency 'xml-mapping_extensions', '~> 0.4', '>= 0.4.1'
 
-  # spec.add_dependency 'swordruby', '~> 1.0'
-  # spec.add_dependency 'multipart-post', '~> 2.0'
-  #
-  # spec.add_dependency 'stash-wrapper', '~> 0.1', '>= 0.1.2'
-  # spec.add_dependency 'datacite-mapping', '~> 0.1', '>= 0.1.8'
-
   spec.add_development_dependency 'equivalent-xml', '~> 0.6.0'
 
   spec.add_development_dependency 'bundler', '~> 1.7'

metadata

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