bearcat 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2846b04fbc3a3759468651a7835928438dea7fb
-  data.tar.gz: 3be35f3374c9d94d14cf863079e439bce7155d04
+  metadata.gz: 8d1c10697f9c2a2710a231e2d7faa7f4517cddcc
+  data.tar.gz: a99835d4a11d0959b4cc38d56755bb9b2a595fd2
 SHA512:
-  metadata.gz: e72c9d4842373cb51dd05593ce6713df345f6065c581668ea8b6b5b4cb6fed5ef28c8360654e4d4a0ac05fe0b4b9f69ac72ac2164304247ee91ac33f31745d9e
-  data.tar.gz: 5d6bcfea7d9d1858181902966d7d2e0552fe44e368e9f8227b4c144b86fa8ad59cbc0d3e9d81fce766ada59ff2556bf494d81dbb0a26be588f5227d88d53b780
+  metadata.gz: c37b3631a8f2b4818e9c6517f58943c6984da05a5044802d2b8673e827dee2ba20cb4a52ab5088dff8d46ddfcedc815b2c4bde7b6634e528b0f00b0e414ea357
+  data.tar.gz: f63bdb3a8d37f766a90697f35aeefd00e3ab7aa92cf0ecdb374c54a5ab2a0b028f00fc66b7b0f52bb07ae1447f917bc692706660f8839bbc988d2b3a31b56354

data/lib/bearcat/client/users.rb

@@ -51,6 +51,10 @@ module Bearcat
       def page_views(user, params = {})
         get("/api/v1/users/#{user}/page_views", params)
       end
+
+      def user_merge(user, merge_into_user)
+        put("/api/v1/users/#{user}/merge_into/#{merge_into_user}")
+      end
     end
   end
 end

data/lib/bearcat/version.rb

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

data/spec/bearcat/client/users_spec.rb

@@ -115,6 +115,12 @@ describe Bearcat::Client::Users do
       custom_food_data["data"]["food"]["least_favorite"].should == "water mellon"
     end
 
+    it "merges user info" do
+      body = {}
+      stub_put(@client, "/api/v1/users/1/merge_into/2").with(body: body).to_return(json_response('merge_user.json'))
+      user = @client.user_merge(1,2)
+    end
+
   end
 
   context 'DELETE' do

data/spec/fixtures/merge_user.json

@@ -0,0 +1,8 @@
+{
+  "id":2,
+  "name":"testuser",
+  "sortable_name":"testuser",
+  "short_name":"testuser",
+  "login_id":"testuser@testing.test",
+  "locale":null
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bearcat
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Nathan Mills, Jake Sorce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2016-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -169,7 +169,6 @@ files:
 - spec/fixtures/access_token.json
 - spec/fixtures/account_admins.json
 - spec/fixtures/account_courses.json
-- spec/fixtures/account_groups.json
 - spec/fixtures/account_reports.json
 - spec/fixtures/account_reports_index.json
 - spec/fixtures/account_reports_result_success.json
@@ -222,6 +221,7 @@ files:
 - spec/fixtures/group_categories.json
 - spec/fixtures/group_conferences.json
 - spec/fixtures/link_unlink_outcome.json
+- spec/fixtures/merge_user.json
 - spec/fixtures/module_item_sequence.json
 - spec/fixtures/module_items.json
 - spec/fixtures/modules.json
@@ -276,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Canvas API
@@ -313,7 +313,6 @@ test_files:
 - spec/fixtures/access_token.json
 - spec/fixtures/account_admins.json
 - spec/fixtures/account_courses.json
-- spec/fixtures/account_groups.json
 - spec/fixtures/account_reports.json
 - spec/fixtures/account_reports_index.json
 - spec/fixtures/account_reports_result_success.json
@@ -366,6 +365,7 @@ test_files:
 - spec/fixtures/group_categories.json
 - spec/fixtures/group_conferences.json
 - spec/fixtures/link_unlink_outcome.json
+- spec/fixtures/merge_user.json
 - spec/fixtures/module_item_sequence.json
 - spec/fixtures/module_items.json
 - spec/fixtures/modules.json
@@ -401,3 +401,4 @@ test_files:
 - spec/fixtures/user_page_views.json
 - spec/fixtures/user_profile.json
 - spec/helper.rb
+has_rdoc: 

data/spec/fixtures/account_groups.json

@@ -1,42 +0,0 @@
-[
-  {
-    "id":2,
-    "name":"2010",
-    "max_membership":null,
-    "is_public":false,
-    "join_level":"invitation_only",
-    "group_category_id":2,
-    "description":null,
-    "members_count":0,
-    "storage_quota_mb":50,
-    "context_type":"Account",
-    "account_id":1,
-    "avatar_url":null,
-    "role":null,
-    "leader":null,
-    "sis_group_id":null,
-    "sis_import_id":null,
-    "has_submission":false,
-    "concluded":false
-  },
-  {
-    "id":3,
-    "name":"2014",
-    "max_membership":null,
-    "is_public":false,
-    "join_level":"invitation_only",
-    "group_category_id":3,
-    "description":null,
-    "members_count":2,
-    "storage_quota_mb":50,
-    "context_type":"Account",
-    "account_id":1,
-    "avatar_url":null,
-    "role":null,
-    "leader":null,
-    "sis_group_id":null,
-    "sis_import_id":null,
-    "has_submission":false,
-    "concluded":false
-  }
-]