koala 1.10.0 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fbf6009ed276428f749b25ebe538d02c4ec0831
-  data.tar.gz: c8a02ac36b34c9d870aa10e07a9e0a5326b0aa08
+  metadata.gz: 8b83335264188054c217fd836a1f6508b2fcf420
+  data.tar.gz: 43116e3f574b6c689bed8a6a47a0ff25b69f6f3f
 SHA512:
-  metadata.gz: f042c8e2da7bed0161d139ade7563308fc03ef4faf9b05ca728c06ba169db6b92cacf915fed0b532ebde92c8816040d579adc3dc1eeb603c99c77f14575db359
-  data.tar.gz: 50870365972759818adf1470907f5af7e5592c9431ca12e1947613ee9fd8e40b13a276709c66f5b8b3eae2ba9367f471c5cc2a43aeb7329c80a2889311d1f253
+  metadata.gz: 5982606d43ac0435e33de8b1a74e6ed32077cc515f0a52162f2ae5fe043242051e23c49a3502fcfac97ba539b7d6bcf777b383ea3bbc70db0c846d8532c04a7f
+  data.tar.gz: abf6a0fbf049448a8d5195e353512307c0dc1d03c319fa3d61448457463ef3e994e14b9dff4b9712b846be47984c88b28225d8aec4a8e4227658807ffafd00a5

data/changelog.md

@@ -1,3 +1,11 @@
+v.1.10.1
+========
+
+Bug fixes:
+
+* Facebook API version now works in all cases (thanks, markprzepiora!)
+* Fixed a typo in an example (thanks, mktakuya!)
+
 v.1.10.0
 ========
 

data/lib/koala/api/graph_api.rb

@@ -119,7 +119,7 @@ module Koala
 
       # Write an object to the Graph for a specific user.
       # See {http://developers.facebook.com/docs/api#publishing Facebook's documentation}
-      # for all the supported writeable objects. It is important to note that objects 
+      # for all the supported writeable objects. It is important to note that objects
       # take the singular form, i.e. "event" when using put_connections.
       #
       # @note (see #get_connection)
@@ -237,7 +237,7 @@ module Koala
       #
       # @example
       #       @api.put_wall_post("Hello there!", {
-      #         "name" => "Link name"
+      #         "name" => "Link name",
       #         "link" => "http://www.example.com/",
       #         "caption" => "{*actor*} posted a new review",
       #         "description" => "This is a longer description of the attachment",

data/lib/koala/http_service.rb

@@ -47,17 +47,12 @@ module Koala
     # @option options :video use the server designated for video uploads
     # @option options :beta use the beta tier
     # @option options :use_ssl force https, even if not needed
-    # @option options :api_version a version of the Facebook API, e.g. v2.0
     #
     # @return a complete server address with protocol
     def self.server(options = {})
       server = "#{options[:rest_api] ? Koala.config.rest_server : Koala.config.graph_server}"
       server.gsub!(Koala.config.host_path_matcher, Koala.config.video_replace) if options[:video]
       server.gsub!(Koala.config.host_path_matcher, Koala.config.beta_replace) if options[:beta]
-      # ...and an API version if specified
-      if api_version = options[:api_version] || Koala.config.api_version
-        server = "#{server}/#{api_version}"
-      end
       "#{options[:use_ssl] ? "https" : "http"}://#{server}"
     end
 
@@ -93,6 +88,13 @@ module Koala
         ssl[:verify] = true unless ssl.has_key?(:verify)
       end
 
+      # if an api_version is specified, prepend it to the path
+      if api_version = request_options[:api_version] || Koala.config.api_version
+        begins_with_slash = path[0] == "/"
+        divider = begins_with_slash ? "" : "/"
+        path = "/#{api_version}#{divider}#{path}"
+      end
+
       # set up our Faraday connection
       # we have to manually assign params to the URL or the
       conn = Faraday.new(server(request_options), faraday_options(request_options), &(faraday_middleware || DEFAULT_MIDDLEWARE))

data/lib/koala/version.rb

@@ -1,3 +1,3 @@
 module Koala
-  VERSION = "1.10.0"
+  VERSION = "1.10.1"
 end

data/spec/cases/http_service_spec.rb

@@ -130,23 +130,6 @@ describe Koala::HTTPService do
         expect(server).to match(Regexp.new(Koala.config.graph_server.gsub(/\.facebook/, "-video.facebook")))
       end
     end
-
-    context "with API versions" do
-      it "adds a version if specified by Koala.config" do
-        Koala.config.api_version = "v1000.000"
-        expect(Koala::HTTPService.server).to eq(
-          "http://#{Koala.config.graph_server}/#{Koala.config.api_version}"
-        )
-      end
-
-      it "prefers a version set in the options" do
-        Koala.config.api_version = "v1000.000"
-        version = "v2.0"
-        expect(Koala::HTTPService.server(api_version: version)).to eq(
-          "http://#{Koala.config.graph_server}/#{version}"
-        )
-      end
-    end
   end
 
   describe ".encode_params" do
@@ -293,6 +276,28 @@ describe Koala::HTTPService do
       end
     end
 
+
+    context "with API versions" do
+      it "adds a version if specified by Koala.config" do
+        expect(Koala.config).to receive(:api_version).and_return("v11")
+        expect(@mock_connection).to receive(:get).with("/v11/anything", anything)
+        Koala::HTTPService.make_request("anything", {}, "get")
+      end
+
+      it "prefers a version set in http_options" do
+        allow(Koala.config).to receive(:api_version).and_return("v11")
+        allow(Koala::HTTPService).to receive(:http_options).and_return({ api_version: 'v12' })
+        expect(@mock_connection).to receive(:get).with("/v12/anything", anything)
+        Koala::HTTPService.make_request("anything", {}, "get")
+      end
+
+      it "doesn't add double slashes to the path" do
+        allow(Koala::HTTPService).to receive(:http_options).and_return({ api_version: 'v12' })
+        expect(@mock_connection).to receive(:get).with("/v12/anything", anything)
+        Koala::HTTPService.make_request("/anything", {}, "get")
+      end
+    end
+
     it "makes a POST request if the verb isn't get" do
       expect(@mock_connection).to receive(:post).and_return(@mock_http_response)
       Koala::HTTPService.make_request("anything", {}, "anything")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: koala
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.10.1
 platform: ruby
 authors:
 - Alex Koppel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-21 00:00:00.000000000 Z
+date: 2014-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json