metacosm 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e645a9a08cbfe919ac910c227a009362cea85489
-  data.tar.gz: ddc00033d2b1753af206e7c94ce826a87a65d08e
+  metadata.gz: 507c3712499d247e71327f2f613360b595c75715
+  data.tar.gz: 2e8eedf08f22ae677cf80a02ffa2d5466a52914c
 SHA512:
-  metadata.gz: 144418e13b1af3653d7bb6e8a41349f47c4c9dc4c2a13affac698a611cf00d7d97531348346e454d93a0aa1ba05fc85c248d086c15911714f99d7dfc0ae01aa0
-  data.tar.gz: a743ea6ca08471c22efd146b2d0b3698b101060eefab3a49b3d36382f384b4f4c8dddbe61ea94959ded1d85d79ff41e4fe9f6002e5c7f5f67c6e3dd4a5cc21ea
+  metadata.gz: 6acfd5b2586c6258354cf2c9ee970637f9e1dc46d67ef4c5d4707f1133d49affef2f4ea72407dc86ad3fd1b24079a454d983c7d64f465fdf5edb9ff919896a1c
+  data.tar.gz: ca4b957d8aa2cc5023e81f6a7a7ca3b4c6ac8edfdc0d57ca6ec1af6b9e2425f9af8d8d463659801801d8aabf13445a070d2b90376f53732bfecfac90a0856d54

data/README.md

@@ -31,6 +31,8 @@ Models only transform their state in response to commands, so their state can be
 
 ## Requirements
 
+Ruby 2.2.1 or higher and Redis. Gosu dependencies are needed for the client.
+
 ## Install
 
     $ gem install metacosm

data/lib/metacosm/redis.rb

@@ -0,0 +1,14 @@
+require 'connection_pool'
+
+REDIS = ConnectionPool.new(size: 5) do
+  if ENV['REDISTOGO_URL']
+    puts "---> using redis to go!"
+    uri = URI.parse(ENV["REDISTOGO_URL"])
+    puts "---> parsed uri: #{uri}"
+    Redis.new(:host => uri.host, :port => uri.port, :password => uri.password, :thread_safe => true)
+  else
+    puts "---> using default redis settings..."
+    Redis.new
+  end
+end
+

data/lib/metacosm/remote_simulation.rb

@@ -9,9 +9,18 @@ module Metacosm
     def apply(command); fire command end
 
     def fire(command)
+      puts "---> Firing command at remote sim..."
+      puts "[command: #{command.inspect}]"
       command_dto = command.attrs.merge(handler_module: command.handler_module_name, handler_class_name: command.handler_class_name)
-      redis = redis_connection
-      redis.publish(@command_queue_name, Marshal.dump(command_dto))
+
+      puts "---> Sending command over redis conn: #{redis.inspect}"
+      Thread.new do
+        REDIS.with do |redis|
+          redis.publish(@command_queue_name, Marshal.dump(command_dto))
+        end
+      end
+      puts "---> Sent!"
+      true
     end
 
     def received_events
@@ -21,26 +30,27 @@ module Metacosm
     def setup_connection
       @remote_listener_thread = Thread.new do
         begin
-          redis = redis_connection
-          redis.subscribe(@event_stream_name) do |on|
-            on.subscribe do |channel, subscriptions|
-              puts "Subscribed to remote simulation event stream ##{channel} (#{subscriptions} subscriptions)"
-            end
+          REDIS.with do |redis|
+            redis.subscribe(@event_stream_name) do |on|
+              on.subscribe do |channel, subscriptions|
+                puts "Subscribed to remote simulation event stream ##{channel} (#{subscriptions} subscriptions)"
+              end
 
-            on.message do |channel, message|
-              event = Marshal.load(message)
-              listener_module_name = event.delete(:listener_module)
-              listener_class_name = event.delete(:listener_class_name)
-              module_name = listener_module_name
-              module_name = "Object" if module_name.empty?
-              listener = (module_name.constantize).const_get(listener_class_name).new(self)
-              listener.receive(event)
+              on.message do |channel, message|
+                event = Marshal.load(message)
+                listener_module_name = event.delete(:listener_module)
+                listener_class_name = event.delete(:listener_class_name)
+                module_name = listener_module_name
+                module_name = "Object" if module_name.empty?
+                listener = (module_name.constantize).const_get(listener_class_name).new(self)
+                listener.receive(event)
 
-              received_events.push(event)
-            end
+                received_events.push(event)
+              end
 
-            on.unsubscribe do |channel, subscriptions|
-              puts "Unsubscribed from remote simulation event stream ##{channel} (#{subscriptions} subscriptions)"
+              on.unsubscribe do |channel, subscriptions|
+                puts "Unsubscribed from remote simulation event stream ##{channel} (#{subscriptions} subscriptions)"
+              end
             end
           end
         rescue ::Redis::BaseConnectionError => error

data/lib/metacosm/simulation.rb

@@ -1,9 +1,9 @@
 module Metacosm
   class Simulation
     # TODO protected?
-    def redis_connection
-      Redis.new
-    end
+    # def redis_connection
+    #   Redis.new
+    # end
 
     def params
       @params ||= {}
@@ -72,8 +72,9 @@ module Metacosm
 
       if !@event_publication_channel.nil?
         event_dto = event.attrs.merge(listener_module: event.listener_module_name, listener_class_name: event.listener_class_name)
-        redis = redis_connection
-        redis.publish(@event_publication_channel, Marshal.dump(event_dto))
+        REDIS.with do |redis|
+          redis.publish(@event_publication_channel, Marshal.dump(event_dto))
+        end
       end
 
       if !local_events_disabled?
@@ -99,28 +100,29 @@ module Metacosm
     def subscribe_for_commands(channel:)
       p [ :subscribe_to_command_channel, channel: channel ]
       @command_subscription_thread = Thread.new do
-        redis = redis_connection
-        begin
-          redis.subscribe(channel) do |on|
-            on.subscribe do |chan, subscriptions|
-              puts "Subscribed to ##{chan} (#{subscriptions} subscriptions)"
-            end
-
-            on.message do |chan, message|
-              # puts "##{chan}: #{message}"
-              command_data = Marshal.load(message)
-              p [ :got_message, command_data: command_data ]
-              apply(command_data)
-            end
-
-            on.unsubscribe do |chan, subscriptions|
-              puts "Unsubscribed from ##{chan} (#{subscriptions} subscriptions)"
+        REDIS.with do |redis|
+          begin
+            redis.subscribe(channel) do |on|
+              on.subscribe do |chan, subscriptions|
+                puts "Subscribed to ##{chan} (#{subscriptions} subscriptions)"
+              end
+
+              on.message do |chan, message|
+                # puts "##{chan}: #{message}"
+                command_data = Marshal.load(message)
+                p [ :got_message, command_data: command_data ]
+                apply(command_data)
+              end
+
+              on.unsubscribe do |chan, subscriptions|
+                puts "Unsubscribed from ##{chan} (#{subscriptions} subscriptions)"
+              end
             end
+          rescue Redis::BaseConnectionError => error
+            puts "#{error}, retrying in 1s"
+            sleep 1
+            retry
           end
-        rescue Redis::BaseConnectionError => error
-          puts "#{error}, retrying in 1s"
-          sleep 1
-          retry
         end
       end
     end

data/lib/metacosm/version.rb

@@ -1,4 +1,4 @@
 module Metacosm
   # metacosm version
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metacosm
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Joseph Weissman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-17 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: passive_record
@@ -163,6 +163,7 @@ files:
 - gemspec.yml
 - lib/metacosm.rb
 - lib/metacosm/model.rb
+- lib/metacosm/redis.rb
 - lib/metacosm/remote_simulation.rb
 - lib/metacosm/simulation.rb
 - lib/metacosm/support/spec_harness.rb