t 1.3.1 → 1.4.0

data/lib/t/cli.rb

@@ -557,7 +557,7 @@ module T
       number = retweets.length
       say "@#{@rcfile.active_profile[0]} retweeted #{pluralize(number, 'tweet')}."
       say
-      say "Run `#{File.basename($0)} delete status #{retweets.map(&:id).join(' ')}` to undo."
+      say "Run `#{File.basename($0)} delete status #{retweets.map{|tweet| tweet.retweeted_status.id}.join(' ')}` to undo."
     end
     map %w(rt) => :retweet
 
@@ -598,6 +598,7 @@ module T
     method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
     def status(status_id)
       status = client.status(status_id.to_i, :include_my_retweet => false)
+      status_activity = client.status_activity(status_id.to_i)
       location = if status.place
         if status.place.name && status.place.attributes && status.place.attributes[:street_address] && status.place.attributes[:locality] && status.place.attributes[:region] && status.place.country
           [status.place.name, status.place.attributes[:street_address], status.place.attributes[:locality], status.place.attributes[:region], status.place.country].join(", ")
@@ -619,8 +620,8 @@ module T
       if options['csv']
         require 'csv'
         require 'fastercsv' unless Array.new.respond_to?(:to_csv)
-        say ["ID", "Text", "Screen name", "Posted at", "Location", "Retweets", "Source", "URL"].to_csv
-        say [status.id, HTMLEntities.new.decode(status.full_text), status.from_user, csv_formatted_time(status), location, status.retweet_count, strip_tags(status.source), "https://twitter.com/#{status.from_user}/status/#{status.id}"].to_csv
+        say ["ID", "Text", "Screen name", "Posted at", "Location", "Retweets", "Favorites", "Replies", "Source", "URL"].to_csv
+        say [status.id, HTMLEntities.new.decode(status.full_text), status.from_user, csv_formatted_time(status), location, status.retweet_count, status_activity.favoriters_count, status_activity.repliers_count, strip_tags(status.source), "https://twitter.com/#{status.from_user}/status/#{status.id}"].to_csv
       else
         array = []
         array << ["ID", status.id.to_s]
@@ -629,6 +630,8 @@ module T
         array << ["Posted at", "#{ls_formatted_time(status)} (#{time_ago_in_words(status.created_at)} ago)"]
         array << ["Location", location] unless location.nil?
         array << ["Retweets", number_with_delimiter(status.retweet_count)]
+        array << ["Favorites", number_with_delimiter(status_activity.favoriters_count)]
+        array << ["Replies", number_with_delimiter(status_activity.repliers_count)]
         array << ["Source", strip_tags(status.source)]
         array << ["URL", "https://twitter.com/#{status.from_user}/status/#{status.id}"]
         print_table(array)

data/lib/t/version.rb

@@ -8,12 +8,12 @@ module T
 
     # @return [Integer]
     def self.minor
-      3
+      4
     end
 
     # @return [Integer]
     def self.patch
-      1
+      0
     end
 
     # @return [String, NilClass]

data/spec/cli_spec.rb

@@ -2301,10 +2301,12 @@ ID                  Posted at     Screen name      Text
   describe "#status" do
     before do
       stub_get("/1.1/statuses/show/55709764298092545.json").with(:query => {:include_my_retweet => "false"}).to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/i/statuses/55709764298092545/activity/summary.json").to_return(:body => fixture("activity_summary.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
-    it "should request the correct resource" do
+    it "should request the correct resources" do
       @cli.status("55709764298092545")
       expect(a_get("/1.1/statuses/show/55709764298092545.json").with(:query => {:include_my_retweet => "false"})).to have_been_made
+      expect(a_get("/i/statuses/55709764298092545/activity/summary.json")).to have_been_made
     end
     it "should have the correct output" do
       @cli.status("55709764298092545")
@@ -2315,6 +2317,8 @@ Screen name  @sferik
 Posted at    Apr  6  2011 (8 months ago)
 Location     Blowfish Sushi To Die For, 2170 Bryant St, San Francisco, California, United States
 Retweets     320
+Favorites    2
+Replies      1
 Source       Twitter for iPhone
 URL          https://twitter.com/sferik/status/55709764298092545
       eos
@@ -2326,17 +2330,17 @@ URL          https://twitter.com/sferik/status/55709764298092545
       it "should have the correct output" do
         @cli.status("55709764298092545")
         expect($stdout.string).to eq <<-eos
-ID,Text,Screen name,Posted at,Location,Retweets,Source,URL
-55709764298092545,The problem with your code is that it's doing exactly what you told it to do.,sferik,2011-04-06 19:13:37 +0000,"Blowfish Sushi To Die For, 2170 Bryant St, San Francisco, California, United States",320,Twitter for iPhone,https://twitter.com/sferik/status/55709764298092545
+ID,Text,Screen name,Posted at,Location,Retweets,Favorites,Replies,Source,URL
+55709764298092545,The problem with your code is that it's doing exactly what you told it to do.,sferik,2011-04-06 19:13:37 +0000,"Blowfish Sushi To Die For, 2170 Bryant St, San Francisco, California, United States",320,2,1,Twitter for iPhone,https://twitter.com/sferik/status/55709764298092545
         eos
       end
     end
     context "with no street address" do
       before do
-        stub_get("/1.1/statuses/show/55709764298092550.json").with(:query => {:include_my_retweet => "false"}).to_return(:body => fixture("status_no_street_address.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/statuses/show/55709764298092545.json").with(:query => {:include_my_retweet => "false"}).to_return(:body => fixture("status_no_street_address.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should have the correct output" do
-        @cli.status("55709764298092550")
+        @cli.status("55709764298092545")
         expect($stdout.string).to eq <<-eos
 ID           55709764298092550
 Text         The problem with your code is that it's doing exactly what you told it to do.
@@ -2344,6 +2348,8 @@ Screen name  @sferik
 Posted at    Apr  6  2011 (8 months ago)
 Location     Blowfish Sushi To Die For, San Francisco, California, United States
 Retweets     320
+Favorites    2
+Replies      1
 Source       Twitter for iPhone
 URL          https://twitter.com/sferik/status/55709764298092550
         eos
@@ -2351,10 +2357,10 @@ URL          https://twitter.com/sferik/status/55709764298092550
     end
     context "with no locality" do
       before do
-        stub_get("/1.1/statuses/show/55709764298092549.json").with(:query => {:include_my_retweet => "false"}).to_return(:body => fixture("status_no_locality.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/statuses/show/55709764298092545.json").with(:query => {:include_my_retweet => "false"}).to_return(:body => fixture("status_no_locality.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should have the correct output" do
-        @cli.status("55709764298092549")
+        @cli.status("55709764298092545")
         expect($stdout.string).to eq <<-eos
 ID           55709764298092549
 Text         The problem with your code is that it's doing exactly what you told it to do.
@@ -2362,6 +2368,8 @@ Screen name  @sferik
 Posted at    Apr  6  2011 (8 months ago)
 Location     Blowfish Sushi To Die For, San Francisco, California, United States
 Retweets     320
+Favorites    2
+Replies      1
 Source       Twitter for iPhone
 URL          https://twitter.com/sferik/status/55709764298092549
         eos
@@ -2369,10 +2377,10 @@ URL          https://twitter.com/sferik/status/55709764298092549
     end
     context "with no attributes" do
       before do
-        stub_get("/1.1/statuses/show/55709764298092546.json").with(:query => {:include_my_retweet => "false"}).to_return(:body => fixture("status_no_attributes.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/statuses/show/55709764298092545.json").with(:query => {:include_my_retweet => "false"}).to_return(:body => fixture("status_no_attributes.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should have the correct output" do
-        @cli.status("55709764298092546")
+        @cli.status("55709764298092545")
         expect($stdout.string).to eq <<-eos
 ID           55709764298092546
 Text         The problem with your code is that it's doing exactly what you told it to do.
@@ -2380,6 +2388,8 @@ Screen name  @sferik
 Posted at    Apr  6  2011 (8 months ago)
 Location     Blowfish Sushi To Die For, San Francisco, United States
 Retweets     320
+Favorites    2
+Replies      1
 Source       Twitter for iPhone
 URL          https://twitter.com/sferik/status/55709764298092546
         eos
@@ -2387,10 +2397,10 @@ URL          https://twitter.com/sferik/status/55709764298092546
     end
     context "with no country" do
       before do
-        stub_get("/1.1/statuses/show/55709764298092547.json").with(:query => {:include_my_retweet => "false"}).to_return(:body => fixture("status_no_country.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/statuses/show/55709764298092545.json").with(:query => {:include_my_retweet => "false"}).to_return(:body => fixture("status_no_country.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should have the correct output" do
-        @cli.status("55709764298092547")
+        @cli.status("55709764298092545")
         expect($stdout.string).to eq <<-eos
 ID           55709764298092547
 Text         The problem with your code is that it's doing exactly what you told it to do.
@@ -2398,6 +2408,8 @@ Screen name  @sferik
 Posted at    Apr  6  2011 (8 months ago)
 Location     Blowfish Sushi To Die For, San Francisco
 Retweets     320
+Favorites    2
+Replies      1
 Source       Twitter for iPhone
 URL          https://twitter.com/sferik/status/55709764298092547
         eos
@@ -2405,10 +2417,10 @@ URL          https://twitter.com/sferik/status/55709764298092547
     end
     context "with no full name" do
       before do
-        stub_get("/1.1/statuses/show/55709764298092548.json").with(:query => {:include_my_retweet => "false"}).to_return(:body => fixture("status_no_full_name.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/statuses/show/55709764298092545.json").with(:query => {:include_my_retweet => "false"}).to_return(:body => fixture("status_no_full_name.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should have the correct output" do
-        @cli.status("55709764298092548")
+        @cli.status("55709764298092545")
         expect($stdout.string).to eq <<-eos
 ID           55709764298092548
 Text         The problem with your code is that it's doing exactly what you told it to do.
@@ -2416,6 +2428,8 @@ Screen name  @sferik
 Posted at    Apr  6  2011 (8 months ago)
 Location     Blowfish Sushi To Die For
 Retweets     320
+Favorites    2
+Replies      1
 Source       Twitter for iPhone
 URL          https://twitter.com/sferik/status/55709764298092548
         eos

data/spec/fixtures/activity_summary.json

@@ -0,0 +1 @@
+{"retweeters_count":"1","repliers":[15395778],"retweeters":[5407632],"favoriters_count":"2","repliers_count":"1","favoriters":[5407632,15395778]}

data/spec/helper.rb

@@ -11,7 +11,7 @@ require 't'
 require 'rspec'
 require 'timecop'
 require 'webmock/rspec'
-require 'json'
+require 'multi_json'
 
 RSpec.configure do |config|
   config.expect_with :rspec do |c|
@@ -64,5 +64,5 @@ def fixture(file)
 end
 
 def status_from_fixture(file)
-  Twitter::Status.new(JSON.parse(fixture(file).read, :symbolize_names => true))
+  Twitter::Status.new(MultiJson.load(fixture(file).read, :symbolize_keys => true))
 end

data/t.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'fastercsv', '~> 1.5'
   gem.add_dependency 'geokit', '~> 1.6'
   gem.add_dependency 'htmlentities', '~> 4.3'
-  gem.add_dependency 'json', '~> 1.6'
   gem.add_dependency 'oauth', '~> 0.4'
+  gem.add_dependency 'oj', '~> 1.4'
   gem.add_dependency 'retryable', '~> 1.2'
   gem.add_dependency 'thor', ['>= 0.16', '< 2']
   gem.add_dependency 'tweetstream', '~> 2.3'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: t
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2012-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
@@ -76,13 +76,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.3'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: oauth
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,15 +90,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: oauth
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: retryable
   requirement: !ruby/object:Gem::Requirement
@@ -305,6 +305,7 @@ files:
 - spec/fixtures/501_ids.json
 - spec/fixtures/501_users_list.json
 - spec/fixtures/access_token
+- spec/fixtures/activity_summary.json
 - spec/fixtures/checkip.html
 - spec/fixtures/direct_message.json
 - spec/fixtures/direct_messages.json
@@ -380,6 +381,7 @@ test_files:
 - spec/fixtures/501_ids.json
 - spec/fixtures/501_users_list.json
 - spec/fixtures/access_token
+- spec/fixtures/activity_summary.json
 - spec/fixtures/checkip.html
 - spec/fixtures/direct_message.json
 - spec/fixtures/direct_messages.json