discourse_api 0.33.0 → 0.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 240707cb3c8f93fe11db4af092edcbf7531e1b1571ebfeec47e16769efdf3336
-  data.tar.gz: 785b03d93e4fa7092b141bc872c29d27ceef95324ab1b181425a643fbaab5214
+  metadata.gz: 52056720fe38a8e6345ebdaa427c8da352681b88bcf3a2de2b21636b251181ce
+  data.tar.gz: 81f2c6c41121d1b15cc5c389d4f067314b271eb96b7976a12ed2625e1927861b
 SHA512:
-  metadata.gz: eaf85eff275d2ec493479f993f1943bebe1a9becf8f7dafd2a320639c51ee3656c225ed1a2fa8eac61a047d3408ad0530dc010a287c225e477055e9844c9c1c7
-  data.tar.gz: 9c20b3165b8332c88d5e92daca5d9ab7d05fd5d9547200dfd078701a6591b60e5caa496ef15fa10b69e746e4087ee9f457f7e305a4dff8b6e88929f171569e53
+  metadata.gz: 75583ba2ac5bc68bba59ba127d87b9660de4101baf7eeb5a79454b536254eb07596d98df5610b67f47445e0f362f1a928d36e2cbdf08a74b57e66eb7aef20409
+  data.tar.gz: '019c08c76bd3150b6eea2f990f7e3194931d04d96522e51a7662b5a2aa1b3cbbc7424b43833ef549d5e351baeeb7890564c0c0f473b6fa8af42ec871666b458d'

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.34.0] - 2019-04-02
+### Added
+- Header based authentication
+### Removed
+- Query param based authentication
+
 ## [0.33.0] - 2019-03-04
 ### Added
 - Added a new method to update a users notification level in a category

data/lib/discourse_api/client.rb

@@ -121,8 +121,8 @@ module DiscourseApi
         conn.adapter Faraday.default_adapter
         #pass api_key and api_username on every request
         unless api_username.nil?
-          conn.params['api_key'] = api_key
-          conn.params['api_username'] = api_username
+          conn.headers['Api-key'] = api_key
+          conn.headers['Api-username'] = api_username
         end
       end
     end

data/lib/discourse_api/version.rb

@@ -1,3 +1,3 @@
 module DiscourseApi
-  VERSION = "0.33.0"
+  VERSION = "0.34.0"
 end

data/spec/discourse_api/api/api_key_spec.rb

@@ -11,16 +11,14 @@ describe DiscourseApi::API::ApiKey do
 
   describe "#api" do
     before do
-      url = "http://localhost:3000/admin/api.json" +
-            "?api_key=test_d7fd0429940&api_username=test_user"
+      url = "http://localhost:3000/admin/api.json"
       stub_get(url).to_return(body: fixture("api.json"),
                               headers: { content_type: "application/json" })
     end
 
     it "requests the correct resource" do
       subject.api
-      url = "http://localhost:3000/admin/api.json" +
-            "?api_key=test_d7fd0429940&api_username=test_user"
+      url = "http://localhost:3000/admin/api.json"
       expect(a_get(url)).to have_been_made
     end
 
@@ -34,8 +32,7 @@ describe DiscourseApi::API::ApiKey do
 
   describe "#generate_user_api_key" do
     before do
-      url = "http://localhost:3000/admin/users/2/generate_api_key.json" +
-            "?api_key=test_d7fd0429940&api_username=test_user"
+      url = "http://localhost:3000/admin/users/2/generate_api_key.json"
       stub_post(url).to_return(body: fixture("generate_api_key.json"),
                                headers: { content_type: "application/json" })
     end
@@ -49,8 +46,7 @@ describe DiscourseApi::API::ApiKey do
 
   describe "#revoke_user_api_key" do
     before do
-      url = "http://localhost:3000/admin/users/2/revoke_api_key.json" +
-            "?api_key=test_d7fd0429940&api_username=test_user"
+      url = "http://localhost:3000/admin/users/2/revoke_api_key.json"
       stub_delete(url).to_return(body: "",
       headers: { content_type: "application/json" })
     end
@@ -63,8 +59,7 @@ describe DiscourseApi::API::ApiKey do
 
   describe "#generate_master_key" do
     before do
-      url = "http://localhost:3000/admin/api/key" +
-            "?api_key=test_d7fd0429940&api_username=test_user"
+      url = "http://localhost:3000/admin/api/key"
       stub_post(url).to_return(body: fixture("generate_master_key.json"),
                                headers: { content_type: "application/json" })
     end
@@ -79,16 +74,14 @@ describe DiscourseApi::API::ApiKey do
 
   describe "#revoke_api_key" do
     before do
-      url = "http://localhost:3000/admin/api/key" +
-        "?api_key=test_d7fd0429940&api_username=test_user&id=10"
+      url = "http://localhost:3000/admin/api/key?id=10"
       stub_delete(url).to_return(body: "",
                                  headers: { content_type: "application/json" })
     end
 
     it "requests the correct resource" do
       subject.revoke_api_key(10)
-      url = "http://localhost:3000/admin/api/key" +
-            "?api_key=test_d7fd0429940&api_username=test_user&id=10"
+      url = "http://localhost:3000/admin/api/key?id=10"
       expect(a_delete(url)).to have_been_made
     end
 
@@ -100,16 +93,14 @@ describe DiscourseApi::API::ApiKey do
 
   describe "#regenerate_api_key" do
     before do
-      url = "http://localhost:3000/admin/api/key" +
-        "?api_key=test_d7fd0429940&api_username=test_user"
+      url = "http://localhost:3000/admin/api/key"
       stub_put(url).to_return(body: fixture("regenerate_api_key.json"),
                                  headers: { content_type: "application/json" })
     end
 
     it "requests the correct resource" do
       subject.regenerate_api_key(10)
-      url = "http://localhost:3000/admin/api/key" +
-        "?api_key=test_d7fd0429940&api_username=test_user"
+      url = "http://localhost:3000/admin/api/key"
       expect(a_put(url)).to have_been_made
     end
 

data/spec/discourse_api/api/backups_spec.rb

@@ -5,12 +5,12 @@ describe DiscourseApi::API::Backups do
 
   describe "#backups" do
     before do
-      stub_get("http://localhost:3000/admin/backups.json?api_key=test_d7fd0429940&api_username=test_user").to_return(body: fixture("backups.json"), headers: { content_type: "application/json" })
+      stub_get("http://localhost:3000/admin/backups.json").to_return(body: fixture("backups.json"), headers: { content_type: "application/json" })
     end
 
     it "requests the correct resource" do
       subject.backups
-      expect(a_get("http://localhost:3000/admin/backups.json?api_key=test_d7fd0429940&api_username=test_user")).to have_been_made
+      expect(a_get("http://localhost:3000/admin/backups.json")).to have_been_made
     end
 
     it "returns the requested backups" do

data/spec/discourse_api/api/badges_spec.rb

@@ -5,12 +5,12 @@ describe DiscourseApi::API::Badges do
 
   describe "#badges" do
     before do
-      stub_get("http://localhost:3000/admin/badges.json?api_key=test_d7fd0429940&api_username=test_user").to_return(body: fixture("badges.json"), headers: { content_type: "application/json" })
+      stub_get("http://localhost:3000/admin/badges.json").to_return(body: fixture("badges.json"), headers: { content_type: "application/json" })
     end
 
     it "requests the correct resource" do
       subject.badges
-      expect(a_get("http://localhost:3000/admin/badges.json?api_key=test_d7fd0429940&api_username=test_user")).to have_been_made
+      expect(a_get("http://localhost:3000/admin/badges.json")).to have_been_made
     end
 
     it "returns the requested badges" do
@@ -22,12 +22,12 @@ describe DiscourseApi::API::Badges do
 
   describe "#user_badges" do
     before do
-      stub_get("http://localhost:3000/users/test_user/activity/badges.json?api_key=test_d7fd0429940&api_username=test_user").to_return(body: fixture("user_badges.json"), headers: { content_type: "application/json" })
+      stub_get("http://localhost:3000/users/test_user/activity/badges.json").to_return(body: fixture("user_badges.json"), headers: { content_type: "application/json" })
     end
 
     it "requests the correct resource" do
       subject.user_badges('test_user')
-      expect(a_get("http://localhost:3000/users/test_user/activity/badges.json?api_key=test_d7fd0429940&api_username=test_user")).to have_been_made
+      expect(a_get("http://localhost:3000/users/test_user/activity/badges.json")).to have_been_made
     end
 
     it "returns the requested user badges" do

data/spec/discourse_api/api/categories_spec.rb

@@ -5,13 +5,13 @@ describe DiscourseApi::API::Categories do
 
   describe "#categories" do
     before do
-      stub_get("http://localhost:3000/categories.json?api_key=test_d7fd0429940&api_username=test_user")
+      stub_get("http://localhost:3000/categories.json")
         .to_return(body: fixture("categories.json"), headers: { content_type: "application/json" })
     end
 
     it "requests the correct resource" do
       subject.categories
-      expect(a_get("http://localhost:3000/categories.json?api_key=test_d7fd0429940&api_username=test_user")).to have_been_made
+      expect(a_get("http://localhost:3000/categories.json")).to have_been_made
     end
 
     it "returns the requested categories" do
@@ -29,7 +29,7 @@ describe DiscourseApi::API::Categories do
 
   describe '#category_latest_topics' do
     before do
-      stub_get("http://localhost:3000/c/category-slug/l/latest.json?api_key=test_d7fd0429940&api_username=test_user")
+      stub_get("http://localhost:3000/c/category-slug/l/latest.json")
         .to_return(body: fixture("category_latest_topics.json"), headers: { content_type: "application/json" })
     end
 
@@ -41,7 +41,7 @@ describe DiscourseApi::API::Categories do
 
   describe '#category_top_topics' do
     before do
-      stub_get("http://localhost:3000/c/category-slug/l/top.json?api_key=test_d7fd0429940&api_username=test_user")
+      stub_get("http://localhost:3000/c/category-slug/l/top.json")
       .to_return(
         body: fixture("category_topics.json"), 
         headers: { content_type: "application/json" }
@@ -56,7 +56,7 @@ describe DiscourseApi::API::Categories do
 
   describe '#category_new_topics' do
     before do
-      stub_get("http://localhost:3000/c/category-slug/l/new.json?api_key=test_d7fd0429940&api_username=test_user")
+      stub_get("http://localhost:3000/c/category-slug/l/new.json")
       .to_return(
         body: fixture("category_topics.json"), 
         headers: { content_type: "application/json" }
@@ -71,14 +71,14 @@ describe DiscourseApi::API::Categories do
 
   describe '#category_new_category' do
     before do
-      stub_post("http://localhost:3000/categories?api_key=test_d7fd0429940&api_username=test_user")
+      stub_post("http://localhost:3000/categories")
       subject.create_category(name: "test_category", color: "283890", text_color: "FFFFFF",
                               description: "This is a description",
                               permissions: {"group_1" => 1, "admins" => 1})
     end
     
     it "makes a create category request" do
-      expect(a_post("http://localhost:3000/categories?api_key=test_d7fd0429940&api_username=test_user").with(body: 
+      expect(a_post("http://localhost:3000/categories").with(body: 
           "color=283890&description=This+is+a+description&name=test_category&parent_category_id&permissions%5Badmins%5D=1&permissions%5Bgroup_1%5D=1&text_color=FFFFFF")
         ).to have_been_made
     end

data/spec/discourse_api/api/email_spec.rb

@@ -5,12 +5,12 @@ describe DiscourseApi::API::Email do
 
   describe "#email_settings" do
     before do
-      stub_get("http://localhost:3000/admin/email.json?api_key=test_d7fd0429940&api_username=test_user").to_return(body: fixture("email_settings.json"), headers: { content_type: "application/json" })
+      stub_get("http://localhost:3000/admin/email.json").to_return(body: fixture("email_settings.json"), headers: { content_type: "application/json" })
     end
 
     it "requests the correct resource" do
       subject.email_settings
-      expect(a_get("http://localhost:3000/admin/email.json?api_key=test_d7fd0429940&api_username=test_user")).to have_been_made
+      expect(a_get("http://localhost:3000/admin/email.json")).to have_been_made
     end
 
     it "returns the requested settings" do
@@ -23,12 +23,12 @@ describe DiscourseApi::API::Email do
 
   describe "#list_email_all" do
     before do
-      stub_get("http://localhost:3000/admin/email/all.json?api_key=test_d7fd0429940&api_username=test_user").to_return(body: fixture("email_list_all.json"), headers: { content_type: "application/json" })
+      stub_get("http://localhost:3000/admin/email/all.json").to_return(body: fixture("email_list_all.json"), headers: { content_type: "application/json" })
     end
 
     it "requests the correct resource" do
       subject.list_email('all')
-      expect(a_get("http://localhost:3000/admin/email/all.json?api_key=test_d7fd0429940&api_username=test_user")).to have_been_made
+      expect(a_get("http://localhost:3000/admin/email/all.json")).to have_been_made
     end
 
     it "returns all email" do

data/spec/discourse_api/api/groups_spec.rb

@@ -5,12 +5,12 @@ describe DiscourseApi::API::Groups do
 
   describe "#groups" do
     before do
-      stub_get("http://localhost:3000/groups.json?api_key=test_d7fd0429940&api_username=test_user").to_return(body: fixture("groups.json"), headers: { content_type: "application/json" })
+      stub_get("http://localhost:3000/groups.json").to_return(body: fixture("groups.json"), headers: { content_type: "application/json" })
     end
 
     it "requests the correct resource" do
       subject.groups
-      expect(a_get("http://localhost:3000/groups.json?api_key=test_d7fd0429940&api_username=test_user")).to have_been_made
+      expect(a_get("http://localhost:3000/groups.json")).to have_been_made
     end
 
     it "returns the requested groups" do
@@ -20,65 +20,65 @@ describe DiscourseApi::API::Groups do
     end
 
     it "returns a single group" do
-      stub_get("http://localhost:3000/groups/some-group.json?api_key=test_d7fd0429940&api_username=test_user").to_return(body: fixture("group.json"), headers: { content_type: "application/json" })
+      stub_get("http://localhost:3000/groups/some-group.json").to_return(body: fixture("group.json"), headers: { content_type: "application/json" })
       group = subject.group('some-group')
       expect(group['basic_group']).to be_a Hash
     end
 
     it "create new groups" do
-      stub_post("http://localhost:3000/admin/groups?api_key=test_d7fd0429940&api_username=test_user")
+      stub_post("http://localhost:3000/admin/groups")
       subject.create_group(name: "test_group")
       params = escape_params("group[name]" => "test_group", "group[visibility_level]" => 0)
-      expect(a_post("http://localhost:3000/admin/groups?api_key=test_d7fd0429940&api_username=test_user").
+      expect(a_post("http://localhost:3000/admin/groups").
               with(body: params)
             ).to have_been_made
     end
 
     it "update an existing group" do
-      stub_put("http://localhost:3000/groups/42?api_key=test_d7fd0429940&api_username=test_user")
+      stub_put("http://localhost:3000/groups/42")
       subject.update_group(42, name: "test_group")
       params = escape_params("group[name]" => "test_group", "group[visibility_level]" => 0)
-      expect(a_put("http://localhost:3000/groups/42?api_key=test_d7fd0429940&api_username=test_user").
+      expect(a_put("http://localhost:3000/groups/42").
               with(body: params)
             ).to have_been_made
     end
 
     describe "add members" do
       before do
-        stub_request(:put, "http://localhost:3000/admin/groups/123/members.json?api_key=test_d7fd0429940&api_username=test_user")
+        stub_request(:put, "http://localhost:3000/admin/groups/123/members.json")
       end
 
       it "adds a single member by username" do
         subject.group_add(123, username: "sam")
-        expect(a_request(:put, "http://localhost:3000/admin/groups/123/members.json?api_key=test_d7fd0429940&api_username=test_user").
+        expect(a_request(:put, "http://localhost:3000/admin/groups/123/members.json").
                 with(body: {usernames: "sam"})
               ).to have_been_made
       end
 
       it "adds an array of members by username" do
         subject.group_add(123, usernames: ["sam", "jeff"])
-        expect(a_request(:put, "http://localhost:3000/admin/groups/123/members.json?api_key=test_d7fd0429940&api_username=test_user").
+        expect(a_request(:put, "http://localhost:3000/admin/groups/123/members.json").
                 with(body: {usernames: "sam,jeff"})
               ).to have_been_made
       end
 
       it "adds a single member by user_id" do
         subject.group_add(123, user_id: 456)
-        expect(a_request(:put, "http://localhost:3000/admin/groups/123/members.json?api_key=test_d7fd0429940&api_username=test_user").
+        expect(a_request(:put, "http://localhost:3000/admin/groups/123/members.json").
                 with(body: {user_ids: "456"})
               ).to have_been_made
       end
 
       it "adds an array of members by user_id" do
         subject.group_add(123, user_id: [123, 456])
-        expect(a_request(:put, "http://localhost:3000/admin/groups/123/members.json?api_key=test_d7fd0429940&api_username=test_user").
+        expect(a_request(:put, "http://localhost:3000/admin/groups/123/members.json").
                 with(body: {user_ids: "123,456"})
               ).to have_been_made
       end
     end
 
     describe "remove members" do
-      let(:url) { "http://localhost:3000/admin/groups/123/members.json?api_key=test_d7fd0429940&api_username=test_user&usernames=sam" }
+      let(:url) { "http://localhost:3000/admin/groups/123/members.json?usernames=sam" }
 
       before do
         stub_delete(url)
@@ -92,20 +92,19 @@ describe DiscourseApi::API::Groups do
 
     describe "group members" do
       before do
-        stub_get("http://localhost:3000/groups/mygroup/members.json?api_key=test_d7fd0429940&api_username=test_user&limit=100&offset=0").to_return(body: fixture("members_0.json"), headers: { content_type: "application/json" })
-        stub_get("http://localhost:3000/groups/mygroup/members.json?api_key=test_d7fd0429940&api_username=test_user&limit=100&offset=100").to_return(body: fixture("members_1.json"), headers: { content_type: "application/json" })
+        stub_get("http://localhost:3000/groups/mygroup/members.json?limit=100&offset=0").to_return(body: fixture("members_0.json"), headers: { content_type: "application/json" })
+        stub_get("http://localhost:3000/groups/mygroup/members.json?limit=100&offset=100").to_return(body: fixture("members_1.json"), headers: { content_type: "application/json" })
       end
 
       it "list members" do
         members = subject.group_members('mygroup')
-        expect(a_get("http://localhost:3000/groups/mygroup/members.json?api_key=test_d7fd0429940&api_username=test_user&limit=100&offset=0")).to have_been_made
+        expect(a_get("http://localhost:3000/groups/mygroup/members.json?limit=100&offset=0")).to have_been_made
         expect(members.length).to eq(100)
         members = subject.group_members('mygroup', offset: 100)
-        expect(a_get("http://localhost:3000/groups/mygroup/members.json?api_key=test_d7fd0429940&api_username=test_user&limit=100&offset=100")).to have_been_made
+        expect(a_get("http://localhost:3000/groups/mygroup/members.json?limit=100&offset=100")).to have_been_made
         expect(members.length).to eq(90)
       end
     end
 
-
   end
 end

data/spec/discourse_api/api/notifications_spec.rb

@@ -6,12 +6,12 @@ describe DiscourseApi::API::Notifications do
   describe "#notifications" do
 
     before do
-      stub_get("http://localhost:3000/notifications.json?api_key=test_d7fd0429940&api_username=test_user").to_return(body: fixture("notifications.json"), headers: { content_type: "application/json" })
+      stub_get("http://localhost:3000/notifications.json").to_return(body: fixture("notifications.json"), headers: { content_type: "application/json" })
     end
 
     it "requests the correct resource" do
       subject.notifications
-      expect(a_get("http://localhost:3000/notifications.json?api_key=test_d7fd0429940&api_username=test_user")).to have_been_made
+      expect(a_get("http://localhost:3000/notifications.json")).to have_been_made
     end
 
     it "returns the requested notifications" do

data/spec/discourse_api/api/posts_spec.rb

@@ -5,7 +5,7 @@ describe DiscourseApi::API::Posts do
 
   describe "#get_post" do
     before do
-      stub_get("http://localhost:3000/posts/11.json?api_key=test_d7fd0429940&api_username=test_user").to_return(body: fixture("post.json"), headers: { content_type: "application/json" })
+      stub_get("http://localhost:3000/posts/11.json").to_return(body: fixture("post.json"), headers: { content_type: "application/json" })
     end
 
     it "fetches a post" do
@@ -17,29 +17,29 @@ describe DiscourseApi::API::Posts do
 
   describe "#wikify_post" do
     before do
-      stub_put("http://localhost:3000/posts/9999/wiki?api_key=test_d7fd0429940&api_username=test_user")
+      stub_put("http://localhost:3000/posts/9999/wiki")
     end
 
     it "fails on unknown post" do
       client.wikify_post(9999)
-      expect(a_put("http://localhost:3000/posts/9999/wiki?api_key=test_d7fd0429940&api_username=test_user")).to have_been_made
+      expect(a_put("http://localhost:3000/posts/9999/wiki")).to have_been_made
     end
   end
 
   describe "#delete_post" do
     before do
-      stub_delete("http://localhost:3000/posts/9999.json?api_key=test_d7fd0429940&api_username=test_user")
+      stub_delete("http://localhost:3000/posts/9999.json")
     end
 
     it "deletes a post" do
       client.delete_post(9999)
-      expect(a_delete("http://localhost:3000/posts/9999.json?api_key=test_d7fd0429940&api_username=test_user")).to have_been_made
+      expect(a_delete("http://localhost:3000/posts/9999.json")).to have_been_made
     end
   end
 
   describe "#post_action_users" do
     before do
-      stub_get("http://localhost:3000/post_action_users.json?api_key=test_d7fd0429940&api_username=test_user&id=11&post_action_type_id=2").to_return(body: fixture("post_action_users.json"), headers: { content_type: "application/json" })
+      stub_get("http://localhost:3000/post_action_users.json?id=11&post_action_type_id=2").to_return(body: fixture("post_action_users.json"), headers: { content_type: "application/json" })
     end
 
     it "fetches post_action_users" do

data/spec/discourse_api/api/private_messages_spec.rb

@@ -5,12 +5,12 @@ describe DiscourseApi::API::PrivateMessages do
 
   describe "#private_messages" do
     before do
-      stub_get("http://localhost:3000/topics/private-messages/test_user.json?api_key=test_d7fd0429940&api_username=test_user").to_return(body: fixture("private_messages.json"), headers: { content_type: "application/json" })
+      stub_get("http://localhost:3000/topics/private-messages/test_user.json").to_return(body: fixture("private_messages.json"), headers: { content_type: "application/json" })
     end
 
     it "requests the correct resource" do
       subject.private_messages('test_user')
-      expect(a_get("http://localhost:3000/topics/private-messages/test_user.json?api_key=test_d7fd0429940&api_username=test_user")).to have_been_made
+      expect(a_get("http://localhost:3000/topics/private-messages/test_user.json")).to have_been_made
     end
 
     it "returns the requested private messages" do
@@ -21,12 +21,12 @@ describe DiscourseApi::API::PrivateMessages do
 
   describe "#sent_private_messages" do
     before do
-      stub_get("http://localhost:3000/topics/private-messages-sent/test_user.json?api_key=test_d7fd0429940&api_username=test_user").to_return(body: fixture("private_messages.json"), headers: { content_type: "application/json" })
+      stub_get("http://localhost:3000/topics/private-messages-sent/test_user.json").to_return(body: fixture("private_messages.json"), headers: { content_type: "application/json" })
     end
 
     it "requests the correct resource" do
       subject.sent_private_messages('test_user')
-      expect(a_get("http://localhost:3000/topics/private-messages-sent/test_user.json?api_key=test_d7fd0429940&api_username=test_user")).to have_been_made
+      expect(a_get("http://localhost:3000/topics/private-messages-sent/test_user.json")).to have_been_made
     end
 
     it "returns the requested sent private messages" do
@@ -37,7 +37,7 @@ describe DiscourseApi::API::PrivateMessages do
 
   describe '#create_private_message' do
     before do
-      stub_post("http://localhost:3000/posts?api_key=test_d7fd0429940&api_username=test_user")
+      stub_post("http://localhost:3000/posts")
       subject.create_private_message(
         title: "Confidential: Hello World!",
         raw: "This is the raw markdown for my private message",
@@ -46,7 +46,7 @@ describe DiscourseApi::API::PrivateMessages do
     end
 
     it "makes a create private message request" do
-      expect(a_post("http://localhost:3000/posts?api_key=test_d7fd0429940&api_username=test_user").with(body:
+      expect(a_post("http://localhost:3000/posts").with(body:
           'archetype=private_message&raw=This+is+the+raw+markdown+for+my+private+message&target_usernames=user1%2Cuser2&title=Confidential%3A+Hello+World%21')
         ).to have_been_made
     end

data/spec/discourse_api/api/search_spec.rb

@@ -5,12 +5,12 @@ describe DiscourseApi::API::Search do
 
   describe "#search" do
     before do
-      stub_get("http://localhost:3000/search/query?api_key=test_d7fd0429940&api_username=test_user").with(query: { term: "test"} ).to_return(body: fixture("search.json"), headers: { content_type: "application/json" })
+      stub_get("http://localhost:3000/search/query").with(query: { term: "test"} ).to_return(body: fixture("search.json"), headers: { content_type: "application/json" })
     end
 
     it "requests the correct resource" do
       subject.search("test")
-      expect(a_get("http://localhost:3000/search/query?api_key=test_d7fd0429940&api_username=test_user").with(query: { term: "test"} )).to have_been_made
+      expect(a_get("http://localhost:3000/search/query").with(query: { term: "test"} )).to have_been_made
     end
 
     it "returns the requested search" do
@@ -18,7 +18,7 @@ describe DiscourseApi::API::Search do
       expect(results).to be_an Array
       expect(results.first).to be_a Hash
     end
-    
+
     it "raises an ArgumentError for nil" do
       expect { subject.search(nil) }.to raise_error(ArgumentError)
     end

data/spec/discourse_api/api/site_settings_spec.rb

@@ -5,12 +5,12 @@ describe DiscourseApi::API::SiteSettings do
 
   describe "#site_setting_update" do
     before do
-      stub_put("http://localhost:3000/admin/site_settings/foo?api_key=test_d7fd0429940&api_username=test_user")
+      stub_put("http://localhost:3000/admin/site_settings/foo")
       subject.site_setting_update(name: "foo", value: "bar")
     end
 
     it "makes a site_settings_update request" do
-      expect(a_put("http://localhost:3000/admin/site_settings/foo?api_key=test_d7fd0429940&api_username=test_user")
+      expect(a_put("http://localhost:3000/admin/site_settings/foo")
              .with(body: "foo=bar")).to have_been_made
     end
   end

data/spec/discourse_api/api/topics_spec.rb

@@ -5,12 +5,12 @@ describe DiscourseApi::API::Topics do
 
   describe "#invite_user_to_topic" do
     before do
-      stub_post("http://localhost:3000/t/12/invite?api_key=test_d7fd0429940&api_username=test_user").to_return(body: fixture("topic_invite_user.json"), headers: { content_type: "application/json" })
+      stub_post("http://localhost:3000/t/12/invite").to_return(body: fixture("topic_invite_user.json"), headers: { content_type: "application/json" })
     end
 
     it "requests the correct resource" do
       subject.invite_user_to_topic(email: "fake_user@example.com", topic_id: 12)
-      expect(a_post("http://localhost:3000/t/12/invite?api_key=test_d7fd0429940&api_username=test_user")).to have_been_made
+      expect(a_post("http://localhost:3000/t/12/invite")).to have_been_made
     end
 
     it "returns success" do
@@ -22,12 +22,12 @@ describe DiscourseApi::API::Topics do
 
   describe "#latest_topics" do
     before do
-      stub_get("http://localhost:3000/latest.json?api_key=test_d7fd0429940&api_username=test_user").to_return(body: fixture("latest.json"), headers: { content_type: "application/json" })
+      stub_get("http://localhost:3000/latest.json").to_return(body: fixture("latest.json"), headers: { content_type: "application/json" })
     end
 
     it "requests the correct resource" do
       subject.latest_topics
-      expect(a_get("http://localhost:3000/latest.json?api_key=test_d7fd0429940&api_username=test_user")).to have_been_made
+      expect(a_get("http://localhost:3000/latest.json")).to have_been_made
     end
 
     it "returns the requested topics" do
@@ -45,12 +45,12 @@ describe DiscourseApi::API::Topics do
 
   describe "#new_topics" do
     before do
-      stub_get("http://localhost:3000/new.json?api_key=test_d7fd0429940&api_username=test_user").to_return(body: fixture("new.json"), headers: { content_type: "application/json" })
+      stub_get("http://localhost:3000/new.json").to_return(body: fixture("new.json"), headers: { content_type: "application/json" })
     end
 
     it "requests the correct resource" do
       subject.new_topics
-      expect(a_get("http://localhost:3000/new.json?api_key=test_d7fd0429940&api_username=test_user")).to have_been_made
+      expect(a_get("http://localhost:3000/new.json")).to have_been_made
     end
 
     it "returns the requested topics" do
@@ -63,12 +63,12 @@ describe DiscourseApi::API::Topics do
 
   describe "#topic" do
     before do
-      stub_get("http://localhost:3000/t/57.json?api_key=test_d7fd0429940&api_username=test_user").to_return(body: fixture("topic.json"), headers: { content_type: "application/json" })
+      stub_get("http://localhost:3000/t/57.json").to_return(body: fixture("topic.json"), headers: { content_type: "application/json" })
     end
 
     it "requests the correct resource" do
       subject.topic(57)
-      expect(a_get("http://localhost:3000/t/57.json?api_key=test_d7fd0429940&api_username=test_user")).to have_been_made
+      expect(a_get("http://localhost:3000/t/57.json")).to have_been_made
     end
 
     it "returns the requested topic" do
@@ -80,28 +80,28 @@ describe DiscourseApi::API::Topics do
 
   describe "#update_topic" do
     before do
-      stub_put("http://localhost:3000/t/57.json?api_key=test_d7fd0429940&api_username=test_user").to_return(body: fixture("topic.json"), headers: { content_type: "application/json" })
+      stub_put("http://localhost:3000/t/57.json").to_return(body: fixture("topic.json"), headers: { content_type: "application/json" })
     end
 
     it "renames the topic" do
       subject.rename_topic(57, "A new title!")
-      expect(a_put("http://localhost:3000/t/57.json?api_key=test_d7fd0429940&api_username=test_user")).to have_been_made
+      expect(a_put("http://localhost:3000/t/57.json")).to have_been_made
     end
 
     it "assigns the topic a new category" do
       subject.recategorize_topic(57, 3)
-      expect(a_put("http://localhost:3000/t/57.json?api_key=test_d7fd0429940&api_username=test_user")).to have_been_made
+      expect(a_put("http://localhost:3000/t/57.json")).to have_been_made
     end
   end
 
   describe "#topics_by" do
     before do
-      stub_get("http://localhost:3000/topics/created-by/test.json?api_key=test_d7fd0429940&api_username=test_user").to_return(body: fixture("topics_created_by.json"), headers: { content_type: "application/json" })
+      stub_get("http://localhost:3000/topics/created-by/test.json").to_return(body: fixture("topics_created_by.json"), headers: { content_type: "application/json" })
     end
 
     it "requests the correct resource" do
       subject.topics_by('test')
-      expect(a_get("http://localhost:3000/topics/created-by/test.json?api_key=test_d7fd0429940&api_username=test_user")).to have_been_made
+      expect(a_get("http://localhost:3000/topics/created-by/test.json")).to have_been_made
     end
 
     it "returns the requested topics" do

data/spec/discourse_api/api/uploads_spec.rb

@@ -5,7 +5,7 @@ describe DiscourseApi::API::Uploads do
 
   describe "#upload_file" do
     before do
-      stub_post("http://localhost:3000/uploads?api_key=test_d7fd0429940&api_username=test_user").to_return(body: fixture("upload_file.json"), headers: { content_type: "application/json" })
+      stub_post("http://localhost:3000/uploads").to_return(body: fixture("upload_file.json"), headers: { content_type: "application/json" })
     end
 
     it "uploads an image via URL" do

data/spec/discourse_api/api/user_actions_spec.rb

@@ -5,12 +5,12 @@ describe DiscourseApi::API::UserActions do
 
   describe "#user_replies" do
     before do
-      stub_get("http://localhost:3000/user_actions.json?api_key=test_d7fd0429940&api_username=test_user&username=testuser&filter=5").to_return(body: fixture("replies.json"), headers: { content_type: "application/json" })
+      stub_get("http://localhost:3000/user_actions.json?username=testuser&filter=5").to_return(body: fixture("replies.json"), headers: { content_type: "application/json" })
     end
 
     it "requests the correct resource" do
       subject.user_replies("testuser")
-      expect(a_get("http://localhost:3000/user_actions.json?api_key=test_d7fd0429940&api_username=test_user&username=testuser&filter=5")).to have_been_made
+      expect(a_get("http://localhost:3000/user_actions.json?username=testuser&filter=5")).to have_been_made
     end
 
     it "returns the requested user" do
@@ -21,12 +21,12 @@ describe DiscourseApi::API::UserActions do
 
   describe "#user_topics_and_replies" do
     before do
-      stub_get("http://localhost:3000/user_actions.json?api_key=test_d7fd0429940&api_username=test_user&username=testuser&filter=4,5").to_return(body: fixture("replies_and_topics.json"), headers: { content_type: "application/json" })
+      stub_get("http://localhost:3000/user_actions.json?username=testuser&filter=4,5").to_return(body: fixture("replies_and_topics.json"), headers: { content_type: "application/json" })
     end
 
     it "requests the correct resource" do
       subject.user_topics_and_replies("testuser")
-      expect(a_get("http://localhost:3000/user_actions.json?api_key=test_d7fd0429940&api_username=test_user&username=testuser&filter=4,5")).to have_been_made
+      expect(a_get("http://localhost:3000/user_actions.json?username=testuser&filter=4,5")).to have_been_made
     end
 
     it "returns the requested user" do

data/spec/discourse_api/api/users_spec.rb

@@ -5,12 +5,12 @@ describe DiscourseApi::API::Users do
 
   describe "#user" do
     before do
-      stub_get("http://localhost:3000/users/test.json?api_key=test_d7fd0429940&api_username=test_user").to_return(body: fixture("user.json"), headers: { content_type: "application/json" })
+      stub_get("http://localhost:3000/users/test.json").to_return(body: fixture("user.json"), headers: { content_type: "application/json" })
     end
 
     it "requests the correct resource" do
       subject.user("test")
-      expect(a_get("http://localhost:3000/users/test.json?api_key=test_d7fd0429940&api_username=test_user")).to have_been_made
+      expect(a_get("http://localhost:3000/users/test.json")).to have_been_made
     end
 
     it "returns the requested user" do
@@ -26,12 +26,12 @@ describe DiscourseApi::API::Users do
 
   describe "#user_sso" do
     before do
-      stub_get("http://localhost:3000/admin/users/15.json?api_key=test_d7fd0429940&api_username=test_user").to_return(body: fixture("admin_user.json"), headers: { content_type: "application/json" })
+      stub_get("http://localhost:3000/admin/users/15.json").to_return(body: fixture("admin_user.json"), headers: { content_type: "application/json" })
     end
 
     it "requests the correct resource" do
       subject.user_sso(15)
-      expect(a_get("http://localhost:3000/admin/users/15.json?api_key=test_d7fd0429940&api_username=test_user")).to have_been_made
+      expect(a_get("http://localhost:3000/admin/users/15.json")).to have_been_made
     end
 
     it "has single_sign_on_record" do
@@ -43,8 +43,8 @@ describe DiscourseApi::API::Users do
 
   describe "#update_avatar" do
     before do
-      stub_post("http://localhost:3000/uploads?api_key=test_d7fd0429940&api_username=test_user").to_return(body: fixture("upload_avatar.json"), headers: { content_type: "application/json" })
-      stub_put("http://localhost:3000/users/test_user/preferences/avatar/pick?api_key=test_d7fd0429940&api_username=test_user").to_return(body: fixture("user_update_avatar_success.json"), headers: { content_type: "application/json" })
+      stub_post("http://localhost:3000/uploads").to_return(body: fixture("upload_avatar.json"), headers: { content_type: "application/json" })
+      stub_put("http://localhost:3000/users/test_user/preferences/avatar/pick").to_return(body: fixture("user_update_avatar_success.json"), headers: { content_type: "application/json" })
     end
 
     it "uploads an image" do
@@ -57,12 +57,12 @@ describe DiscourseApi::API::Users do
 
   describe "#update_email" do
     before do
-      stub_put("http://localhost:3000/users/fake_user/preferences/email?api_key=test_d7fd0429940&api_username=test_user").to_return(body: fixture("user_update_user.json"), headers: { content_type: "application/json" })
+      stub_put("http://localhost:3000/users/fake_user/preferences/email").to_return(body: fixture("user_update_user.json"), headers: { content_type: "application/json" })
     end
 
     it "makes the put request" do
       subject.update_email("fake_user", "fake_user_2@example.com")
-      expect(a_put("http://localhost:3000/users/fake_user/preferences/email?api_key=test_d7fd0429940&api_username=test_user")).to have_been_made
+      expect(a_put("http://localhost:3000/users/fake_user/preferences/email")).to have_been_made
     end
 
     it "returns success" do
@@ -73,14 +73,14 @@ describe DiscourseApi::API::Users do
 
   describe "#update_user" do
     before do
-      stub_put("http://localhost:3000/users/fake_user?api_key=test_d7fd0429940&api_username=test_user").to_return(body: fixture("user_update_user.json"), headers: { content_type: "application/json" })
+      stub_put("http://localhost:3000/users/fake_user").to_return(body: fixture("user_update_user.json"), headers: { content_type: "application/json" })
     end
 
     it "makes the put request" do
       subject.api_key = 'test_d7fd0429940'
       subject.api_username = 'test_user'
       subject.update_user("fake_user", name: "Fake User 2")
-      expect(a_put("http://localhost:3000/users/fake_user?api_key=test_d7fd0429940&api_username=test_user")).to have_been_made
+      expect(a_put("http://localhost:3000/users/fake_user")).to have_been_made
     end
 
     it "returns success" do
@@ -93,12 +93,12 @@ describe DiscourseApi::API::Users do
 
   describe "#update_username" do
     before do
-      stub_put("http://localhost:3000/users/fake_user/preferences/username?api_key=test_d7fd0429940&api_username=test_user").to_return(body: fixture("user_update_username.json"), headers: { content_type: "application/json" })
+      stub_put("http://localhost:3000/users/fake_user/preferences/username").to_return(body: fixture("user_update_username.json"), headers: { content_type: "application/json" })
     end
 
     it "makes the put request" do
       subject.update_username("fake_user", "fake_user_2")
-      expect(a_put("http://localhost:3000/users/fake_user/preferences/username?api_key=test_d7fd0429940&api_username=test_user")).to have_been_made
+      expect(a_put("http://localhost:3000/users/fake_user/preferences/username")).to have_been_made
     end
 
     it "returns the updated username" do
@@ -109,12 +109,12 @@ describe DiscourseApi::API::Users do
 
   describe "#create_user" do
     before do
-      stub_post("http://localhost:3000/users?api_key=test_d7fd0429940&api_username=test_user").to_return(body: fixture("user_create_success.json"), headers: { content_type: "application/json" })
+      stub_post("http://localhost:3000/users").to_return(body: fixture("user_create_success.json"), headers: { content_type: "application/json" })
     end
 
     it "makes the post request" do
       subject.create_user :name => "Test User", :email => "test2@example.com", :password => "P@ssword", :username => "test2"
-      expect(a_post("http://localhost:3000/users?api_key=test_d7fd0429940&api_username=test_user")).to have_been_made
+      expect(a_post("http://localhost:3000/users")).to have_been_made
     end
 
     it "returns success" do
@@ -126,12 +126,12 @@ describe DiscourseApi::API::Users do
 
   describe "#activate_user" do
     before do
-      stub_put("http://localhost:3000/admin/users/15/activate?api_key=test_d7fd0429940&api_username=test_user").to_return(body: fixture("user_activate_success.json"), headers: { content_type: "application/json" })
+      stub_put("http://localhost:3000/admin/users/15/activate").to_return(body: fixture("user_activate_success.json"), headers: { content_type: "application/json" })
     end
 
     it "makes the put request" do
       subject.activate(15)
-      expect(a_put("http://localhost:3000/admin/users/15/activate?api_key=test_d7fd0429940&api_username=test_user")).to have_been_made
+      expect(a_put("http://localhost:3000/admin/users/15/activate")).to have_been_made
     end
 
     it "returns success" do
@@ -142,12 +142,12 @@ describe DiscourseApi::API::Users do
 
   describe "#log_out_success" do
     before do
-      stub_post("http://localhost:3000/admin/users/4/log_out?api_key=test_d7fd0429940&api_username=test_user").to_return(body: fixture("user_log_out_success.json"), headers: { content_type: "application/json" })
+      stub_post("http://localhost:3000/admin/users/4/log_out").to_return(body: fixture("user_log_out_success.json"), headers: { content_type: "application/json" })
     end
 
     it "makes a post request" do
       subject.log_out(4)
-      expect(a_post("http://localhost:3000/admin/users/4/log_out?api_key=test_d7fd0429940&api_username=test_user")).to have_been_made
+      expect(a_post("http://localhost:3000/admin/users/4/log_out")).to have_been_made
     end
 
     it "returns success" do
@@ -159,7 +159,7 @@ describe DiscourseApi::API::Users do
 
   describe "#log_out_unsuccessful" do
     before do
-      stub_post("http://localhost:3000/admin/users/90/log_out?api_key=test_d7fd0429940&api_username=test_user").to_return(status: 404, headers: { content_type: "application/json" })
+      stub_post("http://localhost:3000/admin/users/90/log_out").to_return(status: 404, headers: { content_type: "application/json" })
     end
 
     it "Raises API Error" do
@@ -169,12 +169,12 @@ describe DiscourseApi::API::Users do
 
   describe "#list_users" do
     before do
-      stub_get("http://localhost:3000/admin/users/list/active.json?api_key=test_d7fd0429940&api_username=test_user").to_return(body: fixture("user_list.json"), headers: { content_type: "application/json" })
+      stub_get("http://localhost:3000/admin/users/list/active.json").to_return(body: fixture("user_list.json"), headers: { content_type: "application/json" })
     end
 
     it "requests the correct resource" do
       subject.list_users('active')
-      expect(a_get("http://localhost:3000/admin/users/list/active.json?api_key=test_d7fd0429940&api_username=test_user")).to have_been_made
+      expect(a_get("http://localhost:3000/admin/users/list/active.json")).to have_been_made
     end
 
     it "returns the requested users" do
@@ -186,7 +186,7 @@ describe DiscourseApi::API::Users do
 
   describe "#update_trust_level" do
     before do
-      url = "http://localhost:3000/admin/users/2/trust_level?api_key=test_d7fd0429940&api_username=test_user"
+      url = "http://localhost:3000/admin/users/2/trust_level"
       stub_put(url).to_return(body: fixture("update_trust_level.json"),
                               headers: { content_type: "application/json" })
     end
@@ -194,7 +194,7 @@ describe DiscourseApi::API::Users do
     it "makes the correct put request" do
       params = { user_id: 2, level: 2 }
       subject.update_trust_level(params)
-      url = "http://localhost:3000/admin/users/2/trust_level?api_key=test_d7fd0429940&api_username=test_user"
+      url = "http://localhost:3000/admin/users/2/trust_level"
       expect(a_put(url)).to have_been_made
     end
 
@@ -208,14 +208,14 @@ describe DiscourseApi::API::Users do
 
   describe "#grant admin" do
     before do
-      url = "http://localhost:3000/admin/users/11/grant_admin?api_key=test_d7fd0429940&api_username=test_user"
+      url = "http://localhost:3000/admin/users/11/grant_admin"
       stub_put(url).to_return(body: fixture("user_grant_admin.json"),
                               headers: { content_type: "application/json" })
     end
 
     it "makes the correct put request" do
       subject.grant_admin(11)
-      url = "http://localhost:3000/admin/users/11/grant_admin?api_key=test_d7fd0429940&api_username=test_user"
+      url = "http://localhost:3000/admin/users/11/grant_admin"
       expect(a_put(url)).to have_been_made
     end
 
@@ -228,12 +228,12 @@ describe DiscourseApi::API::Users do
 
   describe "#by_external_id" do
     before do
-      stub_get("http://localhost:3000/users/by-external/1?api_key=test_d7fd0429940&api_username=test_user").to_return(body: fixture("user.json"), headers: { content_type: "application/json" })
+      stub_get("http://localhost:3000/users/by-external/1").to_return(body: fixture("user.json"), headers: { content_type: "application/json" })
     end
 
     it "requests the correct resource" do
       subject.by_external_id(1)
-      expect(a_get("http://localhost:3000/users/by-external/1?api_key=test_d7fd0429940&api_username=test_user")).to have_been_made
+      expect(a_get("http://localhost:3000/users/by-external/1")).to have_been_made
     end
 
     it "returns the requested user" do
@@ -244,13 +244,13 @@ describe DiscourseApi::API::Users do
 
   describe "#suspend" do
     before do
-      url = "http://localhost:3000/admin/users/11/suspend?api_key=test_d7fd0429940&api_username=test_user"
+      url = "http://localhost:3000/admin/users/11/suspend"
       stub_put(url).to_return(body: '', status: 200)
     end
 
     it "makes the correct put request" do
       result = subject.suspend(11, '2030-01-01', "no reason")
-      url = "http://localhost:3000/admin/users/11/suspend?api_key=test_d7fd0429940&api_username=test_user"
+      url = "http://localhost:3000/admin/users/11/suspend"
       expect(a_put(url)).to have_been_made
       expect(result.status).to eq(200)
     end
@@ -258,13 +258,13 @@ describe DiscourseApi::API::Users do
 
   describe "#unsuspend" do
     before do
-      url = "http://localhost:3000/admin/users/11/unsuspend?api_key=test_d7fd0429940&api_username=test_user"
+      url = "http://localhost:3000/admin/users/11/unsuspend"
       stub_put(url).to_return(body: '', status: 200)
     end
 
     it "makes the correct put request" do
       result = subject.unsuspend(11)
-      url = "http://localhost:3000/admin/users/11/unsuspend?api_key=test_d7fd0429940&api_username=test_user"
+      url = "http://localhost:3000/admin/users/11/unsuspend"
       expect(a_put(url)).to have_been_made
       expect(result.status).to eq(200)
     end
@@ -272,13 +272,13 @@ describe DiscourseApi::API::Users do
 
   describe "#delete_user" do
     before do
-      url = "http://localhost:3000/admin/users/11.json?delete_posts=true&api_key=test_d7fd0429940&api_username=test_user"
+      url = "http://localhost:3000/admin/users/11.json?delete_posts=true"
       stub_delete(url).to_return(body: '{"deleted": true}', status: 200)
     end
 
     it "makes the correct delete request" do
       result = subject.delete_user(11, true)
-      url = "http://localhost:3000/admin/users/11.json?delete_posts=true&api_key=test_d7fd0429940&api_username=test_user"
+      url = "http://localhost:3000/admin/users/11.json?delete_posts=true"
       expect(a_delete(url)).to have_been_made
       expect(result.body).to eq('{"deleted": true}')
       expect(result.status).to eq(200)
@@ -286,7 +286,7 @@ describe DiscourseApi::API::Users do
   end
 
   describe "#check_username" do
-    let(:url) { "http://localhost:3000/users/check_username.json?username=sparrow&api_key=test_d7fd0429940&api_username=test_user" }
+    let(:url) { "http://localhost:3000/users/check_username.json?username=sparrow" }
     let(:body) { '{"available":false,"suggestion":"sparrow1"}' }
 
     before do
@@ -304,7 +304,7 @@ describe DiscourseApi::API::Users do
     end
 
     context "when non-URI characters are used" do
-      let(:url) { "http://localhost:3000/users/check_username.json?username=1_%5B4%5D%21+%40the%24%23%3F&api_key=test_d7fd0429940&api_username=test_user" }
+      let(:url) { "http://localhost:3000/users/check_username.json?username=1_%5B4%5D%21+%40the%24%23%3F" }
       let(:body) { '{"errors":["must only include numbers, letters, dashes, and underscores"]}' }
 
       it "escapes them" do
@@ -321,12 +321,12 @@ describe DiscourseApi::API::Users do
 
   describe "#deactivate" do
     before do
-      stub_put("http://localhost:3000/admin/users/15/deactivate?api_key=test_d7fd0429940&api_username=test_user").to_return(body: nil)
+      stub_put("http://localhost:3000/admin/users/15/deactivate").to_return(body: nil)
     end
 
     it "makes the put request" do
       subject.deactivate(15)
-      expect(a_put("http://localhost:3000/admin/users/15/deactivate?api_key=test_d7fd0429940&api_username=test_user")).to have_been_made
+      expect(a_put("http://localhost:3000/admin/users/15/deactivate")).to have_been_made
     end
 
     it "returns success" do

data/spec/discourse_api/client_spec.rb

@@ -64,78 +64,78 @@ describe DiscourseApi::Client do
 
   describe "#delete" do
     before do
-      stub_delete("http://localhost:3000/test/delete?api_key=test_d7fd0429940&api_username=test_user").with(query: { deleted: "object" })
+      stub_delete("http://localhost:3000/test/delete").with(query: { deleted: "object" })
       subject.api_key = 'test_d7fd0429940'
       subject.api_username = 'test_user'
     end
 
     it "allows custom delete requests" do
       subject.delete("/test/delete", { deleted: "object" })
-      expect(a_delete("http://localhost:3000/test/delete?api_key=test_d7fd0429940&api_username=test_user").with(query: { deleted: "object" })).to have_been_made
+      expect(a_delete("http://localhost:3000/test/delete").with(query: { deleted: "object" })).to have_been_made
     end
 
     context 'when using a host with a subdirectory' do
       subject { DiscourseApi::Client.new('http://localhost:3000/forum') }
 
       before do
-        stub_delete("http://localhost:3000/forum/test/delete?api_key=test_d7fd0429940&api_username=test_user").with(query: { deleted: "object" })
+        stub_delete("http://localhost:3000/forum/test/delete").with(query: { deleted: "object" })
       end
 
       it "allows custom delete requests" do
         subject.delete("/test/delete", { deleted: "object" })
-        expect(a_delete("http://localhost:3000/forum/test/delete?api_key=test_d7fd0429940&api_username=test_user").with(query: { deleted: "object" })).to have_been_made
+        expect(a_delete("http://localhost:3000/forum/test/delete").with(query: { deleted: "object" })).to have_been_made
       end
     end
   end
 
   describe "#post" do
     before do
-      stub_post("http://localhost:3000/test/post?api_key=test_d7fd0429940&api_username=test_user").with(body: { created: "object"})
+      stub_post("http://localhost:3000/test/post").with(body: { created: "object"})
       subject.api_key = 'test_d7fd0429940'
       subject.api_username = 'test_user'
     end
 
     it "allows custom post requests" do
       subject.post("/test/post", { created: "object" })
-      expect(a_post("http://localhost:3000/test/post?api_key=test_d7fd0429940&api_username=test_user").with(body: { created: "object"})).to have_been_made
+      expect(a_post("http://localhost:3000/test/post").with(body: { created: "object"})).to have_been_made
     end
 
     context 'when using a host with a subdirectory' do
       subject { DiscourseApi::Client.new('http://localhost:3000/forum') }
 
       before do
-        stub_post("http://localhost:3000/forum/test/post?api_key=test_d7fd0429940&api_username=test_user").with(body: { created: "object"})
+        stub_post("http://localhost:3000/forum/test/post").with(body: { created: "object"})
       end
 
       it "allows custom post requests" do
         subject.post("/test/post", { created: "object" })
-        expect(a_post("http://localhost:3000/forum/test/post?api_key=test_d7fd0429940&api_username=test_user").with(body: { created: "object"})).to have_been_made
+        expect(a_post("http://localhost:3000/forum/test/post").with(body: { created: "object"})).to have_been_made
       end
     end
   end
 
   describe "#put" do
     before do
-      stub_put("http://localhost:3000/test/put?api_key=test_d7fd0429940&api_username=test_user").with(body: { updated: "object" })
+      stub_put("http://localhost:3000/test/put").with(body: { updated: "object" })
       subject.api_key = 'test_d7fd0429940'
       subject.api_username = 'test_user'
     end
 
     it "allows custom put requests" do
       subject.put("/test/put", { updated: "object" })
-      expect(a_put("http://localhost:3000/test/put?api_key=test_d7fd0429940&api_username=test_user").with(body: { updated: "object" })).to have_been_made
+      expect(a_put("http://localhost:3000/test/put").with(body: { updated: "object" })).to have_been_made
     end
 
     context 'when using a host with a subdirectory' do
       subject { DiscourseApi::Client.new('http://localhost:3000/forum') }
 
       before do
-        stub_put("http://localhost:3000/forum/test/put?api_key=test_d7fd0429940&api_username=test_user").with(body: { updated: "object" })
+        stub_put("http://localhost:3000/forum/test/put").with(body: { updated: "object" })
       end
 
       it "allows custom post requests" do
         subject.put("/test/put", { updated: "object" })
-        expect(a_put("http://localhost:3000/forum/test/put?api_key=test_d7fd0429940&api_username=test_user").with(body: { updated: "object" })).to have_been_made
+        expect(a_put("http://localhost:3000/forum/test/put").with(body: { updated: "object" })).to have_been_made
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: discourse_api
 version: !ruby/object:Gem::Version
-  version: 0.33.0
+  version: 0.34.0
 platform: ruby
 authors:
 - Sam Saffron
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-05 00:00:00.000000000 Z
+date: 2019-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday