discourse_api 0.20.1 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c81ac1a3d794e656c8653a7ee8a4a03974ed4736
-  data.tar.gz: 279465d7b0f4c73134b4f06df0b2cd107428bb77
+  metadata.gz: a9d51b2cfe49d9321e7e800f2546744bdde713de
+  data.tar.gz: c5e3166b88afe5648610a67b4657fb3dfa371edb
 SHA512:
-  metadata.gz: 7be49f0583b2d08a819cf9f6def284a795353f68c71db20c414beb22092805235971e673d170c658163f77bb5edcc6ddb5e94defa05f14a9fd82e9fda22a7c2d
-  data.tar.gz: 0f493aea9db9218deb6d52b0aac68ff35395bf4b2f62985d0773c47d1080dfe21e46ead3c80c430f92227f36ea9f8acc1ea2104144d2211eabbfe2fd9dcc3af1
+  metadata.gz: 59dea74713ae2c6db273a223cfda6f3a825c77cfd2643feb3e6b34b19690ac6e3c394b03903493fd0349e0e4c55a483f7d4cfe78e4645315b528341815918fb5
+  data.tar.gz: e73d1365e79c1bf4bf0f4d546234b9f56919561b8b54004f3094ba1467b5279b9891835275fb9104cd903224b4b1cf210c63364774062271cafd7efed8caf029

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.22.0] - 2018-05-04
+### Added
+- Support for subfolder paths
+
 ## [0.21.0] - 2018-04-23
 ### Fixed
 - Update GET groups api route

data/lib/discourse_api/client.rb

@@ -1,6 +1,7 @@
 require 'faraday'
 require 'faraday_middleware'
 require 'json'
+require 'uri'
 require 'discourse_api/version'
 require 'discourse_api/api/categories'
 require 'discourse_api/api/search'
@@ -48,6 +49,7 @@ module DiscourseApi
       @host         = host
       @api_key      = api_key
       @api_username = api_username
+      @use_relative = check_subdirectory(host)
     end
 
     def connection_options
@@ -120,6 +122,7 @@ module DiscourseApi
       unless Hash === params
         params = params.to_h if params.respond_to? :to_h
       end
+      path = @use_relative ? path.sub(/^\//, '') : path
       response = connection.send(method.to_sym, path, params)
       handle_error(response)
       response.env
@@ -141,5 +144,9 @@ module DiscourseApi
         raise DiscourseApi::Error.new(response.env[:body])
       end
     end
+
+    def check_subdirectory(host)
+      URI(host).request_uri != '/'
+    end
   end
 end

data/lib/discourse_api/version.rb

@@ -1,3 +1,3 @@
 module DiscourseApi
-  VERSION = "0.20.1"
+  VERSION = "0.22.0"
 end

data/spec/discourse_api/client_spec.rb

@@ -65,40 +65,79 @@ 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" })
+      subject.api_key = 'test_d7fd0429940'
+      subject.api_username = 'test_user'
     end
 
     it "allows custom delete requests" do
-      subject.api_key = 'test_d7fd0429940'
-      subject.api_username = 'test_user'
       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
     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" })
+      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
+      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"})
+      subject.api_key = 'test_d7fd0429940'
+      subject.api_username = 'test_user'
     end
 
     it "allows custom post requests" do
-      subject.api_key = 'test_d7fd0429940'
-      subject.api_username = 'test_user'
       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
     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"})
+      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
+      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" })
+      subject.api_key = 'test_d7fd0429940'
+      subject.api_username = 'test_user'
     end
 
     it "allows custom put requests" do
-      subject.api_key = 'test_d7fd0429940'
-      subject.api_username = 'test_user'
       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
     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" })
+      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
+      end
+    end
   end
 
   describe "#request" do

metadata

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