metacosm 0.2.11 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f1364b08565c171187ac2147a3812327ae0bacd
-  data.tar.gz: 5c41390aa54ece8be01a6bd52beea209a1a98d97
+  metadata.gz: 8dc2f64e388c19864b4913a01eeb821f6016fdde
+  data.tar.gz: 0e3f337465c42548784342fde5260f93b14c8808
 SHA512:
-  metadata.gz: 0f214a30b472251583b7db4f880feaf3fb7ce29104ea57b47eec8ba52ade6ce8de1602bc9cfb8ab3bd266ae67e317324c95661bbba94ce98cfca3b9375e09873
-  data.tar.gz: 6a934a31535a83c58a01dc18d8001c48eeda2571c340e279c0cdd352bd7e1047d50fa3a877e4faca6bd25ea798c6c84d436d4a8ad96f17e315e1ab719e9af270
+  metadata.gz: 28c5f71234421d6fc5c1ac19161dcf8f8b149e30b771c58168becdb2c9c2888d56cd31d372b46f1e8f8566f55ea763a886b7dffa2af030b402790bd8becf186f
+  data.tar.gz: 1bcad03a5914c8cb0b47c5ddb7bf5a219dc7433e59b246b74a7b14844dc4fb755157701ce0b14950eefe1965c59ad67794fc5664d4313296d0a0c9f46621fb49

data/Gemfile

@@ -4,9 +4,9 @@ ruby '2.3.0'
 
 gemspec
 
-gem 'frappuccino'
 gem 'activesupport'
 gem 'passive_record'
+gem 'redis'
 
 group :test do
   gem 'rspec-its'

data/gemspec.yml

@@ -7,7 +7,7 @@ email: jweissman1986@gmail.com
 homepage: https://rubygems.org/gems/metacosm
 dependencies:
   passive_record: ~> 0.3
-  frappuccino: ~> 0.3
+  redis: ~> 3.2
 development_dependencies:
   bundler: ~> 1.10
   codeclimate-test-reporter: ~> 0.1

data/lib/metacosm.rb

@@ -1,5 +1,4 @@
 require 'passive_record'
-require 'frappuccino'
 
 require 'metacosm/version'
 require 'metacosm/model'

data/lib/metacosm/model.rb

@@ -1,14 +1,18 @@
 module Metacosm
   class Model
     include PassiveRecord
-    before_create :register_observer
+    # before_create :register_observer
     after_create  :emit_creation_event
     after_update  :emit_updation_event
     after_destroy :emit_destruction_event
 
     private
-    def register_observer
-      Simulation.current.watch(self)
+    # def register_observer
+    #   Simulation.current.watch(self)
+    # end
+
+    def emit(event)
+      Simulation.current.receive(event)
     end
 
     def emit_creation_event

data/lib/metacosm/redis_simulation.rb

@@ -0,0 +1,6 @@
+module Metacosm
+  # class RedisSimulation < Simulation
+  #   # need to override remote command/event queue logic
+  #   # and use redis pub/sub instead...
+  # end
+end

data/lib/metacosm/simulation.rb

@@ -1,15 +1,5 @@
-require 'drb/drb'
 module Metacosm
-  class EventStream < Frappuccino::Stream
-    include DRb::DRbUndumped
-  end
-
   class Simulation
-    attr_accessor :running
-    def watch(model)
-      Frappuccino::Stream.new(model).on_value(&method(:receive))
-    end
-
     def fire(command)
       command_queue.push(command)
     end
@@ -18,6 +8,10 @@ module Metacosm
       @command_queue ||= Queue.new
     end
 
+    def event_queue
+      @event_queue ||= Queue.new
+    end
+
     def conduct!
       @conductor_thread = Thread.new { execute }
     end
@@ -26,10 +20,9 @@ module Metacosm
       while true
         if (command=command_queue.pop)
           apply(command)
-        else
-          thread.pass
-          sleep 0.001
+          sleep 0.01
         end
+        Thread.pass
       end
     end
 
@@ -43,33 +36,95 @@ module Metacosm
 
     def apply(command)
       mutex.synchronize do
-        handler = handler_for(command)
-        handler.handle(command.attrs)
+        if command.is_a?(Hash)
+          handler_module_name = command.delete(:handler_module)
+          handler_class_name = command.delete(:handler_class_name)
+          module_name = handler_module_name
+          handler = (module_name.constantize).
+            const_get(handler_class_name).new
+          handler.handle(command)
+        else
+          handler = handler_for(command)
+          handler.handle(command.attrs)
+        end
       end
     end
 
-    def event_stream
-      @event_stream ||= EventStream.new(self)
-    end
+    def apply_event(event)
+      if !@on_event_callback.nil?
+        event_dto = event.attrs.merge(listener_module: event.listener_module_name, listener_class_name: event.listener_class_name)
+        @on_event_callback[event_dto]
+      end
 
-    def has_event_stream?
-      !@event_stream.nil?
+      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.new
+        redis.publish(@event_publication_channel, Marshal.dump(event_dto))
+      end
+
+      if !local_events_disabled?
+        listener = listener_for(event)
+        if event.attrs.any?
+          listener.receive(event.attrs)
+        else
+          listener.receive
+        end
+      end
     end
 
-    def receive(event, record: true)
-      if record
-        events.push(event) 
-        emit(event) if has_event_stream?
+    def on_event(publish_to:nil,&blk)
+      unless publish_to.nil?
+        @event_publication_channel = publish_to
       end
 
-      listener = listener_for(event)
-      if event.attrs.any?
-        listener.receive(event.attrs)
-      else
-        listener.receive
+      if block_given?
+        @on_event_callback = blk
       end
     end
 
+    # TODO lift this stuff from socius
+    # def push_commands_to(channel:)
+    #   @command_push_channel = channel
+    # end
+
+    def subscribe_for_commands(channel:)
+      p [ :subscribe_to_command_channel, channel: channel ]
+      redis = Redis.new
+      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}"
+            apply(Marshal.load(message))
+	  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
+    end
+
+    def disable_local_events
+      @local_events_disabled = true
+    end
+
+    def local_events_disabled?
+      @local_events_disabled ||= false
+    end
+
+    def receive(event, record: true)
+      events.push(event) if record
+      apply_event(event)
+    end
+
     def events
       @events ||= []
     end
@@ -91,7 +146,6 @@ module Metacosm
 
     def construct_handler_for(command)
       module_name = command.handler_module_name
-      # module_name = "Object" if module_name.empty?
       (module_name.constantize).
         const_get(command.handler_class_name).new
     rescue => ex
@@ -105,8 +159,7 @@ module Metacosm
     end
 
     def construct_listener_for(event)
-      module_name = event.listener_module_name #class.name.deconstantize
-      # module_name = "Object" if module_name.empty?
+      module_name = event.listener_module_name
       listener = (module_name.constantize).const_get(event.listener_class_name).new(self)
       listener
     end

data/lib/metacosm/version.rb

@@ -1,4 +1,4 @@
 module Metacosm
   # metacosm version
-  VERSION = "0.2.11"
+  VERSION = "0.2.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metacosm
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors:
 - Joseph Weissman
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: frappuccino
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -163,6 +163,7 @@ files:
 - gemspec.yml
 - lib/metacosm.rb
 - lib/metacosm/model.rb
+- lib/metacosm/redis_simulation.rb
 - lib/metacosm/simulation.rb
 - lib/metacosm/support/spec_harness.rb
 - lib/metacosm/support/test_harness.rb