seapig-client-ruby 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2ff3c8fd5b96df4a2642b77584d2ac0f6da66ad
-  data.tar.gz: 8e9571f50d92b5805304bdaa49606b6906060aac
+  metadata.gz: 10d50a61c5dd7f36d2a6530bdf9d303dec754827
+  data.tar.gz: b4148df117120608d84f0f41c7cb4cdb363f2202
 SHA512:
-  metadata.gz: 8c93cf68cf379b969aa0756b5de9265001ef48a15c141fbdae85e0b0d8d419b61ae73d1dcb1ed5625594d70f5d804ac34f06fc1b9e724290efb02056e99b079a
-  data.tar.gz: e391af96eeb2170b8b9c58a8a3fd17f296dc00af4f3f58c9be54493dc5d35025afd063d3815bb57942d0f6814611c26fed3f85fab0e491551384d66ab9355f80
+  metadata.gz: 90ea378ee0ee331981f43c32f4801bb3435f1969545f83462b7862058fc453c69dcbb95758e27ecd3d5461cb316d65aedff2cc9bee5442592caf1c152b10c947
+  data.tar.gz: 2062f52ae81b2aba65d8a79ace7ccfa8db6820d140197886d67fc634f399aba3334888cd76aeb907f8196b6740100d549dcae8f77a8b8b341fae536a2fe2dba7

data/bin/seapig-observer

@@ -7,12 +7,13 @@ require 'pp'
 
 OPTIONS = Slop.parse { |o|
 	o.string '-c', '--connect', "Seapig server address (default: ws://127.0.0.1:3001)", default: "ws://127.0.0.1:3001"
+	o.bool '-d', '--debug', 'Show debug messages'
 	o.on '-h', '--help' do puts o; exit end
 }
 
 EM.run {
 
-	SeapigClient.new(OPTIONS["connect"],name: 'observer').slave(OPTIONS.arguments[0]).onchange { |what|
+	SeapigClient.new(OPTIONS["connect"], name: 'observer', debug: OPTIONS.debug?).slave(OPTIONS.arguments[0]).onstatuschange { |what|
 		puts "-"*80 + " " + Time.new.to_s
 		puts what.id
 		if what.destroyed

data/bin/seapig-worker

@@ -8,6 +8,7 @@ STDOUT.sync = true
 
 OPTIONS = Slop.parse { |o|
 	o.string '-c', '--connect', "Seapig server address (default: ws://127.0.0.1:3001)", default: "ws://127.0.0.1:3001"
+	o.bool '-d', '--debug', 'Show debug messages'
 	o.on '-h', '--help' do puts o; exit end
 }
 
@@ -33,7 +34,7 @@ end
 
 EM.run {
 
-	client = SeapigClient.new(OPTIONS["connect"], name: 'worker')
+	client = SeapigClient.new(OPTIONS["connect"], name: 'worker', debug: OPTIONS.debug?)
 
 	Producer.all.each { |producer|
 		producer.patterns.each { |pattern|

data/lib/seapig-client-ruby/client.rb

@@ -68,6 +68,7 @@ class SeapigClient
 			}
 			@master_objects.each_pair { |id, object|
 				@socket.send JSON.dump(action: 'object-producer-register', pattern: id, :"version-known" => object.version)
+				object.children.each { |child_id, child| child.upload(0, {}, child.version, true) } if id.include?('*')
 			}
 			@last_communication_at = Time.new.to_f
 		}
@@ -100,17 +101,17 @@ class SeapigClient
 				}
 			when 'object-destroy'
 				@slave_objects.each_pair { |id, object|
-					object.destroy(message) if object.matches(message['id'])
+					object.destroy(message['id']) if object.matches(message['id'])
 				}
 				@master_objects.each_pair { |id, object|
-					object.destroy(message) if object.matches(message['id'])
+					object.destroy(message['id']) if object.matches(message['id'])
 				}
 			when 'object-produce'
 				handler = @master_objects.values.find { |object| object.matches(message['id']) }
 				puts 'Seapig server submitted invalid "produce" request: '+message.inspect if (not handler) and @options[:debug]
 				handler.produce(message['id'],message['version-inferred']) if handler
 			else
-				raise 'Seapig server submitted an unsupported message: '+message.inspect
+				raise 'Seapig server submitted an unsupported message: '+message.inspect if @options[:debug]
 			end
 			@last_communication_at = Time.new.to_f
 		}
@@ -133,7 +134,7 @@ class SeapigClient
 			@reconnection_timer = nil
 		end
 		if @socket
-			if detach_fd
+			if detach_fd #FIXME: this is, most likely, broken
 				IO.new(@socket.detach).close
 				@socket.onclose {}
 				@socket_onclose.call("fd detach", "fd detach")
@@ -146,7 +147,7 @@ class SeapigClient
 	end
 
 
-	def detach_fd
+	def detach_fd #FIXME: this is, most likely, broken
 		disconnect(true)
 	end
 
@@ -350,11 +351,10 @@ class SeapigMasterObject < SeapigObject
 		end
 	end
 
-private
 
 	def upload(version_old, data_old, version_new, data_new)
 		if @client.connected
-			if version_old == 0 or data_new == false
+			if version_old == 0 or data_new == false or data_new == true
 				@client.socket.send JSON.dump(id: @id, action: 'object-patch', :"version-new" => version_new, value: data_new)
 			else
 				diff = JsonDiff.generate(data_old, data_new)
@@ -377,7 +377,7 @@ class SeapigWildcardSlaveObject < SeapigSlaveObject
 
 
 	def patch(message)
-		self[message['id']] ||= SeapigSlaveObject.new(@client, message['id'],{}).onchange(&@onchange_proc)
+		self[message['id']] ||= SeapigSlaveObject.new(@client, message['id'],{}).onchange(&@onchange_proc).onstatuschange(&@onstatuschange_proc).ondestroy(&@ondestroy_proc)
 		self[message['id']].patch(message)
 	end
 
@@ -393,16 +393,17 @@ end
 
 class SeapigWildcardMasterObject < SeapigMasterObject
 
+	attr_reader :children
+
 	def initialize(client, id, options)
 		super(client, id, options)
-		@children = ObjectSpace::WeakMap.new
+		@children = {}
 		@options = options
 	end
 
 
 	def [](id)
-		key = @children.keys.find { |key| key == id }
-		@children[(key or id)] ||= SeapigMasterObject.new(@client, id, @options)
+		@children[id] ||= SeapigMasterObject.new(@client, id, @options).ondestroy(&@ondestroy_proc)
 	end
 
 
@@ -416,9 +417,8 @@ class SeapigWildcardMasterObject < SeapigMasterObject
 	end
 
 
-	def destroy(message)
-		key = @children.keys.find { |key| key == id }
-		return if not (key and destroyed = @children[key])
+	def destroy(id)
+		return if not (destroyed = @children.delete(id))
 		destroyed.destroy(id)
 	end
 

data/lib/seapig-client-ruby/version.rb

@@ -1,3 +1,3 @@
 module Seapig
-	VERSION = "0.2.0"
+	VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seapig-client-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - yunta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-26 00:00:00.000000000 Z
+date: 2017-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-eventmachine-client