t 0.7.0 → 0.8.0

data/spec/delete_spec.rb

@@ -20,7 +20,7 @@ describe T::Delete do
 
   describe "#block" do
     before do
-      @delete.options = @delete.options.merge(:profile => fixture_path + "/.trc")
+      @delete.options = @delete.options.merge("profile" => fixture_path + "/.trc")
       stub_delete("/1/blocks/destroy.json").
         with(:query => {:screen_name => "sferik", :include_entities => "false"}).
         to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
@@ -37,7 +37,7 @@ describe T::Delete do
     end
     context "--id" do
       before do
-        @delete.options = @delete.options.merge(:id => true)
+        @delete.options = @delete.options.merge("id" => true)
         stub_delete("/1/blocks/destroy.json").
           with(:query => {:user_id => "7505382", :include_entities => "false"}).
           to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
@@ -53,7 +53,7 @@ describe T::Delete do
 
   describe "#dm" do
     before do
-      @delete.options = @delete.options.merge(:profile => fixture_path + "/.trc")
+      @delete.options = @delete.options.merge("profile" => fixture_path + "/.trc")
       stub_get("/1/direct_messages/show/1773478249.json").
         with(:query => {:include_entities => "false"}).
         to_return(:body => fixture("direct_message.json"), :headers => {:content_type => "application/json; charset=utf-8"})
@@ -90,7 +90,7 @@ describe T::Delete do
     end
     context "--force" do
       before do
-        @delete.options = @delete.options.merge(:force => true)
+        @delete.options = @delete.options.merge("force" => true)
       end
       it "should request the correct resource" do
         @delete.dm("1773478249")
@@ -107,7 +107,7 @@ describe T::Delete do
 
   describe "#favorite" do
     before do
-      @delete.options = @delete.options.merge(:profile => fixture_path + "/.trc")
+      @delete.options = @delete.options.merge("profile" => fixture_path + "/.trc")
       stub_get("/1/statuses/show/28439861609.json").
         with(:query => {:include_entities => "false", :include_my_retweet => "false", :trim_user => "true"}).
         to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
@@ -144,7 +144,7 @@ describe T::Delete do
     end
     context "--force" do
       before do
-        @delete.options = @delete.options.merge(:force => true)
+        @delete.options = @delete.options.merge("force" => true)
       end
       it "should request the correct resource" do
         @delete.favorite("28439861609")
@@ -161,7 +161,7 @@ describe T::Delete do
 
   describe "#list" do
     before do
-      @delete.options = @delete.options.merge(:profile => fixture_path + "/.trc")
+      @delete.options = @delete.options.merge("profile" => fixture_path + "/.trc")
       stub_get("/1/account/verify_credentials.json").
         to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       stub_get("/1/lists/show.json").
@@ -199,7 +199,7 @@ describe T::Delete do
     end
     context "--force" do
       before do
-        @delete.options = @delete.options.merge(:force => true)
+        @delete.options = @delete.options.merge("force" => true)
       end
       it "should request the correct resource" do
         @delete.list("presidents")
@@ -216,7 +216,7 @@ describe T::Delete do
     end
     context "--id" do
       before do
-        @delete.options = @delete.options.merge(:id => true)
+        @delete.options = @delete.options.merge("id" => true)
         stub_get("/1/lists/show.json").
           with(:query => {:owner_screen_name => "sferik", :list_id => "8863586"}).
           to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
@@ -239,7 +239,7 @@ describe T::Delete do
 
   describe "#status" do
     before do
-      @delete.options = @delete.options.merge(:profile => fixture_path + "/.trc")
+      @delete.options = @delete.options.merge("profile" => fixture_path + "/.trc")
       stub_get("/1/statuses/show/26755176471724032.json").
         with(:query => {:include_entities => "false", :include_my_retweet => "false", :trim_user => "true"}).
         to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
@@ -276,7 +276,7 @@ describe T::Delete do
     end
     context "--force" do
       before do
-        @delete.options = @delete.options.merge(:force => true)
+        @delete.options = @delete.options.merge("force" => true)
       end
       it "should request the correct resource" do
         @delete.status("26755176471724032")

data/spec/list_spec.rb

@@ -22,7 +22,7 @@ describe T::List do
 
   describe "#add" do
     before do
-      @list.options = @list.options.merge(:profile => fixture_path + "/.trc")
+      @list.options = @list.options.merge("profile" => fixture_path + "/.trc")
       stub_get("/1/account/verify_credentials.json").
         to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       stub_post("/1/lists/members/create_all.json").
@@ -43,7 +43,7 @@ describe T::List do
     end
     context "--id" do
       before do
-        @list.options = @list.options.merge(:id => true)
+        @list.options = @list.options.merge("id" => true)
         stub_post("/1/lists/members/create_all.json").
           with(:body => {:user_id => "7505382", :slug => "presidents", :owner_screen_name => "sferik"}).
           to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
@@ -74,7 +74,7 @@ describe T::List do
 
   describe "#create" do
     before do
-      @list.options = @list.options.merge(:profile => fixture_path + "/.trc")
+      @list.options = @list.options.merge("profile" => fixture_path + "/.trc")
       stub_post("/1/lists/create.json").
         with(:body => {:name => "presidents"}).
         to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
@@ -93,7 +93,7 @@ describe T::List do
 
   describe "#information" do
     before do
-      @list.options = @list.options.merge(:profile => fixture_path + "/.trc")
+      @list.options = @list.options.merge("profile" => fixture_path + "/.trc")
       stub_get("/1/lists/show.json").
         with(:query => {:owner_screen_name => "testcli", :slug => "presidents"}).
         to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
@@ -128,7 +128,7 @@ URL          https://twitter.com/sferik/presidents
       end
       context "--id" do
         before do
-          @list.options = @list.options.merge(:id => true)
+          @list.options = @list.options.merge("id" => true)
           stub_get("/1/lists/show.json").
             with(:query => {:owner_id => "7505382", :slug => "presidents"}).
             to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
@@ -143,7 +143,7 @@ URL          https://twitter.com/sferik/presidents
     end
     context "--csv" do
       before do
-        @list.options = @list.options.merge(:csv => true)
+        @list.options = @list.options.merge("csv" => true)
       end
       it "should have the correct output" do
         @list.information("presidents")
@@ -173,7 +173,7 @@ ID,Description,Slug,Screen name,Created at,Members,Subscribers,Following,Mode,UR
     end
     context "--csv" do
       before do
-        @list.options = @list.options.merge(:csv => true)
+        @list.options = @list.options.merge("csv" => true)
       end
       it "should output in CSV format" do
         @list.members("presidents")
@@ -186,7 +186,7 @@ ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
     end
     context "--favorites" do
       before do
-        @list.options = @list.options.merge(:favorites => true)
+        @list.options = @list.options.merge("favorites" => true)
       end
       it "should sort by number of favorites" do
         @list.members("presidents")
@@ -195,7 +195,7 @@ ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
     end
     context "--followers" do
       before do
-        @list.options = @list.options.merge(:followers => true)
+        @list.options = @list.options.merge("followers" => true)
       end
       it "should sort by number of followers" do
         @list.members("presidents")
@@ -204,7 +204,7 @@ ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
     end
     context "--friends" do
       before do
-        @list.options = @list.options.merge(:friends => true)
+        @list.options = @list.options.merge("friends" => true)
       end
       it "should sort by number of friends" do
         @list.members("presidents")
@@ -213,7 +213,7 @@ ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
     end
     context "--listed" do
       before do
-        @list.options = @list.options.merge(:listed => true)
+        @list.options = @list.options.merge("listed" => true)
       end
       it "should sort by number of list memberships" do
         @list.members("presidents")
@@ -222,7 +222,7 @@ ID,Since,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
     end
     context "--long" do
       before do
-        @list.options = @list.options.merge(:long => true)
+        @list.options = @list.options.merge("long" => true)
       end
       it "should output in long format" do
         @list.members("presidents")
@@ -235,7 +235,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Screen
     end
     context "--posted" do
       before do
-        @list.options = @list.options.merge(:posted => true)
+        @list.options = @list.options.merge("posted" => true)
       end
       it "should sort by the time wshen Twitter account was created" do
         @list.members("presidents")
@@ -244,7 +244,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Screen
     end
     context "--reverse" do
       before do
-        @list.options = @list.options.merge(:reverse => true)
+        @list.options = @list.options.merge("reverse" => true)
       end
       it "should reverse the order of the sort" do
         @list.members("presidents")
@@ -253,7 +253,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Screen
     end
     context "--tweets" do
       before do
-        @list.options = @list.options.merge(:tweets => true)
+        @list.options = @list.options.merge("tweets" => true)
       end
       it "should sort by number of Tweets" do
         @list.members("presidents")
@@ -262,7 +262,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Screen
     end
     context "--unsorted" do
       before do
-        @list.options = @list.options.merge(:unsorted => true)
+        @list.options = @list.options.merge("unsorted" => true)
       end
       it "should not be sorted" do
         @list.members("presidents")
@@ -278,7 +278,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Screen
       end
       context "--id" do
         before do
-          @list.options = @list.options.merge(:id => true)
+          @list.options = @list.options.merge("id" => true)
           stub_get("/1/lists/members.json").
             with(:query => {:cursor => "-1", :include_entities => "false", :owner_id => "7505382", :skip_status => "true", :slug => "presidents"}).
             to_return(:body => fixture("users_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
@@ -295,7 +295,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Screen
 
   describe "#remove" do
     before do
-      @list.options = @list.options.merge(:profile => fixture_path + "/.trc")
+      @list.options = @list.options.merge("profile" => fixture_path + "/.trc")
       stub_get("/1/account/verify_credentials.json").
         to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
@@ -319,7 +319,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Screen
     end
     context "--id" do
       before do
-        @list.options = @list.options.merge(:id => true)
+        @list.options = @list.options.merge("id" => true)
         stub_post("/1/lists/members/destroy_all.json").
           with(:body => {:user_id => "7505382", :slug => "presidents", :owner_screen_name => "sferik"}).
           to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
@@ -350,6 +350,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Screen
 
   describe "#timeline" do
     before do
+      @list.options = @list.options.merge("no-color" => true)
       stub_get("/1/lists/statuses.json").
         with(:query => {:owner_screen_name => "testcli", :per_page => "20", :slug => "presidents", :include_entities => "false"}).
         to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
@@ -384,7 +385,7 @@ ID        Since         Tweets  Favorites  Listed  Following  Followers  Screen
     end
     context "--csv" do
       before do
-        @list.options = @list.options.merge(:csv => true)
+        @list.options = @list.options.merge("csv" => true)
       end
       it "should output in long format" do
         @list.timeline("presidents")
@@ -412,7 +413,7 @@ ID,Posted at,Screen name,Text
     end
     context "--long" do
       before do
-        @list.options = @list.options.merge(:long => true)
+        @list.options = @list.options.merge("long" => true)
       end
       it "should output in long format" do
         @list.timeline("presidents")
@@ -440,7 +441,7 @@ ID                  Posted at     Screen name    Text
     end
     context "--number" do
       before do
-        @list.options = @list.options.merge(:number => 1)
+        @list.options = @list.options.merge("number" => 1)
         stub_get("/1/lists/statuses.json").
           with(:query => {:owner_screen_name => "testcli", :per_page => "1", :slug => "presidents", :include_entities => "false"}).
           to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
@@ -454,7 +455,7 @@ ID                  Posted at     Screen name    Text
     end
     context "--reverse" do
       before do
-        @list.options = @list.options.merge(:reverse => true)
+        @list.options = @list.options.merge("reverse" => true)
       end
       it "should reverse the order of the sort" do
         @list.timeline("presidents")
@@ -488,7 +489,7 @@ ID                  Posted at     Screen name    Text
       end
       context "--id" do
         before do
-          @list.options = @list.options.merge(:id => true)
+          @list.options = @list.options.merge("id" => true)
           stub_get("/1/lists/statuses.json").
             with(:query => {:owner_id => "7505382", :per_page => "20", :slug => "presidents", :include_entities => "false"}).
             to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})

data/spec/rcfile_spec.rb

@@ -51,6 +51,20 @@ describe RCFile do
       }
       rcfile['testcli'].keys.should == ['abc123']
     end
+    it 'should not be world readable or writable' do
+      rcfile = RCFile.instance
+      rcfile.path = project_path + "/tmp/trc"
+      rcfile['testcli'] = {
+        'abc123' => {
+          :username => 'testcli',
+          :consumer_key => 'abc123',
+          :consumer_secret => 'def456',
+          :token => 'ghi789',
+          :secret => 'jkl012',
+        }
+      }
+      File.stat(rcfile.path).mode.should == 33152
+    end
   end
 
   describe '#configuration' do
@@ -61,58 +75,58 @@ describe RCFile do
     end
   end
 
-  describe '#default_consumer_key' do
+  describe '#active_consumer_key' do
     it 'should return default consumer key' do
       rcfile = RCFile.instance
       rcfile.path = fixture_path + "/.trc"
-      rcfile.default_consumer_key.should == 'abc123'
+      rcfile.active_consumer_key.should == 'abc123'
     end
   end
 
-  describe '#default_consumer_secret' do
+  describe '#active_consumer_secret' do
     it 'should return default consumer secret' do
       rcfile = RCFile.instance
       rcfile.path = fixture_path + "/.trc"
-      rcfile.default_consumer_secret.should == 'asdfasd223sd2'
+      rcfile.active_consumer_secret.should == 'asdfasd223sd2'
     end
   end
 
-  describe '#default_profile' do
+  describe '#active_profile' do
     it 'should return default profile' do
       rcfile = RCFile.instance
       rcfile.path = fixture_path + "/.trc"
-      rcfile.default_profile.should == ['testcli', 'abc123']
+      rcfile.active_profile.should == ['testcli', 'abc123']
     end
   end
 
-  describe '#default_profile=' do
+  describe '#active_profile=' do
     it 'should set default profile' do
       rcfile = RCFile.instance
       rcfile.path = project_path + "/tmp/trc"
-      rcfile.default_profile = {'username' => 'testcli', 'consumer_key' => 'abc123'}
-      rcfile.default_profile.should == ['testcli', 'abc123']
+      rcfile.active_profile = {'username' => 'testcli', 'consumer_key' => 'abc123'}
+      rcfile.active_profile.should == ['testcli', 'abc123']
     end
     it 'should write the data to disk' do
       rcfile = RCFile.instance
       rcfile.path = project_path + "/tmp/trc"
-      rcfile.default_profile = {'username' => 'testcli', 'consumer_key' => 'abc123'}
-      rcfile.default_profile.should == ['testcli', 'abc123']
+      rcfile.active_profile = {'username' => 'testcli', 'consumer_key' => 'abc123'}
+      rcfile.active_profile.should == ['testcli', 'abc123']
     end
   end
 
-  describe '#default_token' do
+  describe '#active_token' do
     it 'should return default token' do
       rcfile = RCFile.instance
       rcfile.path = fixture_path + "/.trc"
-      rcfile.default_token.should == '428004849-cebdct6bwobn'
+      rcfile.active_token.should == '428004849-cebdct6bwobn'
     end
   end
 
-  describe '#default_secret' do
+  describe '#active_secret' do
     it 'should return default secret' do
       rcfile = RCFile.instance
       rcfile.path = fixture_path + "/.trc"
-      rcfile.default_secret.should == 'epzrjvxtumoc'
+      rcfile.active_secret.should == 'epzrjvxtumoc'
     end
   end
 

data/spec/search_spec.rb

@@ -54,7 +54,7 @@ describe T::Search do
     end
     context "--csv" do
       before do
-        @search.options = @search.options.merge(:csv => true)
+        @search.options = @search.options.merge("csv" => true)
       end
       it "should output in CSV format" do
         @search.all("twitter")
@@ -84,7 +84,7 @@ ID,Posted at,Screen name,Text
     end
     context "--long" do
       before do
-        @search.options = @search.options.merge(:long => true)
+        @search.options = @search.options.merge("long" => true)
       end
       it "should output in long format" do
         @search.all("twitter")
@@ -110,7 +110,7 @@ ID                  Posted at     Screen name       Text
     end
     context "--number" do
       before do
-        @search.options = @search.options.merge(:number => 1)
+        @search.options = @search.options.merge("number" => 1)
         stub_request(:get, "https://search.twitter.com/search.json").
           with(:query => {:q => "twitter", :include_entities => "false", :rpp => "1"}).
           to_return(:body => fixture("search.json"), :headers => {:content_type => "application/json; charset=utf-8"})
@@ -126,6 +126,7 @@ ID                  Posted at     Screen name       Text
 
   describe "#favorites" do
     before do
+      @search.options = @search.options.merge("no-color" => true)
       1.upto(16).each do |page|
         stub_get("/1/favorites.json").
           with(:query => {:count => "200", :page => "#{page}"}).
@@ -163,7 +164,7 @@ ID                  Posted at     Screen name       Text
     end
     context "--csv" do
       before do
-        @search.options = @search.options.merge(:csv => true)
+        @search.options = @search.options.merge("csv" => true)
       end
       it "should output in CSV format" do
         @search.favorites("twitter")
@@ -190,7 +191,7 @@ ID,Posted at,Screen name,Text
     end
     context "--long" do
       before do
-        @search.options = @search.options.merge(:long => true)
+        @search.options = @search.options.merge("long" => true)
       end
       it "should output in long format" do
         @search.favorites("twitter")
@@ -232,6 +233,7 @@ ID                  Posted at     Screen name  Text
 
   describe "#mentions" do
     before do
+      @search.options = @search.options.merge("no-color" => true)
       1.upto(16).each do |page|
         stub_get("/1/statuses/mentions.json").
           with(:query => {:count => "200", :page => "#{page}"}).
@@ -269,7 +271,7 @@ ID                  Posted at     Screen name  Text
     end
     context "--csv" do
       before do
-        @search.options = @search.options.merge(:csv => true)
+        @search.options = @search.options.merge("csv" => true)
       end
       it "should output in CSV format" do
         @search.mentions("twitter")
@@ -296,7 +298,7 @@ ID,Posted at,Screen name,Text
     end
     context "--long" do
       before do
-        @search.options = @search.options.merge(:long => true)
+        @search.options = @search.options.merge("long" => true)
       end
       it "should output in long format" do
         @search.mentions("twitter")
@@ -338,6 +340,7 @@ ID                  Posted at     Screen name  Text
 
   describe "#retweets" do
     before do
+      @search.options = @search.options.merge("no-color" => true)
       1.upto(16).each do |page|
         stub_get("/1/statuses/retweeted_by_me.json").
           with(:query => {:count => "200", :page => "#{page}"}).
@@ -375,7 +378,7 @@ ID                  Posted at     Screen name  Text
     end
     context "--csv" do
       before do
-        @search.options = @search.options.merge(:csv => true)
+        @search.options = @search.options.merge("csv" => true)
       end
       it "should output in CSV format" do
         @search.retweets("twitter")
@@ -402,7 +405,7 @@ ID,Posted at,Screen name,Text
     end
     context "--long" do
       before do
-        @search.options = @search.options.merge(:long => true)
+        @search.options = @search.options.merge("long" => true)
       end
       it "should output in long format" do
         @search.retweets("twitter")
@@ -444,6 +447,7 @@ ID                  Posted at     Screen name  Text
 
   describe "#timeline" do
     before do
+      @search.options = @search.options.merge("no-color" => true)
       1.upto(16).each do |page|
         stub_get("/1/statuses/home_timeline.json").
           with(:query => {:count => "200", :page => "#{page}"}).
@@ -481,7 +485,7 @@ ID                  Posted at     Screen name  Text
     end
     context "--csv" do
       before do
-        @search.options = @search.options.merge(:csv => true)
+        @search.options = @search.options.merge("csv" => true)
       end
       it "should output in CSV format" do
         @search.timeline("twitter")
@@ -508,7 +512,7 @@ ID,Posted at,Screen name,Text
     end
     context "--long" do
       before do
-        @search.options = @search.options.merge(:long => true)
+        @search.options = @search.options.merge("long" => true)
       end
       it "should output in long format" do
         @search.timeline("twitter")
@@ -550,6 +554,7 @@ ID                  Posted at     Screen name  Text
 
   describe "#user" do
     before do
+      @search.options = @search.options.merge("no-color" => true)
       1.upto(16).each do |page|
         stub_get("/1/statuses/user_timeline.json").
           with(:query => {:screen_name => "sferik", :count => "200", :page => "#{page}"}).
@@ -587,7 +592,7 @@ ID                  Posted at     Screen name  Text
     end
     context "--csv" do
       before do
-        @search.options = @search.options.merge(:csv => true)
+        @search.options = @search.options.merge("csv" => true)
       end
       it "should output in CSV format" do
         @search.user("sferik", "twitter")
@@ -614,7 +619,7 @@ ID,Posted at,Screen name,Text
     end
     context "--id" do
       before do
-        @search.options = @search.options.merge(:id => true)
+        @search.options = @search.options.merge("id" => true)
         1.upto(16).each do |page|
           stub_get("/1/statuses/user_timeline.json").
             with(:query => {:user_id => "7505382", :count => "200", :page => "#{page}"}).
@@ -632,7 +637,7 @@ ID,Posted at,Screen name,Text
     end
     context "--long" do
       before do
-        @search.options = @search.options.merge(:long => true)
+        @search.options = @search.options.merge("long" => true)
       end
       it "should output in long format" do
         @search.user("sferik", "twitter")