twitter 4.8.1 → 5.0.0.rc.1

data/lib/twitter/user.rb

@@ -1,12 +1,10 @@
 require 'twitter/basic_user'
 require 'twitter/creatable'
-require 'twitter/exceptable'
 
 module Twitter
   class User < Twitter::BasicUser
     PROFILE_IMAGE_SUFFIX_REGEX = /_normal(\.gif|\.jpe?g|\.png)$/i
     include Twitter::Creatable
-    include Twitter::Exceptable
     attr_reader :connections, :contributors_enabled, :default_profile,
       :default_profile_image, :description, :favourites_count,
       :follow_request_sent, :followers_count, :friends_count, :geo_enabled,
@@ -16,94 +14,106 @@ module Twitter
       :profile_link_color, :profile_sidebar_border_color,
       :profile_sidebar_fill_color, :profile_text_color,
       :profile_use_background_image, :protected, :statuses_count, :time_zone,
-      :url, :utc_offset, :verified
-    alias favorite_count favourites_count
-    alias favoriters_count favourites_count
+      :utc_offset, :verified
     alias favorites_count favourites_count
-    alias favourite_count favourites_count
-    alias favouriters_count favourites_count
-    alias follower_count followers_count
-    alias friend_count friends_count
-    alias status_count statuses_count
-    alias translator is_translator
-    alias translator? is_translator?
-    alias tweet_count statuses_count
+    alias profile_background_image_uri profile_background_image_url
+    alias profile_background_image_uri_https profile_background_image_url_https
+    alias translator? is_translator
     alias tweets_count statuses_count
-    alias update_count statuses_count
-    alias updates_count statuses_count
+    object_attr_reader :Tweet, :status, :user
+    alias tweet status
+    alias tweet? status?
+    alias tweeted? status?
 
     # @return [Array<Twitter::Entity::Url>]
-    def description_urls
-      @description_urls ||= Array(@attrs[:entities][:description][:urls]).map do |entity|
-        Twitter::Entity::Url.fetch_or_new(entity)
+    def description_uris
+      memoize(:description_urls) do
+        Array(@attrs[:entities][:description][:urls]).map do |entity|
+          Twitter::Entity::Url.new(entity)
+        end
       end
     end
+    alias description_urls description_uris
 
     # 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]
-    def profile_banner_url(size=:web)
-      insecure_url([@attrs[:profile_banner_url], size].join('/')) if profile_banner_url?
+    def profile_banner_uri(size=:web)
+      parse_encoded_uri(insecure_uri([@attrs[:profile_banner_url], size].join('/'))) if @attrs[:profile_banner_url]
     end
+    alias profile_banner_url profile_banner_uri
 
     # 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]
-    def profile_banner_url_https(size=:web)
-      [@attrs[:profile_banner_url], size].join('/') if profile_banner_url?
+    def profile_banner_uri_https(size=:web)
+      parse_encoded_uri([@attrs[:profile_banner_url], size].join('/')) if @attrs[:profile_banner_url]
     end
+    alias profile_banner_url_https profile_banner_uri_https
 
-    def profile_banner_url?
-      !@attrs[:profile_banner_url].nil?
+    def profile_banner_uri?
+      !!@attrs[:profile_banner_url]
     end
-    alias profile_banner_url_https? profile_banner_url?
+    alias profile_banner_url? profile_banner_uri?
+    alias profile_banner_uri_https? profile_banner_uri?
+    alias profile_banner_url_https? profile_banner_uri?
 
     # 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]
-    def profile_image_url(size=:normal)
-      insecure_url(profile_image_url_https(size)) if profile_image_url?
+    def profile_image_uri(size=:normal)
+      parse_encoded_uri(insecure_uri(profile_image_uri_https(size))) if @attrs[:profile_image_url_https]
     end
+    alias profile_image_url profile_image_uri
 
     # 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]
-    def profile_image_url_https(size=:normal)
+    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
       # It can be converted to any of the following sizes:
       # https://a0.twimg.com/profile_images/1759857427/image1326743606.png
       # https://a0.twimg.com/profile_images/1759857427/image1326743606_mini.png
       # https://a0.twimg.com/profile_images/1759857427/image1326743606_bigger.png
-      resize_profile_image_url(@attrs[:profile_image_url_https], size) if profile_image_url?
+      parse_encoded_uri(@attrs[:profile_image_url_https].sub(PROFILE_IMAGE_SUFFIX_REGEX, profile_image_suffix(size))) if @attrs[:profile_image_url_https]
     end
+    alias profile_image_url_https profile_image_uri_https
 
-    def profile_image_url?
-      !@attrs[:profile_image_url_https].nil?
+    def profile_image_uri?
+      !!@attrs[:profile_image_url_https]
     end
-    alias profile_image_url_https? profile_image_url?
+    alias profile_image_url? profile_image_uri?
+    alias profile_image_uri_https? profile_image_uri?
+    alias profile_image_url_https? profile_image_uri?
 
-    # @return [Twitter::Tweet]
-    def status
-      @status ||= fetch_or_new_without_self(Twitter::Tweet, @attrs, :status, :user)
+    # @return [String] The URL to the user.
+    def uri
+      @uri ||= ::URI.parse("https://twitter.com/#{screen_name}")
     end
+    alias url uri
 
-    def status?
-      !@attrs[:status].nil?
+    # @return [String] The URL to the user's website.
+    def website
+      @website ||= ::URI.parse(@attrs[:url]) if @attrs[:url]
+    end
+
+    def website?
+      !!@attrs[:url]
     end
 
   private
 
-    def insecure_url(url)
-      url.sub(/^https/i, 'http')
+    def parse_encoded_uri(uri)
+      ::URI.parse(::URI.encode(uri))
     end
 
-    def resize_profile_image_url(url, size)
-      url.sub(PROFILE_IMAGE_SUFFIX_REGEX, profile_image_suffix(size))
+    def insecure_uri(uri)
+      uri.to_s.sub(/^https/i, 'http')
     end
 
     def profile_image_suffix(size)

data/lib/twitter/version.rb

@@ -1,9 +1,9 @@
 module Twitter
   class Version
-    MAJOR = 4 unless defined? Twitter::Version::MAJOR
-    MINOR = 8 unless defined? Twitter::Version::MINOR
-    PATCH = 1 unless defined? Twitter::Version::PATCH
-    PRE = nil unless defined? Twitter::Version::PRE
+    MAJOR = 5
+    MINOR = 0
+    PATCH = 0
+    PRE = "rc.1"
 
     class << self
 

data/spec/fixtures/already_posted.json

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

data/spec/fixtures/ids_list.json

@@ -1 +1 @@
-{"previous_cursor":0,"next_cursor_str":"1305102810874389703","ids":[14100886,22469930,351223419],"previous_cursor_str":"0","next_cursor":1305102810874389703}
+{"previous_cursor":0,"next_cursor_str":"1305102810874389703","ids":[20009713,22469930,351223419],"previous_cursor_str":"0","next_cursor":1305102810874389703}

data/spec/fixtures/ids_list2.json

@@ -1 +1 @@
-{"previous_cursor":-1305101990888327757,"next_cursor_str":"0","ids":[20009713,23621851,14509199],"previous_cursor_str":"-1305101990888327757","next_cursor":0}
+{"previous_cursor":-1305101990888327757,"next_cursor_str":"0","ids":[14100886,23621851,14509199],"previous_cursor_str":"-1305101990888327757","next_cursor":0}

data/spec/fixtures/search.json

@@ -1 +1 @@
-{"statuses":[{"metadata":{"result_type":"recent","iso_language_code":"en"},"created_at":"Mon Sep 17 22:41:52 +0000 2012","id":247827742178021376,"id_str":"247827742178021376","text":"Bubble Mailer #freebandnames","source":"\u003ca href=\"http:\/\/tapbots.com\" rel=\"nofollow\"\u003eTweetbot for Mac\u003c\/a\u003e","truncated":false,"in_reply_to_status_id":null,"in_reply_to_status_id_str":null,"in_reply_to_user_id":null,"in_reply_to_user_id_str":null,"in_reply_to_screen_name":null,"user":{"id":671293,"id_str":"671293","name":"Richard Allen","screen_name":"richrad","location":"Kansas City","url":"http:\/\/richardallen.me","description":"Give me a break, Jeffery.","protected":false,"followers_count":174,"friends_count":273,"listed_count":2,"created_at":"Sat Jan 20 16:02:45 +0000 2007","favourites_count":383,"utc_offset":-21600,"time_zone":"Central Time (US & Canada)","geo_enabled":false,"verified":false,"statuses_count":1370,"lang":"en","contributors_enabled":false,"is_translator":false,"profile_background_color":"0099B9","profile_background_image_url":"http:\/\/a0.twimg.com\/images\/themes\/theme4\/bg.gif","profile_background_image_url_https":"https:\/\/si0.twimg.com\/images\/themes\/theme4\/bg.gif","profile_background_tile":false,"profile_image_url":"http:\/\/a0.twimg.com\/profile_images\/1399177739\/notlookingup_normal.jpeg","profile_image_url_https":"https:\/\/si0.twimg.com\/profile_images\/1399177739\/notlookingup_normal.jpeg","profile_link_color":"0099B9","profile_sidebar_border_color":"5ED4DC","profile_sidebar_fill_color":"95E8EC","profile_text_color":"3C3940","profile_use_background_image":true,"show_all_inline_media":true,"default_profile":false,"default_profile_image":false,"following":null,"follow_request_sent":null,"notifications":null},"geo":null,"coordinates":null,"place":null,"contributors":null,"retweet_count":0,"entities":{"hashtags":[{"text":"freebandnames","indices":[14,28]}],"urls":[],"user_mentions":[]},"favorited":false,"retweeted":false}],"search_metadata":{"completed_in":0.029,"max_id":250126199840518145,"max_id_str":"250126199840518145","next_page":"?page=2&max_id=250126199840518145&q=%23freebandnames&rpp=4&include_entities=1&result_type=mixed","page":1,"query":"%23freebandnames","refresh_url":"?since_id=250126199840518145&q=%23freebandnames&result_type=mixed&include_entities=1","results_per_page":4,"since_id":24012619984051000,"since_id_str":"24012619984051000"}}
+{"statuses":[{"metadata":{"result_type":"recent","iso_language_code":"en"},"created_at":"Mon Sep 17 22:41:52 +0000 2012","id":247827742178021376,"id_str":"247827742178021376","text":"Bubble Mailer #freebandnames","source":"\u003ca href=\"http:\/\/tapbots.com\" rel=\"nofollow\"\u003eTweetbot for Mac\u003c\/a\u003e","truncated":false,"in_reply_to_status_id":null,"in_reply_to_status_id_str":null,"in_reply_to_user_id":null,"in_reply_to_user_id_str":null,"in_reply_to_screen_name":null,"user":{"id":671293,"id_str":"671293","name":"Richard Allen","screen_name":"richrad","location":"Kansas City","url":"http:\/\/richardallen.me","description":"Give me a break, Jeffery.","protected":false,"followers_count":174,"friends_count":273,"listed_count":2,"created_at":"Sat Jan 20 16:02:45 +0000 2007","favourites_count":383,"utc_offset":-21600,"time_zone":"Central Time (US & Canada)","geo_enabled":false,"verified":false,"statuses_count":1370,"lang":"en","contributors_enabled":false,"is_translator":false,"profile_background_color":"0099B9","profile_background_image_url":"http:\/\/a0.twimg.com\/images\/themes\/theme4\/bg.gif","profile_background_image_url_https":"https:\/\/si0.twimg.com\/images\/themes\/theme4\/bg.gif","profile_background_tile":false,"profile_image_url":"http:\/\/a0.twimg.com\/profile_images\/1399177739\/notlookingup_normal.jpeg","profile_image_url_https":"https:\/\/si0.twimg.com\/profile_images\/1399177739\/notlookingup_normal.jpeg","profile_link_color":"0099B9","profile_sidebar_border_color":"5ED4DC","profile_sidebar_fill_color":"95E8EC","profile_text_color":"3C3940","profile_use_background_image":true,"show_all_inline_media":true,"default_profile":false,"default_profile_image":false,"following":null,"follow_request_sent":null,"notifications":null},"geo":null,"coordinates":null,"place":null,"contributors":null,"retweet_count":0,"entities":{"hashtags":[{"text":"freebandnames","indices":[14,28]}],"urls":[],"user_mentions":[]},"favorited":false,"retweeted":false}],"search_metadata":{"completed_in":0.029,"max_id":250126199840518145,"max_id_str":"250126199840518145","next_page":"?page=2&max_id=250126199840518145&q=%23freebandnames&rpp=4&include_entities=1&result_type=mixed","page":1,"query":"%23freebandnames","refresh_url":"?since_id=250126199840518145&q=%23freebandnames&result_type=mixed&include_entities=1","count":4,"since_id":24012619984051000,"since_id_str":"24012619984051000"}}

data/spec/fixtures/search_malformed.json

@@ -1 +1 @@
-{"max_id":28857935752,"since_id":0,"refresh_url":"?since_id=28857935752&q=twitter","next_page":"?page=2&max_id=28857935752&q=twitter","results_per_page":15,"page":1,"completed_in":0.017349,"since_id_str":"0","max_id_str":"28857935752","query":"twitter"}
+{"max_id":28857935752,"since_id":0,"refresh_url":"?since_id=28857935752&q=twitter","next_page":"?page=2&max_id=28857935752&q=twitter","count":15,"page":1,"completed_in":0.017349,"since_id_str":"0","max_id_str":"28857935752","query":"twitter"}

data/spec/fixtures/track_streaming.json

@@ -0,0 +1,3 @@
+{"created_at":"Wed Apr 06 19:13:37 +0000 2011","id":55709764298092545,"id_str":"55709764298092545","text":"The problem with your code is that it's doing exactly what you told it to do.","source":"\u003ca href=\"http:\/\/twitter.com\/download\/iphone\" rel=\"nofollow\"\u003eTwitter for iPhone\u003c\/a\u003e","truncated":false,"in_reply_to_status_id":null,"in_reply_to_status_id_str":null,"in_reply_to_user_id":null,"in_reply_to_user_id_str":null,"in_reply_to_screen_name":null,"user":{"id":7505382,"id_str":"7505382","name":"Erik Michaels-Ober","screen_name":"sferik","location":"San Francisco","description":"Write code. Not too much. Mostly Ruby.","url":"https:\/\/github.com\/sferik","entities":{"url":{"urls":[{"url":"https:\/\/github.com\/sferik","expanded_url":null,"indices":[0,25]}]},"description":{"urls":[]}},"protected":false,"followers_count":2479,"friends_count":200,"listed_count":132,"created_at":"Mon Jul 16 12:59:01 +0000 2007","favourites_count":4421,"utc_offset":-28800,"time_zone":"Pacific Time (US & Canada)","geo_enabled":true,"verified":false,"statuses_count":8730,"lang":"en","contributors_enabled":false,"is_translator":false,"profile_background_color":"000000","profile_background_image_url":"http:\/\/a0.twimg.com\/profile_background_images\/677717672\/bb0b3653dcf0644e344823e0a2eb3382.png","profile_background_image_url_https":"https:\/\/si0.twimg.com\/profile_background_images\/677717672\/bb0b3653dcf0644e344823e0a2eb3382.png","profile_background_tile":false,"profile_image_url":"http:\/\/a0.twimg.com\/profile_images\/1759857427\/image1326743606_normal.png","profile_image_url_https":"https:\/\/si0.twimg.com\/profile_images\/1759857427\/image1326743606_normal.png","profile_banner_url":"https:\/\/si0.twimg.com\/profile_banners\/7505382\/1349499693","profile_link_color":"0084B4","profile_sidebar_border_color":"000000","profile_sidebar_fill_color":"DDEEF6","profile_text_color":"333333","profile_use_background_image":true,"default_profile":false,"default_profile_image":false,"following":false,"follow_request_sent":false,"notifications":false},"geo":{"type":"Point","coordinates":[37.78349999,-122.39362884]},"coordinates":{"type":"Point","coordinates":[-122.39362884,37.78349999]},"place":{"id":"5c92ab5379de3839","url":"https:\/\/api.twitter.com\/1.1\/geo\/id\/5c92ab5379de3839.json","place_type":"neighborhood","name":"South Beach","full_name":"South Beach, San Francisco","country_code":"US","country":"United States","bounding_box":{"type":"Polygon","coordinates":[[[-122.403482,37.777529],[-122.387436,37.777529],[-122.387436,37.794486],[-122.403482,37.794486]]]},"attributes":{}},"contributors":null,"retweet_count":316,"entities":{"hashtags":[],"urls":[],"user_mentions":[]},"favorited":false,"retweeted":false}
+{"created_at":"Wed Apr 06 19:13:37 +0000 2011","id":55709764298092545,"id_str":"55709764298092545","text":"The problem with your code is that it's doing exactly what you told it to do.","source":"\u003ca href=\"http:\/\/twitter.com\/download\/iphone\" rel=\"nofollow\"\u003eTwitter for iPhone\u003c\/a\u003e","truncated":false,"in_reply_to_status_id":null,"in_reply_to_status_id_str":null,"in_reply_to_user_id":null,"in_reply_to_user_id_str":null,"in_reply_to_screen_name":null,"user":{"id":7505382,"id_str":"7505382","name":"Erik Michaels-Ober","screen_name":"sferik","location":"San Francisco","description":"Write code. Not too much. Mostly Ruby.","url":"https:\/\/github.com\/sferik","entities":{"url":{"urls":[{"url":"https:\/\/github.com\/sferik","expanded_url":null,"indices":[0,25]}]},"description":{"urls":[]}},"protected":false,"followers_count":2479,"friends_count":200,"listed_count":132,"created_at":"Mon Jul 16 12:59:01 +0000 2007","favourites_count":4421,"utc_offset":-28800,"time_zone":"Pacific Time (US & Canada)","geo_enabled":true,"verified":false,"statuses_count":8730,"lang":"en","contributors_enabled":false,"is_translator":false,"profile_background_color":"000000","profile_background_image_url":"http:\/\/a0.twimg.com\/profile_background_images\/677717672\/bb0b3653dcf0644e344823e0a2eb3382.png","profile_background_image_url_https":"https:\/\/si0.twimg.com\/profile_background_images\/677717672\/bb0b3653dcf0644e344823e0a2eb3382.png","profile_background_tile":false,"profile_image_url":"http:\/\/a0.twimg.com\/profile_images\/1759857427\/image1326743606_normal.png","profile_image_url_https":"https:\/\/si0.twimg.com\/profile_images\/1759857427\/image1326743606_normal.png","profile_banner_url":"https:\/\/si0.twimg.com\/profile_banners\/7505382\/1349499693","profile_link_color":"0084B4","profile_sidebar_border_color":"000000","profile_sidebar_fill_color":"DDEEF6","profile_text_color":"333333","profile_use_background_image":true,"default_profile":false,"default_profile_image":false,"following":false,"follow_request_sent":false,"notifications":false},"geo":{"type":"Point","coordinates":[37.78349999,-122.39362884]},"coordinates":{"type":"Point","coordinates":[-122.39362884,37.78349999]},"place":{"id":"5c92ab5379de3839","url":"https:\/\/api.twitter.com\/1.1\/geo\/id\/5c92ab5379de3839.json","place_type":"neighborhood","name":"South Beach","full_name":"South Beach, San Francisco","country_code":"US","country":"United States","bounding_box":{"type":"Polygon","coordinates":[[[-122.403482,37.777529],[-122.387436,37.777529],[-122.387436,37.794486],[-122.403482,37.794486]]]},"attributes":{}},"contributors":null,"retweet_count":316,"entities":{"hashtags":[],"urls":[],"user_mentions":[]},"favorited":false,"retweeted":false}
+

data/spec/helper.rb

@@ -8,7 +8,6 @@ SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
 SimpleCov.start
 
 require 'twitter'
-require 'twitter/identity_map'
 require 'rspec'
 require 'stringio'
 require 'tempfile'
@@ -21,42 +20,38 @@ RSpec.configure do |config|
   config.expect_with :rspec do |c|
     c.syntax = :expect
   end
-
-  config.before(:each) do
-    stub_post("/oauth2/token").with(:body => "grant_type=client_credentials").to_return(:body => fixture("bearer_token.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-  end
 end
 
 def a_delete(path)
-  a_request(:delete, Twitter::Default::ENDPOINT + path)
+  a_request(:delete, Twitter::REST::Client::ENDPOINT + path)
 end
 
 def a_get(path)
-  a_request(:get, Twitter::Default::ENDPOINT + path)
+  a_request(:get, Twitter::REST::Client::ENDPOINT + path)
 end
 
 def a_post(path)
-  a_request(:post, Twitter::Default::ENDPOINT + path)
+  a_request(:post, Twitter::REST::Client::ENDPOINT + path)
 end
 
 def a_put(path)
-  a_request(:put, Twitter::Default::ENDPOINT + path)
+  a_request(:put, Twitter::REST::Client::ENDPOINT + path)
 end
 
 def stub_delete(path)
-  stub_request(:delete, Twitter::Default::ENDPOINT + path)
+  stub_request(:delete, Twitter::REST::Client::ENDPOINT + path)
 end
 
 def stub_get(path)
-  stub_request(:get, Twitter::Default::ENDPOINT + path)
+  stub_request(:get, Twitter::REST::Client::ENDPOINT + path)
 end
 
 def stub_post(path)
-  stub_request(:post, Twitter::Default::ENDPOINT + path)
+  stub_request(:post, Twitter::REST::Client::ENDPOINT + path)
 end
 
 def stub_put(path)
-  stub_request(:put, Twitter::Default::ENDPOINT + path)
+  stub_request(:put, Twitter::REST::Client::ENDPOINT + path)
 end
 
 def fixture_path

data/spec/twitter/base_spec.rb

@@ -1,116 +1,42 @@
 require 'helper'
 
 describe Twitter::Base do
-
-  context "identity map enabled" do
-    before do
-      Twitter.identity_map = Twitter::IdentityMap
-      object = Twitter::Base.new(:id => 1)
-      @base = Twitter::Base.store(object)
-    end
-
-    after do
-      Twitter.identity_map = false
-    end
-
-    describe ".identity_map" do
-      it "returns an instance of the identity map" do
-        expect(Twitter::Base.identity_map).to be_a Twitter::IdentityMap
-      end
-    end
-
-    describe ".fetch" do
-      it "returns existing objects" do
-        expect(Twitter::Base.fetch(:id => 1)).to be
-      end
-
-      it "raises an error on objects that don't exist" do
-        expect{Twitter::Base.fetch(:id => 6)}.to raise_error Twitter::Error::IdentityMapKeyError
-      end
-    end
-
-    describe ".store" do
-      it "stores Twitter::Base objects" do
-        object = Twitter::Base.new(:id => 4)
-        expect(Twitter::Base.store(object)).to be_a Twitter::Base
-      end
-    end
-
-    describe ".fetch_or_new" do
-      it "returns existing objects" do
-        expect(Twitter::Base.fetch_or_new(:id => 1)).to be
-      end
-      it "creates new objects and stores them" do
-        expect(Twitter::Base.fetch_or_new(:id => 2)).to be
-        expect(Twitter::Base.fetch(:id => 2)).to be
-      end
-    end
-
-    describe "#[]" do
-      it "calls methods using [] with symbol" do
-        expect(@base[:object_id]).to be_an Integer
-      end
-      it "calls methods using [] with string" do
-        expect(@base['object_id']).to be_an Integer
-      end
-      it "returns nil for missing method" do
-        expect(@base[:foo]).to be_nil
-        expect(@base['foo']).to be_nil
-      end
-    end
-
-    describe "#to_hash" do
-      it "returns a hash" do
-        expect(@base.to_hash).to be_a Hash
-        expect(@base.to_hash[:id]).to eq 1
-      end
-    end
-
-    describe "identical objects" do
-      it "have the same object_id" do
-        expect(@base.object_id).to eq Twitter::Base.fetch(:id => 1).object_id
-      end
-    end
-
+  before do
+    @base = Twitter::Base.new(:id => 1)
   end
 
-  context "identity map disabled" do
-    before(:all) do
-      Twitter.identity_map = false
-    end
-    after(:all) do
-      Twitter.identity_map = Twitter::IdentityMap
+  describe "#[]" do
+    it "calls methods using [] with symbol" do
+      expect(@base[:object_id]).to be_an Integer
     end
-
-    describe ".identity_map" do
-      it "returns nil" do
-        expect(Twitter::Base.identity_map).to be_nil
-      end
+    it "calls methods using [] with string" do
+      expect(@base["object_id"]).to be_an Integer
     end
-
-    describe ".fetch" do
-      it "returns nil" do
-        expect(Twitter::Base.fetch(:id => 1)).to be_nil
-      end
+    it "returns nil for missing method" do
+      expect(@base[:foo]).to be_nil
+      expect(@base["foo"]).to be_nil
     end
+  end
 
-    describe ".store" do
-      it "returns an instance of the object" do
-        expect(Twitter::Base.store(Twitter::Base.new(:id => 1))).to be_a Twitter::Base
-      end
+  describe "#attrs" do
+    it "returns a hash of attributes" do
+      expect(@base.attrs).to eq({:id => 1})
     end
+  end
 
-    describe ".fetch_or_new" do
-      it "creates new objects" do
-        expect(Twitter::Base.fetch_or_new(:id => 2)).to be
-        expect(Twitter.identity_map).to be_false
-      end
+  describe "#delete" do
+    it "deletes an attribute and returns its value" do
+      base = Twitter::Base.new(:id => 1)
+      expect(base.delete(:id)).to eq(1)
+      expect(base.attrs[:id]).to be_nil
     end
   end
 
-  describe '#attrs' do
-    it 'returns a hash of attributes' do
-      expect(Twitter::Base.new(:id => 1).attrs).to eq({:id => 1})
+  describe "#update" do
+    it "returns a hash of attributes" do
+      base = Twitter::Base.new(:id => 1)
+      base.update(:id => 2)
+      expect(base.attrs[:id]).to eq(2)
     end
   end
 

data/spec/twitter/configuration_spec.rb

@@ -4,7 +4,7 @@ describe Twitter::Configuration do
 
   describe "#photo_sizes" do
     it "returns a hash of sizes when photo_sizes is set" do
-      photo_sizes = Twitter::Configuration.new(:photo_sizes => {:small => {:h => 226, :w => 340, :resize => 'fit'}, :large => {:h => 466, :w => 700, :resize => 'fit'}, :medium => {:h => 399, :w => 600, :resize => 'fit'}, :thumb => {:h => 150, :w => 150, :resize => 'crop'}}).photo_sizes
+      photo_sizes = Twitter::Configuration.new(:photo_sizes => {:small => {:h => 226, :w => 340, :resize => "fit"}, :large => {:h => 466, :w => 700, :resize => "fit"}, :medium => {:h => 399, :w => 600, :resize => "fit"}, :thumb => {:h => 150, :w => 150, :resize => "crop"}}).photo_sizes
       expect(photo_sizes).to be_a Hash
       expect(photo_sizes[:small]).to be_a Twitter::Size
     end

data/spec/twitter/cursor_spec.rb

@@ -2,34 +2,9 @@ require 'helper'
 
 describe Twitter::Cursor do
 
-  describe "#collection" do
-    it "returns a collection" do
-      collection = Twitter::Cursor.new({:ids => [1, 2, 3, 4, 5]}, :ids, nil, Twitter::Client.new, :follower_ids, {}).collection
-      expect(collection).to be_an Array
-      expect(collection.first).to be_a Fixnum
-    end
-  end
-
-  describe "#all" do
-    before do
-      @client = Twitter::Client.new
-      stub_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"}).to_return(:body => fixture("ids_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-      stub_get("/1.1/followers/ids.json").with(:query => {:cursor => "1305102810874389703", :screen_name => "sferik"}).to_return(:body => fixture("ids_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-    end
-    it "requests the correct resources" do
-      @client.follower_ids("sferik").all
-      expect(a_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"})).to have_been_made
-      expect(a_get("/1.1/followers/ids.json").with(:query => {:cursor => "1305102810874389703", :screen_name => "sferik"})).to have_been_made
-    end
-    it "fetches all" do
-      follower_ids = @client.follower_ids("sferik").all
-      expect(follower_ids.size).to eq 6
-    end
-  end
-
   describe "#each" do
     before do
-      @client = Twitter::Client.new
+      @client = Twitter::REST::Client.new(:consumer_key => "CK", :consumer_secret => "CS", :access_token => "AT", :access_token_secret => "AS")
       stub_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"}).to_return(:body => fixture("ids_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       stub_get("/1.1/followers/ids.json").with(:query => {:cursor => "1305102810874389703", :screen_name => "sferik"}).to_return(:body => fixture("ids_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
@@ -41,14 +16,21 @@ describe Twitter::Cursor do
     it "iterates" do
       count = 0
       @client.follower_ids("sferik").each{count += 1}
-      expect(count).to eq 6
+      expect(count).to eq(6)
+    end
+    context "with start" do
+      it "iterates" do
+        count = 0
+        @client.follower_ids("sferik").each(5){count += 1}
+        expect(count).to eq(1)
+      end
     end
   end
 
   describe "#first?" do
     context "when previous cursor equals zero" do
       before do
-        @cursor = Twitter::Cursor.new({:previous_cursor => 0}, :ids, nil, Twitter::Client.new, :follower_ids, {})
+        @cursor = Twitter::Cursor.new({:previous_cursor => 0}, :ids, nil, Twitter::REST::Client.new, :get, "/1.1/followers/ids.json", {})
       end
       it "returns true" do
         expect(@cursor.first?).to be_true
@@ -56,7 +38,7 @@ describe Twitter::Cursor do
     end
     context "when previous cursor does not equal zero" do
       before do
-        @cursor = Twitter::Cursor.new({:previous_cursor => 1}, :ids, nil, Twitter::Client.new, :follower_ids, {})
+        @cursor = Twitter::Cursor.new({:previous_cursor => 1}, :ids, nil, Twitter::REST::Client.new, :get, "/1.1/followers/ids.json", {})
       end
       it "returns true" do
         expect(@cursor.first?).to be_false
@@ -67,7 +49,7 @@ describe Twitter::Cursor do
   describe "#last?" do
     context "when next cursor equals zero" do
       before do
-        @cursor = Twitter::Cursor.new({:next_cursor => 0}, :ids, nil, Twitter::Client.new, :follower_ids, {})
+        @cursor = Twitter::Cursor.new({:next_cursor => 0}, :ids, nil, Twitter::REST::Client.new, :get, "/1.1/followers/ids.json", {})
       end
       it "returns true" do
         expect(@cursor.last?).to be_true
@@ -75,7 +57,7 @@ describe Twitter::Cursor do
     end
     context "when next cursor does not equal zero" do
       before do
-        @cursor = Twitter::Cursor.new({:next_cursor => 1}, :ids, nil, Twitter::Client.new, :follower_ids, {})
+        @cursor = Twitter::Cursor.new({:next_cursor => 1}, :ids, nil, Twitter::REST::Client.new, :get, "/1.1/followers/ids.json", {})
       end
       it "returns false" do
         expect(@cursor.last?).to be_false