seapig-server 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c560bf0cf2a5bab92a5b099d388f0c98a25bcbcb
-  data.tar.gz: ad6f5bf5c8e1f4059a6e9bbeb65fd8ab8e5a22cd
+  metadata.gz: 867ee8657bbc0f1f9cdf2f8d56627179e10860f2
+  data.tar.gz: e9102a3be76c639d1717d45c1366271cc9f97721
 SHA512:
-  metadata.gz: 12068e910301f964671983318f26ee5ea82608d3624d73b49d5f6977876ad1b6d28651e2a9b4124af03c6f3dbf643f7de047287b2ae5777b92f78809350dcc52
-  data.tar.gz: b8d90983add600b9c1c33d46444057d7d7955a55c17f8f2e5ee5854696bef692a3e688f99c8455f61d680eedd3f14d1524887de18db4b9dfe9538c6b37b09686
+  metadata.gz: eb28661eaa20bad43f3935c63b66a8ce0ba95febba2f8da5bd0742ab9d1b4e0acadd8eecdbcf6f59e31ebcefca57ed34c5558a9e74a60d88527d09bf7e82d3b8
+  data.tar.gz: 18d635f7e0ef27f966a4d858e8ea8c4696942f4c780c27635a58ad96d754564f5bfb29c66714f560e3f1adc172971143563c184605c525608573dffe95212c80

data/bin/seapig-server

@@ -1,6 +1,5 @@
 #!/bin/env ruby
 # coding: utf-8
-
 require 'websocket-eventmachine-server'
 require 'narray'
 require 'oj'
@@ -161,6 +160,7 @@ module SeapigObjectStore
 			object = (@@objects_by_id[id] or self.spawn(id))
 			accepted = object.version_set(data, version, requested_version)
 			if accepted
+				puts "Version accepted" if DEBUG
 				(@@dependents[id] or Set.new).each { |dependent_id|
 					raise if not @@objects_by_id.has_key?(dependent_id)
 					next if not (dependent = @@objects_by_id[dependent_id])
@@ -174,11 +174,11 @@ module SeapigObjectStore
 					old_dependencies = (@@dependencies[id] or Set.new)
 					new_dependencies = (@@dependencies[id] = Set.new(version.keys))
 					(new_dependencies - old_dependencies).each { |added_dependency|
-						object.version_needed[added_dependency] = [(@@objects_by_id[added_dependency] ? @@objects_by_id[added_dependency].version_latest : 0), (version[added_dependency] or 0)].max
+						object.version_needed[added_dependency] = SeapigObject.version_newer((@@objects_by_id[added_dependency] ? @@objects_by_id[added_dependency].version_latest : 0), (version[added_dependency] or 0))
 						dependent_add(added_dependency, object.id)
 					}
 					(old_dependencies & new_dependencies).each { |kept_dependency|
-						object.version_needed[kept_dependency] = [(@@objects_by_id[kept_dependency] ? @@objects_by_id[kept_dependency].version_latest : 0), (version[kept_dependency] or 0)].max
+						object.version_needed[kept_dependency] = SeapigObject.version_newer((@@objects_by_id[kept_dependency] ? @@objects_by_id[kept_dependency].version_latest : 0), (version[kept_dependency] or 0))
 					}
 					(old_dependencies - new_dependencies).each { |removed_dependency|
 						object.version_needed.delete(removed_dependency)
@@ -265,17 +265,23 @@ private
 
 
 		def self.version_newer?(latest,vb)
+#			return true          if      latest.nil?            and (not vb.nil?)
+#			return false         if (not latest.nil?)           and      vb.nil?
 			return latest < vb   if (not latest.kind_of?(Hash)) and (not vb.kind_of?(Hash))
 			return true          if (not latest.kind_of?(Hash)) and (    vb.kind_of?(Hash))
 			return false         if (    latest.kind_of?(Hash)) and (not vb.kind_of?(Hash))
 			(latest.keys & vb.keys).each { |key|
-#				return true if latest[key] and (vb[key] == nil or vb[key] > latest[key])
-				return true if vb[key] > latest[key]
+				return true if version_newer?(latest[key], vb[key])
 			}
 			return vb.size < latest.size #THINK: is this the right way to go...
 		end
 
 
+		def self.version_newer(va,vb)
+			version_newer?(va,vb) ? vb : va
+		end
+
+
 		def consumer_register(pattern,client)
 			return false if ((not pattern.starexp?) and @direct_consumers.include?(client)) or (pattern.starexp? and @wildcard_consumers[client] and @wildcard_consumers[client].include?(pattern))
 			if pattern.starexp?
@@ -600,7 +606,7 @@ class Client
 		raise "Client already producing something (producing: %s, trying to assign: %s)"%[@producing.inspect, [object_id,object_version].inspect] if @producing
 		raise "Can't produce that pattern: "+@produces.inspect+" "+object_id.inspect if not @produces.find { |pattern| object_id =~ pattern.starexp }
 		puts "Assigning:\n        "+object_id+':'+object_version.inspect+'    to: '+self.id if DEBUG
-		@socket.send Oj.dump("action" => 'object-produce', "id" => object_id)
+		@socket.send Oj.dump("action" => 'object-produce', "id" => object_id, "version"=>object_version)
 		@producing = [object_id, object_version]
 	end
 
@@ -652,7 +658,6 @@ end
 # * change protocol to use "pattern" instead of "id"
 # * change "object-patch" to something nicer
 
-
 processing_times = []
 processing_times_sum = 0
 

data/lib/seapig/version.rb

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

metadata

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