twterm 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6899ab95b0be06317c390cbb3a0a8638f73b1ead
-  data.tar.gz: 5414fbb91b92079b03f2f4f001ac49e9379357ad
+  metadata.gz: 706e593e4edcad70bc6c85a508a87bb3b0b6f627
+  data.tar.gz: 5103de0dc3e61d085910facd228e7901feec04bd
 SHA512:
-  metadata.gz: b0b7bfcaa4aea696889614b2c7e804fb873c5abd25ab288093005dfcbd8e1037a05b2bb0137c26bda64fcefa60cb647c38ab6f9276e172a755345025ee9a8be7
-  data.tar.gz: b47ef4cb13b9c371d15287e328e7c5b1701dc10446ffd9e054af8aa8d90878d8e5b33506f7abc465d8458ba92128d16e0f24ce03b9fb100d420591e20203c75b
+  metadata.gz: b154db08ac62478501dbad44c8330f6abb79a30514ded5432400b36221934a7c89e740b4180471c9334d04c2638bada78fec70a0c4490a570c8db6ad9f99e2de
+  data.tar.gz: e383c7167af2a394cc2ea7f0930c581c6e3afae5c630b7311791e2dcff8438b45f2999fda09e586f71324c3d35d48b567252a3fa9960abb63172d465faea585e

data/lib/twterm.rb

@@ -28,6 +28,7 @@ require 'twterm/filter_query_window'
 require 'twterm/filterable_list'
 require 'twterm/friendship'
 require 'twterm/history/base'
+require 'twterm/history/savable'
 require 'twterm/history/hashtag'
 require 'twterm/history/screen_name'
 require 'twterm/list'
@@ -67,6 +68,6 @@ require 'twterm/version'
 
 module Twterm
   class Conf
-    REQUIRE_VERSION = '1.1.0.beta1'
+    REQUIRE_VERSION = '1.1.1'
   end
 end

data/lib/twterm/app.rb

@@ -21,9 +21,11 @@ module Twterm
 
       Screen.instance.refresh
 
-      client.stream
+      client.user_stream
 
       reset_interruption_handler
+
+      Signal.trap(:WINCH) { Screen.instance.resize }
     end
 
     def run

data/lib/twterm/client.rb

@@ -18,21 +18,6 @@ module Twterm
       end
     end
 
-    def connect_stream
-      stream_client.stop_stream
-
-      @streaming_thread = Thread.new do
-        begin
-          Notifier.instance.show_message 'Trying to connect to Twitter...'
-          stream_client.userstream
-        rescue EventMachine::ConnectionError
-          Notifier.instance.show_error 'Connection failed'
-          sleep 30
-          retry
-        end
-      end
-    end
-
     def destroy_status(status)
       send_request_without_catch do
         rest_client.destroy_status(status.id)
@@ -143,9 +128,45 @@ module Twterm
         end
       end
 
+      initialize_user_stream
+
       @@instances << self
     end
 
+    def initialize_user_stream
+      return if user_stream_initialized?
+
+      streaming_client.on_friends do
+        user_stream_connected!
+      end
+
+      streaming_client.on_timeline_status do |tweet|
+        status = Status.new(tweet)
+        invoke_callbacks(:timeline_status, status)
+        invoke_callbacks(:mention, status) if status.text.include? "@#{@screen_name}"
+      end
+
+      streaming_client.on_delete do |status_id|
+        timeline.delete_status(status_id)
+      end
+
+      streaming_client.on_event(:favorite) do |event|
+        break if event[:source][:screen_name] == @screen_name
+
+        user = event[:source][:screen_name]
+        text = event[:target_object][:text]
+        message = "@#{user} has favorited your tweet: #{text}"
+        Notifier.instance.show_message(message)
+      end
+
+      streaming_client.on_no_data_received do
+        user_stream_disconnected!
+        user_stream
+      end
+
+      user_stream_initialized!
+    end
+
     def list(list_id)
       send_request do
         rest_client.list(list_id)
@@ -318,41 +339,8 @@ module Twterm
       end
     end
 
-    def stream
-      stream_client.on_friends do
-        Notifier.instance.show_message 'Connection established' unless @stream_connected
-        @stream_connected = true
-      end
-
-      stream_client.on_timeline_status do |tweet|
-        status = Status.new(tweet)
-        invoke_callbacks(:timeline_status, status)
-        invoke_callbacks(:mention, status) if status.text.include? "@#{@screen_name}"
-      end
-
-      stream_client.on_delete do |status_id|
-        timeline.delete_status(status_id)
-      end
-
-      stream_client.on_event(:favorite) do |event|
-        break if event[:source][:screen_name] == @screen_name
-
-        user = event[:source][:screen_name]
-        text = event[:target_object][:text]
-        message = "@#{user} has favorited your tweet: #{text}"
-        Notifier.instance.show_message(message)
-      end
-
-      stream_client.on_no_data_received do
-        @stream_connected = false
-        connect_stream
-      end
-
-      connect_stream
-    end
-
-    def stream_client
-      @stream_client ||= TweetStream::Client.new(
+    def streaming_client
+      @streaming_client ||= TweetStream::Client.new(
         consumer_key:       CONSUMER_KEY,
         consumer_secret:    CONSUMER_SECRET,
         oauth_token:        @access_token,
@@ -402,6 +390,42 @@ module Twterm
       end
     end
 
+    def user_stream
+      streaming_client.stop_stream
+
+      @streaming_thread = Thread.new do
+        begin
+          Notifier.instance.show_message 'Trying to connect to Twitter...'
+          streaming_client.userstream
+        rescue EventMachine::ConnectionError
+          Notifier.instance.show_error 'Connection failed'
+          sleep 30
+          retry
+        end
+      end
+    end
+
+    def user_stream_connected?
+      @user_stream_connected || false
+    end
+
+    def user_stream_connected!
+      Notifier.instance.show_message 'Connection established' unless user_stream_connected?
+      @user_stream_connected = true
+    end
+
+    def user_stream_disconnected!
+      @user_stream_connected = false
+    end
+
+    def user_stream_initialized?
+      @user_stream_initialized || false
+    end
+
+    def user_stream_initialized!
+      @user_stream_initialized = true
+    end
+
     def user_timeline(user_id)
       send_request do
         rest_client.user_timeline(user_id, count: 200)

data/lib/twterm/filter_query_window.rb

@@ -73,6 +73,11 @@ module Twterm
       stdscr.addstr(' ' * window.maxx)
     end
 
+    def resize
+      @window.resize(1, stdscr.maxx)
+      @window.move(stdscr.maxy - 1, 0)
+    end
+
     private
 
     attr_reader :window

data/lib/twterm/history/base.rb

@@ -1,39 +1,20 @@
 module Twterm
   module History
     module Base
-      MAX_HISTORY_SIZE = 500
-
       attr_reader :history
 
       def initialize
-        unless File.exist?(history_file)
-          @history = []
-          return
-        end
-
-        begin
-          @history = YAML.load(File.read(history_file)) || []
-        rescue
-          @history = []
-        end
+        @history = []
       end
 
-      def add(hashtag)
-        @history.unshift(hashtag)
-        @history = @history.uniq.take(MAX_HISTORY_SIZE)
-        save
+      def add(item)
+        @history << item
       end
 
       private
 
-      def save
-        File.open(history_file, 'w', 0600) do |f|
-          f.write @history.to_yaml
-        end
-      end
-
-      def history_file
-        fail NotImplementedError, 'history_file method must be implemented'
+      def file
+        fail NotImplementedError, 'file method must be implemented'
       end
     end
   end

data/lib/twterm/history/hashtag.rb

@@ -1,12 +1,12 @@
 module Twterm
   module History
     class Hashtag
-      include Singleton, Base
+      include Singleton, Savable
 
       private
 
-      def history_file
-        "#{App::DATA_DIR}/hashtags"
+      def file
+        "#{App::DATA_DIR}/hashtags".freeze
       end
     end
   end

data/lib/twterm/history/savable.rb

@@ -0,0 +1,37 @@
+module Twterm
+  module History
+    module Savable
+      include Base
+
+      def initialize
+        unless File.exist?(file)
+          @history = []
+          return
+        end
+
+        begin
+          @history = YAML.load(File.read(file)) || []
+        rescue
+          @history = []
+        end
+
+        Scheduler.new(300) { save }
+      end
+
+      def add(item)
+        @history << item unless @history.include?(item)
+        @history = history.take(1000)
+      end
+
+      def save
+        File.open(file, 'w', 0600) { |f| f.write(history.to_yaml) }
+      end
+
+      private
+
+      def file
+        fail NotImplementedError, 'file method must be implemented'
+      end
+    end
+  end
+end

data/lib/twterm/history/screen_name.rb

@@ -3,10 +3,8 @@ module Twterm
     class ScreenName
       include Singleton, Base
 
-      private
-
-      def history_file
-        "#{App::DATA_DIR}/screen_names"
+      def history
+        User.all.map(&:screen_name)
       end
     end
   end

data/lib/twterm/notifier.rb

@@ -16,6 +16,11 @@ module Twterm
       end
     end
 
+    def resize
+      @window.resize(1, stdscr.maxx)
+      @window.move(stdscr.maxy - 2, 0)
+    end
+
     def show_error(message)
       notification = Notification::Error.new(message)
       @queue.push(notification)

data/lib/twterm/screen.rb

@@ -19,6 +19,17 @@ module Twterm
       Notifier.instance.show
     end
 
+    def resize
+      resizeterm(`tput lines`.to_i, `tput cols`.to_i)
+      @screen.resize(`tput lines`.to_i, `tput cols`.to_i)
+
+      TabManager.instance.resize
+      TabManager.instance.each_tab(&:resize)
+      Notifier.instance.resize
+      FilterQueryWindow.instance.resize
+      refresh
+    end
+
     def respond_to_key(key)
       case key
       when ?n

data/lib/twterm/status.rb

@@ -52,13 +52,13 @@ module Twterm
       unless tweet.retweeted_status.is_a? Twitter::NullObject
         @retweeted_by_user_id = tweet.user.id
         User.new(tweet.user)
-        retweeted_at = Status.parse_time(tweet.created_at)
+        retweeted_at = tweet.created_at.dup.localtime
         tweet = tweet.retweeted_status
       end
 
       @id = tweet.id
       @text = CGI.unescapeHTML(tweet.full_text.dup)
-      @created_at = Status.parse_time(tweet.created_at)
+      @created_at = tweet.created_at.dup.localtime
       @appeared_at = retweeted_at || @created_at
       @retweet_count = tweet.retweet_count
       @favorite_count = tweet.favorite_count
@@ -100,7 +100,7 @@ module Twterm
     end
 
     def split(width)
-      @splitted_text[:width] ||= @text.split_by_width(width)
+      @splitted_text[width] ||= @text.split_by_width(width)
     end
 
     def touch!
@@ -138,6 +138,10 @@ module Twterm
       @@instances = status_ids.zip(statuses).to_h
     end
 
+    def self.delete(id)
+      @@instances.delete(id)
+    end
+
     def self.find(id)
       @@instances[id]
     end
@@ -155,9 +159,5 @@ module Twterm
       instance = find(tweet.id)
       instance.nil? ? super : instance.update!(tweet)
     end
-
-    def self.parse_time(time)
-      (time.is_a?(String) ? Time.parse(time) : time.dup).localtime
-    end
   end
 end

data/lib/twterm/tab/base.rb

@@ -37,6 +37,11 @@ module Twterm
         end
       end
 
+      def resize
+        window.resize(stdscr.maxy - 5, stdscr.maxx)
+        window.move(3, 0)
+      end
+
       def respond_to_key(_)
         fail NotImplementedError, 'respond_to_key method must be implemented'
       end

data/lib/twterm/tab/statuses/base.rb

@@ -20,7 +20,7 @@ module Twterm
         end
 
         def delete(status_id)
-          @status_ids.delete(status_id)
+          Status.delete(status_id)
           refresh
         end
 

data/lib/twterm/tab_manager.rb

@@ -116,8 +116,21 @@ module Twterm
       @window.refresh
     end
 
+    def resize
+      @window.resize(3, stdscr.maxx)
+      @window.move(0, 0)
+    end
+
     def respond_to_key(key)
       case key
+      when ?1..?9
+        @index = key.to_i - 1 if @tabs.count >= key.to_i
+        current_tab.refresh
+        refresh_window
+      when ?0
+        @index = @tabs.count - 1
+        current_tab.refresh
+        refresh_window
       when ?h, 2, Key::LEFT
         show_previous
       when ?l, 6, Key::RIGHT

data/lib/twterm/user.rb

@@ -87,8 +87,6 @@ module Twterm
         Friendship.following_not_requested(client_id, user.id)
       end
 
-      History::ScreenName.instance.add(user.screen_name)
-
       self
     end
 

data/lib/twterm/version.rb

@@ -1,3 +1,3 @@
 module Twterm
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/twterm.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'curses', '>= 1.0.1'
   spec.add_dependency 'launchy', '>= 2.4.3'
   spec.add_dependency 'oauth', '>= 0.4.7'
-  spec.add_dependency 'tweetstream', '>= 2.6.1'
-  spec.add_dependency 'twitter', '>= 5.14.0'
+  spec.add_dependency 'tweetstream', '~> 2.6'
+  spec.add_dependency 'twitter', '~> 5.13'
   spec.add_dependency 'twitter-text', '>= 1.11.0'
 
   spec.add_development_dependency 'bundler', '~> 1.8'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twterm
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Ryota Kameoka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-20 00:00:00.000000000 Z
+date: 2015-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -56,30 +56,30 @@ dependencies:
   name: tweetstream
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.1
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.1
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: twitter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.14.0
+        version: '5.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.14.0
+        version: '5.13'
 - !ruby/object:Gem::Dependency
   name: twitter-text
   requirement: !ruby/object:Gem::Requirement
@@ -167,6 +167,7 @@ files:
 - lib/twterm/friendship.rb
 - lib/twterm/history/base.rb
 - lib/twterm/history/hashtag.rb
+- lib/twterm/history/savable.rb
 - lib/twterm/history/screen_name.rb
 - lib/twterm/list.rb
 - lib/twterm/notification/base.rb