koala 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2df6e7ef56616b6120136f096dbea0d3b24aa4bc
-  data.tar.gz: 558317b99886f2aab38e2d1b414d713ea915b9cc
+  metadata.gz: aa79bc7b848a2513d2f1aac248d1aac70d8a392c
+  data.tar.gz: edfd57c54b0b96a4682cf23af9e388ed59e4aa3d
 SHA512:
-  metadata.gz: 2149fedb633aaa21dbb3f2852a4aca1275bec57e09e70be0d958d817071400bdfd15c733a111f3496c43b1eb41e29e41e4f2a4a74432b8a8e1cefaa9ec397841
-  data.tar.gz: 8e399264b110efb9660ebb58ec985046a9a61424d70c4373decbe9cf95a2b42cbba6b6e5e687349ab8aff04780b687edb57b4dbc9cdab0dce2a902d06b3fa2a9
+  metadata.gz: ed4e62ff0f2d70c17cf0301be06e552940fd14654b1dc715f10477f63da89d2b6aa14b21105e2b9e90ca88ee1ff7a60e737f2f24744ab6cb86cf4b9f6aac80ce
+  data.tar.gz: 7a5b55d226afdd6f8e6d8af440b7e714a1cb8ffd68c35a0f80dfdb61d042d988b8b7eb8fad95d30e3cff094a0a3ecfc07fe418d2ec61826a7338b027933d1636

data/.travis.yml

@@ -3,10 +3,10 @@ sudo: false
 cache: bundler
 rvm:
   # MRI
-  - 1.9.3
   - 2.0
   - 2.1
   - 2.2
+  - 2.3.0
   # Rubinius is failing due to segfaults on Travis (and takes significantly longer to run)
   # those builds will be restored later
   # jruby

data/changelog.md

@@ -1,3 +1,26 @@
+v2.4.0
+======
+
+**Note:** Koala is no longer officially supported on Ruby 1.9.3 (which was [end-of-lifed back in
+2015](https://www.ruby-lang.org/en/news/2014/01/10/ruby-1-9-3-will-end-on-2015/)). Versions may
+still work (until version 3.0, when we may start using keyword arguments), but will not be tested
+on 1.9.3.
+
+Updated features:
+
+* Batch API requests will now properly calculate appsecret_proofs for multiple access tokens
+  (thanks, mwpastore!)
+
+Internal improvements:
+
+* Koala now explicitly depends on MultiJson >= 1.3.0, since it uses methods introduced in that
+  version
+
+Testing improvements:
+
+* Test Koala against Ruby 2.3.0
+
+
 v2.3.0
 ======
 

data/koala.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.extra_rdoc_files = ["readme.md", "changelog.md"]
   gem.rdoc_options     = ["--line-numbers", "--inline-source", "--title", "Koala"]
 
-  gem.add_runtime_dependency("multi_json")
+  gem.add_runtime_dependency("multi_json", ">= 1.3.0")
   gem.add_runtime_dependency("faraday")
   gem.add_runtime_dependency("addressable")
 end

data/lib/koala/api/batch_operation.rb

@@ -28,9 +28,15 @@ module Koala
           raise AuthenticationError.new(nil, nil, "Batch operations require an access token, none provided.") unless @access_token
         end
 
-        def to_batch_params(main_access_token)
+        def to_batch_params(main_access_token, app_secret)
           # set up the arguments
-          args_string = Koala.http_service.encode_params(@access_token == main_access_token ? @args : @args.merge(:access_token => @access_token))
+          if @access_token != main_access_token
+            @args[:access_token] = @access_token
+            if app_secret
+              @args[:appsecret_proof] = OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new("sha256"), app_secret, @access_token)
+            end
+          end
+          args_string = Koala.http_service.encode_params(@args)
 
           response = {
             :method => @method.to_s,

data/lib/koala/api/graph_batch_api.rb

@@ -46,7 +46,7 @@ module Koala
         args = {}
         args["batch"] = MultiJson.dump(batch_calls.map { |batch_op|
           args.merge!(batch_op.files) if batch_op.files
-          batch_op.to_batch_params(access_token)
+          batch_op.to_batch_params(access_token, app_secret)
         })
 
         batch_result = graph_call_outside_batch('/', args, 'post', http_options) do |response|

data/lib/koala/version.rb

@@ -1,3 +1,3 @@
 module Koala
-  VERSION = "2.3.0"
+  VERSION = "2.4.0"
 end

data/spec/cases/graph_api_batch_spec.rb

@@ -38,7 +38,7 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
       it "doesn't change the original http_options" do
         @args[:http_options][:name] = "baz2"
         expected = @args[:http_options].dup
-        Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(nil)
+        Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(nil, nil)
         expect(@args[:http_options]).to eq(expected)
       end
 
@@ -102,7 +102,7 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
 
         it "removes the value from the arguments" do
           @args[:args].merge!("source" => @binary)
-          expect(Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(nil)[:body]).not_to match(/source=/)
+          expect(Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(nil, nil)[:body]).not_to match(/source=/)
         end
       end
 
@@ -116,7 +116,7 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
             @args[:url] = url = "/"
             allow(Koala.http_service).to receive(:encode_params).and_return(test_args)
 
-            expect(Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(nil)[:relative_url]).to eq("#{url}?#{test_args}")
+            expect(Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(nil, nil)[:relative_url]).to eq("#{url}?#{test_args}")
           end
 
           it "adds the args to the URL string, with & if args previously present" do
@@ -124,16 +124,16 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
             @args[:url] = url = "/?a=2"
             allow(Koala.http_service).to receive(:encode_params).and_return(test_args)
 
-            expect(Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(nil)[:relative_url]).to eq("#{url}&#{test_args}")
+            expect(Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(nil, nil)[:relative_url]).to eq("#{url}&#{test_args}")
           end
 
           it "adds nothing to the URL string if there are no args to be added" do
             @args[:args] = {}
-            expect(Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(@args[:access_token])[:relative_url]).to eq(@args[:url])
+            expect(Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(@args[:access_token], nil)[:relative_url]).to eq(@args[:url])
           end
 
           it "adds nothing to the body" do
-            expect(Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(nil)[:body]).to be_nil
+            expect(Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(nil, nil)[:body]).to be_nil
           end
         end
 
@@ -142,13 +142,13 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
             test_args = "foo"
             allow(Koala.http_service).to receive(:encode_params).and_return(test_args)
 
-            expect(Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(nil)[:body]).to eq(test_args)
+            expect(Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(nil, nil)[:body]).to eq(test_args)
           end
 
           it "does not set the body if there are no args" do
             test_args = ""
             allow(Koala.http_service).to receive(:encode_params).and_return(test_args)
-            expect(Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(nil)[:body]).to be_nil
+            expect(Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(nil, nil)[:body]).to be_nil
           end
 
 
@@ -156,7 +156,7 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
             test_args = "foo"
             allow(Koala.http_service).to receive(:encode_params).and_return(test_args)
 
-            expect(Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(nil)[:relative_url]).to eq(@args[:url])
+            expect(Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(nil, nil)[:relative_url]).to eq(@args[:url])
           end
         end
 
@@ -194,45 +194,50 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
       end
 
       it "includes the access token if the token is not the main one for the request" do
-         params = Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(nil)
+         params = Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(nil, nil)
          expect(params[:relative_url]).to match(/access_token=#{@args[:access_token]}/)
       end
 
+      it "re-signs the access token if the token is not the main one for the request" do
+         params = Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(nil, '1234')
+         expect(params[:relative_url]).to match(/appsecret_proof=[^?&]+/)
+      end
+
       it "includes the other arguments if the token is not the main one for the request" do
         @args[:args] = {:a => 2}
-        params = Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(nil)
+        params = Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(nil, nil)
         expect(params[:relative_url]).to match(/a=2/)
       end
 
       it "does not include the access token if the token is the main one for the request" do
-         params = Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(@args[:access_token])
+         params = Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(@args[:access_token], nil)
          expect(params[:relative_url]).not_to match(/access_token=#{@args[:access_token]}/)
       end
 
       it "includes the other arguments if the token is the main one for the request" do
         @args[:args] = {:a => 2}
-        params = Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(@args[:access_token])
+        params = Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(@args[:access_token], nil)
         expect(params[:relative_url]).to match(/a=2/)
       end
 
       it "includes any arguments passed as http_options[:batch_args]" do
         batch_args = {:name => "baz", :headers => {:some_param => true}}
         @args[:http_options][:batch_args] = batch_args
-        params = Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(nil)
+        params = Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(nil, nil)
         expect(params).to include(batch_args)
       end
 
       it "includes the method" do
-        params = Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(@args[:access_token])
+        params = Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(@args[:access_token], nil)
         expect(params[:method]).to eq(@args[:method].to_s)
       end
 
       it "works with nil http_options" do
-        expect { Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args.merge(:http_options => nil)).to_batch_params(nil) }.not_to raise_exception
+        expect { Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args.merge(:http_options => nil)).to_batch_params(nil, nil) }.not_to raise_exception
       end
 
       it "works with nil args" do
-        expect { Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args.merge(:args => nil)).to_batch_params(nil) }.not_to raise_exception
+        expect { Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args.merge(:args => nil)).to_batch_params(nil, nil) }.not_to raise_exception
       end
 
       describe "with binary files" do
@@ -254,7 +259,7 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
           @args[:args].merge!("source" => @binary, "source2" => @binary)
           batch_op = Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args)
           file_ids = batch_op.files.find_all {|k, v| v == @uploadable_io}.map {|k, v| k}
-          params = batch_op.to_batch_params(nil)
+          params = batch_op.to_batch_params(nil, nil)
           expect(params[:attached_files]).to eq(file_ids.join(","))
         end
       end
@@ -317,7 +322,7 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
           allow(Koala::Facebook::GraphBatchAPI::BatchOperation).to receive(:new).and_return(op)
 
           # two requests should generate two batch operations
-          expected = MultiJson.dump([op.to_batch_params(access_token), op.to_batch_params(access_token)])
+          expected = MultiJson.dump([op.to_batch_params(access_token, nil), op.to_batch_params(access_token, nil)])
           expect(Koala).to receive(:make_request).with(anything, hash_including("batch" => expected), anything, anything).and_return(@fake_response)
           Koala::Facebook::API.new(access_token).batch do |batch_api|
             batch_api.get_object('me')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: koala
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Alex Koppel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-10 00:00:00.000000000 Z
+date: 2016-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement