seapig-server 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33a42ea75372a1f1cf7fa95c5f7ca88ad46d789c
-  data.tar.gz: daf21ca47cc732516621bb5b05fa6a453655203a
+  metadata.gz: d495ebefe96291363c1b3f82a0ef41894c7a4272
+  data.tar.gz: 1abe36a2de4df79207a00c96c2e68f9de8dc4be0
 SHA512:
-  metadata.gz: 68d63fc5779b3f3c3e19df5d403c7227ec8a4e233a82a23189db8bec15ce2fde2796706abaf913f45de8435116597cdc06b416d245972f634f781bceaf6cc8f8
-  data.tar.gz: 9dc56616fb19d88bbab9ce34f22faf22494b1700faf1679eef3f45a1bc24c506fead2a4dbcc355b69b23bc056ba86f8672cd99bfd5b763b731d45c286ec5e045
+  metadata.gz: b0ee3e9afb9052a0657e5cec69b9d1b11dbd25e0c4f8e53483f9d8600a6b98a86629f906a1ff0da8aa418b9cf87b2e35906be5634e1ad087918cdf582ec8291e
+  data.tar.gz: 16bb0c84bd01c7174bca9e72f25d918cf5eefb1f2a47d842ff25e7ac92c37e0dacded8d77757b5494a0c24e1fb007ca5d8f2ded898f2ce2c85db9fe378377475

data/Rakefile

@@ -14,12 +14,6 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-#APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
-#load 'rails/tasks/engine.rake'
-
-
-#load 'rails/tasks/statistics.rake'
-
 
 
 Bundler::GemHelper.install_tasks

data/bin/seapig-server

@@ -78,13 +78,18 @@ class SeapigObject
 
 
 	def patch(patch, value, from_version, new_version)
-		print "Patching version:"+@version.inspect+" from_version:"+from_version.inspect+" new_version:"+new_version.inspect+' --> '  
+		print "Patching:\n\tversion:"+@version.inspect+"\n\tfrom_version: "+from_version.inspect+"\n\tnew_version: "+new_version.inspect+"\n\tpatch_size: "+(patch and patch.size.to_s or "nil")+"\n\t--> "  
 		if from_version == @version or from_version == 0
 			puts 'Clean'
 			old_object = JSON.load(JSON.dump(@object))
 			old_version = @version
 			@object.clear if from_version == 0 or value
-			Hana::Patch.new(patch).apply(@object) if patch
+			begin
+				Hana::Patch.new(patch).apply(@object) if patch
+			rescue Exception => e
+				puts "Patching failed!\n\tOld object: "+old_object.inspect+"\n\tPatch: "+patch.inspect
+				raise e
+			end
 			@object.merge!(value) if value
 			@version = new_version
 			Client.all.each { |client| send(client, old_version, old_object) }
@@ -182,11 +187,17 @@ class Client
 		Client.all.each { |client| client.produces.each { |pattern| SeapigObject[pattern] if (not pattern.starexp?) and (pattern =~ object.id.starexp) } } if object.id.starexp?
 		SeapigObject.matching(object.id).each { |object|
 			Client.all.find { |client| client.assign(object) }
-			object.send(self,nil,{}) if object.valid
+			object.send(self,0,{}) if object.valid
 		}
 	end
 
 
+	def consumer_unregister(object)
+		@consumes.delete(object)
+		SeapigObject.gc
+	end
+
+
 	def assign(object)
 		puts 'Assign? %20s <> %-30s - %s'%[self.id, object.id, [object.valid,object.id.starexp?,@producing,Client.all.find { |client| client.producing == object },(not @produces.find { |pattern| object.id =~ pattern.starexp })].map { |b| b and 'T' or 'F' }.join('')]
 		return true if object.valid
@@ -272,6 +283,7 @@ EM.run {
 		client_socket.onpong { Client[client_socket].pong }
 	}
 
+        Socket.open(:UNIX, :DGRAM)  { |s| s.connect(Socket.pack_sockaddr_un(ENV['NOTIFY_SOCKET'])); s.sendmsg "READY=1" } if ENV['NOTIFY_SOCKET']
 	
 	EM.add_periodic_timer(10) {
 		Client.all.each { |client|

data/lib/seapig/version.rb

@@ -1,3 +1,3 @@
 module Seapig
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seapig-server
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - yunta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-21 00:00:00.000000000 Z
+date: 2016-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-eventmachine-server