twterm 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c12295e3d9afd6d5530f4bef0a7ce04303534dd
-  data.tar.gz: b510d4cbde776eea8f84f841ed4b74a620b03d97
+  metadata.gz: a9e8728be1c9bd555f0354eb36822c8d01156911
+  data.tar.gz: 03799091452f4954c392253206977513e8a66f9f
 SHA512:
-  metadata.gz: eba83dd74c4a3ddb83f3d6bb926a88251dc705868dad7a7ceee16f89bb13a6792cd293110611561c7cb7437df8f7c4dca517a47095a458c329299c90c75caf88
-  data.tar.gz: 89bb48da13afb9588dec0a4fdf40ffc2280487957e0326fe2eb7bf17d96cc395aad131333ea7e992951fdd335ec09af1c5b73fd82c3d201bb82888df7fc91a7d
+  metadata.gz: 14af06eb721896713d982419195c28e64c22cfe6eace3746fb299cbbc849d5382a1c37a4fe527899ccb5aa6d89ee13dea1ce9d3027da34865af8955fbfd7787b
+  data.tar.gz: 99e220ffd485f2d8b7d2909a0b9689dd2e06ef52528c600da85e201657304f693d5bab38f5410afd7135b8e49de134ceac4908056d6223fda7d4900df8990a43

data/lib/twterm.rb

@@ -9,6 +9,7 @@ require 'readline'
 require 'singleton'
 require 'tweetstream'
 require 'twitter'
+require 'twitter-text'
 require 'yaml'
 
 require 'extentions'
@@ -26,10 +27,10 @@ require 'twterm/notification/message'
 require 'twterm/notification/error'
 require 'twterm/notifier'
 require 'twterm/screen'
+require 'twterm/scheduler'
 require 'twterm/status'
 require 'twterm/tab_manager'
 require 'twterm/tab/base'
-require 'twterm/tab/auto_reloadable'
 require 'twterm/tab/exceptions'
 require 'twterm/tab/scrollable'
 require 'twterm/tab/statuses_tab'
@@ -50,6 +51,6 @@ require 'twterm/version'
 
 module Twterm
   class Conf
-    REQUIRE_VERSION = '1.0.4'
+    REQUIRE_VERSION = '1.0.6'
   end
 end

data/lib/twterm/app.rb

@@ -51,12 +51,7 @@ module Twterm
     private
 
     def run_periodic_cleanup
-      Thread.new do
-        loop do
-          sleep 300
-          Status.cleanup
-        end
-      end
+      Scheduler.new(300) { Status.cleanup }
     end
   end
 end

data/lib/twterm/client.rb

@@ -173,6 +173,17 @@ module Twterm
       end
     end
 
+    def destroy_status(status)
+      send_request do
+        begin
+          @rest_client.destroy_status(status.id)
+          yield if block_given?
+        rescue Twitter::Error::NotFound, Twitter::Error::Forbidden
+          Notifier.instance.show_error 'You cannot destroy that status'
+        end
+      end
+    end
+
     def on_timeline_status(&block)
       fail ArgumentError, 'no block given' unless block_given?
       on(:timeline_status, &block)

data/lib/twterm/scheduler.rb

@@ -0,0 +1,30 @@
+class Scheduler
+  def initialize(interval, &block)
+    fail ArgumentError, 'Interval must be a real number' unless interval.is_a?(Numeric) && interval.real?
+    fail RangeError, 'Interval must be greater than zero' unless interval > 0
+
+    @interval, @block = interval, block
+    @paused = false
+
+    @thread = Thread.new do
+      sleep @interval
+      run
+    end
+  end
+
+  def kill
+    @thread.kill
+  end
+
+  def pause
+    @paused = true
+  end
+
+  def run
+    @block.call unless @paused
+  end
+
+  def unpause
+    @paused = false
+  end
+end

data/lib/twterm/status.rb

@@ -116,6 +116,9 @@ module Twterm
         count = MAX_CACHED_STATUSES_COUNT
         return if @@instances.count < count
 
+        TabManager.instance.each_tab do |tab|
+          tab.touch_statuses if tab.is_a?(Tab::StatusesTab)
+        end
         statuses = @@instances.values.sort_by(&:touched_at).take(count)
         status_ids = statuses.map(&:id)
         @@instances = status_ids.zip(statuses).to_h

data/lib/twterm/tab/list_tab.rb

@@ -13,7 +13,7 @@ module Twterm
         @list = list
         @title = @list.full_name
         fetch { move_to_top }
-        auto_reload(300) { fetch }
+        @auto_reloader = Scheduler.new(300) { fetch }
       end
 
       def fetch
@@ -25,6 +25,11 @@ module Twterm
         end
       end
 
+      def close
+        @auto_reloader.kill
+        super
+      end
+
       def ==(other)
         other.is_a?(self.class) && list == other.list
       end

data/lib/twterm/tab/mentions_tab.rb

@@ -17,7 +17,7 @@ module Twterm
         @title = 'Mentions'
 
         fetch { move_to_top }
-        auto_reload(300) { fetch }
+        @auto_reloader = Scheduler.new(300) { fetch }
       end
 
       def fetch

data/lib/twterm/tab/statuses_tab.rb

@@ -3,19 +3,11 @@ module Twterm
     module StatusesTab
       include Base
       include Scrollable
-      include AutoReloadable
 
       def initialize
         super
 
         @status_ids = []
-
-        Thread.new do
-          loop do
-            statuses.take(100).each(&:touch!)
-            sleep 60
-          end
-        end
       end
 
       def statuses
@@ -73,7 +65,16 @@ module Twterm
         end
       end
 
-      def delete_status(status_id)
+      def destroy_status
+        status = highlighted_status
+
+        Client.current.destroy_status(status) do
+          delete(status.id)
+          refresh
+        end
+      end
+
+      def delete(status_id)
         @status_ids.delete(status_id)
         refresh
       end
@@ -102,6 +103,10 @@ module Twterm
         fail NotImplementedError, 'fetch method must be implemented'
       end
 
+      def touch_statuses
+        statuses.take(100).each(&:touch!)
+      end
+
       def update
         current_line = 0
 
@@ -195,6 +200,8 @@ module Twterm
         case key
         when 'c'
           show_conversation
+        when 'D'
+          destroy_status
         when 'F'
           favorite
         when 'o'

data/lib/twterm/tab/timeline_tab.rb

@@ -12,7 +12,7 @@ module Twterm
         @title = 'Timeline'
 
         fetch { move_to_top }
-        auto_reload(180) { fetch }
+        @auto_reloader = Scheduler.new(180) { fetch }
       end
 
       def fetch

data/lib/twterm/tab/user_tab.rb

@@ -14,7 +14,7 @@ module Twterm
         @title = "@#{user.screen_name}"
 
         fetch { move_to_top }
-        auto_reload(120) { fetch }
+        @auto_reloader = Scheduler.new(120) { fetch }
       end
 
       def fetch
@@ -25,6 +25,11 @@ module Twterm
         end
       end
 
+      def close
+        @auto_reloader.kill
+        super
+      end
+
       def ==(other)
         other.is_a?(self.class) && user == other.user
       end

data/lib/twterm/tab_manager.rb

@@ -72,6 +72,12 @@ module Twterm
       add_and_show(tab)
     end
 
+    def each_tab(&block)
+      @tabs.each do |tab|
+        block.call(tab)
+      end
+    end
+
     def refresh_window
       @window.clear
       current_tab_id = current_tab.object_id

data/lib/twterm/tweetbox.rb

@@ -47,16 +47,32 @@ module Twterm
         end
 
         loop do
-          msg = @in_reply_to.nil? || !@status.empty? ? '> ' : "> @#{in_reply_to.user.screen_name} "
-          line = (readline(msg, true) || '').strip
-          break if line.empty?
+          loop do
+            msg = @in_reply_to.nil? || !@status.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"
+            if line.end_with?('\\')
+              @status << line.chop.lstrip + "\n"
+            else
+              @status << 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
-            @status << line
             break
           end
+
+          puts "\n"
+          clear
         end
 
         resetter.call
@@ -74,12 +90,20 @@ module Twterm
     end
 
     def post
-      return if @status.nil? || @status.empty?
+      return if validate
 
       Client.current.post(@status, @in_reply_to)
       clear
     end
 
+    def validate
+      Twitter::Validation.tweet_invalid?(@status)
+    end
+
+    def length
+      Twitter::Validation.tweet_length(@status)
+    end
+
     def clear
       @status = ''
     end

data/lib/twterm/version.rb

@@ -1,3 +1,3 @@
 module Twterm
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
 end

data/twterm.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'oauth', '>= 0.4.7'
   spec.add_dependency 'tweetstream', '>= 2.6.1'
   spec.add_dependency 'twitter', '>= 5.14.0'
+  spec.add_dependency 'twitter-text', '>= 1.11.0'
 
   spec.add_development_dependency 'bundler', '~> 1.8'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twterm
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Ryota Kameoka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.14.0
+- !ruby/object:Gem::Dependency
+  name: twitter-text
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.11.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -137,9 +151,9 @@ files:
 - lib/twterm/notification/error.rb
 - lib/twterm/notification/message.rb
 - lib/twterm/notifier.rb
+- lib/twterm/scheduler.rb
 - lib/twterm/screen.rb
 - lib/twterm/status.rb
-- lib/twterm/tab/auto_reloadable.rb
 - lib/twterm/tab/base.rb
 - lib/twterm/tab/conversation_tab.rb
 - lib/twterm/tab/exceptions.rb

data/lib/twterm/tab/auto_reloadable.rb

@@ -1,14 +0,0 @@
-module Twterm
-  module Tab
-    module AutoReloadable
-      def auto_reload(period, &block)
-        Thread.new do
-          loop do
-            sleep period
-            block.call
-          end
-        end
-      end
-    end
-  end
-end