twitter 5.5.0 → 5.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: baa0ce3302ef65ee7f6c6472b847ce5c71ce005a
-  data.tar.gz: 8933bed1f45fd295836a0cd4b75873f41aee8189
+  metadata.gz: 9bfdd02a5944df78afbf1124d926c9091e45664b
+  data.tar.gz: 0d13ee7c160b20d5b6574e124695ee1ea11303d1
 SHA512:
-  metadata.gz: b3a5cb3b3259de32cd96dd7e913b816b3c063230d64c375e53cb9e9b84cdd22856c75b575b98c2fd3d99dc22d438a634a3f38739b0992703a9d11750e84ee713
-  data.tar.gz: cbf5b4fb759e16ae6c6146a2081e479533ea11a640270b153d86d25478e688e5b910410c06c19711436acf7151b340275777d077609776afe6902b33b43bdb98
+  metadata.gz: c17c71d6fa3c510d6891ddf7005bf0c3e035261a8b9b9d807e5c049b318cf1dfe0f2bb26e5a9a9857e3be988876eadce3fb3c5d848c972bfb2868e55423652f1
+  data.tar.gz: c94ba75414df2d149705bfc83a1e38372336505dd4caa4b38232797e90e72c000a0651a662ead16032a51d3c0fd1b56b72f02aeaf5cac246c48f6afe7469cbd7

data.tar.gz.sig

@@ -1 +1,2 @@
-y�;6���_��æt�B��#���K%C-��@�5^B�'d0E���F����$��#P-��7)�9u�������X���3�5��	v
+Sm� ��@8��_�5�d�O�i"��0�sD��D����l���b�(��)�H�$O�+To/{���,�R��Eܖ0PD��ZߜP�n��6�7s�0[Wb:V
+{��$�qL�*|o���X=��q��ہ�;�?)��X`�Y2"}�	�[
�4(�:���#��C��S�^�l��\&`:i���u�u��?��Q>�j��̧�>�i`#�}��s���v���h����W|�x�u�n`b�۟�%���sR���A�

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+5.5.1
+-----
+* [Fix bug where `Twitter::Error::AlreadyFavorited` would never be raised](https://github.com/sferik/twitter/issues/512) ([@polestarw](https://twitter.com/polestarw))
+* [Fix bug where `Twitter::Error::AlreadyPosted` would never be raised](https://github.com/sferik/twitter/commit/e6b37b930c056a88d8ee1477246635caf579111d)
+* [Restore `Twitter::Entities#entities?` as a public method](https://github.com/sferik/twitter/commit/234a9e3134eeee072bd511e1c1f1823ceb1531a2)
+
 5.5.0
 -----
 * [Add entities to `Twitter::DirectMessage`](https://github.com/sferik/twitter/commit/d911deb456cb2da6e14d0b3c69ba4d068ca85868)

data/lib/twitter/entities.rb

@@ -9,6 +9,12 @@ module Twitter
   module Entities
     include Memoizable
 
+    # @return [Boolean]
+    def entities?
+      !@attrs[:entities].nil? && @attrs[:entities].any? { |_, array| !array.empty? }
+    end
+    memoize :entities?
+
     # @note Must include entities in your request for this method to work
     # @return [Array<Twitter::Entity::Hashtag>]
     def hashtags
@@ -47,12 +53,6 @@ module Twitter
 
   private
 
-    # @return [Boolean]
-    def entities?
-      !@attrs[:entities].nil? && @attrs[:entities].any? { |_, array| !array.empty? }
-    end
-    memoize :entities?
-
     # @param klass [Class]
     # @param key [Symbol]
     def entities(klass, key)

data/lib/twitter/error/already_favorited.rb

@@ -4,7 +4,7 @@ module Twitter
   class Error
     # Raised when a Tweet has already been favorited
     class AlreadyFavorited < Twitter::Error::Forbidden
-      MESSAGE = 'You have already favorited this status'
+      MESSAGE = 'You have already favorited this status.'
     end
   end
 end

data/lib/twitter/error/already_posted.rb

@@ -4,7 +4,7 @@ module Twitter
   class Error
     # Raised when a Tweet has already been posted
     class AlreadyPosted < Twitter::Error::Forbidden
-      MESSAGE = 'Status is a duplicate'
+      MESSAGE = 'Status is a duplicate.'
     end
   end
 end

data/lib/twitter/rest/api/utils.rb

@@ -144,8 +144,8 @@ module Twitter
         end
 
         def handle_forbidden_error(klass, error)
-          error = error.message == klass::MESSAGE ? klass.new : error
-          fail error
+          error = klass.new(error) if error.message == klass::MESSAGE
+          fail(error)
         end
 
         def merge_default_cursor!(options)

data/lib/twitter/version.rb

@@ -2,7 +2,7 @@ module Twitter
   class Version
     MAJOR = 5
     MINOR = 5
-    PATCH = 0
+    PATCH = 1
     PRE = nil
 
     class << self

data/spec/fixtures/already_favorited.json

@@ -1 +1 @@
-{"errors":[{"message":"You have already favorited this status","code":139}]}
+{"errors":[{"message":"You have already favorited this status.","code":139}]}

data/spec/fixtures/already_posted.json

@@ -1 +1 @@
-{"errors":"Status is a duplicate"}
+{"errors":"Status is a duplicate."}

data/spec/twitter/direct_message_spec.rb

@@ -52,6 +52,30 @@ describe Twitter::DirectMessage do
     end
   end
 
+  describe '#entities?' do
+    it 'returns false if there are no entities set' do
+      tweet = Twitter::DirectMessage.new(:id => 1_825_786_345)
+      expect(tweet.entities?).to be false
+    end
+
+    it 'returns false if there are blank lists of entities set' do
+      tweet = Twitter::DirectMessage.new(:id => 1_825_786_345, :entities => {:urls => []})
+      expect(tweet.entities?).to be false
+    end
+    it 'returns true if there are entities set' do
+      urls_array = [
+        {
+          :url => 'http://example.com/t.co',
+          :expanded_url => 'http://example.com/expanded',
+          :display_url => 'example.com/expandedâ¦',
+          :indices => [10, 33],
+        }
+      ]
+      tweet = Twitter::DirectMessage.new(:id => 1_825_786_345, :entities => {:urls => urls_array})
+      expect(tweet.entities?).to be true
+    end
+  end
+
   describe '#recipient' do
     it 'returns a User when recipient is set' do
       direct_message = Twitter::DirectMessage.new(:id => 1_825_786_345, :recipient => {:id => 7_505_382})
@@ -104,34 +128,34 @@ describe Twitter::DirectMessage do
           :indices => [10, 33],
         }
       ]
-      hashtags = Twitter::DirectMessage.new(:id => 28_669_546_014, :entities => {:hashtags => hashtags_array}).hashtags
+      hashtags = Twitter::DirectMessage.new(:id => 1_825_786_345, :entities => {:hashtags => hashtags_array}).hashtags
       expect(hashtags).to be_an Array
       expect(hashtags.first).to be_a Twitter::Entity::Hashtag
       expect(hashtags.first.indices).to eq([10, 33])
       expect(hashtags.first.text).to eq('twitter')
     end
     it 'is empty when not set' do
-      hashtags = Twitter::DirectMessage.new(:id => 28_669_546_014).hashtags
+      hashtags = Twitter::DirectMessage.new(:id => 1_825_786_345).hashtags
       expect(hashtags).to be_empty
     end
     it 'warns when not set' do
-      Twitter::DirectMessage.new(:id => 28_669_546_014).hashtags
+      Twitter::DirectMessage.new(:id => 1_825_786_345).hashtags
       expect($stderr.string).to match(/To get hashtags, you must pass `:include_entities => true` when requesting the Twitter::DirectMessage\./)
     end
   end
 
   describe '#media' do
     it 'returns media' do
-      media = Twitter::DirectMessage.new(:id => 28_669_546_014, :entities => {:media => [{:id => 1, :type => 'photo'}]}).media
+      media = Twitter::DirectMessage.new(:id => 1_825_786_345, :entities => {:media => [{:id => 1, :type => 'photo'}]}).media
       expect(media).to be_an Array
       expect(media.first).to be_a Twitter::Media::Photo
     end
     it 'is empty when not set' do
-      media = Twitter::DirectMessage.new(:id => 28_669_546_014).media
+      media = Twitter::DirectMessage.new(:id => 1_825_786_345).media
       expect(media).to be_empty
     end
     it 'warns when not set' do
-      Twitter::DirectMessage.new(:id => 28_669_546_014).media
+      Twitter::DirectMessage.new(:id => 1_825_786_345).media
       expect($stderr.string).to match(/To get media, you must pass `:include_entities => true` when requesting the Twitter::DirectMessage\./)
     end
   end
@@ -142,7 +166,7 @@ describe Twitter::DirectMessage do
         {:text => 'PEP', :indices => [114, 118]},
         {:text => 'COKE', :indices => [128, 133]}
       ]
-      symbols = Twitter::DirectMessage.new(:id => 28_669_546_014, :entities => {:symbols => symbols_array}).symbols
+      symbols = Twitter::DirectMessage.new(:id => 1_825_786_345, :entities => {:symbols => symbols_array}).symbols
       expect(symbols).to be_an Array
       expect(symbols.size).to eq(2)
       expect(symbols.first).to be_a Twitter::Entity::Symbol
@@ -150,11 +174,11 @@ describe Twitter::DirectMessage do
       expect(symbols.first.text).to eq('PEP')
     end
     it 'is empty when not set' do
-      symbols = Twitter::DirectMessage.new(:id => 28_669_546_014).symbols
+      symbols = Twitter::DirectMessage.new(:id => 1_825_786_345).symbols
       expect(symbols).to be_empty
     end
     it 'warns when not set' do
-      Twitter::DirectMessage.new(:id => 28_669_546_014).symbols
+      Twitter::DirectMessage.new(:id => 1_825_786_345).symbols
       expect($stderr.string).to match(/To get symbols, you must pass `:include_entities => true` when requesting the Twitter::DirectMessage\./)
     end
   end
@@ -169,7 +193,7 @@ describe Twitter::DirectMessage do
           :indices => [10, 33],
         }
       ]
-      direct_message = Twitter::DirectMessage.new(:id => 28_669_546_014, :entities => {:urls => urls_array})
+      direct_message = Twitter::DirectMessage.new(:id => 1_825_786_345, :entities => {:urls => urls_array})
       expect(direct_message.uris).to be_an Array
       expect(direct_message.uris.first).to be_a Twitter::Entity::URI
       expect(direct_message.uris.first.indices).to eq([10, 33])
@@ -177,11 +201,11 @@ describe Twitter::DirectMessage do
       expect(direct_message.uris.first.display_uri).to eq('example.com/expanded…')
     end
     it 'is empty when not set' do
-      direct_message = Twitter::DirectMessage.new(:id => 28_669_546_014)
+      direct_message = Twitter::DirectMessage.new(:id => 1_825_786_345)
       expect(direct_message.uris).to be_empty
     end
     it 'warns when not set' do
-      Twitter::DirectMessage.new(:id => 28_669_546_014).urls
+      Twitter::DirectMessage.new(:id => 1_825_786_345).urls
       expect($stderr.string).to match(/To get urls, you must pass `:include_entities => true` when requesting the Twitter::DirectMessage\./)
     end
     it 'can handle strange urls' do
@@ -193,7 +217,7 @@ describe Twitter::DirectMessage do
           :indices => [10, 33],
         }
       ]
-      direct_message = Twitter::DirectMessage.new(:id => 28_669_546_014, :entities => {:urls => urls_array})
+      direct_message = Twitter::DirectMessage.new(:id => 1_825_786_345, :entities => {:urls => urls_array})
       uri = direct_message.uris.first
       expect { uri.url }.not_to raise_error
       expect { uri.expanded_url }.not_to raise_error
@@ -212,18 +236,18 @@ describe Twitter::DirectMessage do
           :id => 7_505_382,
         }
       ]
-      user_mentions = Twitter::DirectMessage.new(:id => 28_669_546_014, :entities => {:user_mentions => user_mentions_array}).user_mentions
+      user_mentions = Twitter::DirectMessage.new(:id => 1_825_786_345, :entities => {:user_mentions => user_mentions_array}).user_mentions
       expect(user_mentions).to be_an Array
       expect(user_mentions.first).to be_a Twitter::Entity::UserMention
       expect(user_mentions.first.indices).to eq([0, 6])
       expect(user_mentions.first.id).to eq(7_505_382)
     end
     it 'is empty when not set' do
-      user_mentions = Twitter::DirectMessage.new(:id => 28_669_546_014).user_mentions
+      user_mentions = Twitter::DirectMessage.new(:id => 1_825_786_345).user_mentions
       expect(user_mentions).to be_empty
     end
     it 'warns when not set' do
-      Twitter::DirectMessage.new(:id => 28_669_546_014).user_mentions
+      Twitter::DirectMessage.new(:id => 1_825_786_345).user_mentions
       expect($stderr.string).to match(/To get user mentions, you must pass `:include_entities => true` when requesting the Twitter::DirectMessage\./)
     end
   end

data/spec/twitter/error_spec.rb

@@ -7,23 +7,23 @@ describe Twitter::Error do
   end
 
   describe '#message' do
-    it 'returns the message of the wrapped exception' do
+    it 'returns the message of the cause' do
       error = Twitter::Error.new(Faraday::Error::ClientError.new('Oops'))
       expect(error.message).to eq('Oops')
     end
   end
 
   describe '#rate_limit' do
-    it 'returns the wrapped exception' do
+    it 'returns the cause' do
       error = Twitter::Error.new(Faraday::Error::ClientError.new('Oops'))
       expect(error.rate_limit).to be_a Twitter::RateLimit
     end
   end
 
-  describe '#wrapped_exception' do
-    it 'returns the wrapped exception' do
+  describe '#cause' do
+    it 'returns the cause' do
       error = Twitter::Error.new(Faraday::Error::ClientError.new('Oops'))
-      expect(error.wrapped_exception.class).to eq(Faraday::Error::ClientError)
+      expect(error.cause.class).to eq(Faraday::Error::ClientError)
     end
   end
 

data/spec/twitter/tweet_spec.rb

@@ -52,6 +52,30 @@ describe Twitter::Tweet do
     end
   end
 
+  describe '#entities?' do
+    it 'returns false if there are no entities set' do
+      tweet = Twitter::Tweet.new(:id => 28_669_546_014)
+      expect(tweet.entities?).to be false
+    end
+
+    it 'returns false if there are blank lists of entities set' do
+      tweet = Twitter::Tweet.new(:id => 28_669_546_014, :entities => {:urls => []})
+      expect(tweet.entities?).to be false
+    end
+    it 'returns true if there are entities set' do
+      urls_array = [
+        {
+          :url => 'http://example.com/t.co',
+          :expanded_url => 'http://example.com/expanded',
+          :display_url => 'example.com/expandedâ¦',
+          :indices => [10, 33],
+        }
+      ]
+      tweet = Twitter::Tweet.new(:id => 28_669_546_014, :entities => {:urls => urls_array})
+      expect(tweet.entities?).to be true
+    end
+  end
+
   describe '#filter_level' do
     it 'returns the filter level when filter_level is set' do
       tweet = Twitter::Tweet.new(:id => 28_669_546_014, :filter_level => 'high')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twitter
 version: !ruby/object:Gem::Version
-  version: 5.5.0
+  version: 5.5.1
 platform: ruby
 authors:
 - Erik Michaels-Ober
@@ -39,160 +39,160 @@ dependencies:
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
   name: buftok
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: descendants_tracker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: equalizer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.9
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.8'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.8'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: memoizable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: simple_oauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 description: A Ruby interface to the Twitter API.
@@ -202,13 +202,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .yardopts
+- ".yardopts"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - LICENSE.md
 - README.md
 - Rakefile
-- twitter.gemspec
+- lib/twitter.rb
 - lib/twitter/arguments.rb
 - lib/twitter/base.rb
 - lib/twitter/basic_user.rb
@@ -218,12 +218,13 @@ files:
 - lib/twitter/cursor.rb
 - lib/twitter/direct_message.rb
 - lib/twitter/entities.rb
+- lib/twitter/entity.rb
 - lib/twitter/entity/hashtag.rb
 - lib/twitter/entity/symbol.rb
 - lib/twitter/entity/uri.rb
 - lib/twitter/entity/user_mention.rb
-- lib/twitter/entity.rb
 - lib/twitter/enumerable.rb
+- lib/twitter/error.rb
 - lib/twitter/error/already_favorited.rb
 - lib/twitter/error/already_posted.rb
 - lib/twitter/error/already_retweeted.rb
@@ -239,11 +240,10 @@ files:
 - lib/twitter/error/too_many_requests.rb
 - lib/twitter/error/unauthorized.rb
 - lib/twitter/error/unprocessable_entity.rb
-- lib/twitter/error.rb
 - lib/twitter/factory.rb
+- lib/twitter/geo.rb
 - lib/twitter/geo/point.rb
 - lib/twitter/geo/polygon.rb
-- lib/twitter/geo.rb
 - lib/twitter/geo_factory.rb
 - lib/twitter/geo_results.rb
 - lib/twitter/identity.rb
@@ -303,7 +303,6 @@ files:
 - lib/twitter/user.rb
 - lib/twitter/utils.rb
 - lib/twitter/version.rb
-- lib/twitter.rb
 - spec/fixtures/already_favorited.json
 - spec/fixtures/already_posted.json
 - spec/fixtures/already_retweeted.json
@@ -426,6 +425,7 @@ files:
 - spec/twitter/trend_spec.rb
 - spec/twitter/tweet_spec.rb
 - spec/twitter/user_spec.rb
+- twitter.gemspec
 homepage: http://sferik.github.com/twitter/
 licenses:
 - MIT
@@ -436,17 +436,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: A Ruby interface to the Twitter API.

metadata.gz.sig

@@ -1,5 +1 @@
-,㣯�I-qU
VB�[���!C��=
-��u
- ���[�#�t�gx�E�
-��x�H����UI�ەݟN�D�M![oS~���>&�%)۸	d�,���%�_
-I�~�Y�����F�:�Z
卿�Q�gz7�1a{}u���L�MuR���4g����۵!��/c�&��7�wK��&�h	�|}��;�(Ɛ����}3غ���d����]�)���X��ށ��M�
+\�y$�1�WW^��1��\[��F#Yœ�2�_3Q�u��:�.P��˒��k[��Ogg�S�@2��×�
I���rsL�b�f�����Tp)��Rt��	��D5\/VSġ�����
�Ȣi���XB>bԫ�y�}��8lS����vʶA��=�� �;!k�p]�Ċ�(���(D�i����2r��ت��/�
��^�@�ߖbM�n�~.c������q�d쁿�f�t�L�/ٶE��