discourse_api 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef1ea595c7e724545877e4a688f7f192a1f63573
-  data.tar.gz: f97ed183f55cae5b6cb01616264cabf5249bdbdb
+  metadata.gz: 8330a94a826de63e8b485e79b0ee6e43dfc0cbe2
+  data.tar.gz: d8145df00cfb45f265fe8fc2e3af9e1d0e35e230
 SHA512:
-  metadata.gz: 31b68b7b2101e74ca1dcb84c8528c129b630cdd1ff74a1c2eeadc42529562fc8dcfb5f13ed899dc94fe8513f1e4c0c314d6609fe7a1f0c3eef5436cb344b9751
-  data.tar.gz: eac6dbdd5cdecae47f0b2b4fac2a819b324437831b8aabb984db2f0b9f86efe0d4872b6a1970f67d2472665ce893ad13a09b238b60cff6c3726a7f94e31094f2
+  metadata.gz: f9ea65210238643e2233e73f28ea1945a877472c4581794c93cf208a99232b135669fa476a400f69ac43c39b6fdf47a0dd33189c67009da65a8137b23bfbdca6
+  data.tar.gz: f0753dc07dc1c480e2ee6e78a8565b96cf5605ea40bee94a5c3eed2022fb10b6c848cf9ff58f1eafb306e2a319ca0b181f9b3517f3e0a5424285de90985432bf

data/examples/groups.rb

@@ -7,8 +7,11 @@ client = DiscourseApi::Client.new
 response = client.create_group(name: "engineering_team")
 group_id = response["basic_group"]["id"]
 
-client.group_add(group_id, "sam")
-client.group_add(group_id, "jeff")
-client.group_add(group_id, "neil")
+client.group_add(group_id, username: "sam")
+client.group_add(group_id, username: "jeff")
+client.group_add(group_id, usernames: ["neil", "dan"])
+client.group_add(group_id, user_id: 123)
+client.group_add(group_id, user_ids: [123, 456])
 
-client.group_remove(group_id, "neil")
+client.group_remove(group_id, username: "neil")
+client.group_remove(group_id, user_id: 123)

data/lib/discourse_api/api/api_key.rb

@@ -0,0 +1,31 @@
+module DiscourseApi
+  module API
+    module ApiKey
+      def api
+        response = get("/admin/api.json")
+        response.body
+      end
+
+      def generate_user_api_key(user_id)
+        response = post("/admin/users/#{user_id}/generate_api_key.json")
+      end
+
+      def revoke_user_api_key(user_id)
+        response = delete("/admin/users/#{user_id}/revoke_api_key.json")
+      end
+
+      def generate_master_key
+        response = post("/admin/api/key")
+      end
+
+      def revoke_api_key(id)
+        response = delete("/admin/api/key", {id: id})
+      end
+
+      def regenerate_api_key(id)
+        response = put("/admin/api/key", {id: id})
+        response.body
+      end
+    end
+  end
+end

data/lib/discourse_api/api/categories.rb

@@ -21,6 +21,16 @@ module DiscourseApi
         response[:body]['topic_list']['topics']
       end
 
+      def category_top_topics(category_slug)
+        response = get("/category/#{category_slug}/l/top.json")
+        response[:body]['topic_list']['topics']
+      end
+
+      def category_new_topics(category_slug)
+        response = get("/category/#{category_slug}/l/new.json")
+        response[:body]['topic_list']['topics']
+      end
+
       def category(id)
         response = get("/c/#{id}/show")
         response.body['category']

data/lib/discourse_api/api/groups.rb

@@ -6,7 +6,7 @@ module DiscourseApi
                   .required(:name)
                   .default(visible: true)
                   .to_h
-        post("/admin/groups", group: args)
+        post("/admin/groups", args)
       end
 
       def groups
@@ -14,12 +14,25 @@ module DiscourseApi
         response.body
       end
 
-      def group_add(group_id, *usernames)
-        patch("/admin/groups/#{group_id}", changes: {add: usernames})
+      def group_add(group_id, users)
+        users.keys.each do |key|
+          # Accept arrays and convert to comma-delimited string.
+          if users[key].respond_to? :join
+            users[key] = users[key].join(",")
+          end
+
+          # Accept non-plural user_id or username, but send pluralized version in the request.
+          if key.to_s[-1] != 's'
+            users["#{key}s"] = users[key]
+            users.delete(key)
+          end
+        end
+
+        put("/admin/groups/#{group_id}/members.json", users)
       end
 
-      def group_remove(group_id, *usernames)
-        patch("/admin/groups/#{group_id}", changes: {delete: usernames})
+      def group_remove(group_id, user)
+        delete("/admin/groups/#{group_id}/members.json", user)
       end
     end
   end

data/lib/discourse_api/api/users.rb

@@ -59,6 +59,16 @@ module DiscourseApi
         response = get("admin/users/list/#{type}.json")
         response[:body]
       end
+
+      def grant_admin(user_id)
+        response = put("admin/users/#{user_id}/grant_admin")
+        response[:body]
+      end
+
+      def revoke_admin(user_id)
+        response = put("admin/users/#{user_id}/revoke_admin")
+        response[:body]
+      end
     end
   end
 end

data/lib/discourse_api/client.rb

@@ -15,7 +15,7 @@ require 'discourse_api/api/private_messages'
 require 'discourse_api/api/notifications'
 require 'discourse_api/api/badges'
 require 'discourse_api/api/email'
-require 'discourse_api/api/api_admin'
+require 'discourse_api/api/api_key'
 require 'discourse_api/api/backups'
 
 module DiscourseApi
@@ -35,7 +35,7 @@ module DiscourseApi
     include DiscourseApi::API::Notifications
     include DiscourseApi::API::Badges
     include DiscourseApi::API::Email
-    include DiscourseApi::API::ApiAdmin
+    include DiscourseApi::API::ApiKey
     include DiscourseApi::API::Backups
 
     def initialize(host = ENV["DISCOURSE_URL"],
@@ -114,9 +114,17 @@ module DiscourseApi
         params = params.to_h if params.respond_to? :to_h
       end
       response = connection.send(method.to_sym, path, params)
+      handle_error(response)
       response.env
     rescue Faraday::Error::ClientError, JSON::ParserError
       raise DiscourseApi::Error
     end
+
+    def handle_error(response)
+      case response.status
+      when 403
+        raise DiscourseApi::UnauthenticatedError.new(response.env[:body])
+      end
+    end
   end
 end

data/lib/discourse_api/error.rb

@@ -11,4 +11,7 @@ module DiscourseApi
       exception.respond_to?(:message) ? super(exception.message) : super(exception.to_s)
     end
   end
+
+  class UnauthenticatedError < StandardError
+  end
 end

data/lib/discourse_api/version.rb

@@ -1,3 +1,3 @@
 module DiscourseApi
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/discourse_api/api/api_key_spec.rb

@@ -0,0 +1,121 @@
+require 'spec_helper'
+
+describe DiscourseApi::API::ApiKey do
+  subject {
+    DiscourseApi::Client.new(
+      "http://localhost:3000",
+      "test_d7fd0429940",
+      "test_user"
+    )
+  }
+
+  describe "#api" do
+    before do
+      url = "http://localhost:3000/admin/api.json" +
+            "?api_key=test_d7fd0429940&api_username=test_user"
+      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"
+      expect(a_get(url)).to have_been_made
+    end
+
+    it "returns the requested api keys" do
+      api = subject.api
+      expect(api).to be_an Array
+      expect(api.first).to be_a Hash
+      expect(api.first).to have_key('key')
+    end
+  end
+
+  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"
+      stub_post(url).to_return(body: fixture("generate_api_key.json"),
+                               headers: { content_type: "application/json" })
+    end
+
+    it "returns the generated api key" do
+      api_key = subject.generate_user_api_key(2)
+      expect(api_key).to be_a Hash
+      expect(api_key['api_key']).to have_key('key')
+    end
+  end
+
+  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"
+      stub_delete(url).to_return(body: "",
+      headers: { content_type: "application/json" })
+    end
+
+    it "returns 200" do
+      response = subject.revoke_user_api_key(2)
+      expect(response['status']).to eq(200)
+    end
+  end
+
+  describe "#generate_master_key" do
+    before do
+      url = "http://localhost:3000/admin/api/key" +
+            "?api_key=test_d7fd0429940&api_username=test_user"
+      stub_post(url).to_return(body: fixture("generate_master_key.json"),
+                               headers: { content_type: "application/json" })
+    end
+
+    it "returns the generated master key" do
+      master_key = subject.generate_master_key
+      expect(master_key).to be_a Hash
+      expect(master_key['api_key']).to have_key('key')
+      expect(master_key['api_key']['user']).to eq(nil)
+    end
+  end
+
+  describe "#revoke_api_key" do
+    before do
+      url = "http://localhost:3000/admin/api/key" +
+        "?api_key=test_d7fd0429940&api_username=test_user&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"
+      expect(a_delete(url)).to have_been_made
+    end
+
+    it "returns 200" do
+      response = subject.revoke_api_key(10)
+      expect(response['status']).to eq(200)
+    end
+  end
+
+  describe "#regenerate_api_key" do
+    before do
+      url = "http://localhost:3000/admin/api/key" +
+        "?api_key=test_d7fd0429940&api_username=test_user"
+      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"
+      expect(a_put(url)).to have_been_made
+    end
+
+    it "returns the regenerated api key" do
+      key = subject.regenerate_api_key(10)
+      expect(key['api_key']).to have_key('key')
+    end
+  end
+end

data/spec/discourse_api/api/categories_spec.rb

@@ -36,4 +36,34 @@ describe DiscourseApi::API::Categories do
       expect(latest_topics).to be_an Array
     end
   end
+
+  describe '#category_top_topics' do
+    before do
+      stub_get("http://localhost:3000/category/category-slug/l/top.json?api_key=test_d7fd0429940&api_username=test_user")
+      .to_return(
+        body: fixture("category_topics.json"), 
+        headers: { content_type: "application/json" }
+      )
+    end
+
+    it "returns the top topics in a category" do
+      topics = subject.category_top_topics('category-slug')
+      expect(topics).to be_an Array
+    end
+  end
+
+  describe '#category_new_topics' do
+    before do
+      stub_get("http://localhost:3000/category/category-slug/l/new.json?api_key=test_d7fd0429940&api_username=test_user")
+      .to_return(
+        body: fixture("category_topics.json"), 
+        headers: { content_type: "application/json" }
+      )
+    end
+
+    it "returns the new topics in a category" do
+      topics = subject.category_new_topics('category-slug')
+      expect(topics).to be_an Array
+    end
+  end
 end

data/spec/discourse_api/api/groups_spec.rb

@@ -23,24 +23,56 @@ describe DiscourseApi::API::Groups do
       stub_post("http://localhost:3000/admin/groups?api_key=test_d7fd0429940&api_username=test_user")
       subject.create_group(name: "test_group")
       expect(a_post("http://localhost:3000/admin/groups?api_key=test_d7fd0429940&api_username=test_user").
-              with(body: {group: {name: "test_group", visible: "true"}})
+              with(body: {name: "test_group", visible: "true"})
             ).to have_been_made
     end
 
-    it "adds members" do
-      stub_request(:patch, "http://localhost:3000/admin/groups/123?api_key=test_d7fd0429940&api_username=test_user")
-      subject.group_add(123, "sam")
-      expect(a_request(:patch, "http://localhost:3000/admin/groups/123?api_key=test_d7fd0429940&api_username=test_user").
-              with(body: {changes: {add: [ "sam" ]}})
-            ).to have_been_made
+    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")
+      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").
+                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").
+                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").
+                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").
+                with(body: {user_ids: "123,456"})
+              ).to have_been_made
+      end
     end
 
-    it "removes members" do
-      stub_request(:patch, "http://localhost:3000/admin/groups/123?api_key=test_d7fd0429940&api_username=test_user")
-      subject.group_remove(123, "sam")
-      expect(a_request(:patch, "http://localhost:3000/admin/groups/123?api_key=test_d7fd0429940&api_username=test_user").
-              with(body: {changes: {delete: [ "sam" ]}})
-            ).to have_been_made
+    describe "remove members" do
+      before do
+        url = "http://localhost:3000/admin/groups/123/members.json?api_key=test_d7fd0429940&api_username=test_user&username=sam"
+        stub_delete(url)
+      end
+
+      it "removes member" do
+        subject.group_remove(123, username: "sam")
+        expect(a_delete("http://localhost:3000/admin/groups/123/members.json?api_key=test_d7fd0429940&api_username=test_user&username=sam")).to have_been_made
+      end
     end
+
+
   end
 end

data/spec/discourse_api/api/users_spec.rb

@@ -170,7 +170,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"
-      stub_get(url).to_return(body: fixture("update_trust_level.json"),
+      stub_put(url).to_return(body: fixture("update_trust_level.json"),
                               headers: { content_type: "application/json" })
     end
 
@@ -188,4 +188,24 @@ describe DiscourseApi::API::Users do
       expect(admin_user['admin_user']).to have_key('trust_level')
     end
   end
+
+  describe "#grant admin" do
+    before do
+      url = "http://localhost:3000/admin/users/11/grant_admin?api_key=test_d7fd0429940&api_username=test_user"
+      stub_put(url).to_return(body: fixture("user_grant_admin.json"),
+                              headers: { content_type: "application/json" })
+    end
+
+    it "makes the correct put request" do
+      result = subject.grant_admin(11)
+      url = "http://localhost:3000/admin/users/11/grant_admin?api_key=test_d7fd0429940&api_username=test_user"
+      expect(a_put(url)).to have_been_made
+    end
+
+    it "makes the user an admin" do
+      result = subject.grant_admin(11)
+      expect(result).to be_a Hash
+      expect(result['admin_user']['admin']).to eq(true)
+    end
+  end
 end

data/spec/fixtures/category_topics.json

@@ -0,0 +1,92 @@
+{
+  "users": [
+    {
+      "id": 3,
+      "username": "fuzzy",
+      "avatar_template": "//www.gravatar.com/avatar/c0c59575e86a794d733db4ee29b2baf4.png?s={size}&r=pg&d=identicon"
+    }
+  ],
+  "topic_list": {
+    "can_create_topic": true,
+    "draft": null,
+    "draft_key": "new_topic",
+    "draft_sequence": 2,
+    "topics": [
+      {
+        "id": 5,
+        "title": "About the category",
+        "fancy_title": "About the category",
+        "slug": "about-the-category",
+        "posts_count": 2,
+        "reply_count": 0,
+        "highest_post_number": 2,
+        "image_url": null,
+        "created_at": "2014-04-16T14:10:50.950-04:00",
+        "last_posted_at": "2014-04-16T14:31:10.406-04:00",
+        "bumped": true,
+        "bumped_at": "2014-04-17T13:35:01.102-04:00",
+        "unseen": false,
+        "last_read_post_number": 2,
+        "unread": 0,
+        "new_posts": 0,
+        "pinned": true,
+        "unpinned": null,
+        "excerpt": null,
+        "visible    ": true,
+        "closed": false,
+        "archived": false,
+        "views": 0,
+        "like_count": 0,
+        "starred": false,
+        "has_summary": false,
+        "archetype": "regular",
+        "last_poster_username": "fuzzy",
+        "category_id": 2,
+        "posters": [
+          {
+            "extras": "latest",
+            "description": "Original Poster, Most Recent Poster",
+            "user_id": 3
+          }
+        ]
+      },
+      {
+        "id": 4,
+        "title": "This is a markdown post",
+        "fancy_title": "This is a markdown post",
+        "slug": "this-is-a-markdown-post",
+        "posts_count": 2,
+        "reply_count": 0,
+        "highest_post_number": 2,
+        "image_url": null,
+        "created_at": "2014-04-16T13:52:58.777-04:00",
+        "last_posted_at": "2014-04-16T14:31:37.371-04:00",
+        "bumped": true,
+        "bumped_at": "2014-04-16T14:31:37.371-04:00",
+        "unseen": false,
+        "last_read_post_number": 2,
+        "unread": 0,
+        "new_posts": 0,
+        "pinned": false,
+        "unpinned    ": null,
+        "visible": true,
+        "closed": false,
+        "archived": false,
+        "views": 0,
+        "like_count": 0,
+        "starred": false,
+        "has_summary": false,
+        "archetype": "regular",
+        "last_poster_username": "fuzzy",
+        "category_id": 2,
+        "posters": [
+          {
+            "extras": "latest",
+            "description": "Original Poster, Most Recent Poster",
+            "user_id": 3
+          }
+        ]
+      }
+    ]
+  }
+}

data/spec/fixtures/generate_master_key.json

@@ -0,0 +1,7 @@
+{
+  "api_key": {
+    "id": 10,
+    "key": "c999afe41d3a6ed0798a13ef69f90c4cc7d38120818c4a098e402bc5e5ef2085",
+    "user": null
+  }
+}

data/spec/fixtures/regenerate_api_key.json

@@ -0,0 +1,7 @@
+{
+    "api_key": {
+        "id": 10,
+        "key": "d8a80230fd14531c9b4809c7800b1fe78073a3771d3d2a56a5671bace55bc393",
+        "user": null
+    }
+}

data/spec/fixtures/user_grant_admin.json

@@ -0,0 +1,37 @@
+{
+    "admin_user": {
+        "id": 11,
+        "username": "dave4",
+        "uploaded_avatar_id": null,
+        "avatar_template": "/letter_avatar/dave4/{size}/2.png",
+        "active": true,
+        "admin": true,
+        "moderator": false,
+        "last_seen_at": null,
+        "last_emailed_at": "2014-12-31T17:11:51.189Z",
+        "created_at": "2014-12-08T14:32:29.906Z",
+        "last_seen_age": null,
+        "last_emailed_age": "20d",
+        "created_at_age": "43d",
+        "username_lower": "dave4",
+        "trust_level": 0,
+        "trust_level_locked": false,
+        "flag_level": 0,
+        "title": null,
+        "suspended_at": null,
+        "suspended_till": null,
+        "suspended": null,
+        "blocked": false,
+        "time_read": "< 1m",
+        "days_visited": 0,
+        "posts_read_count": 0,
+        "topics_entered": 0,
+        "post_count": 0,
+        "can_send_activation_email": true,
+        "can_activate": false,
+        "can_deactivate": false,
+        "ip_address": "127.0.0.1",
+        "registration_ip_address": "127.0.0.1",
+        "single_sign_on_record": null
+    }
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: discourse_api
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Sam Saffron
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -208,7 +208,7 @@ files:
 - examples/topic_lists.rb
 - examples/update_user.rb
 - lib/discourse_api.rb
-- lib/discourse_api/api/api_admin.rb
+- lib/discourse_api/api/api_key.rb
 - lib/discourse_api/api/backups.rb
 - lib/discourse_api/api/badges.rb
 - lib/discourse_api/api/categories.rb
@@ -228,7 +228,7 @@ files:
 - lib/discourse_api/single_sign_on.rb
 - lib/discourse_api/version.rb
 - routes.txt
-- spec/discourse_api/api/api_admin_spec.rb
+- spec/discourse_api/api/api_key_spec.rb
 - spec/discourse_api/api/backups_spec.rb
 - spec/discourse_api/api/badges_spec.rb
 - spec/discourse_api/api/categories_spec.rb
@@ -247,9 +247,11 @@ files:
 - spec/fixtures/badges.json
 - spec/fixtures/categories.json
 - spec/fixtures/category_latest_topics.json
+- spec/fixtures/category_topics.json
 - spec/fixtures/email_list_all.json
 - spec/fixtures/email_settings.json
 - spec/fixtures/generate_api_key.json
+- spec/fixtures/generate_master_key.json
 - spec/fixtures/groups.json
 - spec/fixtures/hot.json
 - spec/fixtures/latest.json
@@ -257,6 +259,7 @@ files:
 - spec/fixtures/notifications.json
 - spec/fixtures/post.json
 - spec/fixtures/private_messages.json
+- spec/fixtures/regenerate_api_key.json
 - spec/fixtures/search.json
 - spec/fixtures/topic.json
 - spec/fixtures/topic_invite_user.json
@@ -266,6 +269,7 @@ files:
 - spec/fixtures/user_activate_success.json
 - spec/fixtures/user_badges.json
 - spec/fixtures/user_create_success.json
+- spec/fixtures/user_grant_admin.json
 - spec/fixtures/user_list.json
 - spec/fixtures/user_log_out_success.json
 - spec/fixtures/user_update_avatar_success.json
@@ -297,7 +301,7 @@ signing_key:
 specification_version: 4
 summary: Allows access to the Discourse API
 test_files:
-- spec/discourse_api/api/api_admin_spec.rb
+- spec/discourse_api/api/api_key_spec.rb
 - spec/discourse_api/api/backups_spec.rb
 - spec/discourse_api/api/badges_spec.rb
 - spec/discourse_api/api/categories_spec.rb
@@ -316,9 +320,11 @@ test_files:
 - spec/fixtures/badges.json
 - spec/fixtures/categories.json
 - spec/fixtures/category_latest_topics.json
+- spec/fixtures/category_topics.json
 - spec/fixtures/email_list_all.json
 - spec/fixtures/email_settings.json
 - spec/fixtures/generate_api_key.json
+- spec/fixtures/generate_master_key.json
 - spec/fixtures/groups.json
 - spec/fixtures/hot.json
 - spec/fixtures/latest.json
@@ -326,6 +332,7 @@ test_files:
 - spec/fixtures/notifications.json
 - spec/fixtures/post.json
 - spec/fixtures/private_messages.json
+- spec/fixtures/regenerate_api_key.json
 - spec/fixtures/search.json
 - spec/fixtures/topic.json
 - spec/fixtures/topic_invite_user.json
@@ -335,6 +342,7 @@ test_files:
 - spec/fixtures/user_activate_success.json
 - spec/fixtures/user_badges.json
 - spec/fixtures/user_create_success.json
+- spec/fixtures/user_grant_admin.json
 - spec/fixtures/user_list.json
 - spec/fixtures/user_log_out_success.json
 - spec/fixtures/user_update_avatar_success.json

data/lib/discourse_api/api/api_admin.rb

@@ -1,18 +0,0 @@
-module DiscourseApi
-  module API
-    module ApiAdmin
-      def api
-        response = get("/admin/api.json")
-        response.body
-      end
-
-      def generate_api_key(user_id)
-        response = post("/admin/users/#{user_id}/generate_api_key.json")
-      end
-
-      def revoke_api_key(user_id)
-        response = delete("/admin/users/#{user_id}/revoke_api_key.json")
-      end
-    end
-  end
-end

data/spec/discourse_api/api/api_admin_spec.rb

@@ -1,63 +0,0 @@
-require 'spec_helper'
-
-describe DiscourseApi::API::ApiAdmin do
-  subject {
-    DiscourseApi::Client.new(
-      "http://localhost:3000",
-      "test_d7fd0429940",
-      "test_user"
-    )
-  }
-
-  describe "#api" do
-    before do
-      url = "http://localhost:3000/admin/api.json?" +
-            "api_key=test_d7fd0429940&api_username=test_user"
-      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"
-      expect(a_get(url)).to have_been_made
-    end
-
-    it "returns the requested api keys" do
-      api = subject.api
-      expect(api).to be_an Array
-      expect(api.first).to be_a Hash
-      expect(api.first).to have_key('key')
-    end
-  end
-
-  describe "#generate_api_key" do
-    before do
-      url = "http://localhost:3000/admin/users/2/generate_api_key.json?" +
-            "api_key=test_d7fd0429940&api_username=test_user"
-      stub_post(url).to_return(body: fixture("generate_api_key.json"),
-                               headers: { content_type: "application/json" })
-    end
-
-    it "returns the generated api key" do
-      api_key = subject.generate_api_key(2)
-      expect(api_key).to be_a Hash
-      expect(api_key['api_key']).to have_key('key')
-    end
-  end
-
-  describe "#revoke_api_key" do
-    before do
-      url = "http://localhost:3000/admin/users/2/revoke_api_key.json?" +
-      "api_key=test_d7fd0429940&api_username=test_user"
-      stub_post(url).to_return(body: "",
-      headers: { content_type: "application/json" })
-    end
-
-    it "returns 200" do
-      response = subject.revoke_api_key(2)
-      expect(response['status']).to eq(200)
-    end
-  end
-end