protolink 0.2.8 → 0.2.9

data/Gemfile.lock

@@ -1,17 +1,8 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.6)
     crack (0.1.8)
-    em-http-request (1.0.0)
-      addressable (>= 2.2.3)
-      em-socksify
-      eventmachine (>= 1.0.0.beta.3)
-      http_parser.rb (>= 0.5.2)
-    em-socksify (0.1.0)
-      eventmachine
     eventmachine (1.0.0.beta.4)
-    http_parser.rb (0.5.3)
     httparty (0.7.8)
       crack (= 0.1.8)
     rake (0.9.2)
@@ -21,7 +12,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  em-http-request
   eventmachine (= 1.0.0.beta.4)
   httparty
   rake

data/lib/protolink/channel.rb

@@ -15,7 +15,7 @@ module Protolink
 
     # Post a new message to the chat channel
     def speak(message, options = {})
-      send_message(message)
+      send_message(message, options)
     end
 
     def delete!
@@ -49,8 +49,8 @@ module Protolink
         @loaded      = true
       end
 
-      def send_message(message)
-        connection.post("/api/v1/meeps", :body => {:channel_id => self.id, :message => message})
+      def send_message(message, option)
+        connection.post("/api/v1/meeps", :body => {:channel_id => self.id, :message => message, :text_extension => option[:text_extension]})
       end
 
       def connection

data/lib/protolink/proto_socket.rb

@@ -27,7 +27,11 @@ class ProtoSocket < FlashConnection
   end
   
   def unbind
+    puts "DISCONNECTED"
     EventMachine::cancel_timer @ping
+    EventMachine::add_timer(30) {
+      EventMachine.connect URI.parse(@connection.class.base_uri).host, 5000, ProtoSocket, @connection, @message_callback
+    }
   end
   
 end

data/lib/protolink/protonet.rb

@@ -135,7 +135,7 @@ module Protolink
     end
     
     def find_user_by_login(login)
-      response = get("/api/v1/users/#{login}")
+      response = get("/api/v1/users/find_by_login/#{login}")
       User.new(self, response) if response
     end
 

data/lib/protolink/version.rb

@@ -1,3 +1,3 @@
 module Protolink
-  VERSION = '0.2.8' unless defined?(::Protolink::VERSION)
+  VERSION = '0.2.9' unless defined?(::Protolink::VERSION)
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: protolink
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 2
-  - 8
-  version: 0.2.8
+  - 9
+  version: 0.2.9
 platform: ruby
 authors: 
 - "Bj\xC3\xB6rn B. Dorra"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-26 00:00:00 +02:00
+date: 2011-12-16 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,42 +64,7 @@ files:
 - Gemfile.lock
 - README.markdown
 - Rakefile
-- example/chatbot.rb
 - example/create_and_subscribe.rb
-- example/linkbot/base_plugins.rb
-- example/linkbot/plugins/awwwyeah.rb
-- example/linkbot/plugins/blowhard.rb
-- example/linkbot/plugins/comic.rb
-- example/linkbot/plugins/dumb.rb
-- example/linkbot/plugins/dupe.rb.inactive
-- example/linkbot/plugins/face.rb
-- example/linkbot/plugins/fuuu.rb
-- example/linkbot/plugins/help.rb
-- example/linkbot/plugins/image.rb
-- example/linkbot/plugins/imgur.rb
-- example/linkbot/plugins/jason.rb
-- example/linkbot/plugins/karma.rb.inactive
-- example/linkbot/plugins/last.rb
-- example/linkbot/plugins/links.rb.inactive
-- example/linkbot/plugins/log.rb
-- example/linkbot/plugins/okay.rb
-- example/linkbot/plugins/onion.rb
-- example/linkbot/plugins/popcorn.rb
-- example/linkbot/plugins/qwantz.rb
-- example/linkbot/plugins/search.rb
-- example/linkbot/plugins/shutup.rb
-- example/linkbot/plugins/slap.rb
-- example/linkbot/plugins/snap.rb
-- example/linkbot/plugins/stab.rb
-- example/linkbot/plugins/store.rb
-- example/linkbot/plugins/store_help.rb
-- example/linkbot/plugins/swanson.rb
-- example/linkbot/plugins/titles.rb
-- example/linkbot/plugins/translate.rb
-- example/linkbot/plugins/tsa.rb
-- example/linkbot/plugins/twss.rb
-- example/linkbot/plugins/urban.rb
-- example/linkbot/util.rb
 - lib/protolink.rb
 - lib/protolink/channel.rb
 - lib/protolink/flash_connection.rb

data/example/chatbot.rb

@@ -1,24 +0,0 @@
-$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
-
-require 'rubygems'
-require 'protolink'
-require 'linkbot/base_plugins'
-
-# require 'ruby-debug'
-# Debugger.start
-
-# from https://github.com/markolson/linkbot
-Linkbot::Plugin.collect
-
-# change this if you need to connect to another server
-PTN_SERVER = "http://localhost:3000"
-PTN_USER   = "admin"
-PTN_PASS   = "admin"
-protonet = Protolink::Protonet.open(PTN_SERVER, PTN_USER, PTN_PASS)
-protonet.socket do |json|
-  response = Linkbot::Plugin.handle_message(Message.new(json["message"], json["user_id"], json["author"], :message)) if json["trigger"] == "meep.receive"
-  unless response.blank?
-    c = protonet.find_channel(json["channel_id"])
-    c.speak(response.first)
-  end
-end

data/example/linkbot/base_plugins.rb

@@ -1,71 +0,0 @@
-require 'rubygems'
-require 'pp'
-require 'hpricot'
-
-class MessageType
-  MESSAGE       = :message
-  DIRECTMESSAGE = :"direct-message"
-  STARRED       = :starred
-  UNSTARRED     = :unstarred
-end
-
-#The interface message object between Linkbot::Plugin and the plugins.
-#New axiom: the plugins know nothing about the service they're using!
-Message = Struct.new(:body, :user_id, :user_name, :type)
-
-class Linkbot
-  class Plugin
-    @@plugins = {}
-    @@message_log = []
-    
-    def self.handle_message(message)
-      print "handle_message got called with #{message}"
-
-      @@message_log << message
-
-      final_message = []
-
-      Linkbot::Plugin.plugins.each {|k,v|
-        if v[:handlers][message.type] && v[:handlers][message.type][:handler]
-          
-          if ((v[:handlers][message.type][:regex] && v[:handlers][message.type][:regex].match(message.body)) || v[:handlers][message.type][:regex].nil?)
-            
-            matches = v[:handlers][message.type][:regex] ? v[:handlers][message.type][:regex].match(message.body).to_a.drop(1) : nil
-            p "#{k} processing message type #{message.type}"
-            begin
-              end_msg = v[:ptr].send(v[:handlers][message.type][:handler], message, matches)
-            rescue => e
-              end_msg = "the #{k} plugin threw an exception: #{e.inspect}"
-              puts e.inspect
-              puts e.backtrace.join("\n")
-            end
-            final_message << end_msg if !end_msg.empty?
-          end
-        end  
-      }
-      print "returning msgs from plugins:"
-      pp final_message
-      final_message
-    end
-
-    def self.message_history
-      @@message_log
-    end
-    
-    def self.registered_methods
-      @registered_methods ||= {}
-      @registered_methods
-    end
-    
-    def self.plugins; @@plugins; end;
-
-    def self.collect
-      Dir["linkbot/plugins/*.rb"].each {|file| load file }
-    end
-  
-    def self.register(name, s, handlers)
-      @@plugins[name] = {:ptr => s, :handlers => handlers}
-    end
-  end
-  
-end

data/example/linkbot/plugins/awwwyeah.rb

@@ -1,11 +0,0 @@
-class Awwyeah < Linkbot::Plugin
-    def self.on_message(message, matches)
-      "http://i.imgur.com/Y3Q0Z.png"
-    end
-
-    Linkbot::Plugin.register('awwwyeah', self,
-      {
-        :message => {:regex => /a+w+ y+e+a+h+/i, :handler => :on_message}
-      }
-    )
-end

data/example/linkbot/plugins/blowhard.rb

@@ -1,40 +0,0 @@
-class Blowhard < Linkbot::Plugin
-    def self.on_message(message, matches)
-      quotes = ['I just blue myself.',
-    		"I'll be your wingman. Even if it means I have to take a chubby. I will suck it up.",
-    		"Well, yes, but I'm afraid I prematurely shot my wad on what was supposed to be a dry run, if you will, so now I’m afraid I have something of a mess on my hands.",
-    		"I can already taste those meaty leading man parts.",
-    		"I just can't seem to get one in the can...",
-    		"I will pack your mouth with your sweet, pink mouth with so much ice cream, you'll be the envy of every Jerry and Jane on the block.",
-    		"Well I guess you could say I am buy-curious",
-    		'I see you wasted no time filling my "seat hole"',
-    		'Excuse me, do these effectively hide my thunder?',
-    		'Perhaps I should call the hot cops and tell them to come up with a more nautical theme. Hot sailors. Better yet... Hot sea...',
-    		'Ah yes, the Bob Loblaw Law Blog. You, sir, are a mouthful.',
-    		"No, no. It's pronounced a-nal-ra-pist.",
-    		"Okay, who'd like a banger in the mouth? Right, I forgot, here in the States, you call it a sausage in the mouth.",
-    		'Michael, you are quite the cupid. You can stick an arrow in my buttocks any time. ',
-    		'Oh really? Then have sex with this girl right now. Go on. Have some sex with her.',
-    		'Let the great experiment begin!',
-    		"Tobias, you blowhard.",
-    		"Michael, you are not quite the ladies man I had pictured. Hopefully, we will remedy that when we are in the spa spreading body chocolate on each other. ",
-    		"Boy, I sure feel like a Mary without a Peter and a Paul. ",
-    		"I'm looking for something that says 'Dad likes leather'. ",
-    		"I need to go take down the buffet and set up the leather pony. "]
-    	
-      quotes[rand(quotes.length)]
-    end
-
-
-    def self.help
-      "!blowhard - words of wisdom from Dr. Funke"
-    end
-
-    
-    Linkbot::Plugin.register('blowhard', self,
-      {
-        :message => {:regex => /!blowhard/, :handler => :on_message, :help => :help},
-        :"direct-message" => {:regex => /!blowhard/, :handler => :on_message, :help => :help}
-      }
-    )
-end

data/example/linkbot/plugins/comic.rb

@@ -1,40 +0,0 @@
-require 'active_support'
-
-class Comic < Linkbot::Plugin
-  Linkbot::Plugin.register('comic', self,
-    {
-      :message => {:regex => Regexp.new('(?:!comic|!fffffffuuuuuuuuuuuu)(?: (\d+))?'), :handler => :on_message, :help => :help},
-    }
-  )
-
-  def self.on_message(message, matches)
-    times = matches[0] || "1"
-    times = times.to_i
-    messages = []
-
-    1.upto(times) do
-
-      # Brute force this mother
-      subreddit = "http://reddit.com/r/fffffffuuuuuuuuuuuu.json"
-
-      puts subreddit
-      doc = ActiveSupport::JSON.decode(open(subreddit, "Cookie" => "reddit_session=8390507%2C2011-03-22T07%3A06%3A44%2C2516dcc69a22ad297b9900cbde147b365203bbbb").read)
-
-      url = doc["data"]["children"][rand(doc["data"]["children"].length)]["data"]["url"]
-
-      # Check if it's an imgur link without an image extension
-      if url =~ /http:\/\/(www\.)?imgur\.com/ && !['jpg','png','gif'].include?(url.split('.').last)
-        # Fetch the imgur page and pull out the image
-        doc = Hpricot(open(url).read)
-        url = doc.search("img")[1]['src']
-      end
-
-      messages << url
-    end
-    return messages.join("\n")
-  end
-
-  def self.help
-    "!comic - return a random fffffffuuuuuuuuuuuu comic"
-  end
-end

data/example/linkbot/plugins/dumb.rb

@@ -1,11 +0,0 @@
-class Dumb < Linkbot::Plugin
-    def self.on_message(message, matches) 
-      "No, you're dumb"
-    end
-
-    Linkbot::Plugin.register('dumb', self,
-      {
-        :message => {:regex => /dumb|stupid/, :handler => :on_message}
-      }
-    )
-end

data/example/linkbot/plugins/dupe.rb.inactive

@@ -1,64 +0,0 @@
-require 'open-uri'
-require 'hpricot'
-require 'sqlite3'
-require 'time'
-
-class Dupe < Linkbot::Plugin
-  
-  Linkbot::Plugin.register('dupe', self,
-    {
-      :message => {:regex => /!stats/, :handler => :on_message, :help => :help}
-    }
-  )
-  
-  def self.on_message(message, matches) 
-    rows = Linkbot.db.execute("select u.username,s.total,s.dupes,k.karma,u.showname from stats s, users u, karma k where u.user_id = s.user_id AND u.user_id = k.user_id order by k.karma desc")
-    mess = "Link stats:\n--------------------------\n"
-
-    #find the maximum length karma total
-    max = rows.collect { |row| row[1].to_s }.map(&:length).max
-
-    rows.each {|row|
-      username = (row[4].nil? || row[4] == '') ? row[0] : row[4]
-      dupe = row[2] == 1 ? 'dupe' : 'dupes'
-      mess = mess + sprintf("%#{max}d: #{username} (%d links, %d %s, %.2f%% new)\n", row[3], row[1], row[2], dupe, (row[1]/(row[1]+row[2]).to_f)*100)
-    }
-    mess
-  end
-  
-  def self.on_dupe(message, url, duped_user, duped_timestamp)
-    total,dupes = self.stats(message.user_id)
-    Linkbot.db.execute("update stats set dupes = #{dupes+1} where user_id='#{message.user_id}'")
-    res = Linkbot.db.execute("select username,showname from users where user_id='#{message.user_id}'")[0]
-    username = (res[1].nil? || res[1] == '') ? res[0] : res[1]
-    puts duped_timestamp
-    "DUPE: Previously posted by #{duped_user} #{::Util.ago_in_words(Time.now, Time.parse(duped_timestamp.to_s))}"
-  end
-  
-  def self.on_newlink(message, url)
-    total,dupes = self.stats(message.user_id)
-    Linkbot.db.execute("update stats set total = #{total+1} where user_id='#{message.user_id}'")
-  end
-  
-  
-  def self.stats(user_id)
-    total = 0
-    dupes = 0
-    rows = Linkbot.db.execute("select user_id,total,dupes from stats where user_id = '#{user_id}'")
-    if rows.empty?
-      Linkbot.db.execute("insert into stats (user_id,total,dupes) values ('#{user_id}', 0, 0)")
-    else
-      total = rows[0][1]
-      dupes = rows[0][2]
-    end
-    return total,dupes
-  end
-  
-  def self.help
-    "!stats - show all karma and links stats for linkchat participants"
-  end
-  
-  if Linkbot.db.table_info('stats').empty?
-    Linkbot.db.execute('CREATE TABLE stats (user_id INTEGER, dupes INTEGER, total INTEGER)');
-  end
-end

data/example/linkbot/plugins/face.rb

@@ -1,11 +0,0 @@
-class Face < Linkbot::Plugin
-    def self.on_message(message, matches)
-      "http://i.imgur.com/ZbfvQ.gif"
-    end
-
-    Linkbot::Plugin.register('face', self,
-      {
-        :message => {:regex => Regexp.new('/face'), :handler => :on_message}
-      }
-    )
-end

data/example/linkbot/plugins/fuuu.rb

@@ -1,12 +0,0 @@
-class Fuu < Linkbot::Plugin
-    def self.on_message(message, matches)
-      "http://imgur.com/M4KFN.jpg"
-    end
-    
-    Linkbot::Plugin.register('fuuu', self,
-      {
-        :message => {:regex => Regexp.new('FUUU'), :handler => :on_message}
-      }
-    )
-end
-

data/example/linkbot/plugins/help.rb

@@ -1,26 +0,0 @@
-class Helper < Linkbot::Plugin
-  
-  Linkbot::Plugin.register('help', self,
-    {
-      :message => {:regex => /!help/, :handler => :on_message},
-      :"direct-message" => {:regex => /!help/, :handler => :on_message}
-    }
-  )
-  
-  def self.on_message(message, matches)
-    messages = [] 
-    Linkbot::Plugin.plugins.each {|k,v|
-      if(v[:handlers][message.type] && v[:handlers][message.type][:help])
-        messages << v[:ptr].send(v[:handlers][message.type][:help])
-      end
-    }
-    messages.sort! do |x,y|
-      x =~ /([A-Za-z]+)/
-      sort1 = $1
-      y =~ /([A-Za-z]+)/
-      sort2 = $1
-      sort1 <=> sort2
-    end
-    messages.join("\n")
-  end
-end