flumtter 5.4.0 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 172a58ccba1cebebba54f06578778897391e2655
-  data.tar.gz: 1978786bb8795ffad698c95201283478de4059f8
+  metadata.gz: 13d1dedbe6e2272bfc5a0703d9ca4ac97891205f
+  data.tar.gz: f2a259bf554cf3b41526b280b8ecf106246b492a
 SHA512:
-  metadata.gz: 9aaa57eff2459a530a89cd8eaa66a73881cdf313a0242565c20d789f4a54ab4635450f0651949773c113c51b95321e605a427ddea3492d0a330c23151246dc39
-  data.tar.gz: abca932b6739cb8f7c3442f338dd02d49466b81ea891a7a790fa3aaf8de873a2c0e5c0c7827f95c3db36c3ac32e1f390c9be0838a6988918405ace16d83345f8
+  metadata.gz: d2607cae78919444f5fcd1844a0cf1c0c78257ee6e97b5ad9875c0161a6452ba518e2f0022616b199213cd4022197dbd60cfc7632a8b5bb50e5a78cc715a792b
+  data.tar.gz: ee9ea90fe2b6bb37dc88a44706ead7549680d686268e9068e284416ec5139183eb6ad9b1dd7c803e6556ca56aaf256b18dafb195f3fb844db46925b0293cc10e

data/lib/flumtter/app/core/command/tweet.rb

@@ -19,6 +19,14 @@ module Flumtter
           Plugins::Reply.update(obj, m2, twitter)
         end
       end
+      command("g", "Conversation") do |m|
+        error_handler do
+          obj, _ = parse_index(m[1])
+          if_tweet(obj, twitter) do |tweet|
+            Window::Conversation.new(tweet, twitter).show
+          end
+        end
+      end
     end
   end
 end

data/lib/flumtter/app/core/util.rb

@@ -11,6 +11,10 @@ module Flumtter
       EOF
     end
 
+    def parse_time(time)
+      time.getlocal.strftime("%Y/%m/%d %H:%M:%S")
+    end
+
     def parse_index(text, with_screen_name=false)
       if m = text.match(index_regexp)
         obj = id2obj(m[1])

data/lib/flumtter/app/core/windows/buf_window.rb

@@ -57,6 +57,8 @@ module Flumtter
       end
 
       class Element
+        include Util
+
         attr_reader :object
         def initialize(object, index)
           @object = object

data/lib/flumtter/app/core/windows/conversation.rb

@@ -0,0 +1,28 @@
+module Flumtter
+  module Window
+    class ConversationBuf < Buf::Buf
+      def initialize(twitter)
+        @twitter = twitter
+        super(Window::TweetBase)
+      end
+
+      def prefetch
+        id = @buf.last&.object&.in_reply_to_status_id
+        add(
+          @twitter.rest.status(id)
+        ) unless id.nil?
+      end
+    end
+
+    class Conversation < Window::Buf::Screen
+      include Command::Tweet
+
+      def initialize(obj, twitter)
+        buf = ConversationBuf.new(twitter)
+        buf.add(obj)
+        super(buf, "Conversation")
+        add_command(twitter)
+      end
+    end
+  end
+end

data/lib/flumtter/app/core/windows/dmbase.rb

@@ -10,7 +10,7 @@ module Flumtter
     end
 
     def created_at
-      @object.created_at.strftime("%Y/%m/%d %H:%M:%S")
+      parse_time(@object.created_at)
     end
 
     def header

data/lib/flumtter/app/core/windows/tweetbase.rb

@@ -10,7 +10,7 @@ module Flumtter
     end
 
     def created_at
-      @object.created_at.strftime("%Y/%m/%d %H:%M:%S")
+      parse_time(@object.created_at)
     end
 
     def body

data/lib/flumtter/app/plugins/commands/conversation.rb

@@ -1,37 +1,12 @@
 module Flumtter
   plugin do
-    class self::Buf < Window::Buf::Buf
-      def initialize(twitter)
-        @twitter = twitter
-        super(Window::TweetBase)
-      end
-
-      def prefetch
-        id = @buf.last&.object&.in_reply_to_status_id
-        add(
-          @twitter.rest.status(id)
-        ) unless id.nil?
-      end
-    end
-
-    class self::Conversation < Window::Buf::Screen
-      include Command::Tweet
-
-      def initialize(obj, twitter)
-        buf = Plugins::Conversation::Buf.new(twitter)
-        buf.add(obj)
-        super(buf, "Conversation")
-        add_command(twitter)
-      end
-    end
-
     Keyboard.add("g", "Conversation") do |m, twitter|
       error_handler do
         obj, _ = index_with_dialog(m[1], "Conversation Screen", <<~EOF)
           Please input target index.
         EOF
         if_tweet(obj, twitter) do |tweet|
-          self::Conversation.new(tweet, twitter).show
+          Window::Conversation.new(tweet, twitter).show
         end
       end
     end

data/lib/flumtter/app/plugins/timeline/base.rb

@@ -1,6 +1,8 @@
 module Flumtter
   module TimeLine
     class Base
+      include Util
+
       @@elements = []
 
       def self.[](key)
@@ -51,7 +53,7 @@ module Flumtter
       end
 
       def created_at
-        @object.created_at.strftime("%Y/%m/%d %H:%M:%S")
+        parse_time(@object.created_at)
       end
 
       def index

data/lib/flumtter/app/plugins/timeline/fav.rb

@@ -16,7 +16,7 @@ module Flumtter
       end
 
       def created_at
-        @object.target_object.created_at.strftime("%Y/%m/%d %H:%M:%S")
+        parse_time(@object.target_object.created_at)
       end
 
       def body

data/lib/flumtter/version.rb

@@ -1,3 +1,3 @@
 module Flumtter
-  VERSION = "5.4.0"
+  VERSION = "5.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flumtter
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 5.5.0
 platform: ruby
 authors:
 - flum1025
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-08 00:00:00.000000000 Z
+date: 2017-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -152,6 +152,7 @@ files:
 - lib/flumtter/app/core/util.rb
 - lib/flumtter/app/core/windows/base.rb
 - lib/flumtter/app/core/windows/buf_window.rb
+- lib/flumtter/app/core/windows/conversation.rb
 - lib/flumtter/app/core/windows/dialog.rb
 - lib/flumtter/app/core/windows/dmbase.rb
 - lib/flumtter/app/core/windows/dynamic_view.rb