twitter 4.8.0 → 4.8.1

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+4.8.1
+-----
+* [Ignore case of profile image extension](https://github.com/sferik/twitter/commit/73760610e959ae868de23de3da661d237fbcb106)
+* [Allow use of Twitter::Token in place of bearer token string](https://github.com/sferik/twitter/commit/13596bc60db36ecaf5a1df09ecb322d85d8c2922)
+* [Add Twitter::API::Undocumented#tweet_count](https://github.com/sferik/twitter/commit/795458a25ec7b143a995e7f2f2043e523c11961c)
+* [Add missing dependencies](https://github.com/sferik/twitter/commit/e07e034472df8b7aa44c779371cf1e25d8caa77d) ([@tmatilai](https://twitter.com/tmatilai))
+
 4.8.0
 -----
 * [Add `Twitter::SearchResults#refresh_url`](https://github.com/sferik/twitter/commit/6bf08c008de139aad3ec173461e8633bfa5a3bd8) ([@mustafaturan](https://twitter.com/mustafaturan))

data/lib/twitter/api/oauth.rb

@@ -31,11 +31,12 @@ module Twitter
       # @rate_limited No
       # @authentication Required
       # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
-      # @param access_token [String] The value of the bearer token to revoke.
+      # @param access_token [String, Twitter::Token] The bearer token to revoke.
       # @return [Twitter::Token] The invalidated token. token_type should be nil.
       # @example Revoke a token
       #   Twitter.invalidate_token("AAAA%2FAAA%3DAAAAAAAA")
       def invalidate_token(access_token)
+        access_token = access_token.access_token if access_token.is_a?(Twitter::Token)
         object_from_response(Twitter::Token, :post, "/oauth2/invalidate_token", :access_token => access_token)
       end
     end

data/lib/twitter/api/tweets.rb

@@ -257,14 +257,21 @@ module Twitter
       end
 
       # Returns a collection of user IDs belonging to users who have retweeted the specified Tweet.
+      #
       # @see https://dev.twitter.com/docs/api/1.1/get/statuses/retweeters/ids
       # @rate_limited Yes
       # @authentication Required
       # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
       # @return [Array<Integer>]
-      # @param options [Hash] A customizable set of options.
-      # @example Return a collection of user IDs belonging to users who have retweeted the specified Tweet
-      #   Twitter.retweeters_ids(25938088801)
+      # @overload retweeters_ids(options)
+      #   @param options [Hash] A customizable set of options.
+      #   @example Return a collection of user IDs belonging to users who have retweeted the specified Tweet
+      #     Twitter.retweeters_ids({:id => 25938088801})
+      # @overload retweeters_ids(id, options={})
+      #   @param id [Integer] The numerical ID of the desired Tweet.
+      #   @param options [Hash] A customizable set of options.
+      #   @example Return a collection of user IDs belonging to users who have retweeted the specified Tweet
+      #     Twitter.retweeters_ids(25938088801)
       def retweeters_ids(*args)
         arguments = Twitter::API::Arguments.new(args)
         arguments.options[:id] ||= arguments.first

data/lib/twitter/api/undocumented.rb

@@ -77,6 +77,21 @@ module Twitter
         end
       end
 
+      # Returns Tweets count for a URL
+      #
+      # @note Undocumented
+      # @rate_limited No
+      # @authentication Not required
+      # @return [Integer]
+      # @param url [Integer] A URL.
+      # @param options [Hash] A customizable set of options.
+      # @example Return Tweet count for http://twitter.com
+      #   Twitter.tweet_count("http://twitter.com/")
+      def tweet_count(url, options={})
+        connection = Faraday.new("https://cdn.api.twitter.com", @connection_options.merge(:builder => @middleware))
+        connection.get("/1/urls/count.json", options.merge(:url => url)).body[:count]
+      end
+
     end
   end
 end

data/lib/twitter/client.rb

@@ -93,7 +93,7 @@ module Twitter
           request.headers[:accept] = '*/*' # It is important we set this, otherwise we get an error.
         elsif params.delete(:app_auth) || !user_token?
           unless bearer_token?
-            @bearer_token = token[:access_token]
+            @bearer_token = token
             Twitter.client.bearer_token = @bearer_token if Twitter.client?
           end
           request.headers[:authorization] = bearer_auth_header
@@ -132,7 +132,11 @@ module Twitter
     end
 
     def bearer_auth_header
-      "Bearer #{@bearer_token}"
+      if @bearer_token.is_a?(Twitter::Token) && @bearer_token.token_type == "bearer"
+        "Bearer #{@bearer_token.access_token}"
+      else
+        "Bearer #{@bearer_token}"
+      end
     end
 
     def oauth_auth_header(method, path, params={})

data/lib/twitter/configurable.rb

@@ -1,4 +1,5 @@
 require 'forwardable'
+require 'twitter/default'
 require 'twitter/error/configuration_error'
 
 module Twitter

data/lib/twitter/error.rb

@@ -1,3 +1,5 @@
+require 'twitter/rate_limit'
+
 module Twitter
   # Custom error class for rescuing from all Twitter errors
   class Error < StandardError

data/lib/twitter/search_results.rb

@@ -55,24 +55,69 @@ module Twitter
 
     # Returns a Hash of query parameters for the next result in the search
     #
-    # Returned Hash can be merged into the previous search options list
-    # to easily access the next page
-    #
-    # @return [Hash]
+    # @note Returned Hash can be merged into the previous search options list to easily access the next page.
+    # @return [Hash] The parameters needed to fetch the next page.
     def next_results
-      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?
+      if next_results?
+        query_string = strip_first_character(@attrs[:search_metadata][:next_results])
+        query_string_to_hash(query_string)
+      end
     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]
+    # @note Returned Hash can be merged into the previous search options list to easily access the refresh page.
+    # @return [Hash] The parameters needed to refresh the page.
     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}
+      query_string = strip_first_character(@attrs[:search_metadata][:refresh_url])
+      query_string_to_hash(query_string)
     end
     alias refresh_page refresh_url
+
+  private
+
+    # Returns the string with the first character removed
+    #
+    # @param string [String]
+    # @return [String] A copy of string without the first character.
+    # @example Returns the query string with the question mark removed
+    #   strip_first_character("?foo=bar&baz=qux") #=> "foo=bar&baz=qux"
+    def strip_first_character(string)
+      strip_first_character!(string.dup)
+    end
+
+    # Removes the first character from a string
+    #
+    # @param string [String]
+    # @return [String] The string without the first character.
+    # @example Remove the first character from a query string
+    #   strip_first_character!("?foo=bar&baz=qux") #=> "foo=bar&baz=qux"
+    def strip_first_character!(string)
+      string[0] = ""
+      string
+    end
+
+    # Converts query string to a hash
+    #
+    # @param query_string [String] The query string of a URL.
+    # @return [Hash] The query string converted to a hash (with symbol keys).
+    # @example Convert query string to a hash
+    #   query_string_to_hash("foo=bar&baz=qux") #=> {:foo=>"bar", :baz=>"qux"}
+    def query_string_to_hash(query_string)
+      symbolize_keys(Faraday::Utils.parse_nested_query(query_string))
+    end
+
+    # Converts hash's keys to symbols
+    #
+    # @note Does not support nested hashes.
+    # @param hash [Hash]
+    # @return [Hash] The hash with symbols as keys.
+    # @example Convert hash's keys to symbols
+    #   symbolize_keys({"foo"=>"bar", "baz"=>"qux"}) #=> {:foo=>"bar", :baz=>"qux"}
+    def symbolize_keys(hash)
+      Hash[hash.map{|key, value| [key.to_sym, value]}]
+    end
+
   end
 end

data/lib/twitter/user.rb

@@ -4,7 +4,7 @@ require 'twitter/exceptable'
 
 module Twitter
   class User < Twitter::BasicUser
-    PROFILE_IMAGE_SUFFIX_REGEX = /_normal(\.gif|\.jpe?g|\.png)$/
+    PROFILE_IMAGE_SUFFIX_REGEX = /_normal(\.gif|\.jpe?g|\.png)$/i
     include Twitter::Creatable
     include Twitter::Exceptable
     attr_reader :connections, :contributors_enabled, :default_profile,

data/lib/twitter/version.rb

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

data/spec/fixtures/count.json

@@ -0,0 +1 @@
+{"count":13845465,"url":"http:\/\/twitter.com\/"}

data/spec/twitter/api/oauth_spec.rb

@@ -44,6 +44,13 @@ describe Twitter::API::OAuth do
       expect(token.access_token).to eq "AAAA%2FAAA%3DAAAAAAAA"
       expect(token.token_type).to eq nil
     end
+    context "with a token" do
+      it "requests the correct resource" do
+        token = Twitter::Token.new(:access_token => "AAAA%2FAAA%3DAAAAAAAA")
+        @client.invalidate_token(token)
+        expect(a_post("/oauth2/invalidate_token").with(:body => {:access_token => "AAAA%2FAAA%3DAAAAAAAA"})).to have_been_made
+      end
+    end
   end
 
 end

data/spec/twitter/api/undocumented_spec.rb

@@ -111,4 +111,19 @@ describe Twitter::API::Undocumented do
     end
   end
 
+  describe "#statuses_activity" do
+    before do
+      stub_request(:get, "https://cdn.api.twitter.com/1/urls/count.json").with(:query => {:url => "http://twitter.com"}).to_return(:body => fixture("count.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+    end
+    it "requests the correct resource" do
+      @client.tweet_count("http://twitter.com")
+      expect(a_request(:get, "https://cdn.api.twitter.com/1/urls/count.json").with(:query => {:url => "http://twitter.com"})).to have_been_made
+    end
+    it "returns a Tweet count" do
+      tweet_count = @client.tweet_count("http://twitter.com")
+      expect(tweet_count).to be_an Integer
+      expect(tweet_count).to eq 13845465
+    end
+  end
+
 end

data/spec/twitter/user_spec.rb

@@ -185,6 +185,14 @@ describe Twitter::User do
         expect(user.profile_image_url(:mini)).to eq "http://a0.twimg.com/profile_images/1759857427/image1326743606_mini.png"
       end
     end
+    context "with capitalized file extension" do
+      it "returns the correct image" do
+        user = Twitter::User.new(:id => 7505382, :profile_image_url_https => "https://si0.twimg.com/profile_images/67759670/DSCN2136_normal.JPG")
+        expect(user.profile_image_url(:original)).to eq "http://si0.twimg.com/profile_images/67759670/DSCN2136.JPG"
+        expect(user.profile_image_url(:bigger)).to eq "http://si0.twimg.com/profile_images/67759670/DSCN2136_bigger.JPG"
+        expect(user.profile_image_url(:mini)).to eq "http://si0.twimg.com/profile_images/67759670/DSCN2136_mini.JPG"
+      end
+    end
   end
 
   describe "#profile_image_url_https" do
@@ -218,6 +226,14 @@ describe Twitter::User do
         expect(user.profile_image_url_https(:mini)).to eq "https://a0.twimg.com/profile_images/1759857427/image1326743606_mini.png"
       end
     end
+    context "with capitalized file extension" do
+      it "returns the correct image" do
+        user = Twitter::User.new(:id => 7505382, :profile_image_url_https => "https://si0.twimg.com/profile_images/67759670/DSCN2136_normal.JPG")
+        expect(user.profile_image_url_https(:original)).to eq "https://si0.twimg.com/profile_images/67759670/DSCN2136.JPG"
+        expect(user.profile_image_url_https(:bigger)).to eq "https://si0.twimg.com/profile_images/67759670/DSCN2136_bigger.JPG"
+        expect(user.profile_image_url_https(:mini)).to eq "https://si0.twimg.com/profile_images/67759670/DSCN2136_mini.JPG"
+      end
+    end
   end
 
   describe "#profile_image_url?" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twitter
 version: !ruby/object:Gem::Version
-  version: 4.8.0
+  version: 4.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -40,7 +40,7 @@ cert_chain:
   U0xxV3ZRUnNCbHlwSGZoczZKSnVMbHlaUEdoVTNSL3YKU2YzbFZLcEJDV2dS
   cEdUdnk0NVhWcEIrNTl5MzNQSm1FdVExUFRFT1l2UXlhbzlVS01BQWFBTi83
   cVdRdGpsMApobHc9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -236,6 +236,7 @@ files:
 - spec/fixtures/category.json
 - spec/fixtures/configuration.json
 - spec/fixtures/contributees.json
+- spec/fixtures/count.json
 - spec/fixtures/direct_message.json
 - spec/fixtures/direct_messages.json
 - spec/fixtures/empty.json
@@ -394,6 +395,7 @@ test_files:
 - spec/fixtures/category.json
 - spec/fixtures/configuration.json
 - spec/fixtures/contributees.json
+- spec/fixtures/count.json
 - spec/fixtures/direct_message.json
 - spec/fixtures/direct_messages.json
 - spec/fixtures/empty.json

metadata.gz.sig

@@ -1,2 +1,2 @@
-�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�
+���T�@J(H�2�4Q����w}��3ҟ
+.����tb�tn�#�F0פR��/˦j���<��ֳ��'T�oR�tF0D��#)	}&i��Y{�+�^�X�*��+8��Zh)�c���'��ꙫ�����b��L��j{�O$6{�{�_���1ۙ�����$>0�_���ysO��E%��"P��9I�������FNOe�6�g��t�U�xq(�V��gM���ȝ��Hܟthf])�