earthquake 0.4.4 → 0.4.5

data/README.md

@@ -7,6 +7,13 @@ It supports ruby 1.9 only.
 
 ![http://images.instagram.com/media/2011/03/21/862f3b8d119b4eeb9c52e690a0087f5e_7.jpg](http://images.instagram.com/media/2011/03/21/862f3b8d119b4eeb9c52e690a0087f5e_7.jpg)
 
+Features
+----
+
+* You can deal Twitter on Terminal entirely.
+* You can receive data in real time with Streaming API.
+* You can easily extend in Ruby.
+
 Install
 ----
 
@@ -150,6 +157,8 @@ The 'm' is a MatchData.
 TODO
 ----
 
+* unescape html
+* dealing direct messages
 * more intelligent completion
 * caching statuses
 * typable id

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.5

data/earthquake.gemspec

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

data/lib/earthquake/commands.rb

@@ -25,10 +25,13 @@ module Earthquake
     end
 
     command %r|^:reply (\d+)\s+(.*)|, :as => :reply do |m|
-      # TODO: fill the user name to reply
-      async {
-        twitter.update(m[2], :in_reply_to_status_id => m[1])
-      } if confirm("reply '#{m[2]}' to #{m[1]}")
+      in_reply_to_status_id = m[1]
+      target = twitter.status(in_reply_to_status_id)
+      screen_name = target["user"]["screen_name"]
+      text = "@#{screen_name} #{m[2]}"
+      if confirm(["'@#{screen_name}: #{target["text"].u}'".c(36), "reply '#{text}'"].join("\n"))
+        async { twitter.update(text, :in_reply_to_status_id => in_reply_to_status_id) }
+      end
     end
 
     command :status do |m|
@@ -56,6 +59,10 @@ module Earthquake
       puts_items twitter.user_timeline(:screen_name => m[1]).reverse
     end
 
+    command :home do
+      puts_items twitter.home_timeline.reverse
+    end
+
     command :user do |m|
       ap twitter.show(m[1]).slice(*%w(id screen_name name profile_image_url description url location time_zone lang protected))
     end
@@ -64,7 +71,15 @@ module Earthquake
       puts_items twitter.search(m[1])["results"].each { |s|
         s["user"] = {"screen_name" => s["from_user"]}
       }.each {|s|
-        s["highlights"] = [m[1]]
+        words = m[1].split(/\s+/).reject{|x| x[0] =~ /^-|^(OR|AND)$/ }.map{|x|
+          case x
+          when /^from:(.+)/, /^to:(.+)/
+            $1
+          else
+            x
+          end
+        }
+        s["highlights"] = words
       }.reverse
     end
 

data/lib/earthquake/core.rb

@@ -40,6 +40,7 @@ module Earthquake
       loaded = ActiveSupport::Dependencies.loaded.dup
       ActiveSupport::Dependencies.clear
       loaded.each { |lib| require_dependency lib }
+    ensure
       _init
     end
 

data/lib/earthquake/ext.rb

@@ -2,4 +2,28 @@ class String
   def c(*codes)
     "\e[#{codes.join;}m#{self}\e[0m"
   end
+
+  def u
+    gsub(/&(lt|gt|amp|quot|apos);/) do |s|
+      case s
+        when '&' then '&'
+        when '&lt;' then '<'
+        when '&gt;' then '>'
+        when '&apos;' then "'"
+        when '&quot;' then '"'
+      end
+    end
+  end
+
+  def e
+    gsub(/[&<>'"]/) do |s|
+      case s
+        when '&' then '&amp;'
+        when '<' then '&lt;'
+        when '>' then '&gt;'
+        when "'" then '&apos;'
+        when '"' then '&quot;'
+      end
+    end
+  end
 end

data/lib/earthquake/input.rb

@@ -20,8 +20,8 @@ module Earthquake
     def input(text)
       begin
         reload if config[:debug]
-        if command = commands.detect { |c| c[:pattern] =~ text }
-          command[:block].call($~)
+        if command = command(text)
+          command[:block].call(command[:pattern].match(text))
         elsif !text.empty?
           puts "Command not found".c(43)
         end
@@ -44,7 +44,7 @@ module Earthquake
         command_names << ":#{options[:as]}" if options[:as]
         commands << {:pattern => pattern, :block => block}
       else
-        commands.detect { |c| c[:name] == name }
+        commands.detect {|c| c[:pattern] =~ pattern}
       end
     end
 

data/lib/earthquake/output.rb

@@ -21,7 +21,7 @@ module Earthquake
         insert do
           while item = item_queue.shift
             item["stream"] = true
-            puts_items(item) if filters.all? { |filter| filter.call(item) }
+            puts_items(item)
           end
         end
       end
@@ -29,9 +29,10 @@ module Earthquake
 
     def puts_items(items)
       [items].flatten.each do |item|
-        outputs.each do |p|
+        next if filters.any? { |f| f.call(item) == false }
+        outputs.each do |o|
           begin
-            p.call(item)
+            o.call(item)
           rescue => e
             error e
           end
@@ -62,6 +63,7 @@ module Earthquake
 
   init do
     outputs.clear
+    filters.clear
 
     config[:colors] ||= (31..36).to_a + (91..96).to_a
 
@@ -81,9 +83,9 @@ module Earthquake
         statuses.insert(0, "[#{Time.parse(item["created_at"]).strftime('%Y.%m.%d %X')}]")
       end
 
-      source = item["source"] =~ />(.*)</ ? $1 : 'web'
+      source = item["source"].u =~ />(.*)</ ? $1 : 'web'
       user_color = color_of(item["user"]["screen_name"])
-      text = item["text"].gsub(/[@#]([0-9A-Za-z_]+)/) do |i|
+      text = item["text"].u.gsub(/[@#]([0-9A-Za-z_]+)/) do |i|
         i.c(color_of($1))
       end
 
@@ -99,8 +101,8 @@ module Earthquake
       mark = item["mark"] || ""
 
       status =  [
-                  "#{mark}#{statuses.join(" ")}".c(90),
-                  item["user"]["screen_name"].c(user_color),
+                  "#{mark}" + "#{statuses.join(" ")}".c(90),
+                  "#{item["user"]["screen_name"].c(user_color)}:",
                   "#{text}",
                   "#{misc} #{source}".c(90)
                 ].join(" ")

data/lib/earthquake/twitter.rb

@@ -15,7 +15,7 @@ module Earthquake
           s = status_without_cache(id)
           Earthquake.cache.write(key, s, :expires_in => 1.hour.ago)
         end
-        s
+        s.dup
       end
       alias_method_chain :status, :cache
     end

metadata

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