twterm 1.1.3 → 1.2.0

data/lib/twterm/tab_manager.rb

@@ -1,12 +1,20 @@
+require 'twterm/event/screen/resize'
+require 'twterm/publisher'
+require 'twterm/subscriber'
+require 'twterm/utils'
+
 module Twterm
   class TabManager
     include Singleton
     include Curses
+    include Publisher
+    include Subscriber
+    include Utils
 
     DUMPED_TABS_FILE = "#{ENV['HOME']}/.twterm/dumped_tabs"
 
     def add(tab_to_add)
-      fail ArgumentError, 'argument must be an instance of Tab::Base' unless tab_to_add.is_a? Tab::Base
+      check_type Tab::Base, tab_to_add
 
       @tabs.each.with_index do |tab, i|
         next unless tab == tab_to_add
@@ -37,7 +45,7 @@ module Twterm
       current_tab.refresh
       refresh_window
     rescue Tab::NotClosableError
-      Notifier.instance.show_error 'This tab cannot be closed'
+      publish(Event::Notification.new(:error, 'this tab cannot be closed'))
     end
 
     def current_tab
@@ -67,6 +75,8 @@ module Twterm
       @history = []
 
       @window = stdscr.subwin(3, stdscr.maxx, 0, 0)
+
+      subscribe(Event::Screen::Resize, :resize)
     end
 
     def open_my_profile
@@ -93,7 +103,7 @@ module Twterm
         add(tab)
       end
     rescue
-      Notifier.instance.show_error 'Failed to recover tabs'
+      publish(Event::Notification.new(:error, 'Failed to recover tabs'))
     end
 
     def refresh_window
@@ -116,11 +126,6 @@ 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
@@ -163,5 +168,12 @@ module Twterm
       close
       add_and_show(tab)
     end
+
+    private
+
+    def resize(event)
+      @window.resize(3, stdscr.maxx)
+      @window.move(0, 0)
+    end
   end
 end

data/lib/twterm/tweetbox.rb

@@ -1,3 +1,5 @@
+require 'twterm/publisher'
+
 module Twterm
   class Tweetbox
     class EmptyTextError < StandardError; end
@@ -7,6 +9,7 @@ module Twterm
     include Singleton
     include Readline
     include Curses
+    include Publisher
 
     def compose(in_reply_to = nil)
       @text = ''
@@ -94,9 +97,9 @@ module Twterm
     rescue EmptyTextError
       # do nothing
     rescue InvalidCharactersError
-      Notifier.instance.show_error 'Text contains invalid characters'
+      publish(Event::Notification.new(:error, 'Text contains invalid characters'))
     rescue TextTooLongError
-      Notifier.instance.show_error "Text is too long (#{text_length} / 140 characters)"
+      publish(Event::Notification.new(:error, "Text is too long (#{text_length} / 140 characters)"))
     ensure
       clear
     end

data/lib/twterm/uri_opener.rb

@@ -0,0 +1,25 @@
+require 'launchy'
+require 'singleton'
+require 'twterm/event/open_uri'
+require 'twterm/publisher'
+require 'twterm/subscriber'
+
+module Twterm
+  class URIOpener
+    include Publisher
+    include Singleton
+    include Subscriber
+
+    def initialize
+      subscribe(Event::OpenURI) { |e| open e.uri }
+    end
+
+    private
+
+    def open(uri)
+      Launchy.open(uri)
+    rescue Launchy::CommandNotFoundError
+      publish(Event::Notification.new(:error, 'Browser not found'))
+    end
+  end
+end

data/lib/twterm/user.rb

@@ -61,6 +61,8 @@ module Twterm
     end
 
     def update!(user)
+      return self if recently_updated?
+
       @name = user.name
       @screen_name = user.screen_name
       @description = user.description || ''
@@ -87,6 +89,8 @@ module Twterm
         Friendship.following_not_requested(client_id, user.id)
       end
 
+      @updated_at = Time.now
+
       self
     end
 
@@ -116,7 +120,7 @@ module Twterm
       cond = -> (user) { user.touched_at > Time.now - MAX_CACHED_TIME }
       users = all.select(&cond)
       user_ids = users.map(&:id)
-      @@instances = user_ids.zip(users).to_h
+      @@instances = Hash[user_ids.zip(users)]
     end
 
     def self.ids
@@ -127,5 +131,11 @@ module Twterm
       instance = find(user.id)
       instance.nil? ? super : instance.update!(user)
     end
+
+    private
+
+    def recently_updated?
+      !@updated_at.nil? && @updated_at + 60 > Time.now
+    end
   end
 end

data/lib/twterm/utils.rb

@@ -0,0 +1,13 @@
+module Twterm
+  module Utils
+    module_function
+
+    def check_type(expected_type, argument)
+      return if argument.is_a?(expected_type)
+
+      raise TypeError, 'TypeError: wrong argument type %s (expected %s)' % [
+        argument.class, expected_type
+      ]
+    end
+  end
+end

data/lib/twterm/version.rb

@@ -1,3 +1,3 @@
 module Twterm
-  VERSION = '1.1.3'
+  VERSION = '1.2.0'
 end

data/lib/twterm.rb

@@ -32,9 +32,6 @@ require 'twterm/history/savable'
 require 'twterm/history/hashtag'
 require 'twterm/history/screen_name'
 require 'twterm/list'
-require 'twterm/notification/base'
-require 'twterm/notification/message'
-require 'twterm/notification/error'
 require 'twterm/notifier'
 require 'twterm/promise'
 require 'twterm/screen'

data/spec/twterm/event/screen/resize_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+require 'twterm/event/screen/resize'
+
+RSpec.describe Twterm::Event::Screen::Resize do
+  describe '#fields' do
+    it 'has fields of Integer * Integer' do
+      expect { described_class.new(5, 10) }.not_to raise_error
+      expect { described_class.new('hello', 'world') }.to raise_error
+    end
+  end
+end

data/spec/twterm/event_dispatcher_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+RSpec.describe Twterm::EventDispatcher do
+  let(:event_dispatcher) { described_class.instance }
+
+  describe '#dispatch' do
+    subject { event_dispatcher.dispatch(event) }
+
+    let(:event) { Twterm::Event::Base.new }
+
+    it { is_expected.to eq event_dispatcher }
+  end
+
+  describe '.instance' do
+    subject { described_class.instance }
+
+    it { is_expected.to be_kind_of described_class }
+  end
+end

data/twterm.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |i| i == 'Gemfile.lock' }
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.1.0'
+  spec.required_ruby_version = '>= 2.0.0'
 
   spec.add_dependency 'curses', '>= 1.0.1'
   spec.add_dependency 'launchy', '>= 2.4.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twterm
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Ryota Kameoka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-16 00:00:00.000000000 Z
+date: 2016-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -158,6 +158,21 @@ files:
 - lib/twterm/color_manager.rb
 - lib/twterm/completion_mamanger.rb
 - lib/twterm/config.rb
+- lib/twterm/direct_message.rb
+- lib/twterm/direct_message_composer.rb
+- lib/twterm/direct_message_manager.rb
+- lib/twterm/event/base.rb
+- lib/twterm/event/direct_message/fetched.rb
+- lib/twterm/event/favorite.rb
+- lib/twterm/event/follow.rb
+- lib/twterm/event/notification.rb
+- lib/twterm/event/open_uri.rb
+- lib/twterm/event/screen/resize.rb
+- lib/twterm/event/status/base.rb
+- lib/twterm/event/status/delete.rb
+- lib/twterm/event/status/mention.rb
+- lib/twterm/event/status/timeline.rb
+- lib/twterm/event_dispatcher.rb
 - lib/twterm/extensions/curses/window.rb
 - lib/twterm/extensions/enumerator/lazy.rb
 - lib/twterm/extensions/integer.rb
@@ -170,15 +185,18 @@ files:
 - lib/twterm/history/savable.rb
 - lib/twterm/history/screen_name.rb
 - lib/twterm/list.rb
-- lib/twterm/notification/base.rb
-- lib/twterm/notification/error.rb
-- lib/twterm/notification/message.rb
 - lib/twterm/notifier.rb
 - lib/twterm/promise.rb
+- lib/twterm/publisher.rb
+- lib/twterm/rest_client.rb
 - lib/twterm/scheduler.rb
 - lib/twterm/screen.rb
 - lib/twterm/status.rb
+- lib/twterm/streaming_client.rb
+- lib/twterm/subscriber.rb
 - lib/twterm/tab/base.rb
+- lib/twterm/tab/direct_message/conversation.rb
+- lib/twterm/tab/direct_message/conversation_list.rb
 - lib/twterm/tab/dumpable.rb
 - lib/twterm/tab/exceptions.rb
 - lib/twterm/tab/favorites.rb
@@ -202,11 +220,15 @@ files:
 - lib/twterm/tab/users/friends.rb
 - lib/twterm/tab_manager.rb
 - lib/twterm/tweetbox.rb
+- lib/twterm/uri_opener.rb
 - lib/twterm/user.rb
+- lib/twterm/utils.rb
 - lib/twterm/version.rb
 - spec/resources/config
 - spec/spec_helper.rb
 - spec/twterm/config_spec.rb
+- spec/twterm/event/screen/resize_spec.rb
+- spec/twterm/event_dispatcher_spec.rb
 - spec/twterm/friendship_spec.rb
 - twterm.gemspec
 homepage: http://twterm.ryota-ka.me/
@@ -221,7 +243,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -229,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A full-featured CLI Twitter client

data/lib/twterm/notification/base.rb

@@ -1,24 +0,0 @@
-module Twterm
-  module Notification
-    module Base
-      attr_reader :time, :fg_color, :bg_color
-
-      def initialize(message)
-        @message = CGI.unescapeHTML(message)
-        @time = Time.now
-      end
-
-      def show_with_width(width)
-        @message.gsub("\n", ' ')
-      end
-
-      def fg_color
-        fail NotImplementedError, 'fg_color method must be implemented'
-      end
-
-      def bg_color
-        fail NotImplementedError, 'bg_color method must be implemented'
-      end
-    end
-  end
-end

data/lib/twterm/notification/error.rb

@@ -1,19 +0,0 @@
-module Twterm
-  module Notification
-    class Error
-      include Base
-
-      def initialize(message)
-        super
-      end
-
-      def fg_color
-        :white
-      end
-
-      def bg_color
-        :red
-      end
-    end
-  end
-end

data/lib/twterm/notification/message.rb

@@ -1,19 +0,0 @@
-module Twterm
-  module Notification
-    class Message
-      include Base
-
-      def initialize(message)
-        super
-      end
-
-      def fg_color
-        :white
-      end
-
-      def bg_color
-        :blue
-      end
-    end
-  end
-end