earthquake 0.4.5 → 0.4.6

data/README.md

@@ -33,6 +33,11 @@ Commands
 
     ⚡ Hello World!
 
+### Timeline
+
+    ⚡ :recent
+    ⚡ :recent twitter
+
 ### Searth
 
     ⚡ :search #ruby
@@ -157,12 +162,9 @@ The 'm' is a MatchData.
 TODO
 ----
 
-* unescape html
 * dealing direct messages
 * more intelligent completion
-* caching statuses
 * typable id
-* request asynchronously
 * spec
 
 Copyright

data/VERSION

@@ -1 +1 @@
-0.4.5
+0.4.6

data/earthquake.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{earthquake}
-  s.version = "0.4.5"
+  s.version = "0.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jugyo"]

data/lib/earthquake/commands.rb

@@ -55,12 +55,12 @@ module Earthquake
       async { twitter.unfriend(m[1]) }
     end
 
-    command :list do |m|
-      puts_items twitter.user_timeline(:screen_name => m[1]).reverse
+    command :recent do
+      puts_items twitter.home_timeline.reverse
     end
 
-    command :home do
-      puts_items twitter.home_timeline.reverse
+    command :recent do |m|
+      puts_items twitter.user_timeline(:screen_name => m[1]).reverse
     end
 
     command :user do |m|
@@ -70,7 +70,7 @@ module Earthquake
     command :search do |m|
       puts_items twitter.search(m[1])["results"].each { |s|
         s["user"] = {"screen_name" => s["from_user"]}
-      }.each {|s|
+        s["disable_cache"] = true
         words = m[1].split(/\s+/).reject{|x| x[0] =~ /^-|^(OR|AND)$/ }.map{|x|
           case x
           when /^from:(.+)/, /^to:(.+)/
@@ -83,8 +83,19 @@ module Earthquake
       }.reverse
     end
 
-    command :retweet do |m|
-      async { twitter.retweet(m[1]) }
+    command %r|^:retweet\s+(\d+)$|, :as => :retweet do |m|
+      target = twitter.status(m[1])
+      if confirm("retweet 'RT @#{target["user"]["screen_name"]}: #{target["text"].e}'")
+        async { twitter.retweet(m[1]) }
+      end
+    end
+
+    command %r|^:retweet\s+(\d+)\s+(.*)$|, :as => :retweet do |m|
+      target = twitter.status(m[1])
+      text = "#{m[2]} RT @#{target["user"]["screen_name"]}: #{target["text"].e} (#{target["id"]})"
+      if confirm("unofficial retweet '#{text}'")
+        async { twitter.update(text) }
+      end
     end
 
     command :favorite do |m|

data/lib/earthquake/input.rb

@@ -1,4 +1,6 @@
 # encoding: UTF-8
+require 'set'
+
 module Earthquake
   module Input
     def commands
@@ -6,7 +8,7 @@ module Earthquake
     end
 
     def command_names
-      @command_names ||= []
+      @command_names ||= Set.new
     end
 
     def completions

data/lib/earthquake/twitter.rb

@@ -1,3 +1,4 @@
+# NOTE: It's important to cache duped objects
 module Earthquake
   module Twitter
     attr_reader :twitter
@@ -5,19 +6,28 @@ module Earthquake
 
   init do
     @twitter = TwitterOAuth::Client.new(config.slice(:consumer_key, :consumer_secret, :token, :secret))
+
+    filter do |item|
+      next if item["text"].nil? || item["disable_cache"]
+      Earthquake.cache.write("status:#{item["id"]}", item.dup, :expires_in => 1.hour.ago)
+    end
   end
 
   once do
     class ::TwitterOAuth::Client
-      def status_with_cache(id)
-        key = "status:#{id}"
-        unless s = Earthquake.cache.read(key)
-          s = status_without_cache(id)
-          Earthquake.cache.write(key, s, :expires_in => 1.hour.ago)
+      [:status, :info].each do |m|
+        define_method("#{m}_with_cache") do |*args|
+          key = "#{m}:#{args.join(',')}"
+          if result = Earthquake.cache.read(key)
+            result.dup
+          else
+            result = __send__(:"#{m}_without_cache", *args)
+            Earthquake.cache.write(key, result.dup, :expires_in => 1.hour.ago)
+            result
+          end
         end
-        s.dup
+        alias_method_chain m, :cache
       end
-      alias_method_chain :status, :cache
     end
   end
 

metadata

@@ -2,7 +2,7 @@
 name: earthquake
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors: 
 - jugyo