discordrb 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4553a299935a6bdc2eabefbfb3457eea8549b108
-  data.tar.gz: cecbbcba26ee274e071e36a6198c5ebf7a488ea4
+  metadata.gz: 2296feb0a038652aa89be29c52175bc0f11eaf34
+  data.tar.gz: 6ddb6b25676a6c62c337a90cbd353f3f8657ef09
 SHA512:
-  metadata.gz: 5f4693a18e7b29449038662944e6d91514dc5d7c127ba18f1d27e8a5de87666142bf831dea05cfac0b982bf7628e56e6461cc66b33ca490fb8b8b9ff4c5535ef
-  data.tar.gz: 37fd4cd938da34073f15a5c28bceadfdd05e2fa64f37abe42736fb5ee861a7b72c02375d97b8d17cd618da7c8407aba7a7126054741764bf73f58e0af10b0dc2
+  metadata.gz: b15a87221c8c796400ddff8689c324a8fb554855b268fda56d45bfce7ac1513897647bc22bb939fd9fb140598a5d7739e3f74b35166263210c579d9c368b02da
+  data.tar.gz: 520abf9af895c57671e502f0294e7aa23baa4c5cdda02d410d4dc050055870f84d06677e9b93418b17ab4c30cb696ecb91d18eb6731d0fdec66fa1cf26e07587

data/README.md

@@ -1,23 +1,49 @@
+[![Build Status](https://travis-ci.org/meew0/discordrb.svg?branch=master)](https://travis-ci.org/meew0/discordrb)
+
 # discordrb
 
 An implementation of the [Discord](https://discordapp.com/) API using Ruby.
 
 ## Installation
 
-Add this line to your application's Gemfile:
+### Linux
 
-```ruby
-gem 'discordrb'
-```
+On Linux, it should be as simple as running:
+
+    $ gem install discordrb
+
+### Windows
+
+On Windows, to install discordrb, run this in a shell:
+
+    $ gem install discordrb
+
+Run the [ping example](https://github.com/meew0/discordrb/blob/master/examples/ping.rb) to verify that the installation works:
+
+    $ ruby ping.rb
+
+#### Troubleshooting
 
-And then execute:
+**If you get an error like this when installing the gem**:
 
-    $ bundle
+    ERROR:  Error installing discordrb:
+            The 'websocket-driver' native gem requires installed build tools.
 
-Or install it yourself as:
+You're missing the development kit required to build native extensions. Follow [these instructions](https://github.com/oneclick/rubyinstaller/wiki/Development-Kit#installation-instructions) and reinstall discordrb:
 
+    $ gem uninstall discordrb
     $ gem install discordrb
 
+**If you get an error like this when running the example**:
+
+    terminate called after throwing an instance of 'std::runtime_error'
+      what():  Encryption not available on this event-machine
+
+You're missing the OpenSSL libraries that EventMachine, a dependency of discordrb, needs to be built with to use encrypted connections (which Discord requires). Download the OpenSSL libraries from [here](http://slproweb.com/download/Win32OpenSSL-1_0_2d.exe), install them to their default location and reinstall EventMachine using these libraries:
+
+    $ gem uninstall eventmachine
+    $ gem install eventmachine -- --with-ssl-dir=C:/OpenSSL-Win32
+
 ## Usage
 
 You can make a simple bot like this:

data/Rakefile

@@ -1 +1,4 @@
 require "bundler/gem_tasks"
+
+# Make "build" the default task
+task :default => :build

data/examples/pm.rb

@@ -0,0 +1,11 @@
+# This bot shows off PM functionality by sending a PM every time the bot is mentioned.
+
+require 'discordrb'
+
+bot = Discordrb::Bot.new "email@example.com", "hunter2"
+
+bot.mention do |event|
+  event.user.pm("You have mentioned me!")
+end
+
+bot.run

data/lib/discordrb/bot.rb

@@ -40,7 +40,12 @@ module Discordrb
         end
       end
 
-      websocket_connect
+      while true do
+        @token = login
+        websocket_connect
+        puts "disconnected. attempting to reconnect."
+        sleep 5
+      end
     end
 
     def channel(id)
@@ -107,6 +112,18 @@ module Discordrb
       register_event(MentionEvent, attributes, block)
     end
 
+    def remove_handler(handler)
+      clazz = event_class(handler.class)
+      @event_handlers[clazz].delete(handler)
+    end
+
+    def add_handler(handler)
+      clazz = event_class(handler.class)
+      @event_handlers[clazz] << handler
+    end
+
+    alias_method :<<, :add_handler
+
     private
 
     def debug(message)
@@ -115,6 +132,8 @@ module Discordrb
 
     def login
       debug("Logging in")
+      login_attempts = login_attempts || 0
+
       # Login
       login_response = RestClient.post Discordrb::Endpoints::LOGIN, :email => @email, :password => @password
       raise HTTPStatusException.new(login_response.code) if login_response.code >= 400
@@ -125,6 +144,15 @@ module Discordrb
 
       debug("Received token: #{login_response_object['token']}")
       login_response_object['token']
+    rescue SocketError => e
+      if login_attempts < 100 && e.inspect.include?("No such host is known.")
+        sleep 15
+        puts "login failed. reattempting."
+        login_attempts = login_attempts + 1
+        retry
+      else
+        raise $!
+      end
     end
 
     def websocket_connect
@@ -202,6 +230,7 @@ module Discordrb
 
     def websocket_close(event)
       raise_event(DisconnectEvent.new)
+      EM.stop
     end
 
     def websocket_open(event)
@@ -233,10 +262,13 @@ module Discordrb
     end
 
     def register_event(clazz, attributes, block)
-      #handler = Kernel.const_get(clazz.to_s + "Handler")
-      handler = class_from_string(clazz.to_s + "Handler")
+      handler = handler_class(clazz).new(attributes, block)
+
       @event_handlers[clazz] ||= []
-      @event_handlers[clazz] << handler.new(attributes, block)
+      @event_handlers[clazz] << handler
+
+      # Return the handler so it can be removed later
+      handler
     end
 
     def send_heartbeat
@@ -255,5 +287,16 @@ module Discordrb
         mod.const_get(class_name)
       end
     end
+
+    def event_class(handler_class)
+      class_name = handler_class.to_s
+      return nil unless class_name.end_with? "Handler"
+
+      class_from_string(class_name[0..-8])
+    end
+
+    def handler_class(event_class)
+      class_from_string(event_class.to_s + "Handler")
+    end
   end
 end

data/lib/discordrb/version.rb

@@ -1,3 +1,3 @@
 module Discordrb
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discordrb
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - meew0
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-25 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
@@ -83,6 +83,7 @@ files:
 - bin/setup
 - discordrb.gemspec
 - examples/ping.rb
+- examples/pm.rb
 - lib/discordrb.rb
 - lib/discordrb/bot.rb
 - lib/discordrb/data.rb