twitter 4.7.0 → 4.8.0

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+4.8.0
+-----
+* [Add `Twitter::SearchResults#refresh_url`](https://github.com/sferik/twitter/commit/6bf08c008de139aad3ec173461e8633bfa5a3bd8) ([@mustafaturan](https://twitter.com/mustafaturan))
+* [Fix issue with wrong signature being generated when multipart data is posted](https://github.com/sferik/twitter/commit/65ab90a6d51755e5901434a3568f8163ca3e262f) ([@mustafaturan](https://twitter.com/mustafaturan))
+* [Restore compatibility with Ruby 1.8.7](https://github.com/sferik/twitter/commit/fb63970c1bd19792955d092a38b6adf53b558ec7)
+* [Remove undocumented methods, retired in the APIpocalypse](https://github.com/sferik/twitter/commit/cf6a91f8df833dce5bffc7a0292402860e7d4da7)
+
 4.7.0
 -----
 * [Add support for application-only authentication](https://github.com/sferik/twitter/pull/387) ([@paracycle](https://twitter.com/paracycle))

data/lib/twitter/api/friends_and_followers.rb

@@ -260,7 +260,7 @@ module Twitter
       # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
       # @return [Twitter::Cursor]
       # @overload followers(options={})
-      #   Returns an array of numeric IDs for every user the authenticated user is following
+      #   Returns a cursored collection of user objects for users following the authenticated user.
       #
       #   @param options [Hash] A customizable set of options.
       #   @option options [Integer] :cursor (-1) Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1 to begin paging. Provide values as returned in the response body's next_cursor and previous_cursor attributes to page back and forth in the list.
@@ -269,7 +269,7 @@ module Twitter
       #   @example Return the authenticated user's friends' IDs
       #     Twitter.followers
       # @overload followers(user, options={})
-      #   Returns an array of numeric IDs for every user the specified user is following
+      #   Returns a cursored collection of user objects for users following the specified user.
       #
       #   @param user [Integer, String, Twitter::User] A Twitter user ID, screen name, or object.
       #   @param options [Hash] A customizable set of options.
@@ -291,7 +291,7 @@ module Twitter
       # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
       # @return [Twitter::Cursor]
       # @overload friends(options={})
-      #   Returns an array of numeric IDs for every user the authenticated user is following
+      #   Returns a cursored collection of user objects for every user the authenticated user is following (otherwise known as their "friends").
       #
       #   @param options [Hash] A customizable set of options.
       #   @option options [Integer] :cursor (-1) Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1 to begin paging. Provide values as returned in the response body's next_cursor and previous_cursor attributes to page back and forth in the list.
@@ -300,7 +300,7 @@ module Twitter
       #   @example Return the authenticated user's friends' IDs
       #     Twitter.friends
       # @overload friends(user, options={})
-      #   Returns an array of numeric IDs for every user the specified user is following
+      #   Returns a cursored collection of user objects for every user the specified user is following (otherwise known as their "friends").
       #
       #   @param user [Integer, String, Twitter::User] A Twitter user ID, screen name, or object.
       #   @param options [Hash] A customizable set of options.

data/lib/twitter/api/lists.rb

@@ -69,7 +69,7 @@ module Twitter
       def list_timeline(*args)
         arguments = Twitter::API::Arguments.new(args)
         merge_list!(arguments.options, arguments.pop)
-        merge_owner!(arguments.options, arguments.pop || screen_name) unless arguments.options[:owner_id] || arguments.options[:owner_screen_name]
+        merge_owner!(arguments.options, arguments.pop)
         objects_from_response(Twitter::Tweet, :get, "/1.1/lists/statuses.json", arguments.options)
       end
 
@@ -541,14 +541,14 @@ module Twitter
       def list_from_response(request_method, path, args)
         arguments = Twitter::API::Arguments.new(args)
         merge_list!(arguments.options, arguments.pop)
-        merge_owner!(arguments.options, arguments.pop || screen_name) unless arguments.options[:owner_id] || arguments.options[:owner_screen_name]
+        merge_owner!(arguments.options, arguments.pop)
         object_from_response(Twitter::List, request_method, path, arguments.options)
       end
 
       def cursor_from_response_with_list(request_method, path, args, calling_method)
         arguments = Twitter::API::Arguments.new(args)
         merge_list!(arguments.options, arguments.pop)
-        merge_owner!(arguments.options, arguments.pop || screen_name) unless arguments.options[:owner_id] || arguments.options[:owner_screen_name]
+        merge_owner!(arguments.options, arguments.pop)
         cursor_from_response(:users, Twitter::User, request_method, path, arguments.options, calling_method)
       end
 
@@ -556,7 +556,7 @@ module Twitter
         arguments = Twitter::API::Arguments.new(args)
         merge_user!(arguments.options, arguments.pop)
         merge_list!(arguments.options, arguments.pop)
-        merge_owner!(arguments.options, arguments.pop || screen_name) unless arguments.options[:owner_id] || arguments.options[:owner_screen_name]
+        merge_owner!(arguments.options, arguments.pop)
         send(request_method.to_sym, path, arguments.options)
         true
       rescue Twitter::Error::NotFound, Twitter::Error::Forbidden
@@ -567,7 +567,7 @@ module Twitter
         arguments = Twitter::API::Arguments.new(args)
         merge_user!(arguments.options, arguments.pop)
         merge_list!(arguments.options, arguments.pop)
-        merge_owner!(arguments.options, arguments.pop || screen_name) unless arguments.options[:owner_id] || arguments.options[:owner_screen_name]
+        merge_owner!(arguments.options, arguments.pop)
         object_from_response(Twitter::List, request_method, path, arguments.options)
       end
 
@@ -575,7 +575,7 @@ module Twitter
         arguments = Twitter::API::Arguments.new(args)
         members = arguments.pop
         merge_list!(arguments.options, arguments.pop)
-        merge_owner!(arguments.options, arguments.pop || screen_name) unless arguments.options[:owner_id] || arguments.options[:owner_screen_name]
+        merge_owner!(arguments.options, arguments.pop)
         members.flatten.each_slice(MAX_USERS_PER_REQUEST).threaded_map do |users|
           object_from_response(Twitter::List, request_method, path, merge_users(arguments.options, users))
         end.last
@@ -605,8 +605,11 @@ module Twitter
       # @param user[Integer, String, Twitter::User] A Twitter user ID, screen_name, or object.
       # @return [Hash]
       def merge_owner!(hash, user)
-        merge_user!(hash, user, "owner")
-        hash[:owner_id] = hash.delete(:owner_user_id) unless hash[:owner_user_id].nil?
+        unless hash[:owner_id] || hash[:owner_screen_name]
+          user ||= screen_name
+          merge_user!(hash, user, "owner")
+          hash[:owner_id] = hash.delete(:owner_user_id) unless hash[:owner_user_id].nil?
+        end
         hash
       end
 

data/lib/twitter/api/undocumented.rb

@@ -10,38 +10,6 @@ module Twitter
     module Undocumented
       include Twitter::API::Utils
 
-      # Returns activity about me
-      #
-      # @note Undocumented
-      # @rate_limited Yes
-      # @authentication Requires user context
-      # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
-      # @return [Array] An array of actions
-      # @param options [Hash] A customizable set of options.
-      # @option options [Integer] :count Specifies the number of records to retrieve. Must be less than or equal to 100.
-      # @option options [Integer] :since_id Returns results with an ID greater than (that is, more recent than) the specified ID.
-      # @example Return activity about me
-      #   Twitter.activity_about_me
-      def activity_about_me(options={})
-        objects_from_response(Twitter::ActionFactory, :get, "/i/activity/about_me.json", options)
-      end
-
-      # Returns activity by friends
-      #
-      # @note Undocumented
-      # @rate_limited Yes
-      # @authentication Requires user context
-      # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid./
-      # @return [Array] An array of actions
-      # @param options [Hash] A customizable set of options.
-      # @option options [Integer] :count Specifies the number of records to retrieve. Must be less than or equal to 100.
-      # @option options [Integer] :since_id Returns results with an ID greater than (that is, more recent than) the specified ID.
-      # @example Return activity by friends
-      #   Twitter.activity_by_friends
-      def activity_by_friends(options={})
-        objects_from_response(Twitter::ActionFactory, :get, "/i/activity/by_friends.json", options)
-      end
-
       # @note Undocumented
       # @rate_limited Yes
       # @authentication Requires user context

data/lib/twitter/client.rb

@@ -20,7 +20,6 @@ require 'twitter/configurable'
 require 'twitter/error/client_error'
 require 'twitter/error/decode_error'
 require 'simple_oauth'
-require 'base64'
 require 'uri'
 
 module Twitter
@@ -86,7 +85,7 @@ module Twitter
     # @param path [String]
     # @param params [Hash]
     # @return [Proc]
-    def request_setup(method, path, params)
+    def request_setup(method, path, params, signature_params)
       Proc.new do |request|
         if params.delete(:bearer_token_request)
           request.headers[:authorization] = bearer_token_credentials_auth_header
@@ -99,13 +98,13 @@ module Twitter
           end
           request.headers[:authorization] = bearer_auth_header
         else
-          request.headers[:authorization] = oauth_auth_header(method, path, params).to_s
+          request.headers[:authorization] = oauth_auth_header(method, path, signature_params).to_s
         end
       end
     end
 
     def request(method, path, params={}, signature_params=params)
-      request_setup = request_setup(method, path, params)
+      request_setup = request_setup(method, path, params, signature_params)
       connection.send(method.to_sym, path, params, &request_setup).env
     rescue Faraday::Error::ClientError
       raise Twitter::Error::ClientError
@@ -124,10 +123,14 @@ module Twitter
     #
     # @return [String]
     def bearer_token_credentials_auth_header
-      basic_auth_token = Base64.strict_encode64("#{@consumer_key}:#{@consumer_secret}")
+      basic_auth_token = encode_value("#{@consumer_key}:#{@consumer_secret}")
       "Basic #{basic_auth_token}"
     end
 
+    def encode_value(value)
+      [value].pack("m0").gsub("\n", '')
+    end
+
     def bearer_auth_header
       "Bearer #{@bearer_token}"
     end

data/lib/twitter/error/unprocessable_entity.rb

@@ -2,7 +2,7 @@ require 'twitter/error/client_error'
 
 module Twitter
   class Error
-    # Raised when Twitter returns the HTTP status code 404
+    # Raised when Twitter returns the HTTP status code 422
     class UnprocessableEntity < Twitter::Error::ClientError
       HTTP_STATUS_CODE = 422
     end

data/lib/twitter/search_results.rb

@@ -63,5 +63,16 @@ module Twitter
       Faraday::Utils.parse_nested_query(@attrs[:search_metadata][:next_results][1..-1]).inject({}) { |memo, (k,v)| memo[k.to_sym] = v; memo} if next_results?
     end
     alias next_page next_results
+
+    # Returns a Hash of query parameters for the refresh URL in the search
+    #
+    # Returned Hash can be merged into the previous search options list
+    # to easily access the refresh page
+    #
+    # @return [Hash]
+    def refresh_url
+      Faraday::Utils.parse_nested_query(@attrs[:search_metadata][:refresh_url][1..-1]).inject({}) { |memo, (k,v)| memo[k.to_sym] = v; memo}
+    end
+    alias refresh_page refresh_url
   end
 end

data/lib/twitter/version.rb

@@ -1,7 +1,7 @@
 module Twitter
   class Version
     MAJOR = 4 unless defined? Twitter::Version::MAJOR
-    MINOR = 7 unless defined? Twitter::Version::MINOR
+    MINOR = 8 unless defined? Twitter::Version::MINOR
     PATCH = 0 unless defined? Twitter::Version::PATCH
     PRE = nil unless defined? Twitter::Version::PRE
 

data/spec/twitter/api/oauth_spec.rb

@@ -8,7 +8,7 @@ describe Twitter::API::OAuth do
 
   describe "#token" do
     before do
-      # WebMock treats Basic Auth differently so we have to chack against the full url with credentials.
+      # WebMock treats Basic Auth differently so we have to chack against the full URL with credentials.
       @oauth2_token_url = "https://CK:CS@api.twitter.com/oauth2/token"
       stub_request(:post, @oauth2_token_url).with(:body => "grant_type=client_credentials").to_return(:body => fixture("bearer_token.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end

data/spec/twitter/api/undocumented_spec.rb

@@ -6,34 +6,6 @@ describe Twitter::API::Undocumented do
     @client = Twitter::Client.new
   end
 
-  describe "#activity_about_me" do
-    before do
-      stub_get("/i/activity/about_me.json").to_return(:body => fixture("about_me.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-    end
-    it "requests the correct resource" do
-      @client.activity_about_me
-      expect(a_get("/i/activity/about_me.json")).to have_been_made
-    end
-    it "returns activity about me" do
-      activity_about_me = @client.activity_about_me
-      expect(activity_about_me.first).to be_a Twitter::Action::Mention
-    end
-  end
-
-  describe "#activity_by_friends" do
-    before do
-      stub_get("/i/activity/by_friends.json").to_return(:body => fixture("by_friends.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-    end
-    it "requests the correct resource" do
-      @client.activity_by_friends
-      expect(a_get("/i/activity/by_friends.json")).to have_been_made
-    end
-    it "returns activity by friends" do
-      activity_by_friends = @client.activity_by_friends
-      expect(activity_by_friends.first).to be_a Twitter::Action::Favorite
-    end
-  end
-
   describe "#following_followers_of" do
     context "with a screen_name passed" do
       before do

data/spec/twitter/client_spec.rb

@@ -173,6 +173,32 @@ describe Twitter::Client do
       expect(authorization.options[:token]).to eq "OT"
       expect(authorization.options[:token_secret]).to eq "OS"
     end
+    it "submits the correct auth header when no media is present" do
+      # We use static values for nounce and timestamp to get a stable signature
+      secret = {:consumer_key => 'CK', :consumer_secret => 'CS',
+                :token => 'OT', :token_secret => 'OS',
+                :nonce => 'b6ebe4c2a11af493f8a2290fe1296965', :timestamp => '1370968658'}
+      header = {"Authorization" => /oauth_signature="FbthwmgGq02iQw%2FuXGEWaL6V6eM%3D"/}
+
+      subject.stub(:credentials).and_return(secret)
+      stub_post("/1.1/statuses/update.json")
+      subject.update("Just a test")
+      expect(a_post("/1.1/statuses/update.json").
+             with(:headers => header)).to have_been_made
+    end
+    it "submits the correct auth header when media is present" do
+      # We use static values for nounce and timestamp to get a stable signature
+      secret = {:consumer_key => 'CK', :consumer_secret => 'CS',
+                :token => 'OT', :token_secret => 'OS',
+                :nonce => 'e08201ad0dab4897c99445056feefd95', :timestamp => '1370967652'}
+      header = {"Authorization" => /oauth_signature="9ziouUPwZT9IWWRbJL8r0BerKYA%3D"/}
+
+      subject.stub(:credentials).and_return(secret)
+      stub_post("/1.1/statuses/update_with_media.json")
+      subject.update_with_media("Just a test", fixture("pbjt.gif"))
+      expect(a_post("/1.1/statuses/update_with_media.json").
+             with(:headers => header)).to have_been_made
+    end
   end
 
   describe "#bearer_auth_header" do
@@ -191,7 +217,7 @@ describe Twitter::Client do
     it "creates the correct auth header with supplied consumer_key and consumer_secret" do
       uri = "/1.1/direct_messages.json"
       authorization = subject.send(:bearer_token_credentials_auth_header)
-      expect(authorization).to eq "Basic #{Base64.strict_encode64("CK:CS")}"
+      expect(authorization).to eq "Basic Q0s6Q1M="
     end
   end
 end

data/spec/twitter/search_results_spec.rb

@@ -113,10 +113,7 @@ describe Twitter::SearchResults do
   end
 
   describe "#next_results" do
-    let(:next_results) {Twitter::SearchResults.new(:search_metadata =>
-        {:next_results => "?max_id=249279667666817023&q=%23freebandnames&count=4&include_entities=1&result_type=mixed"
-      }).next_results
-    }
+    let(:next_results) {Twitter::SearchResults.new(:search_metadata => {:next_results => "?max_id=249279667666817023&q=%23freebandnames&count=4&include_entities=1&result_type=mixed"}).next_results}
 
     it "returns a hash of query parameters" do
       expect(next_results).to be_a Hash
@@ -127,4 +124,16 @@ describe Twitter::SearchResults do
     end
   end
 
+  describe "#refresh_url" do
+    let(:refresh_url) {Twitter::SearchResults.new(:search_metadata => {:refresh_url => "?since_id=249279667666817023&q=%23freebandnames&count=4&include_entities=1&result_type=recent"}).refresh_url}
+
+    it "returns a hash of query parameters" do
+      expect(refresh_url).to be_a Hash
+    end
+
+    it "returns a since_id" do
+      expect(refresh_url[:since_id]).to eq "249279667666817023"
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twitter
 version: !ruby/object:Gem::Version
-  version: 4.7.0
+  version: 4.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -40,7 +40,7 @@ cert_chain:
   U0xxV3ZRUnNCbHlwSGZoczZKSnVMbHlaUEdoVTNSL3YKU2YzbFZLcEJDV2dS
   cEdUdnk0NVhWcEIrNTl5MzNQSm1FdVExUFRFT1l2UXlhbzlVS01BQWFBTi83
   cVdRdGpsMApobHc9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-date: 2013-05-30 00:00:00.000000000 Z
+date: 2013-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday

metadata.gz.sig

@@ -1 +1,2 @@
-O(�ӓa݌�i[f�b��M�h��ĉ�eƆ��5�؄�$oWg�2Vf�:���	���u�O���T>ܺ�����1
+�x����N�
+c�ڴ��۝1�����
�P?���
Kݐnzx�A��փ@48ڏD�"S� �1d�T��ꍫ��䦐�T�2Y�Dm?�ͷ������?1~2X��L��
����� &���������[2[�s+n5�ӱ=7��x�Ƞ��w��"و�p�3м���>�=��	�R�	���Q�]p(`�P��?ö߀�j$���)�.��L�fM�0�HcD�ѽ�=�R�uȀzR2֓���ꔢ!hzb`uy�B�