bearcat 1.3.13 → 1.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4017848830f53fece7f85a94a62e421f7d1ec1bd
-  data.tar.gz: 5d9eaa1f2a20f86d8645b4eb3c11dd4503b00fb4
+  metadata.gz: 634cf3aab55a6019c01d68f5ec1946244f9f92fe
+  data.tar.gz: 660a9a0fb83d02a60b6e69350d6dec5087c58ddc
 SHA512:
-  metadata.gz: 926b53ae82f7772736c6f97365791652eca27e6be3b224436c75a0737ee6351c27013187c056b28b038d0a248f0d249e00471ee206d8a3aa643e30d87337106c
-  data.tar.gz: 190b3f22ec84e138dc389a5bb6d406d8e1356f00c7e018d1770af780b3d0b2fd29e3bb78c5f87925c5130ffecc0e2b2276f6d81090aa3fffbad3a0c70bb0333b
+  metadata.gz: e0af6addb849e2cbeeb68defe4b633fa306b354df8c2ee21ac9839f2f571c12443c99cafaad501f27b33d48ff43b0202d2b62f59720a2bde7ff3ac7e6b615774
+  data.tar.gz: 8ceb9e9a59da4ce71c0e5923be511fce6eb3011094cabe8e1760c18c4b4aad11a78e3edf03d85ac2dfa6c7e6da5b2193c2a50b8d54ab95984572f4209b78240c

data/lib/bearcat/client/courses.rb

@@ -30,11 +30,16 @@ module Bearcat
         get("/api/v1/courses/#{course}/outcome_results", params)
       end
 
-      def create_content_migration(course, file_path, params={})
-        response = post("/api/v1/courses/#{course}/content_migrations", params)
-        pre_attachment = response['pre_attachment']
+      def create_content_migration_with_both_responses(course, file_path, params={})
+        content_migration_response = post("/api/v1/courses/#{course}/content_migrations", params)
+        pre_attachment = content_migration_response['pre_attachment']
         confirmation_url = post_file(pre_attachment['upload_url'], pre_attachment['upload_params'], file_path)
-        confirm_file_upload(confirmation_url)
+        [content_migration_response, confirm_file_upload(confirmation_url)]
+      end
+
+      def create_content_migration(course, file_path, params={})
+        content_migration_response, file_upload_response = create_content_migration_with_both_responses(course, file_path, params)
+        file_upload_response
       end
 
       # Performs effectively the same operation as #create_content_migration, but without the need to specify a file to be uploaded

data/lib/bearcat/version.rb

@@ -1,3 +1,3 @@
 module Bearcat
-  VERSION = '1.3.13' unless defined?(Bearcat::VERSION)
+  VERSION = '1.3.14' unless defined?(Bearcat::VERSION)
 end

data/spec/bearcat/client/accounts_spec.rb

@@ -74,10 +74,11 @@ describe Bearcat::Client::Accounts do
     account_admin = @client.delete_account_admin(1, "sis_user_id:user1_sis_id", {role_id:1})
     expect(account_admin['id']).to eq 99
     expect(account_admin['status']).to eq 'deleted'
+  end
 
   it 'returns a list of sis_imports' do
     stub_get(@client, "/api/v1/accounts/1/sis_imports").to_return(json_response("account_sis_imports.json"))
-    sis_imports = @client.account_sis_imports(1)
+    sis_imports = @client.account_sis_imports(1)['sis_imports']
     expect(sis_imports.first['id']).to eq 30
     expect(sis_imports.first['workflow_state']).to eq 'imported'
   end

data/spec/bearcat/client/courses_spec.rb

@@ -57,6 +57,25 @@ describe Bearcat::Client::Sections do
     expect(response['id']).to eq 293
   end
 
+  describe '#create_content_migration_with_both_responses' do
+    it 'creates a content migration and returns the content migration response and the file creation response' do
+      stub_post(@client, "/api/v1/courses/659/content_migrations").
+        with(:body => {"migration_type"=>"canvas_cartridge_importer", "pre_attachment"=>{"name"=>"cc.imscc", "size"=>"2034"}}).
+        to_return(json_response('content_migration_files', 'response.json'))
+
+      stub_request(:post, "http://host/files_api").
+        to_return(status: 302, headers: {'Location' => 'https://confirm-upload.invalid/confirm?param=true'})
+
+      stub_post(@client, "/confirm").
+        with(:body => {"param" => ["true"]}).to_return(json_response('content_migration_files', 'upload_success.json'))
+
+      opts = {'migration_type' => 'canvas_cartridge_importer', 'pre_attachment[name]' => 'cc.imscc', 'pre_attachment[size]' => '2034'}
+      content_migration_response, file_upload_response = @client.create_content_migration_with_both_responses('659', fixture('cc.imscc'), opts)
+      expect(content_migration_response['id']).to eq 21
+      expect(file_upload_response['id']).to eq 293
+    end
+  end
+
   it 'throws an error on a failed file upload' do
     stub_post(@client, "/api/v1/courses/659/content_migrations").
       with(:body => {"migration_type"=>"canvas_cartridge_importer", "pre_attachment"=>{"name"=>"cc.imscc", "size"=>"2034"}}).

data/spec/fixtures/account_sis_imports.json

@@ -1,38 +1,39 @@
-[
-  {
-    "created_at": "2017-03-22T03:01:18Z",
-    "started_at": "2017-03-22T03:01:18Z",
-    "ended_at": "2017-03-22T03:01:19Z",
-    "updated_at": "2017-03-22T03:01:19Z",
-    "progress": 100,
-    "id": 30,
-    "workflow_state": "imported",
-    "data": {
-      "import_type": "instructure_csv",
-      "supplied_batches": [
-        "course"
-      ],
-      "counts": {
-        "accounts": 0,
-        "terms": 0,
-        "abstract_courses": 0,
-        "courses": 1,
-        "sections": 0,
-        "xlists": 0,
-        "users": 0,
-        "user_observers": 0,
-        "enrollments": 0,
-        "groups": 0,
-        "group_memberships": 0,
-        "grade_publishing_results": 0
-      }
-    },
-    "batch_mode": null,
-    "batch_mode_term_id": null,
-    "override_sis_stickiness": null,
-    "add_sis_stickiness": null,
-    "clear_sis_stickiness": null,
-    "diffing_data_set_identifier": null,
-    "diffed_against_import_id": null
+{
+  "sis_imports":
+  [{"created_at": "2017-03-22T03:01:18Z",
+  "started_at": "2017-03-22T03:01:18Z",
+  "ended_at": "2017-03-22T03:01:19Z",
+  "updated_at": "2017-03-22T03:01:19Z",
+  "progress": 100,
+  "id": 30,
+  "workflow_state": "imported",
+  "data": {
+  "import_type": "instructure_csv",
+  "supplied_batches": [
+  "course"
+  ],
+  "counts": {
+  "accounts": 0,
+  "terms": 0,
+  "abstract_courses": 0,
+  "courses": 1,
+  "sections": 0,
+  "xlists": 0,
+  "users": 0,
+  "user_observers": 0,
+  "enrollments": 0,
+  "groups": 0,
+  "group_memberships": 0,
+  "grade_publishing_results": 0
   }
-]
+  },
+  "batch_mode": null,
+  "batch_mode_term_id": null,
+  "override_sis_stickiness": null,
+  "add_sis_stickiness": null,
+  "clear_sis_stickiness": null,
+  "diffing_data_set_identifier": null,
+  "diffed_against_import_id": null
+  }
+  ]
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bearcat
 version: !ruby/object:Gem::Version
-  version: 1.3.13
+  version: 1.3.14
 platform: ruby
 authors:
 - Nathan Mills, Jake Sorce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-31 00:00:00.000000000 Z
+date: 2017-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -317,7 +317,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Canvas API