twterm 2.3.0 → 2.4.0

data/lib/twterm/tab/rate_limit_status.rb

@@ -2,7 +2,7 @@ require 'twterm/tab/loadable'
 
 module Twterm
   module Tab
-    class RateLimitStatus < Tab::Base
+    class RateLimitStatus < AbstractTab
       include Loadable
       include Scrollable
 

data/lib/twterm/tab/status_tab.rb

@@ -1,18 +1,19 @@
 require 'addressable/uri'
 
+require 'twterm/event/open_photo'
 require 'twterm/event/open_uri'
 require 'twterm/hashtag'
 require 'twterm/image'
 require 'twterm/image_builder/user_name_image_builder'
 require 'twterm/publisher'
-require 'twterm/tab/base'
+require 'twterm/tab/abstract_tab'
 require 'twterm/tab/dumpable'
 require 'twterm/tab/loadable'
 require 'twterm/tab/scrollable'
 
 module Twterm
   module Tab
-    class StatusTab < Tab::Base
+    class StatusTab < AbstractTab
       include Dumpable
       include Publisher
       include Tab::Scrollable
@@ -184,7 +185,7 @@ module Twterm
         when Twitter::Entity::URI
           publish(Event::OpenURI.new(item.expanded_url))
         when Twitter::Media::Photo
-          publish(Event::OpenURI.new(item.media_url_https))
+          publish(Event::OpenPhoto.new(item))
         when Twitter::Media::AnimatedGif, Twitter::Media::Video
           url = item.video_info.variants.max { |v| v.bitrate }.url
           publish(Event::OpenURI.new(url))

data/lib/twterm/tab/statuses/{base.rb → abstract_statuses_tab.rb}

@@ -6,7 +6,7 @@ require 'twterm/event/status_garbage_collected'
 require 'twterm/image_builder/user_name_image_builder'
 require 'twterm/publisher'
 require 'twterm/subscriber'
-require 'twterm/tab/base'
+require 'twterm/tab/abstract_tab'
 require 'twterm/tab/loadable'
 require 'twterm/tab/status_tab'
 require 'twterm/utils'
@@ -14,7 +14,7 @@ require 'twterm/utils'
 module Twterm
   module Tab
     module Statuses
-      class Base < Tab::Base
+      class AbstractStatusesTab < AbstractTab
         include Publisher
         include Searchable
         include Subscriber

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

@@ -1,13 +1,13 @@
 require 'concurrent'
 
 require 'twterm/tab/dumpable'
-require 'twterm/tab/statuses/base'
+require 'twterm/tab/statuses/abstract_statuses_tab'
 require 'twterm/tab/statuses/cacheable'
 
 module Twterm
   module Tab
     module Statuses
-      class Conversation < Base
+      class Conversation < AbstractStatusesTab
         include Cacheable
         include Dumpable
 

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

@@ -1,9 +1,9 @@
-require 'twterm/tab/statuses/base'
+require 'twterm/tab/statuses/abstract_statuses_tab'
 
 module Twterm
   module Tab
     module Statuses
-      class Favorites < Base
+      class Favorites < AbstractStatusesTab
         include Dumpable
 
         attr_reader :user, :user_id

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

@@ -1,12 +1,12 @@
 require 'twterm/subscriber'
 require 'twterm/event/status/timeline'
-require 'twterm/tab/statuses/base'
+require 'twterm/tab/statuses/abstract_statuses_tab'
 require 'twterm/utils'
 
 module Twterm
   module Tab
     module Statuses
-      class Home < Base
+      class Home < AbstractStatusesTab
         include Subscriber
         include Utils
 

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

@@ -1,9 +1,9 @@
-require 'twterm/tab/statuses/base'
+require 'twterm/tab/statuses/abstract_statuses_tab'
 
 module Twterm
   module Tab
     module Statuses
-      class ListTimeline < Base
+      class ListTimeline < AbstractStatusesTab
         include Dumpable
 
         attr_reader :list_id

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

@@ -1,9 +1,9 @@
-require 'twterm/tab/statuses/base'
+require 'twterm/tab/statuses/abstract_statuses_tab'
 
 module Twterm
   module Tab
     module Statuses
-      class Mentions < Base
+      class Mentions < AbstractStatusesTab
         include Subscriber
 
         def close

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

@@ -1,9 +1,9 @@
-require 'twterm/tab/statuses/base'
+require 'twterm/tab/statuses/abstract_statuses_tab'
 
 module Twterm
   module Tab
     module Statuses
-      class Search < Base
+      class Search < AbstractStatusesTab
         include Dumpable
 
         attr_reader :query

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

@@ -1,10 +1,10 @@
-require 'twterm/tab/statuses/base'
+require 'twterm/tab/statuses/abstract_statuses_tab'
 require 'twterm/tab/statuses/cacheable'
 
 module Twterm
   module Tab
     module Statuses
-      class UserTimeline < Base
+      class UserTimeline < AbstractStatusesTab
         include Cacheable
         include Dumpable
 

data/lib/twterm/tab/user_list_management.rb

@@ -9,7 +9,7 @@ require 'twterm/tab/searchable'
 
 module Twterm
   module Tab
-    class UserListManagement < Base
+    class UserListManagement < AbstractTab
       include Dumpable
       include Loadable
       include Publisher

data/lib/twterm/tab/user_tab.rb

@@ -1,12 +1,12 @@
 require 'twterm/event/open_uri'
 require 'twterm/publisher'
 require 'twterm/image_builder/user_name_image_builder'
-require 'twterm/tab/base'
+require 'twterm/tab/abstract_tab'
 require 'twterm/tab/user_list_management'
 
 module Twterm
   module Tab
-    class UserTab < Base
+    class UserTab < AbstractTab
       include Dumpable
       include Publisher
       include Scrollable

data/lib/twterm/tab/users/{base.rb → abstract_users_tab.rb}

@@ -2,13 +2,13 @@ require 'concurrent'
 
 require 'twterm/event/user_garbage_collected'
 require 'twterm/image_builder/user_name_image_builder'
-require 'twterm/tab/base'
+require 'twterm/tab/abstract_tab'
 require 'twterm/tab/loadable'
 
 module Twterm
   module Tab
     module Users
-      class Base < Tab::Base
+      class AbstractUsersTab < AbstractTab
         include Loadable
         include Searchable
 

data/lib/twterm/tab/users/followers.rb

@@ -1,9 +1,9 @@
-require 'twterm/tab/users/base'
+require 'twterm/tab/users/abstract_users_tab'
 
 module Twterm
   module Tab
     module Users
-      class Followers < Base
+      class Followers < AbstractUsersTab
         include Dumpable
 
         attr_reader :user_id

data/lib/twterm/tab/users/friends.rb

@@ -1,9 +1,9 @@
-require 'twterm/tab/users/base'
+require 'twterm/tab/users/abstract_users_tab'
 
 module Twterm
   module Tab
     module Users
-      class Friends < Base
+      class Friends < AbstractUsersTab
         include Dumpable
 
         attr_reader :user_id

data/lib/twterm/tab_manager.rb

@@ -14,7 +14,7 @@ module Twterm
     DUMPED_TABS_FILE = "#{ENV['HOME']}/.twterm/dumped_tabs"
 
     def add(tab_to_add)
-      check_type Tab::Base, tab_to_add
+      check_type Tab::AbstractTab, tab_to_add
 
       @tabs.each.with_index do |tab, i|
         next unless tab == tab_to_add
@@ -88,7 +88,7 @@ module Twterm
     end
 
     def open_new
-      tab = Tab::New::Start.new(app, client)
+      tab = Tab::New::Index.new(app, client)
       add_and_show(tab)
     end
 

data/lib/twterm/tweetbox.rb

@@ -1,11 +1,19 @@
 require 'twterm/publisher'
 require 'twterm/event/message/error'
+require 'twterm/event/screen/refresh'
 
 module Twterm
   class Tweetbox
     class EmptyTextError < StandardError; end
-    class InvalidCharactersError < StandardError; end
-    class TextTooLongError < StandardError; end
+    class TextTooLongError < StandardError
+      def initialize(parse_result)
+        @parse_result = parse_result
+      end
+
+      def message
+        "Text is too long (weighted length: #{@parse_result[:weighted_length]} / 280)"
+      end
+    end
 
     include Readline
     include Curses
@@ -67,10 +75,8 @@ module Twterm
             break
           rescue EmptyTextError
             break
-          rescue InvalidCharactersError
-            puts 'Text contains invalid characters'
-          rescue TextTooLongError
-            puts "Text is too long (#{text_length(text)} / 140 characters)"
+          rescue TextTooLongError => e
+            puts e.message
           end
 
           puts "\n"
@@ -99,22 +105,20 @@ module Twterm
     def reset
       reset_prog_mode
       sleep 0.1
-      app.screen.refresh
+      publish(Event::Screen::Refresh.new)
     end
 
     def text_length(text)
-      Twitter::Validation.tweet_length(text)
+      Twitter::TwitterText::Validation.tweet_length(text)
     end
 
     def validate!(text)
-      case Twitter::Validation.tweet_invalid?(text)
-      when :empty
-        fail EmptyTextError
-      when :invalid_characters
-        fail InvalidCharactersError
-      when :too_long
-        fail TextTooLongError
-      end
+      raise EmptyTextError if text.empty?
+
+      result = Twitter::TwitterText::Validation.parse_tweet(text)
+      valid = result[:valid]
+
+      raise TextTooLongError.new(result) unless valid
     end
   end
 end

data/lib/twterm/version.rb

@@ -1,3 +1,3 @@
 module Twterm
-  VERSION = '2.3.0'
+  VERSION = '2.4.0'
 end

data/spec/twterm/event_dispatcher_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe Twterm::EventDispatcher do
   describe '#dispatch' do
     subject { event_dispatcher.dispatch(event) }
 
-    let(:event) { Twterm::Event::Base.new }
+    let(:event) { Twterm::Event::AbstractEvent.new }
 
     it { is_expected.to eq event_dispatcher }
   end

data/twterm.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'terminal-notifier', '~> 2.0.0'
   spec.add_dependency 'toml-rb', '~> 0.3.14'
   spec.add_dependency 'twitter', '~> 6.2.0'
-  spec.add_dependency 'twitter-text', '1.14.5'
+  spec.add_dependency 'twitter-text', '~> 2.1.0'
 
   spec.add_development_dependency 'bundler', '~> 1.8'
   spec.add_development_dependency 'hashie', '~> 3.5.6'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twterm
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Ryota Kameoka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-03 00:00:00.000000000 Z
+date: 2018-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -112,16 +112,16 @@ dependencies:
   name: twitter-text
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.5
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.5
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -238,7 +238,7 @@ files:
 - lib/twterm/direct_message_composer.rb
 - lib/twterm/direct_message_manager.rb
 - lib/twterm/environment.rb
-- lib/twterm/event/base.rb
+- lib/twterm/event/abstract_event.rb
 - lib/twterm/event/direct_message/fetched.rb
 - lib/twterm/event/message/abstract_message.rb
 - lib/twterm/event/message/error.rb
@@ -253,9 +253,11 @@ files:
 - lib/twterm/event/notification/mention.rb
 - lib/twterm/event/notification/quote.rb
 - lib/twterm/event/notification/retweet.rb
+- lib/twterm/event/open_photo.rb
 - lib/twterm/event/open_uri.rb
+- lib/twterm/event/screen/refresh.rb
 - lib/twterm/event/screen/resize.rb
-- lib/twterm/event/status/base.rb
+- lib/twterm/event/status/abstract_status_event.rb
 - lib/twterm/event/status/delete.rb
 - lib/twterm/event/status/mention.rb
 - lib/twterm/event/status/timeline.rb
@@ -297,6 +299,11 @@ files:
 - lib/twterm/notification_backend/tmux_backend.rb
 - lib/twterm/notification_dispatcher.rb
 - lib/twterm/persistable_configuration_proxy.rb
+- lib/twterm/photo_viewer.rb
+- lib/twterm/photo_viewer_backend/abstract_photo_viewer_backend.rb
+- lib/twterm/photo_viewer_backend/browser_backend.rb
+- lib/twterm/photo_viewer_backend/imgcat_backend.rb
+- lib/twterm/photo_viewer_backend/quick_look_backend.rb
 - lib/twterm/preferences.rb
 - lib/twterm/publisher.rb
 - lib/twterm/repository/abstract_entity_repository.rb
@@ -315,25 +322,25 @@ files:
 - lib/twterm/status.rb
 - lib/twterm/streaming_client.rb
 - lib/twterm/subscriber.rb
-- lib/twterm/tab/base.rb
+- lib/twterm/tab/abstract_tab.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
 - lib/twterm/tab/key_assignments_cheatsheet.rb
 - lib/twterm/tab/loadable.rb
+- lib/twterm/tab/new/index.rb
 - lib/twterm/tab/new/list.rb
 - lib/twterm/tab/new/search.rb
-- lib/twterm/tab/new/start.rb
 - lib/twterm/tab/new/user.rb
 - lib/twterm/tab/preferences/index.rb
 - lib/twterm/tab/preferences/notification_backend.rb
+- lib/twterm/tab/preferences/photo_viewer_backend.rb
 - lib/twterm/tab/rate_limit_status.rb
 - lib/twterm/tab/scrollable.rb
 - lib/twterm/tab/searchable.rb
 - lib/twterm/tab/status_tab.rb
-- lib/twterm/tab/statuses/base.rb
+- lib/twterm/tab/statuses/abstract_statuses_tab.rb
 - lib/twterm/tab/statuses/cacheable.rb
 - lib/twterm/tab/statuses/conversation.rb
 - lib/twterm/tab/statuses/favorites.rb
@@ -344,7 +351,7 @@ files:
 - lib/twterm/tab/statuses/user_timeline.rb
 - lib/twterm/tab/user_list_management.rb
 - lib/twterm/tab/user_tab.rb
-- lib/twterm/tab/users/base.rb
+- lib/twterm/tab/users/abstract_users_tab.rb
 - lib/twterm/tab/users/followers.rb
 - lib/twterm/tab/users/friends.rb
 - lib/twterm/tab_manager.rb