senkyoshi 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26c7126fd95fa6cf136131c92014471f65e2089e
-  data.tar.gz: 6a6a5352177a859ddbb3ac1c83fe9ac465e927a9
+  metadata.gz: 9bfcbb5ad1a455e185f52a6d119204d63140c23f
+  data.tar.gz: 746db96ccf09d5edbe1c29740b587b1c43a9dd42
 SHA512:
-  metadata.gz: bb156e023de570e457222738c42a34af1433c279ad9879501fcd7ed82d5a76538f2e3bfc191832bdcdcd03a54f4486a87abe2fbc9783d2eb9d54a7b415dff903
-  data.tar.gz: fb795ce77619b24d9b0ec6e55eeba40ece4e82b5f325b8b48a39be08d970349e96828395a1c29e34d63e4b8d60cd96d16b8fe11c57b844a9b140b11f780bb400
+  metadata.gz: 32a24dc841797b72293bed5d0aabd1864657bb2b165c5a0b9d610433587d1b7555c9cc24deeebee984fd990ccf019339fc66e7d637fc8e4c45bd7d4d2c4bb979
+  data.tar.gz: 3696fb68ef7759f6f890b7bc6ff377ab0b3e78116484ab79b24c5bcdb6c1997f9b27ffd3723d1df6b2dad79580d29c4e6fe62a3b0ae21f489078c54f7b2b52e6

data/README.md

@@ -55,6 +55,9 @@ Create a `senkyoshi.yml` and add credentials:
 
 # The account or sub-account ID. This can be :self, :default, or an ID
 :account_id: <id>
+
+# The number of seconds before uploads timeout. Defaults to 1800 (30 minutes)
+:request_timeout: <request timeout seconds>
 ```
 
 ## Usage

data/lib/senkyoshi/canvas_course.rb

@@ -6,6 +6,7 @@ module Senkyoshi
   ##
   # This class represents a canvas course for which we are uploading data to
   ##
+
   class CanvasCourse
     attr_reader :scorm_packages
 
@@ -211,9 +212,11 @@ module Senkyoshi
         upload_params[:file] = file
 
         # Post to S3
-        RestClient.post(
-          upload_url,
-          upload_params,
+        RestClient::Request.execute(
+          method: :post,
+          url: upload_url,
+          payload: upload_params,
+          timeout: Senkyoshi.configuration.request_timeout,
         ) do |response|
           # Post to Canvas
           RestClient.post(

data/lib/senkyoshi/configuration.rb

@@ -8,6 +8,9 @@ module Senkyoshi
     attr_accessor :scorm_url
     attr_accessor :scorm_launch_url
     attr_accessor :scorm_shared_auth
+    attr_accessor :request_timeout
+
+    DEFAULT_TIMEOUT = 1_800 # 30 minutes
 
     def initialize
       @canvas_url = Configuration._config[:canvas_url]
@@ -16,6 +19,8 @@ module Senkyoshi
       @scorm_url = Configuration._config[:scorm_url]
       @scorm_launch_url = Configuration._config[:scorm_launch_url]
       @scorm_shared_auth = Configuration._config[:scorm_shared_auth]
+      @request_timeout =
+        Configuration._config[:request_timeout] || DEFAULT_TIMEOUT
     end
 
     def self._config

data/lib/senkyoshi/version.rb

@@ -1,3 +1,3 @@
 module Senkyoshi
-  VERSION = "1.0.4".freeze
+  VERSION = "1.0.5".freeze
 end

data/lib/senkyoshi.rb

@@ -11,6 +11,8 @@ require "ostruct"
 require "nokogiri"
 require "zip"
 
+Zip.write_zip64_support = true
+
 require "senkyoshi/exceptions"
 
 module Senkyoshi
@@ -94,7 +96,6 @@ module Senkyoshi
     end
 
     course = ModuleConverter.set_modules(course, pre_data)
-
     resources.find_instances_of(Rule).each do |rule|
       course = rule.canvas_conversion(course, resources)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: senkyoshi
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Atomic Jolt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry-byebug