orator 0.5.1 → 0.6.0

data/lib/orator/base.rb

@@ -22,7 +22,8 @@ module Orator
     # @return [Array<Object>, nil] the values of the trigger, or nil if the
     #   event was prevented.
     def __trigger(event, *args)
-      orator, method_name = event.to_s.split('.')
+      orator = event[0..event.index('.')-1]
+      method_name = event[event.index('.')+1..-1]
       __check_event(orator, method_name)
 
       @event = [orator, method_name]

data/lib/orator/client.rb

@@ -39,6 +39,15 @@ module Orator
     def trigger(event, *args)
       event_handler.trigger(event, context, *args)
     end
-    
+
+    # This is here just in case anyone gets the bright idea to serialize the
+    # client with Oj.  This should not happen, because it could reveal
+    # information that you may not want to be revealed.
+    #
+    # @return [Hash]
+    def to_hash
+      context.table
+    end
+
   end
 end

data/lib/orator/event_handler.rb

@@ -41,7 +41,8 @@ module Orator
 
     # This triggers the events.  The events aren't triggered in any particular
     # order, since they are stored in a [Set].  Extra arguments are passed to
-    # the block/class.
+    # the block/class.  If no events are found, it runs the `socket.missing`
+    # event.
     #
     # @param event [String, Symbol] the event to trigger.
     # @param context [Object] the context to run in.  If the event is mapped to
@@ -50,11 +51,14 @@ module Orator
     # @return [Object, nil]
     def trigger(event, context, *args)
       puts "Running event #{event}..." if Orator.debug
-      events(event).map do |event|
+      if events(event).map do |event|
         puts "Found responder #{event[:block] || event[:class]}" if Orator.debug
 
         run_event(event, context, args)
         if event[:count] then event[:count] -= 1 end
+      end.length == 0
+        puts "could not find event, running socket.missing..." if Orator.debug
+        events('socket.missing').map { |e| run_event(e, context, args) }
       end
 
       clear_events

data/lib/orator/middle_ground.rb

@@ -8,10 +8,16 @@ module Orator
     # @return [Client]
     attr_reader :client
 
+    # Provides access to the list of clients that are connected.
+    #
+    # @return [Set<Client>]
+    attr_accessor :clients
+
     # Initialize the class.
-    def initialize(client)
-      @client = client
-      @struct = ::Orator::OpenStruct.new
+    def initialize(client, clients)
+      @client  = client
+      @clients = clients
+      @struct  = ::Orator::OpenStruct.new
     end
 
     # This sends a message to the client.
@@ -19,7 +25,7 @@ module Orator
     # @param data [Hash] the data to be sent to the client.
     # @return [void]
     def send(data)
-      @client.socket.send Oj.dump(data, :mode => :null)
+      @client.socket.send Oj.dump(data, :mode => :compat)
     end
 
     # This builds a message from a hash and an event.

data/lib/orator/server.rb

@@ -40,9 +40,9 @@ module Orator
     #
     # @param [Object]
     def handle_socket(socket)
-      client = Client.new :event_handler => @event_handler.dup, 
+      client = Client.new :event_handler => @event_handler.dup,
         :socket => socket, :context => nil
-      client.context = MiddleGround.new(client)
+      client.context = MiddleGround.new(client, clients)
       clients << client
 
       socket.onopen do |handshake|
@@ -66,5 +66,5 @@ module Orator
     end
 
   end
-    
+
 end

data/lib/orator/version.rb

@@ -1,5 +1,5 @@
 module Orator
 
   # Version of Orator.
-  VERSION = '0.5.1'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: orator
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
+  prerelease: 
 platform: ruby
 authors:
 - Jeremy Rodi
@@ -13,6 +14,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: em-websocket
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: swf_fu
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -75,65 +84,65 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/tasks/orator.rake
+- lib/orator.rb
+- lib/orator/engine.rb
+- lib/orator/server.rb
+- lib/orator/base.rb
 - lib/orator/middle_ground.rb
+- lib/orator/event_handler.rb
+- lib/orator/open_struct.rb
 - lib/orator/version.rb
-- lib/orator/server.rb
 - lib/orator/cli.rb
 - lib/orator/client.rb
-- lib/orator/open_struct.rb
-- lib/orator/engine.rb
-- lib/orator/base.rb
-- lib/orator/event_handler.rb
-- lib/generators/orator/orator_generator.rb
-- lib/generators/orator/config_generator.rb
+- lib/generators/templates/template_orator.rb
 - lib/generators/templates/config.yml
 - lib/generators/templates/orators/example_orator.rb
 - lib/generators/templates/orators/application_orator.rb
-- lib/generators/templates/template_orator.rb
-- lib/orator.rb
-- lib/tasks/orator.rake
+- lib/generators/orator/config_generator.rb
+- lib/generators/orator/orator_generator.rb
 - bin/orator
-- spec/client_spec.rb
-- spec/spec_helper.rb
+- spec/event_handler_spec.rb
 - spec/middle_ground_spec.rb
+- spec/client_spec.rb
 - spec/base_orator_spec.rb
-- spec/event_handler_spec.rb
-- vendor/assets/javascripts/orator/middle_ground.coffee
-- vendor/assets/javascripts/orator/swfobject.js
-- vendor/assets/javascripts/orator/command_handler.coffee
-- vendor/assets/javascripts/orator/event_handler.coffee
-- vendor/assets/javascripts/orator/chat_logger.coffee
+- spec/spec_helper.rb
+- vendor/assets/swfs/WebSocketMain.swf
+- vendor/assets/javascripts/orator.coffee
 - vendor/assets/javascripts/orator/web_socket.js
-- vendor/assets/javascripts/orator/strbuf.coffee
 - vendor/assets/javascripts/orator/stringify.jquery.js
 - vendor/assets/javascripts/orator/header.coffee
-- vendor/assets/javascripts/orator.coffee
-- vendor/assets/swfs/WebSocketMain.swf
+- vendor/assets/javascripts/orator/event_handler.coffee
+- vendor/assets/javascripts/orator/chat_logger.coffee
+- vendor/assets/javascripts/orator/swfobject.js
+- vendor/assets/javascripts/orator/command_handler.coffee
+- vendor/assets/javascripts/orator/strbuf.coffee
+- vendor/assets/javascripts/orator/middle_ground.coffee
 - README.md
 - Rakefile
 - LICENSE
 homepage: http://github.com/redjazz96/orator
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Magic for your browser.
 test_files: []
-has_rdoc: false

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YjgxMWQyODVkNmU4OTZlYTlkNzVhMzM2MWMwYjM1NjZjNmMxN2M0Nw==
-  data.tar.gz: !binary |-
-    NjgxMWE5NWEyYjlhZGM1YWIyYjI5MGZlMDAzZGQ0MzE5NzE1MGVmMA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MTg5MTYzM2JmOTg2YmFiN2IzMjQ4OGQ0ZDVhOWE1MzU3MjQ5ODk5MzUwN2Uz
-    MzFlNThmNDJlYzNiMDBlYjYwN2VhZjI4OGY0M2QzNzRmNTQ4MzZmYzY2ODI3
-    NDljMDM0Zjc2MGQ1NzU3ZWNmNjRkMWU4ZmI3NWRhZmI5ZDNiOTk=
-  data.tar.gz: !binary |-
-    NTgyOGViMDY2ZDcxN2RkOThkZjI5MDMxZmMyZjdkNWQ0ODVkNjE4N2RhYTIx
-    ZjllMjA1YzgzOGI1OWJkMjVkZWE3OThkNzEyNzliNmIwODgwYzRhZWY4Mzgx
-    NGE4YWFkMzlhMzUwYzJjZmNmNGU5NzkxYWQ1ZmI3ZmM1OGMwZTM=