seapig-client 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40e03252696dd652e32f57c27c9eb21bc5b46305
-  data.tar.gz: 57da37b0536d9ce54d22d08b697140d7828bf59c
+  metadata.gz: e86d63970d638a4afdcc306f55860780274b6ad4
+  data.tar.gz: bb6e591c5b89a89873abda0bbf3742e86a4d9ca3
 SHA512:
-  metadata.gz: 466f428a9e0ec11d2adec3595a90ae6abdb1cbd36cd1e06165a95e7658404d431d0f2264d77f08ac7e9b53512804ca4b962425d4fb82fd642efcedcf052c8ef9
-  data.tar.gz: d2c93c3b8427851dfea92da95c77f81abea1693294916a27ce25107c6ea6d44cc7f2ab887d344a2f732bad4aca1b05edc3a75a1ba75febb3e8eb31447c58a236
+  metadata.gz: 2b6bbf8d050f5b3ad6bfb568d6e8d2921839b19f88fe71ea58b0d7bc19b268e8e60231641cb8319f337c20e4a23dcf913a8a12b06156f54371ae17bb18e0339e
+  data.tar.gz: 9dd877bcf3f0d5a55061e9d0880c055f552e4f7147c3fe750e5c127a75ad04797c97f2ab2d02f553ccdeade3084c7d4c0946124873140df566aa9f933ef75c3b

data/bin/seapig-observer

@@ -7,6 +7,7 @@ EM.run {
 	
 	SeapigServer.new(ARGV[0],name: 'observer').slave(ARGV[1]).onchange { |what|
 		puts "-"*80 + " " + Time.new.to_s
+		puts what.object_id
 		puts what.version
 		pp what
 		puts

data/lib/seapig/client.rb

@@ -62,8 +62,9 @@ class SeapigServer
 					object.destroy(message) if object.matches?(message['id'])
 				}
 			when 'object-produce'
-				@master_objects[message['id']].onproduce_proc.call(message['id']) if @master_objects[message['id']].onproduce_proc
-				@master_objects[message['id']].upload(0,{}) if @master_objects[message['id']]
+				handler = @master_objects.keys.find { |key| key.include?('*') and (message['id'] =~ Regexp.new(Regexp.escape(key).gsub('\*','.*?'))) or (message['id'] == key) }
+				@master_objects[handler].onproduce_proc.call(message['id']) if @master_objects[handler].onproduce_proc
+				@master_objects[handler].upload(0,{},message['id']) if @master_objects[handler]
 			else
 				p :wtf, message
 			end
@@ -88,7 +89,7 @@ class SeapigServer
 	
 
 	
-	def disconnect(detach_fd: false)
+	def disconnect(detach_fd = false)
 		@connected = false
 		if @timeout_timer
 			@timeout_timer.cancel
@@ -129,7 +130,7 @@ end
 
 class SeapigObject < Hash
 
-	attr_accessor :version, :object_id, :valid, :onproduce_proc, :stall
+	attr_accessor :version, :object_id, :valid, :onproduce_proc, :stall, :parent, :destroyed
 
 
 	def matches?(id)
@@ -137,7 +138,7 @@ class SeapigObject < Hash
 	end
 
 
-	def initialize(server, object_id)
+	def initialize(server, object_id, parent = nil)
 		@server = server
 		@object_id = object_id
 		@version = 0
@@ -146,6 +147,8 @@ class SeapigObject < Hash
 		@valid = false
 		@shadow = JSON.load(JSON.dump(self))
 		@stall = false
+		@parent = parent
+		@destroyed = false
 	end
 
 	
@@ -194,7 +197,7 @@ class SeapigObject < Hash
 		old_object = @shadow
 		@version += 1
 		@shadow = sanitized
-		upload(old_version, old_object)	
+		upload(old_version, old_object, @object_id)	
 	end
 
 
@@ -203,9 +206,9 @@ class SeapigObject < Hash
 	end
 
 
-	def upload(old_version, old_object)
+	def upload(old_version, old_object, object_id)
 		message = {
-			id: @object_id,
+			id: object_id,
 			action: 'object-patch',
 			old_version: old_version,
 			new_version: @version,
@@ -228,16 +231,18 @@ class SeapigWildcardObject < SeapigObject
 
 
 	def patch(message)
-		self[message['id']] ||= SeapigObject.new(@server, message['id'])
+		self[message['id']] ||= SeapigObject.new(@server, message['id'], self)
 		self[message['id']].patch(message)
 #		puts JSON.dump(self)
-		@onchange.call(self) if @onchange
+		@onchange_proc.call(self[message['id']]) if @onchange_proc
 	end
 
 
 	def destroy(message)
-		self.delete(message['id'])
-		@onchange.call(self) if @onchange
+		if destroyed = self.delete(message['id'])
+			destroyed.destroyed = true
+			@onchange_proc.call(destroyed) if @onchange_proc
+		end
 	end
 
 end

data/lib/seapig/version.rb

@@ -1,3 +1,3 @@
 module Seapig
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seapig-client
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - yunta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-20 00:00:00.000000000 Z
+date: 2016-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-eventmachine-client