tw 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebdae18e1fd9f00e03f4437929a2669d65429793
-  data.tar.gz: 022a895933f19e28e2c3e00dbf5bed491d7241b4
+  metadata.gz: 5cbca5d6d9424b6bc4b14c75b1b0516c133a6c1b
+  data.tar.gz: a30d27fc896def18a7d7bfb419c8849836d65f8b
 SHA512:
-  metadata.gz: 13d724acd45d97df4ae4a93e316885c32aee8b6f126ebeca76b350b916cdde1070b3f041fc72c42b30588f76024c4923d3c64618bcf3e313f78b07c464ce1336
-  data.tar.gz: 91aa0ac3a46a43df3caa3666b26b29d0c49252ad75c42c52947d27cc6f293206f7804c8629061ca4776776c25c60f114c968a80929b318b0de217143f41d5d0c
+  metadata.gz: b60705bad682626dafa97d50241b68c4bd19826776e9df556b8443d1e08480ffe7514056280422134cfd3c22ea1bfe7c9d96f31644fe456dcc95fabbe1d66212
+  data.tar.gz: 3fc301af0cde6adaaa0142bae1138114ccd968741b3316d0970805bfac3377d85dc4a1897b61fe9f551f78923fa60b29c10014b312a8b344f2cb24e067d18326

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.2.0 2017-08-20
+
+* fix --stream option (#73)
+
 === 1.1.0 2017-07-02
 
 * update rubygems - parallel, rainbow, launchy #72

data/lib/tw.rb

@@ -4,7 +4,6 @@ $:.unshift(File.dirname(__FILE__)) unless
 require 'oauth'
 require 'twitter'
 require 'time'
-require 'user_stream'
 require 'yaml'
 require 'time'
 require 'cgi'

data/lib/tw/client/stream.rb

@@ -3,41 +3,39 @@ module Tw
   class Client::Stream
     def initialize(user=nil)
       user = Tw::Auth.get_or_regist_user user
-      UserStream.configure do |config|
+      @client = Twitter::Streaming::Client.new do |config|
         config.consumer_key = Conf['consumer_key']
         config.consumer_secret = Conf['consumer_secret']
-        config.oauth_token = user['access_token']
-        config.oauth_token_secret = user['access_secret']
+        config.access_token = user['access_token']
+        config.access_token_secret = user['access_secret']
       end
-
-      @client = UserStream::Client.new
     end
 
     def user_stream(&block)
       raise ArgumentError, 'block not given' unless block_given?
-      @client.user do |m|
-        if data = tweet?(m)
-          yield data
+      @client.user do |chunk|
+        if tweet = get_if_tweet(chunk)
+          yield tweet
         end
       end
     end
 
     def filter(*track_words, &block)
       raise ArgumentError, 'block not given' unless block_given?
-      @client.filter :track => track_words.join(',') do |m|
-        if data = tweet?(m)
-          yield data
+      @client.filter :track => track_words.join(',') do |chunk|
+        if tweet = get_if_tweet(chunk)
+          yield tweet
         end
       end
     end
 
     private
-    def tweet?(chunk)
-      return false unless chunk.user and chunk.user.screen_name and chunk.text and chunk.created_at and chunk.id
+    def get_if_tweet(chunk)
+      return nil unless chunk.kind_of? Twitter::Tweet
       Tw::Tweet.new(:id => chunk.id,
                     :user => chunk.user.screen_name,
                     :text => chunk.text,
-                    :time => (Time.parse chunk.created_at))
+                    :time => chunk.created_at)
     end
 
   end

data/lib/tw/version.rb

@@ -1,3 +1,3 @@
 module Tw
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

data/tw.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency 'twitter', '>= 5.15.0'
-  gem.add_dependency 'userstream', '>= 1.2.0', '< 1.3.0'
+  gem.add_dependency 'oauth', '>= 0.5.3'
   gem.add_dependency 'json', '>= 2.1.0'
   gem.add_dependency 'yajl-ruby', '>= 1.3.0'
   gem.add_dependency 'rainbow', '>= 2.2.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tw
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-02 00:00:00.000000000 Z
+date: 2017-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter
@@ -25,25 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.15.0
 - !ruby/object:Gem::Dependency
-  name: userstream
+  name: oauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 0.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement