tw 0.5.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e443e2de4df2afab8a2a2476bb6aaf21dc130bfe
-  data.tar.gz: 234c968e2d9fc6904554391df197d6927c09b6a9
+  metadata.gz: 132f0246dedce958ec284e55e854c7519058975d
+  data.tar.gz: 827e812dbf302b85807b250a9e40a637a4e139ad
 SHA512:
-  metadata.gz: 46614a7c3a556c76d71bfc5abfa9441c14ab96368489b1c36af0dfc7186a4962b3312766950ed3d926cf23932543c4480c6bb70798fcd02945a0e4385b4feecd
-  data.tar.gz: 672c8332ba1406d325f8c4c985f9465646ca061a0a01ae90b18d2f28ff07079f61a52f80a4b999c82fc7f43e5330054e4ce80c7582a5be260eb5498917617ae4
+  metadata.gz: a807627313770df3891b8a93f345faa945fb8ca6bc3cf99710088d26cb6762015249445e3879aaf8015b758edf52fa00a6b3d73f61760c097ccb52d8f174f9da
+  data.tar.gz: b968ac4487d0f2c4dc718267b4c835577b85ca4ae11415fba0df08c4176cf4cf96245748fa469228643d122776f51e1e12931bdc988cf07074d8f73d79432c5d

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.0.0 2013-11-21
+
+* fix for twitter gem v5.0.0  #50
+
 === 0.5.2 2013-09-19
 
 * do not show dialogue with "--yes" option

data/lib/tw/client/auth.rb

@@ -1,8 +1,16 @@
 
 module Tw
   class Client
+    def self.client
+      @@client
+    end
+
+    def self.client=(client)
+      @@client = client
+    end
+
     def auth(user=nil)
-      Auth.auth user
+      self.class.client = @rest_client = Auth.auth user
     end
   end
 
@@ -10,7 +18,7 @@ module Tw
 
     def self.auth(user=nil)
       user = get_or_regist_user user
-      Twitter.configure do |c|
+      return Twitter::REST::Client.new do |c|
         c.consumer_key = Conf['consumer_key']
         c.consumer_secret = Conf['consumer_secret']
         c.oauth_token = user['access_token']

data/lib/tw/client/request.rb

@@ -2,7 +2,7 @@ module Tw
   class Client
 
     def mentions
-      Twitter.mentions.map{|m|
+      @rest_client.mentions.map{|m|
         Tw::Tweet.new(:id => m.id,
                       :user => m.user.screen_name,
                       :text => m.text,
@@ -13,9 +13,9 @@ module Tw
     end
 
     def search(word)
-      Twitter.search(word).results.map{|m|
+      @rest_client.search(word).map{|m|
         Tw::Tweet.new(:id => m.id,
-                      :user => m.from_user,
+                      :user => m.user.screen_name,
                       :text => m.text,
                       :time => m.created_at,
                       :fav_count => m.favorite_count,
@@ -24,7 +24,7 @@ module Tw
     end
 
     def home_timeline
-      Twitter.home_timeline.map{|m|
+      @rest_client.home_timeline.map{|m|
         Tw::Tweet.new(:id => m.id,
                       :user => m.user.screen_name,
                       :text => m.text,
@@ -35,7 +35,7 @@ module Tw
     end
 
     def user_timeline(user)
-      Twitter.user_timeline(user).map{|m|
+      @rest_client.user_timeline(user).map{|m|
         Tw::Tweet.new(:id => m.id,
                       :user => m.user.screen_name,
                       :text => m.text,
@@ -46,7 +46,7 @@ module Tw
     end
 
     def list_timeline(user,list)
-      Twitter.list_timeline(user, list).map{|m|
+      @rest_client.list_timeline(user, list).map{|m|
         Tw::Tweet.new(:id => m.id,
                       :user => m.user.screen_name,
                       :text => m.text,
@@ -57,12 +57,12 @@ module Tw
     end
 
     def direct_messages
-      [Twitter.direct_messages.map{|m|
+      [@rest_client.direct_messages.map{|m|
          Tw::Tweet.new(:id => m.id,
                        :user => m.sender.screen_name,
                        :text => m.text,
                        :time => m.created_at)
-       }, Twitter.direct_messages_sent.map{|m|
+       }, @rest_client.direct_messages_sent.map{|m|
          Tw::Tweet.new(:id => m.id,
                        :user => {
                          :from => m.sender.screen_name,
@@ -74,27 +74,27 @@ module Tw
     end
 
     def tweet(message, opts={})
-      res = Twitter.update message, opts
+      res = @rest_client.update message, opts
       puts res.text
       puts "http://twitter.com/#{res.user.screen_name}/status/#{res.id}"
       puts res.created_at
     end
 
     def tweet_with_file(message, file, opts={})
-      res = Twitter.update_with_media message, file, opts
+      res = @rest_client.update_with_media message, file, opts
       puts res.text
       puts "http://twitter.com/#{res.user.screen_name}/status/#{res.id}"
       puts res.created_at
     end
 
     def direct_message_create(to, message)
-      res = Twitter.direct_message_create to, message
+      res = @rest_client.create_direct_message to, message
       puts res.text
       puts res.created_at
     end
 
     def show_status(status_id)
-      res = Twitter.status(status_id)
+      res = @rest_client.status(status_id)
       line = CGI.unescapeHTML res.text
       line += " #{res.favorite_count}Fav" if res.favorite_count.to_i > 0
       line += " #{res.retweet_count}RT" if res.retweet_count.to_i > 0
@@ -104,11 +104,11 @@ module Tw
     end
 
     def favorite(status_id)
-      Twitter.favorite status_id
+      @rest_client.favorite status_id
     end
 
     def retweet(status_id)
-      Twitter.retweet status_id
+      @rest_client.retweet status_id
     end
 
   end

data/lib/tw/conf.rb

@@ -71,8 +71,8 @@ module Tw
         return
       end
       self['twitter_config'] = {}
-      self['twitter_config']['short_url_length'] = Twitter::configuration.short_url_length
-      self['twitter_config']['short_url_length_https'] = Twitter::configuration.short_url_length_https
+      self['twitter_config']['short_url_length'] = Tw::Client.client.configuration.short_url_length
+      self['twitter_config']['short_url_length_https'] = Tw::Client.client.configuration.short_url_length_https
       self['twitter_config']['last_updated_at'] = Time.now.to_i
       self.save
     end

data/lib/tw/version.rb

@@ -1,3 +1,3 @@
 module Tw
-  VERSION = '0.5.2'
+  VERSION = '1.0.0'
 end

data/tw.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'twitter', '>= 4.4.0'
+  gem.add_dependency 'twitter', '>= 5.0.0'
   gem.add_dependency 'userstream', '>= 1.2.0'
   gem.add_dependency 'json', '>= 1.7.0'
   gem.add_dependency 'rainbow', '>= 1.1.4'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tw
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-19 00:00:00.000000000 Z
+date: 2013-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: userstream
   requirement: !ruby/object:Gem::Requirement
@@ -193,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: CUI Twitter Client.