twitter 5.10.0 → 5.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ed9a45b1f841e8fd80f06a88cdb71d73448c27b
-  data.tar.gz: 28ec0e841594b0e1c7b26a262ae1d8451157f1c0
+  metadata.gz: 6d7d42d9e3c81c1633f4d439a2986371be492475
+  data.tar.gz: ff20ed8b670c4843eaa02650184f74e99e70507b
 SHA512:
-  metadata.gz: 7a1171a26b33386f6bc0a5d5fc71dd7c9250f4b8e45efe50465b8d795436dedf6fb767b026be8882c2e370bf8c4ef5d371b3c4aed0a3a99a67268bb147bce6f9
-  data.tar.gz: 046690ce229a2af4d4d762602b1e64f694d0a2fcd138324a6dd0d430545c5967c15cde11b8181e250d5bdb64631ba3754aacd642f3fc309f81c17d002b751dce
+  metadata.gz: bec1abcdc08fbfd1e4b1f13dbccef720951ee61b18259f82a14e70e19fce5a856f57ebd7d127a131d2e39b8369bd4151cecc4393c8946c81542f8a2b9fb29599
+  data.tar.gz: a0025ecdd3e1802588789dc53ae5dd6f6801fb94e8ee1b8e7f0ed6c8c5a5ebee3ce79442e69ab7015bdcc0d595a059466235b7e7f952e3d1a212f0df6bc9e85b

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+5.11.0
+------
+* [Return a Twitter::NullObject for empty attributes](https://github.com/sferik/twitter/commit/bca179eefb1c157f19b882a88ba608f6817b76bb)
+* [Add `iso_language_code` attribute to `Twitter::Metadata`](https://github.com/sferik/twitter/commit/7bf3a1b6ad0c35dc608b03ba2b3321b594e4da1c)
+
 5.10.0
 ------
 * [Add support for extended entities](https://github.com/sferik/twitter/commit/ed7c708e4208de1df27d141678c14e23422504a0)

data/Rakefile

@@ -31,7 +31,7 @@ end
 
 require 'yardstick/rake/verify'
 Yardstick::Rake::Verify.new do |verify|
-  verify.threshold = 59.5
+  verify.threshold = 59.6
 end
 
 task :default => [:spec, :rubocop, :verify_measurements]

data/lib/twitter/base.rb

@@ -84,11 +84,11 @@ module Twitter
       # @param key2 [Symbol]
       def define_attribute_method(key1, klass = nil, key2 = nil)
         define_method(key1) do ||
-          if klass.nil?
-            @attrs[key1]
+          if @attrs[key1].nil? || @attrs[key1].respond_to?(:empty?) && @attrs[key1].empty?
+            NullObject.new
           else
-            if @attrs[key1].nil?
-              NullObject.new
+            if klass.nil?
+              @attrs[key1]
             else
               attrs = attrs_for_object(key1, key2)
               Twitter.const_get(klass).new(attrs)
@@ -115,7 +115,7 @@ module Twitter
       # @param key2 [Symbol]
       def define_predicate_method(key1, key2 = key1)
         define_method(:"#{key1}?") do ||
-          !@attrs[key2].nil? && @attrs[key2] != false
+          !@attrs[key2].nil? && @attrs[key2] != false && !(@attrs[key2].respond_to?(:empty?) && @attrs[key2].empty?)
         end
         memoize(:"#{key1}?")
       end

data/lib/twitter/metadata.rb

@@ -2,6 +2,6 @@ require 'twitter/base'
 
 module Twitter
   class Metadata < Twitter::Base
-    attr_reader :result_type
+    attr_reader :iso_language_code, :result_type
   end
 end

data/lib/twitter/place.rb

@@ -17,7 +17,7 @@ module Twitter
     # @raise [ArgumentError] Error raised when supplied argument is missing a :woeid key.
     # @return [Twitter::Place]
     def initialize(attrs = {})
-      attrs[:id] ||= attrs[:woeid]
+      attrs[:id] ||= attrs.fetch(:woeid)
       super
     end
 

data/lib/twitter/profile.rb

@@ -24,7 +24,7 @@ module Twitter
     # Return the URL to the user's profile banner image
     #
     # @param size [String, Symbol] The size of the image. Must be one of: 'mobile', 'mobile_retina', 'web', 'web_retina', 'ipad', or 'ipad_retina'
-    # @return [String]
+    # @return [Addressable::URI]
     def profile_banner_uri(size = :web)
       parse_encoded_uri(insecure_uri([@attrs[:profile_banner_url], size].join('/'))) unless @attrs[:profile_banner_url].nil?
     end
@@ -33,7 +33,7 @@ module Twitter
     # Return the secure URL to the user's profile banner image
     #
     # @param size [String, Symbol] The size of the image. Must be one of: 'mobile', 'mobile_retina', 'web', 'web_retina', 'ipad', or 'ipad_retina'
-    # @return [String]
+    # @return [Addressable::URI]
     def profile_banner_uri_https(size = :web)
       parse_encoded_uri([@attrs[:profile_banner_url], size].join('/')) unless @attrs[:profile_banner_url].nil?
     end
@@ -49,7 +49,7 @@ module Twitter
     # Return the URL to the user's profile image
     #
     # @param size [String, Symbol] The size of the image. Must be one of: 'mini', 'normal', 'bigger' or 'original'
-    # @return [String]
+    # @return [Addressable::URI]
     def profile_image_uri(size = :normal)
       parse_encoded_uri(insecure_uri(profile_image_uri_https(size))) unless @attrs[:profile_image_url_https].nil?
     end
@@ -58,7 +58,7 @@ module Twitter
     # Return the secure URL to the user's profile image
     #
     # @param size [String, Symbol] The size of the image. Must be one of: 'mini', 'normal', 'bigger' or 'original'
-    # @return [String]
+    # @return [Addressable::URI]
     def profile_image_uri_https(size = :normal)
       # The profile image URL comes in looking like like this:
       # https://a0.twimg.com/profile_images/1759857427/image1326743606_normal.png

data/lib/twitter/rest/lists.rb

@@ -92,10 +92,12 @@ module Twitter
       # @return [Twitter::Cursor]
       # @overload memberships(options = {})
       #   @param options [Hash] A customizable set of options.
+      #   @option options [Integer] :count The amount of results to return per page. Defaults to 20. No more than 1000 results will ever be returned in a single page.
       #   @option options [Boolean, String, Integer] :filter_to_owned_lists When set to true, t or 1, will return just lists the authenticating user owns, and the user represented by user_id or screen_name is a member of.
       # @overload memberships(user, options = {})
       #   @param user [Integer, String, Twitter::User] A Twitter user ID, screen name, URI, or object.
       #   @param options [Hash] A customizable set of options.
+      #   @option options [Integer] :count The amount of results to return per page. Defaults to 20. No more than 1000 results will ever be returned in a single page.
       #   @option options [Boolean, String, Integer] :filter_to_owned_lists When set to true, t or 1, will return just lists the authenticating user owns, and the user represented by user_id or screen_name is a member of.
       def memberships(*args)
         cursor_from_response_with_user(:lists, Twitter::List, :get, '/1.1/lists/memberships.json', args)

data/lib/twitter/utils.rb

@@ -26,7 +26,7 @@ module Twitter
     # @return [Array, Enumerator]
     def flat_pmap(enumerable)
       return to_enum(:flat_pmap, enumerable) unless block_given?
-      pmap(enumerable, &Proc.new).flatten(1)
+      pmap(enumerable, &Proc.new).flatten!(1)
     end
     module_function :flat_pmap
 
@@ -37,24 +37,12 @@ module Twitter
     # @return [Array, Enumerator]
     def pmap(enumerable)
       return to_enum(:pmap, enumerable) unless block_given?
-      pmap_with_index(enumerable).sort_by { |_, index| index }.collect { |object, _| yield(object) }
-    end
-    module_function :pmap
-
-    # Calls block with two arguments, the item and its index, for each item in enumerable. Given arguments are passed through to pmap.
-    # If no block is given, an enumerator is returned instead.
-    #
-    # @param enumerable [Enumerable]
-    # @return [Array, Enumerator]
-    def pmap_with_index(enumerable)
-      return to_enum(:pmap_with_index, enumerable) unless block_given?
-      # Don't bother spawning a new thread if there's only one item
       if enumerable.count == 1
-        enumerable.collect { |object| yield(object, 0) }
+        enumerable.collect { |object| yield(object) }
       else
-        enumerable.each_with_index.collect { |object, index| Thread.new { yield(object, index) } }.collect(&:value)
+        enumerable.collect { |object| Thread.new { yield(object) } }.collect(&:value)
       end
     end
-    module_function :pmap_with_index
+    module_function :pmap
   end
 end

data/lib/twitter/version.rb

@@ -1,7 +1,7 @@
 module Twitter
   class Version
     MAJOR = 5
-    MINOR = 10
+    MINOR = 11
     PATCH = 0
     PRE = nil
 

data/spec/twitter/place_spec.rb

@@ -2,6 +2,14 @@ require 'helper'
 
 describe Twitter::Place do
 
+  describe '.new' do
+    it 'raises an IndexError when id or woeid is not specified' do
+      expect { Twitter::Place.new(:id => 1) }.not_to raise_error
+      expect { Twitter::Place.new(:woeid => 1) }.not_to raise_error
+      expect { Twitter::Place.new }.to raise_error(IndexError)
+    end
+  end
+
   describe '#eql?' do
     it 'returns true when objects WOE IDs are the same' do
       place = Twitter::Place.new(:woeid => 1, :name => 'foo')

data/spec/twitter/tweet_spec.rb

@@ -210,7 +210,7 @@ describe Twitter::Tweet do
 
   describe '#metadata' do
     it 'returns a Twitter::Metadata when metadata is set' do
-      tweet = Twitter::Tweet.new(:id => 28_669_546_014, :metadata => {})
+      tweet = Twitter::Tweet.new(:id => 28_669_546_014, :metadata => {:result_type => 'recent'})
       expect(tweet.metadata).to be_a Twitter::Metadata
     end
     it 'returns nil when metadata is not set' do
@@ -221,7 +221,7 @@ describe Twitter::Tweet do
 
   describe '#metadata?' do
     it 'returns true when metadata is set' do
-      tweet = Twitter::Tweet.new(:id => 28_669_546_014, :metadata => {})
+      tweet = Twitter::Tweet.new(:id => 28_669_546_014, :metadata => {:result_type => 'recent'})
       expect(tweet.metadata?).to be true
     end
     it 'returns false when metadata is not set' do

data/spec/twitter/utils_spec.rb

@@ -0,0 +1,34 @@
+require 'benchmark'
+require 'helper'
+
+describe Twitter::Utils do
+  describe '#pmap' do
+    it 'maps in parallel' do
+      delay = 0.1
+      array = (0..9).to_a
+      size  = array.size
+      block = proc { |x| sleep(delay) && x + 1 }
+      block_without_sleep = proc { |x| x + 1 }
+      expected = array.collect(&block_without_sleep)
+      elapsed_time = Benchmark.realtime do
+        expect(subject.pmap(array, &block)).to eq(expected)
+      end
+      expect(elapsed_time).to be_between(delay, delay * size)
+    end
+  end
+
+  describe '#flat_pmap' do
+    it 'flat maps in parallel' do
+      delay = 0.1
+      array = (0..4).to_a.combination(2).to_a
+      size  = array.size
+      block = proc { |x| sleep(delay) && x.reverse }
+      block_without_sleep = proc { |x| x.reverse }
+      expected = array.collect(&block_without_sleep).flatten!(1)
+      elapsed_time = Benchmark.realtime do
+        expect(subject.flat_pmap(array, &block)).to eq(expected)
+      end
+      expect(elapsed_time).to be_between(delay, delay * size)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twitter
 version: !ruby/object:Gem::Version
-  version: 5.10.0
+  version: 5.11.0
 platform: ruby
 authors:
 - Erik Michaels-Ober
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2014-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -389,6 +389,7 @@ files:
 - spec/twitter/trend_spec.rb
 - spec/twitter/tweet_spec.rb
 - spec/twitter/user_spec.rb
+- spec/twitter/utils_spec.rb
 - twitter.gemspec
 homepage: http://sferik.github.com/twitter/
 licenses:
@@ -410,7 +411,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: A Ruby interface to the Twitter API.
@@ -540,4 +541,5 @@ test_files:
 - spec/twitter/trend_spec.rb
 - spec/twitter/tweet_spec.rb
 - spec/twitter/user_spec.rb
+- spec/twitter/utils_spec.rb
 has_rdoc: