seapig-client 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a2fbbcbaa6f58227bed8ad11499cce4d6568fa8
-  data.tar.gz: a491e1e3deb1286f88ff47939695963455930a20
+  metadata.gz: 8e6d7c793fd0adf28e9241bfa324a89cd5469ba8
+  data.tar.gz: 9fa8f737be79b15bcefe0e130bccf3c47d134f7d
 SHA512:
-  metadata.gz: 85a50080420cefbbb952596abcaa633c60e91b48f7dbcb8fbd635eeaed28b21178529b4e96e5ba029f7375fa55334c3a9662cae985fc712a602293f71f37e3c7
-  data.tar.gz: 37ce453bea6c88a70de678fea4c8f9b88bdcb425b5cb3299b042f89ecd7c369fd0ca4e52d877a1a9335661cae905c1a79e2c98f9a32d9b81c75d9c142b77a4b3
+  metadata.gz: da0d27c4a875d53657bdade99201b3e2bf48c6bc081856e9c080fb0d096deb5f1e418ecdfb2cf4b4ed27dc79bb74b7fc1ef77acbeb141dd3a364fb4709a56887
+  data.tar.gz: 1feeb44ee9179a5f5800038c6983f0dd5caf46da671513ff1ec2c8a46f06847579cb4bd9e8d9bc43c379ab94eed3246aa20db41a20b0afef0ae78c61f6e28023

data/bin/seapig-worker

@@ -9,11 +9,11 @@ class Producer
 	class << self
 		attr_reader :patterns
 	end
-	
+
 	def self.all
 		@producers ||= ObjectSpace.each_object(Class).select { |klass| klass < Producer }
 	end
-	
+
 end
 
 ($LOAD_PATH+['./lib']).each { |load_path|
@@ -30,12 +30,12 @@ EM.run {
 	Producer.all.each { |producer|
 		producer.patterns.each { |pattern|
 			object = server.master(pattern)
-			object.onproduce { |object_id|
+			object.onproduce { |child|
 				start = Time.new
-				print 'Generated  %-30s  '%[object_id]
-				data,version = producer.produce(object_id)
-				object.set(data, version)
-				puts 'in %5.2fs'%[(Time.new-start).to_f]
+				print 'Sent  %-30s  '%[child.object_id]
+				data, version = producer.produce(child.object_id)
+				child.reset.set(data).send(version)
+				puts 'in %5.2fs - %s'%[(Time.new-start).to_f,version.inspect]
 			}
 		}
 	}

data/lib/seapig/client.rb

@@ -85,8 +85,8 @@ class SeapigServer
 				}
 			when 'object-produce'
 				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]
+				raise "Stupid produce" if not @master_objects[handler]
+				@master_objects[handler].produce(message['id'],message['version'])
 			else
 				p :wtf, message
 			end
@@ -142,7 +142,8 @@ class SeapigServer
 
 
 	def master(object_id)
-		object = SeapigObject.new(self, object_id)
+		object = if object_id.include?('*') then SeapigWildcardObject.new(self, object_id) else SeapigObject.new(self, object_id) end
+		object.version = nil
 		@socket.send JSON.dump(action: 'object-producer-register', pattern: object_id) if @connected
 		@master_objects[object_id] = object
 	end
@@ -160,7 +161,8 @@ end
 
 class SeapigObject < Hash
 
-	attr_accessor :version, :object_id, :valid, :onproduce_proc, :stall, :parent, :destroyed
+	attr_accessor :version, :object_id, :stall, :parent, :destroyed, :version_requested
+	attr_reader :received_at
 
 
 	def matches?(id)
@@ -193,6 +195,8 @@ class SeapigObject < Hash
 
 
 	def patch(message)
+		@received_at = Time.new
+		old_data = @shadow
 		if (not message['old_version']) or (message['old_version'] == 0) or (message['value'])
 			self.clear
 		elsif not @version == message['old_version']
@@ -207,24 +211,31 @@ class SeapigObject < Hash
 		end
 		@version = message['new_version']
 		@valid = true
-		@onchange_proc.call(self) if @onchange_proc
+		@shadow = JSON.load(JSON.dump(self))
+		@onchange_proc.call(self) if @onchange_proc and old_data != @shadow
+	end
+
+
+	def reset()
+		@version = 0
+		@shadow = {}
+		self
 	end
 
 
-	def set(data, version)
+	def set(data)
 		if data
 			@stall = false
 			self.clear
 			self.merge!(data)
-			@shadow = sanitized
 		else
 			@stall = true
 		end
-		@version = version
+		self
 	end
 
 
-	def changed(new_version=nil)
+	def send(new_version=nil)
 		old_version = @version
 		old_object = @shadow
 		@version = (new_version or (Time.new.to_f*1000000).to_i)
@@ -257,6 +268,22 @@ class SeapigObject < Hash
 			end
 		end
 		@server.socket.send JSON.dump(message)
+		self
+	end
+
+
+ 	def produce(object_id, version)
+		@version_requested = version
+		if @onproduce_proc
+			@onproduce_proc.call(self)
+		else
+			self.upload(0,{},object_id)
+		end
+	end
+
+
+	def valid?
+		@valid
 	end
 
 end
@@ -265,11 +292,15 @@ end
 
 class SeapigWildcardObject < SeapigObject
 
+	def initialize(*args)
+		super(*args)
+		@children = ObjectSpace::WeakMap.new
+	end
+
 
 	def patch(message)
 		self[message['id']] ||= SeapigObject.new(@server, message['id'], self)
 		self[message['id']].patch(message)
-#		puts JSON.dump(self)
 		@onchange_proc.call(self[message['id']]) if @onchange_proc
 	end
 
@@ -281,6 +312,16 @@ class SeapigWildcardObject < SeapigObject
 		end
 	end
 
-end
 
+	def produce(object_id, version)
+		key = @children.keys.find { |key| key == object_id }
+		child = (@children[(key or object_id)] ||= SeapigObject.new(@server, object_id, self))
+		child.version_requested = version
+		if @onproduce_proc
+			@onproduce_proc.call(child)
+		else
+			child.upload(0,{},object_id)
+		end
+	end
 
+end

data/lib/seapig/version.rb

@@ -1,3 +1,3 @@
 module Seapig
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seapig-client
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - yunta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-18 00:00:00.000000000 Z
+date: 2016-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-eventmachine-client