twterm 1.3.0 → 2.0.0.beta1

data/spec/twterm/user_spec.rb

@@ -0,0 +1,94 @@
+require 'twterm/user'
+
+RSpec.describe Twterm::User do
+  let(:user) { described_class.new(Twitter::User.new(json)) }
+  let(:json) { JSON.parse(fixture('user.json'), symbolize_names: true) }
+
+  describe '#update!' do
+    subject { -> { user.update!(Hashie::Mash.new(params)) } }
+
+    before do
+      user.update!(Hashie::Mash.new(
+        name: 'Alice',
+        screen_name: 'alice',
+        description: 'Hi! I am Alice.',
+        location: 'Tokyo',
+        website: 'http://example.com',
+        protected?: false,
+        statuses_count: 0,
+        favorites_count: 0,
+        friends_count: 0,
+        followers_count: 0,
+        verified?: false,
+      ))
+    end
+
+    context 'when updating name' do
+      let(:params) { { name: 'Bob' } }
+
+      it { is_expected.to change { user.name }.from('Alice').to('Bob') }
+    end
+
+    context 'when updating screen_name' do
+      let(:params) { { screen_name: 'bob' } }
+
+      it { is_expected.to change { user.screen_name }.from('alice').to('bob') }
+    end
+
+    context 'when updating description' do
+      let(:params) { { description: 'Hi! I am Bob.' } }
+
+      it { is_expected.to change { user.description }.from('Hi! I am Alice.').to('Hi! I am Bob.') }
+    end
+
+    context 'when updating location' do
+      context 'when location is empty' do
+        let(:params) { { location: Twitter::NullObject.new } }
+
+        it { is_expected.to change { user.location }.from('Tokyo').to('') }
+      end
+
+      context 'when location is present' do
+        let(:params) { { location: 'New York' } }
+
+        it { is_expected.to change { user.location }.from('Tokyo').to('New York') }
+      end
+    end
+
+    context 'when updating website' do
+      let(:params) { { website: 'https://example.com' } }
+
+      it { is_expected.to change { user.website }.from('http://example.com').to('https://example.com') }
+    end
+
+    context 'when updating protected' do
+      let(:params) { { protected?: true } }
+
+      it { is_expected.to change { user.protected? }.from(false).to(true) }
+    end
+
+    context 'when updating statuses_count' do
+      let(:params) { { statuses_count: 42 } }
+
+      it { is_expected.to change { user.statuses_count }.from(0).to(42) }
+    end
+
+    context 'when updating favorites_count' do
+      let(:params) { { favorites_count: 42 } }
+
+      it { is_expected.to change { user.favorites_count }.from(0).to(42) }
+    end
+
+    context 'when updating followers_count' do
+      let(:params) { { followers_count: 42 } }
+
+      it { is_expected.to change { user.followers_count }.from(0).to(42) }
+    end
+
+    context 'when updating verified' do
+      let(:params) { { verified?: true } }
+
+      it { is_expected.to change { user.verified? }.from(false).to(true) }
+    end
+  end
+end

data/twterm.gemspec

@@ -8,23 +8,26 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Ryota Kameoka']
   spec.email         = ['kameoka.ryota@gmail.com']
 
-  spec.summary       = 'A full-featured CLI Twitter client'
-  spec.description   = 'A full-featured CLI Twitter client'
+  spec.summary       = 'A full-featured TUI Twitter client'
+  spec.description   = 'A full-featured TUI Twitter client'
   spec.homepage      = 'http://twterm.ryota-ka.me/'
   spec.license       = 'MIT'
 
   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.0.0'
+  spec.required_ruby_version = '>= 2.1.0'
 
-  spec.add_dependency 'curses', '>= 1.0.1'
-  spec.add_dependency 'launchy', '>= 2.4.3'
-  spec.add_dependency 'oauth', '>= 0.4.7'
-  spec.add_dependency 'twitter', '~> 6.0.0'
-  spec.add_dependency 'twitter-text', '1.14.0'
+  spec.add_dependency 'curses', '~> 1.2.2'
+  spec.add_dependency 'concurrent-ruby', '~> 1.0.5'
+  spec.add_dependency 'launchy', '~> 2.4.3'
+  spec.add_dependency 'oauth', '~> 0.5.1'
+  spec.add_dependency 'toml-rb', '~> 0.3.14'
+  spec.add_dependency 'twitter', '~> 6.1.0'
+  spec.add_dependency 'twitter-text', '~> 1.14.0'
 
   spec.add_development_dependency 'bundler', '~> 1.8'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.2.0'
+  spec.add_development_dependency 'hashie', '~> 3.5.6'
+  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rspec', '~> 3.5.0'
 end

metadata

@@ -1,83 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: twterm
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - Ryota Kameoka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-31 00:00:00.000000000 Z
+date: 2017-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.2.2
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.3
 - !ruby/object:Gem::Dependency
   name: oauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+- !ruby/object:Gem::Dependency
+  name: toml-rb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.7
+        version: 0.3.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.7
+        version: 0.3.14
 - !ruby/object:Gem::Dependency
   name: twitter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: twitter-text
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.14.0
 - !ruby/object:Gem::Dependency
@@ -94,35 +122,49 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.5.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.5.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
-description: A full-featured CLI Twitter client
+        version: 3.5.0
+description: A full-featured TUI Twitter client
 email:
 - kameoka.ryota@gmail.com
 executables:
@@ -152,7 +194,11 @@ files:
 - 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/notification/abstract_notification.rb
+- lib/twterm/event/notification/error.rb
+- lib/twterm/event/notification/info.rb
+- lib/twterm/event/notification/success.rb
+- lib/twterm/event/notification/warning.rb
 - lib/twterm/event/open_uri.rb
 - lib/twterm/event/screen/resize.rb
 - lib/twterm/event/status/base.rb
@@ -160,24 +206,47 @@ files:
 - lib/twterm/event/status/mention.rb
 - lib/twterm/event/status/timeline.rb
 - lib/twterm/event_dispatcher.rb
+- lib/twterm/extensions/array.rb
 - lib/twterm/extensions/curses/window.rb
 - lib/twterm/extensions/enumerator/lazy.rb
-- lib/twterm/extensions/integer.rb
 - lib/twterm/extensions/string.rb
-- lib/twterm/filter_query_window.rb
-- lib/twterm/filterable_list.rb
 - 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/image.rb
+- lib/twterm/image/between.rb
+- lib/twterm/image/blank_line.rb
+- lib/twterm/image/bold.rb
+- lib/twterm/image/brackets.rb
+- lib/twterm/image/color.rb
+- lib/twterm/image/empty.rb
+- lib/twterm/image/horizontal_sequential_image.rb
+- lib/twterm/image/parens.rb
+- lib/twterm/image/string_image.rb
+- lib/twterm/image/vertical_sequential_image.rb
+- lib/twterm/key_mapper.rb
+- lib/twterm/key_mapper/abstract_key_mapper.rb
+- lib/twterm/key_mapper/app_key_mapper.rb
+- lib/twterm/key_mapper/cursor_key_mapper.rb
+- lib/twterm/key_mapper/general_key_mapper.rb
+- lib/twterm/key_mapper/no_such_command.rb
+- lib/twterm/key_mapper/no_such_key.rb
+- lib/twterm/key_mapper/status_key_mapper.rb
+- lib/twterm/key_mapper/tab_key_mapper.rb
 - lib/twterm/list.rb
 - lib/twterm/notifier.rb
-- lib/twterm/promise.rb
 - lib/twterm/publisher.rb
+- lib/twterm/repository/abstract_entity_repository.rb
+- lib/twterm/repository/abstract_expirable_entity_repository.rb
+- lib/twterm/repository/abstract_repository.rb
+- lib/twterm/repository/direct_message_repository.rb
+- lib/twterm/repository/friendship_repository.rb
+- lib/twterm/repository/hashtag_repository.rb
+- lib/twterm/repository/list_repository.rb
+- lib/twterm/repository/status_repository.rb
+- lib/twterm/repository/user_repository.rb
 - lib/twterm/rest_client.rb
 - lib/twterm/scheduler.rb
 - lib/twterm/screen.rb
+- lib/twterm/search_query_window.rb
 - lib/twterm/status.rb
 - lib/twterm/streaming_client.rb
 - lib/twterm/subscriber.rb
@@ -188,11 +257,14 @@ files:
 - 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/list.rb
 - lib/twterm/tab/new/search.rb
 - lib/twterm/tab/new/start.rb
 - lib/twterm/tab/new/user.rb
+- lib/twterm/tab/rate_limit_status.rb
 - lib/twterm/tab/scrollable.rb
+- lib/twterm/tab/searchable.rb
 - lib/twterm/tab/statuses/base.rb
 - lib/twterm/tab/statuses/conversation.rb
 - lib/twterm/tab/statuses/favorites.rb
@@ -201,6 +273,7 @@ files:
 - lib/twterm/tab/statuses/mentions.rb
 - lib/twterm/tab/statuses/search.rb
 - 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/followers.rb
@@ -211,12 +284,33 @@ files:
 - lib/twterm/user.rb
 - lib/twterm/utils.rb
 - lib/twterm/version.rb
+- lib/twterm/view.rb
+- spec/fixtures/status.json
+- spec/fixtures/user.json
 - spec/resources/config
 - spec/spec_helper.rb
+- spec/supports/shared_examples/abstract_key_mapper.rb
 - spec/twterm/config_spec.rb
 - spec/twterm/event/screen/resize_spec.rb
 - spec/twterm/event_dispatcher_spec.rb
+- spec/twterm/extension/enumerator/lazy_spec.rb
 - spec/twterm/friendship_spec.rb
+- spec/twterm/image/blank_line_spec.rb
+- spec/twterm/image/brackets_spec.rb
+- spec/twterm/image/color_spec.rb
+- spec/twterm/image/empry_spec.rb
+- spec/twterm/image/horizontal_sequential_image_spec.rb
+- spec/twterm/image/parens_spec.rb
+- spec/twterm/image/string_image_spec.rb
+- spec/twterm/image/vertical_sequential_image_spec.rb
+- spec/twterm/image_spec.rb
+- spec/twterm/key_mapper/abstract_key_mapper_spec.rb
+- spec/twterm/key_mapper/app_key_mapper_spec.rb
+- spec/twterm/key_mapper/status_key_mapper_spec.rb
+- spec/twterm/key_mapper/tab_key_mapper_spec.rb
+- spec/twterm/repository/friendship_repository_spec.rb
+- spec/twterm/status_spec.rb
+- spec/twterm/user_spec.rb
 - twterm.gemspec
 homepage: http://twterm.ryota-ka.me/
 licenses:
@@ -230,16 +324,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
-summary: A full-featured CLI Twitter client
+summary: A full-featured TUI Twitter client
 test_files: []

data/lib/twterm/event/notification.rb

@@ -1,33 +0,0 @@
-require 'twterm/event/base'
-
-module Twterm
-  module Event
-    class Notification < Base
-      attr_reader :time
-
-      def initialize(type, message)
-        super(type, CGI.unescapeHTML(message))
-
-        @time = Time.now
-      end
-
-      def fields
-        {
-          type: Symbol,
-          message: String
-        }
-      end
-
-      def color
-        case type
-        when :error
-          [:white, :red]
-        when :message
-          [:white, :blue]
-        else
-          [:white, :black]
-        end
-      end
-    end
-  end
-end

data/lib/twterm/extensions/integer.rb

@@ -1,5 +0,0 @@
-class Integer
-  def format
-    to_s.gsub(/(\d)(?=(\d{3})+(?!\d))/, '\1,')
-  end
-end

data/lib/twterm/filter_query_window.rb

@@ -1,91 +0,0 @@
-require 'twterm/event/screen/resize'
-require 'twterm/subscriber'
-
-module Twterm
-  class FilterQueryWindow
-    include Curses
-    include Singleton
-    include Subscriber
-
-    def initialize
-      @window = stdscr.subwin(1, stdscr.maxx, stdscr.maxy - 1, 0)
-
-      subscribe(Event::Screen::Resize, :resize)
-    end
-
-    def input
-      clear
-      stdscr.setpos(stdscr.maxy - 1, 0)
-      stdscr.addch '/'
-
-      Curses.timeout = 10
-      raw
-
-      chars = []
-      str = ''
-
-      loop do
-        char = getch
-
-        if char.nil?
-          case chars.first
-          when 3, 27 # cancel with <C-c> / Esc
-            str = ''
-            clear
-            break
-          when 4 # cancel with <C-d> when query is empty
-            if str.empty?
-              clear
-              break
-            end
-          when 10 # submit with <C-j>
-            break
-          when 127 # backspace
-            if str.empty?
-              clear
-              break
-            end
-
-            str.chop!
-            chars = []
-            clear
-            stdscr.setpos(stdscr.maxy - 1, 0)
-            stdscr.addstr("/#{str}")
-          when 0..31
-            # ignore control codes (\x00 - \x1f)
-          else
-            str << chars
-              .map { |x| x.is_a?(String) ? x.ord : x }
-              .pack('c*')
-              .force_encoding('utf-8')
-            chars = []
-          end
-        else
-          chars << char
-        end
-
-        stdscr.setpos(stdscr.maxy - 1, 1)
-        stdscr.addstr(str)
-      end
-
-      Curses.timeout = -1
-      cbreak
-
-      str
-    end
-
-    def clear
-      stdscr.setpos(stdscr.maxy - 1, 0)
-      stdscr.addstr(' ' * window.maxx)
-    end
-
-    private
-
-    attr_reader :window
-
-    def resize(event)
-      @window.resize(1, stdscr.maxx)
-      @window.move(stdscr.maxy - 1, 0)
-    end
-  end
-end

data/lib/twterm/filterable_list.rb

@@ -1,41 +0,0 @@
-require 'twterm/event/notification'
-require 'twterm/publisher'
-
-module Twterm
-  module FilterableList
-    extend Forwardable
-
-    include Publisher
-
-    def filter
-      @filter_query = FilterQueryWindow.instance.input
-
-      if filter_query.empty?
-        reset_filter
-      elsif items.count == 0
-        query = filter_query
-        reset_filter
-        publish(Event::Notification.new(:error, "No matches found: \"#{query}\""))
-      else
-        Notifier.instance.show_message "#{total_item_count} items found: \"#{filter_query}\""
-        scroller.move_to_top
-      end
-
-      refresh
-    end
-
-    def filter_query
-      @filter_query ||= ''
-    end
-
-    def items
-      fail NotImplementedError, 'items method must be implemented'
-    end
-
-    def reset_filter
-      FilterQueryWindow.instance.clear
-      @filter_query = ''
-      refresh
-    end
-  end
-end

data/lib/twterm/history/base.rb

@@ -1,21 +0,0 @@
-module Twterm
-  module History
-    module Base
-      attr_reader :history
-
-      def initialize
-        @history = []
-      end
-
-      def add(item)
-        @history << item
-      end
-
-      private
-
-      def file
-        fail NotImplementedError, 'file method must be implemented'
-      end
-    end
-  end
-end

data/lib/twterm/history/hashtag.rb

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