twterm 1.0.9 → 1.0.10

data/lib/twterm/tweetbox.rb

@@ -1,14 +1,16 @@
 module Twterm
   class Tweetbox
+    class EmptyTextError < StandardError; end
+    class InvalidCharactersError < StandardError; end
+    class TextTooLongError < StandardError; end
+
     include Singleton
     include Readline
     include Curses
 
-    def initialize
-      @status = ''
-    end
-
     def compose(in_reply_to = nil)
+      @text = ''
+
       if in_reply_to.is_a? Status
         @in_reply_to = in_reply_to
       else
@@ -24,37 +26,39 @@ module Twterm
       thread = Thread.new do
         close_screen
 
-        if @in_reply_to.nil?
+        if in_reply_to.nil?
           puts "\nCompose new tweet:"
         else
-          puts "\nReply to @#{@in_reply_to.user.screen_name}'s tweet: \"#{@in_reply_to.text}\""
+          puts "\nReply to @#{in_reply_to.user.screen_name}'s tweet: \"#{in_reply_to.text}\""
         end
 
         CompletionManager.instance.set_default_mode!
 
         loop do
           loop do
-            msg = @in_reply_to.nil? || !@status.empty? ? '> ' : "> @#{in_reply_to.user.screen_name} "
+            msg = in_reply_to.nil? || !text.empty? ? '> ' : "> @#{in_reply_to.user.screen_name} "
             line = (readline(msg, true) || '').strip
             break if line.empty?
 
             if line.end_with?('\\')
-              @status << line.chop.lstrip + "\n"
+              @text << line.chop.rstrip + "\n"
             else
-              @status << line
+              @text << line
               break
             end
           end
 
           puts "\n"
 
-          case validate
-          when :too_long
-            puts "Status is too long (#{length} / 140 characters)"
-          when :invalid_characters
-            puts 'Status contains invalid characters'
-          else
+          begin
+            validate_text!
             break
+          rescue EmptyTextError
+            break
+          rescue InvalidCharactersError
+            puts 'Text contains invalid characters'
+          rescue TextTooLongError
+            puts "Text is too long (#{text_length} / 140 characters)"
           end
 
           puts "\n"
@@ -68,30 +72,52 @@ module Twterm
       App.instance.register_interruption_handler do
         thread.kill
         clear
-        puts "\ncanceled"
+        puts "\nCanceled"
         resetter.call
       end
 
       thread.join
     end
 
-    def post
-      return if validate
+    private
+
+    attr_reader :in_reply_to
 
-      Client.current.post(@status, @in_reply_to)
+    def clear
+      @text = ''
+      @in_reply_to = nil
+    end
+
+    def post
+      validate_text!
+      Client.current.post(text, in_reply_to)
+    rescue EmptyTextError
+      # do nothing
+    rescue InvalidCharactersError
+      Notifier.instance.show_error 'Text contains invalid characters'
+    rescue TextTooLongError
+      Notifier.instance.show_error "Text is too long (#{text_length} / 140 characters)"
+    ensure
       clear
     end
 
-    def validate
-      Twitter::Validation.tweet_invalid?(@status)
+    def text
+      @text || ''
     end
 
-    def length
-      Twitter::Validation.tweet_length(@status)
+    def text_length
+      Twitter::Validation.tweet_length(text)
     end
 
-    def clear
-      @status = ''
+    def validate_text!
+      case Twitter::Validation.tweet_invalid?(text)
+      when :empty
+        fail EmptyTextError
+      when :invalid_characters
+        fail InvalidCharactersError
+      when :too_long
+        fail TextTooLongError
+      end
     end
   end
 end

data/lib/twterm/user.rb

@@ -5,20 +5,12 @@ module Twterm
                 :followers_count, :touched_at, :color
     alias_method :following?, :following
     alias_method :protected?, :protected
-    class << self
-      alias_method :create, :new
-    end
 
     MAX_CACHED_TIME = 3600
     COLORS = [:red, :blue, :green, :cyan, :yellow, :magenta]
 
     @@instances = {}
 
-    def self.new(user)
-      instance = find(user.id)
-      instance.nil? ? super : instance.update!(user)
-    end
-
     def initialize(user)
       @id = user.id
       update!(user)
@@ -73,5 +65,10 @@ module Twterm
       user_ids = users.map(&:id)
       @@instances = user_ids.zip(users).to_h
     end
+
+    def self.new(user)
+      instance = find(user.id)
+      instance.nil? ? super : instance.update!(user)
+    end
   end
 end

data/lib/twterm/version.rb

@@ -1,3 +1,3 @@
 module Twterm
-  VERSION = '1.0.9'
+  VERSION = '1.0.10'
 end

data/lib/twterm.rb

@@ -3,6 +3,7 @@ $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname
 
 require 'cgi'
 require 'curses'
+require 'forwardable'
 require 'launchy'
 require 'oauth'
 require 'readline'
@@ -36,9 +37,10 @@ require 'twterm/tab_manager'
 require 'twterm/tab/base'
 require 'twterm/tab/dumpable'
 require 'twterm/tab/exceptions'
-require 'twterm/tab/scrollable'
+require 'twterm/tab/scroll_manager'
 require 'twterm/tab/statuses_tab'
 require 'twterm/tab/conversation_tab'
+require 'twterm/tab/key_assignments_cheatsheet'
 require 'twterm/tab/list_tab'
 require 'twterm/tab/mentions_tab'
 require 'twterm/tab/new/start'
@@ -55,6 +57,6 @@ require 'twterm/version'
 
 module Twterm
   class Conf
-    REQUIRE_VERSION = '1.0.9'
+    REQUIRE_VERSION = '1.0.10'
   end
 end

data/spec/resources/config

@@ -0,0 +1,4 @@
+---
+:access_token: token
+:access_token_secret: secret
+:screen_name: name

data/spec/spec_helper.rb

@@ -0,0 +1,7 @@
+RSpec.configure do |config|
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+  config.order = :random
+end
+
+require 'twterm'

data/spec/twterm/config_spec.rb

@@ -0,0 +1,34 @@
+describe Twterm::Config do
+  MOCK_CONFIG_PATH = 'spec/resources/config'.freeze
+
+  let(:config) { described_class.new }
+
+  describe '#[]' do
+    it 'returns config value from config_file_path' do
+      allow(config).to receive(:config_file_path).and_return(MOCK_CONFIG_PATH)
+
+      expect(config[:access_token]).to eq 'token'
+    end
+  end
+
+  describe '#[]=' do
+    context 'when fail to load config file' do
+      it 'set new value to config file' do
+        allow(config).to receive(:config_file_path).and_return('invalid path')
+        allow(config).to receive(:save_config_to_file).and_return(nil)
+
+        expect(config[:access_token]).to be_nil
+        config[:access_token] = 'new_token'
+        expect(config[:access_token]).to eq 'new_token'
+      end
+    end
+
+    it 'can set some value' do
+      allow(config).to receive(:config_file_path).and_return(MOCK_CONFIG_PATH)
+      allow(config).to receive(:save_config_to_file).and_return(nil)
+
+      config[:access_token] = 'new_token'
+      expect(config[:access_token]).to eq 'new_token'
+    end
+  end
+end

data/twterm.gemspec

@@ -16,6 +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.add_dependency 'curses', '>= 1.0.1'
   spec.add_dependency 'launchy', '>= 2.4.3'
@@ -26,4 +27,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.8'
   spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twterm
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Ryota Kameoka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.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
 email:
 - kameoka.ryota@gmail.com
@@ -131,8 +145,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - Gemfile
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
 - bin/twterm
@@ -162,13 +177,14 @@ files:
 - 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/list_tab.rb
 - lib/twterm/tab/mentions_tab.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/scrollable.rb
+- lib/twterm/tab/scroll_manager.rb
 - lib/twterm/tab/search_tab.rb
 - lib/twterm/tab/statuses_tab.rb
 - lib/twterm/tab/timeline_tab.rb
@@ -178,6 +194,9 @@ files:
 - lib/twterm/user.rb
 - lib/twterm/user_window.rb
 - lib/twterm/version.rb
+- spec/resources/config
+- spec/spec_helper.rb
+- spec/twterm/config_spec.rb
 - twterm.gemspec
 homepage: http://twterm.ryota-ka.me/
 licenses:
@@ -191,7 +210,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -199,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: A full-featured CLI Twitter client

data/lib/twterm/tab/scrollable.rb

@@ -1,130 +0,0 @@
-module Twterm
-  module Tab
-    module Scrollable
-      include Base
-
-      def initialize
-        super
-
-        @scrollable_index = 0
-        @scrollable_count = 0
-        @scrollable_offset = 0
-        @scrollable_last = 0
-        @scrollable_scrollbar_length = 0
-      end
-
-      def respond_to_key(key)
-        case key
-        when 'g'
-          move_to_top
-        when 'G'
-          move_to_bottom
-        when 'j', 14, Key::DOWN
-          move_down
-        when 'k', 16, Key::UP
-          move_up
-        when 'd', 4
-          10.times { move_down }
-        when 'u', 21
-          10.times { move_up }
-        else
-          return false
-        end
-        true
-      end
-
-      def index
-        @scrollable_index
-      end
-
-      def count
-        @scrollable_count
-      end
-
-      def offset
-        @scrollable_offset
-      end
-
-      def last
-        @scrollable_last
-      end
-
-      def item_prepended
-        @scrollable_index += 1
-        @scrollable_offset += 1
-        update_scrollbar_length
-      end
-
-      def item_appended
-        @scrollable_index -= 1
-        @scrollable_offset -= 1 if @scrollable_offset > 0
-        update_scrollbar_length
-      end
-
-      def move_up
-        return if count == 0 || index == 0
-
-        @scrollable_index = [index - 1, 0].max
-        @scrollable_offset = [offset - 1, 0].max if index - 4 < offset
-        refresh
-      end
-
-      def move_down
-        return if count == 0 || index == count - 1
-
-        @scrollable_index = [index + 1, count - 1].min
-        @scrollable_offset = [
-          offset + 1,
-          count - 1,
-          count - offset_from_bottom
-        ].min if index > last - 4
-
-        refresh
-      end
-
-      def move_to_top
-        return if count == 0 || index == 0
-
-        @scrollable_index = 0
-        @scrollable_offset = 0
-        refresh
-      end
-
-      def move_to_bottom
-        return if count == 0 || index == count - 1
-
-        @scrollable_index = count - 1
-        @scrollable_offset = count - 1 - offset_from_bottom
-        refresh
-      end
-
-      def offset_from_bottom
-        0
-      end
-
-      def update_scrollbar_length
-        @scrollable_scrollbar_length =
-          if count == 0
-            0
-          else
-            height = @window.maxy
-            [height * (last - offset + 1) / count, 1].max
-          end
-      end
-
-      def draw_scroll_bar
-        return if count == 0
-
-        height = @window.maxy
-        top = height * index / count
-
-        @window.with_color(:black, :white) do
-          @scrollable_scrollbar_length.times do |i|
-            @window.setpos(top + i, @window.maxx - 1)
-            @window.addch(' ')
-          end
-        end
-      end
-    end
-  end
-end