chione 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e3f59bc83b67172347b8bdfba8dde65806c4d166
-  data.tar.gz: 1e55f3d92ded7e6250ab83207d548a5a7c4da4a2
+SHA256:
+  metadata.gz: 414e1caef54ca7d5f41452376a2309e343bb52812f567012504628b5ec2347ff
+  data.tar.gz: ca11c73c74c4e45c1373e54f224603f059b8eb0338e40b4a8e5cc676dc56c98f
 SHA512:
-  metadata.gz: 1e214f19a70f22f2556649740985d211918697acea54942fd76820f500e50f42100b9eed42ce31fbed112be5b82f54282c5a674487262cd0a8df40bacef61266
-  data.tar.gz: 75323d5fd8dd00fa7f78b22d5150e26e2112fb16c3a0b049ecce5753687bcc76cd3980f340515955607e49bad3c71420cefe31752243185007b85b9175e48ebb
+  metadata.gz: 1a21bcb7a924fdeff7f3d1fd4effe157a642baf7ddbc56303cb966b83ad182e41c5b7ab9d9d000dfa7fc963ad36fd1cdab560bdcad2ae2da87a57789a0a8abf5
+  data.tar.gz: 2ba9b26c5f7cbf5be5dd1d6b85857215861a4827e2454c67fd6d529154346921582568f1d47248d34bba8aef6af63bce2d860e2e8569009bc79e6afd6e77acf8

data/History.md

@@ -1,3 +1,17 @@
+##  v0.1.0 [2017-05-22] Michael Granger <ged@FaerieMUD.org>
+
+Enhancements:
+
+- Refactor the World start/stop logic to make it easier to override in
+  implementations which have their own process models.
+- Allow a component's default to be generated by a callable
+
+Bugfixes:
+
+- Stringify the Manager or System class in `manager/added` and `system/added`
+  events.
+
+
 ## v0.0.3 [2017-01-04] Michael Granger <ged@FaerieMUD.org>
 
 Enhancements:

data/lib/chione.rb

@@ -13,7 +13,7 @@ module Chione
 
 
 	# Gem version
-	VERSION = '0.0.3'
+	VERSION = '0.1.0'
 
 
 	require 'chione/mixins'

data/lib/chione/behaviors.rb

@@ -29,3 +29,17 @@ end
 
 
 
+RSpec.shared_examples "a Chione Manager" do |args|
+
+
+	let( :chione_world ) { Chione::World.new }
+
+
+	it "can be created by a Chione::World" do
+		described_class.new( chione_world )
+	end
+
+end
+
+
+

data/lib/chione/component.rb

@@ -4,19 +4,21 @@
 require 'loggability'
 
 require 'chione' unless defined?( Chione )
+require 'chione/mixins'
+
 
 # The Component (data) class
 class Chione::Component
-	extend Loggability
+	extend Loggability,
+		Chione::MethodUtilities
 
 	# Loggability API -- log to the 'chione' logger
 	log_to :chione
 
 
+	##
 	# The Hash of fields implemented by the component
-	class << self
-		attr_accessor :fields
-	end
+	singleton_attr_accessor :fields
 
 
 	### Declare a field for the component named +name+, with a default value of
@@ -32,7 +34,7 @@ class Chione::Component
 	def initialize( values={} )
 		if self.class.fields
 			self.class.fields.each do |name, default|
-				self.method( "#{name}=" ).call( values[name] || deep_copy(default) )
+				self.method( "#{name}=" ).call( values[name] || default_value(default) )
 			end
 		end
 	end
@@ -61,6 +63,14 @@ class Chione::Component
 	private
 	#######
 
+	### Process the given +default+ value so it's suitable for use as a default
+	### attribute value.
+	def default_value( default )
+		return default.call( self ) if default.respond_to?( :call )
+		return deep_copy( default )
+	end
+
+
 	### Make a deep copy of the specified +value+.
 	def deep_copy( value )
 		return Marshal.load( Marshal.dump(value) )

data/lib/chione/world.rb

@@ -114,6 +114,13 @@ class Chione::World
 	end
 
 
+	### Stop any Managers running in the world.
+	def stop_managers
+		self.log.info "Stopping managers."
+		self.managers.each {|_, mgr| mgr.stop }
+	end
+
+
 	### Start any Systems registered with the world.
 	def start_systems
 		self.log.info "Starting %d Systems" % [ self.systems.length ]
@@ -127,6 +134,13 @@ class Chione::World
 	end
 
 
+	### Stop any Systems running in the world.
+	def stop_systems
+		self.log.info "Stopping systems."
+		self.systems.each {|_, sys| sys.stop }
+	end
+
+
 	### Returns +true+ if the World has been started (but is not necessarily running yet).
 	def started?
 		return @main_thread && @main_thread.alive?
@@ -139,22 +153,29 @@ class Chione::World
 	end
 
 
-	### Stop the world.
-	def stop
-		self.systems.each {|_, sys| sys.stop }
-		self.managers.each {|_, mgr| mgr.stop }
-
+	### Kill the threads other than the main thread in the world's thread list.
+	def kill_world_threads
+		self.log.info "Killing child threads."
 		self.world_threads.list.each do |thr|
 			next if thr == @main_thread
+			self.log.debug "  killing: %p" % [ thr ]
 			thr.join( self.class.max_stop_wait )
 		end
+	end
+
 
+	### Stop the world.
+	def stop
+		self.stop_systems
+		self.stop_managers
+		self.kill_world_threads
 		self.stop_timing_loop
 	end
 
 
 	### Halt the main timing loop. By default, this just kills the world's main thread.
 	def stop_timing_loop
+		self.log.info "Stopping the timing loop."
 		@main_thread.kill
 	end
 
@@ -184,7 +205,7 @@ class Chione::World
 	### Publish an event with the specified +event_name+, calling any subscribers with
 	### the specified +payload+.
 	def publish( event_name, *payload )
-		self.log.debug "Publishing a %p event: %p" % [ event_name, payload ]
+		# self.log.debug "Publishing a %p event: %p" % [ event_name, payload ]
 		@subscriptions.each do |pattern, callbacks|
 			next unless File.fnmatch?( pattern, event_name, File::FNM_EXTGLOB|File::FNM_PATHNAME )
 
@@ -194,6 +215,7 @@ class Chione::World
 				rescue => err
 					self.log.error "%p while calling %p for a %p event: %s" %
 						[ err.class, callback, event_name, err.message ]
+					self.log.debug "  %s" % [ err.backtrace.join("\n  ") ]
 					callbacks.delete( callback )
 				end
 			end
@@ -281,7 +303,7 @@ class Chione::World
 			system_obj.start
 		end
 
-		self.publish( 'system/added', system_type )
+		self.publish( 'system/added', system_type.name )
 		return system_obj
 	end
 
@@ -297,7 +319,7 @@ class Chione::World
 			manager_obj.start
 		end
 
-		self.publish( 'manager/added', manager_type )
+		self.publish( 'manager/added', manager_type.name )
 		return manager_obj
 	end
 

data/spec/chione/component_spec.rb

@@ -48,6 +48,17 @@ describe Chione::Component do
 			expect( instance2.things ).to be_empty
 		end
 
+
+		it "calls a callable default if it responds to #call" do
+			component_subclass.field( :oid, default: ->(obj) { obj.object_id } )
+
+			instance1 = component_subclass.new
+			instance2 = component_subclass.new( oid: 121212 )
+
+			expect( instance1.oid ).to eq( instance1.object_id )
+			expect( instance2.oid ).to eq( 121212 )
+		end
+
 	end
 
 end

data/spec/chione/world_spec.rb

@@ -379,7 +379,7 @@ describe Chione::World do
 
 			sys = world.add_system( test_system )
 
-			expect( event_payload ).to eq([ 'system/added', [test_system] ])
+			expect( event_payload ).to eq([ 'system/added', [test_system.name] ])
 		end
 
 
@@ -424,7 +424,7 @@ describe Chione::World do
 
 			manager = world.add_manager( test_manager )
 
-			expect( event_payload ).to eq([ 'manager/added', [test_manager] ])
+			expect( event_payload ).to eq([ 'manager/added', [test_manager.name] ])
 		end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chione
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Michael Granger
@@ -35,7 +35,7 @@ cert_chain:
   w8aNA5re5+Rt/Vvjxj5AcEnZnZiz5x959NaddQocX32Z1unHw44pzRNUur1GInfW
   p4vpx2kUSFSAGjtCbDGTNV2AH8w9OU4xEmNz8c5lyoA=
   -----END CERTIFICATE-----
-date: 2017-01-04 00:00:00.000000000 Z
+date: 2017-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: loggability
@@ -99,14 +99,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: hoe-highline
   requirement: !ruby/object:Gem::Requirement
@@ -169,14 +169,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.16'
 description: |-
   An Entity/Component System framework inspired by Artemis.
 
@@ -245,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: An Entity/Component System framework inspired by Artemis