chione 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e97a13cf34e52ecdafa6435e9f8a6a055b0491d8
-  data.tar.gz: c166e2cf474f7eadd82c8974ce30cdab06961e2e
+  metadata.gz: 9b24299f45b2755cca922ee6762900f1afb4b2b7
+  data.tar.gz: e4bb1a2a39c594b2ecee9e898b358f138c9d6ce7
 SHA512:
-  metadata.gz: f3d4d5d410fe1a8b41dd56f5ed5888d2e9a553c55a279857fb1759ce9e9b40c3e4b763aabaed899e04375b539b6143f1f526637d3db81e955a6f0d185c3b5644
-  data.tar.gz: de83ffeaefad492c73ca249f3af9ebfbb8d0371ec955a39c0f35938131be8fe95f4c140e3789404d88b147afb522ddcac1dcc19289c8c8ec404c5e71dcfdaa2e
+  metadata.gz: fde13065c29d54acf5e355456f146740ed8a6f4a02084dff417944fae714e9395f566b2b717eef18ea398e4a7e9940f8f57871e1d9eb140ce60aa99bdaf45856
+  data.tar.gz: 19d74ac66382bd50991a149ff5082346ba6eb67cbf0a629852051f19361bde42e3b7ec1e2b3279f128dbca377e94e8057df88b8eca349bed45480f0cb5caea4f

data/ChangeLog

@@ -1,8 +1,78 @@
+2017-05-31  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.3.0 for changeset c91f71b3d7d9
+	[06fdcde9eb00] [tip]
+
+	* .hgsigs:
+	Added signature for changeset 0d453cae95c3
+	[c91f71b3d7d9] [v0.3.0]
+
+	* Rakefile, chione.gemspec:
+	Update gemspec
+	[0d453cae95c3]
+
+	* History.md, Manifest.txt, lib/chione.rb:
+	Bump the minor version, update history.
+	[e102f20bc862]
+
+	* lib/chione.rb, lib/chione/archetype.rb, lib/chione/assemblage.rb,
+	spec/chione/archetype_spec.rb:
+	Add more backward-compat for Chione::Assemblage
+	[a2e8b35fb950] [github/master]
+
+	* .gems, Manifest.txt, Rakefile, chione.gemspec, lib/chione.rb,
+	lib/chione/archetype.rb, lib/chione/assemblage.rb,
+	lib/chione/entity.rb, lib/chione/world.rb,
+	spec/chione/archetype_spec.rb, spec/chione/assemblage_spec.rb,
+	spec/chione/entity_spec.rb, spec/chione/world_spec.rb,
+	spec/spec_helper.rb:
+	Rename Assemblage to Archetype to follow Artemis's naming.
+
+	Also add 'deprecatable' to track deprecations.
+	[687db9f6d955]
+
+	* lib/chione/entity.rb, lib/chione/system.rb, lib/chione/world.rb,
+	spec/chione/entity_spec.rb, spec/chione/system_spec.rb:
+	Add some flexibility to working with Components.
+
+	- Add a Chione::Component() coercion method
+	- Allow a component to be added to an entity by name or class
+	- Rename Entity#get_component to #find_component to more accurately
+	reflect what it does. Aliased to the old name for backward
+	compatibility, but the alias will likely be removed before 1.0.
+	- Add an #entities method to System for easy iteration by subclasses.
+	- Change the return value of World#entities_for to an Enumerator for
+	future optimizations.
+	[0f1b93f7118f]
+
+	* lib/chione/component.rb:
+	Add a missing private method to Component
+	[476c7503fa52]
+
+2017-05-30  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/chione.rb, spec/chione_spec.rb:
+	Add a Component coercion method
+	[48f58a3494f1]
+
 2017-05-26  Michael Granger  <ged@FaerieMUD.org>
 
+	* .hgtags:
+	Added tag v0.2.0 for changeset 94e6caba943c
+	[582fdd9c20c8]
+
+	* .hgsigs:
+	Added signature for changeset 89f0f18003f0
+	[94e6caba943c] [v0.2.0]
+
+	* History.md, Rakefile, chione.gemspec:
+	Re-prep for 0.2.0 release.
+	[89f0f18003f0]
+
 	* Rakefile, chione.gemspec:
 	Update gemspec
-	[068af8eec0e0] [github/master, tip]
+	[068af8eec0e0]
 
 2017-05-25  Michael Granger  <ged@FaerieMUD.org>
 

data/History.md

@@ -1,3 +1,25 @@
+##  v0.3.0 [2017-05-31] Michael Granger <ged@FaerieMUD.org>
+
+Changes:
+
+- Rename Assemblage to Archetype to follow Artemis's naming.
+- Rename Entity#get_component to #find_component to more accurately
+  reflect what it does. Aliased to the old name for backward
+  compatibility, but the alias will likely be removed before 1.0.
+
+Enhancements:
+
+- Add a Chione::Component() coercion method
+- Allow a component to be added to an entity by name or class
+- Add an #entities method to System for easy iteration by subclasses.
+- Change the return value of World#entities_for to an Enumerator for
+  future optimizations.
+
+Bugfixes:
+
+- Add a missing private method to Component
+
+
 ##  v0.2.0 [2017-05-26] Michael Granger <ged@FaerieMUD.org>
 
 Enhancements:

data/Manifest.txt

@@ -6,6 +6,7 @@ Manifest.txt
 README.md
 Rakefile
 lib/chione.rb
+lib/chione/archetype.rb
 lib/chione/aspect.rb
 lib/chione/assemblage.rb
 lib/chione/behaviors.rb
@@ -15,8 +16,8 @@ lib/chione/manager.rb
 lib/chione/mixins.rb
 lib/chione/system.rb
 lib/chione/world.rb
+spec/chione/archetype_spec.rb
 spec/chione/aspect_spec.rb
-spec/chione/assemblage_spec.rb
 spec/chione/component_spec.rb
 spec/chione/entity_spec.rb
 spec/chione/manager_spec.rb

data/Rakefile

@@ -35,6 +35,7 @@ hoespec = Hoe.spec 'chione' do |spec|
 	spec.dependency 'configurability', '~> 3.0'
 	spec.dependency 'pluggability',    '~> 0.4'
 	spec.dependency 'uuid',            '~> 2.3'
+	spec.dependency 'deprecatable',    '~> 1.0'
 
 	spec.dependency 'hoe-deveiate',            '~> 1.0',  :developer
 	spec.dependency 'simplecov',               '~> 0.12',  :developer
@@ -84,9 +85,12 @@ if File.directory?( '.hg' )
 	end
 end
 
+file __FILE__
+file 'lib/chione.rb'
+file 'Manifest.txt'
 
 task :gemspec => GEMSPEC
-file GEMSPEC => __FILE__
+file GEMSPEC => [ __FILE__, 'Manifest.txt', 'lib/chione.rb' ]
 task GEMSPEC do |task|
 	Rake.application.trace "Updating gemspec"
 	spec = $hoespec.spec
@@ -100,3 +104,4 @@ task GEMSPEC do |task|
 end
 
 CLOBBER.include( GEMSPEC.to_s )
+

data/lib/chione.rb

@@ -3,23 +3,26 @@
 
 require 'uuid'
 require 'loggability'
+require 'deprecatable'
+
+Deprecatable.options.has_at_exit_report = false
 
 # An Entity/Component System inspired by Artemis
 module Chione
 	extend Loggability
 
-	# Loggability API -- set up a log host
-	log_as :chione
+	# Gem version
+	VERSION = '0.3.0'
 
 
-	# Gem version
-	VERSION = '0.2.0'
+	# Loggability API -- set up a log host
+	log_as :chione
 
 
 	require 'chione/mixins'
 
 	autoload :Aspect,     'chione/aspect'
-	autoload :Assemblage, 'chione/assemblage'
+	autoload :Archetype,  'chione/archetype'
 	autoload :Component,  'chione/component'
 	autoload :Entity,     'chione/entity'
 	autoload :Manager,    'chione/manager'
@@ -31,6 +34,25 @@ module Chione
 	class << self; attr_reader :uuid ; end
 	@uuid = UUID.new
 
+
+	### Coerce the specified +object+ into a Chione::Component and return it.
+	def self::Component( object )
+		return object if object.is_a?( Chione::Component )
+		return Chione::Component.create( object ) if
+			object.is_a?( Class ) || object.is_a?( String ) || object.is_a?( Symbol )
+		raise TypeError, "can't convert %p into Chione::Component" % [ object.class ]
+	end
+
+
+	### Warn about deprecated constants.
+	def self::const_missing( name )
+		super unless name == :Assemblage
+		warn "Chione::Assemblage has been renamed to Chione::Archetype. " \
+			"This alias will be removed before 1.0\n" \
+			"Used at #{caller(1).first}"
+		return Chione::Archetype
+	end
+
 end # module Chione
 
 # vim: set nosta noet ts=4 sw=4:

data/lib/chione/archetype.rb

@@ -0,0 +1,71 @@
+# -*- ruby -*-
+#encoding: utf-8
+
+require 'pluggability'
+require 'loggability'
+
+require 'chione' unless defined?( Chione )
+
+
+# An Archetype mixin for defining factories for common entity configurations.
+module Chione::Archetype
+	extend Loggability,
+	       Pluggability
+
+	# Loggability API -- log to the chione logger
+	log_to :chione
+
+	# Pluggability API -- load subclasses from the 'chione/archetype' directory
+	plugin_prefixes 'chione/archetype', 'chione/assemblage'
+
+
+	### Extension callback -- add archetype functionality to an extended +object+.
+	def self::extended( object )
+		super
+		object.extend( Loggability )
+		object.log_to( :chione )
+		object.components ||= {}
+	end
+
+
+	### Inclusion callback -- add the components from this archetype to those in
+	### the specified +mod+.
+	def included( mod )
+		super
+		self.log.debug "Including %d components in %p" % [ self.components.length, mod ]
+		self.components.each do |component_type, args|
+			self.log.debug "Adding %p to %p from %p" % [ component_type, mod, self ]
+			mod.add( component_type, *args )
+		end
+	end
+
+
+	##
+	# The Hash of component types and initialization values to add to entities
+	# constructed by this Archetype.
+	attr_accessor :components
+
+
+	### Add a +component_type+ to the list used when constructing a new entity from
+	### the current Archetype. The component will be instantiated using the specified
+	### +init_args+.
+	def add( component_type, *init_args )
+		self.components[ component_type ] = init_args
+	end
+
+
+	### Construct a new entity for the specified +world+ with all of the archetype's
+	### components.
+	def construct_for( world )
+		entity = world.create_entity
+		self.components.each do |component_type, args|
+			component = component_type.new( *args )
+			entity.add_component( component )
+		end
+
+		return entity
+	end
+
+end # module Chione::Archetype
+
+

data/lib/chione/assemblage.rb

@@ -1,69 +1,6 @@
 # -*- ruby -*-
 #encoding: utf-8
 
-require 'pluggability'
-require 'loggability'
+# Replaced by chione/archetype
+require 'chione/archetype'
 
-require 'chione' unless defined?( Chione )
-
-
-# An Assemblage mixin for defining factories for common entity configurations.
-module Chione::Assemblage
-	extend Loggability,
-	       Pluggability
-
-	# Loggability API -- log to the chione logger
-	log_to :chione
-
-	# Pluggability API -- load subclasses from the 'chione/assemblage' directory
-	plugin_prefixes 'chione/assemblage'
-
-
-	### Extension callback -- add assemblage functionality to an extended +object+.
-	def self::extended( object )
-		super
-		object.extend( Loggability )
-		object.log_to( :chione )
-		object.components ||= {}
-	end
-
-
-	### Inclusion callback -- add the components from this assemblage to those in
-	### the specified +mod+.
-	def included( mod )
-		super
-		self.log.debug "Including %d components in %p" % [ self.components.length, mod ]
-		self.components.each do |component_type, args|
-			self.log.debug "Adding %p to %p from %p" % [ component_type, mod, self ]
-			mod.add( component_type, *args )
-		end
-	end
-
-
-	##
-	# The Hash of component types and initialization values to add to entities
-	# constructed by this Assemblage.
-	attr_accessor :components
-
-
-	### Add a +component_type+ to the list used when constructing a new entity from
-	### the current Assemblage. The component will be instantiated using the specified
-	### +init_args+.
-	def add( component_type, *init_args )
-		self.components[ component_type ] = init_args
-	end
-
-
-	### Construct a new entity for the specified +world+ with all of the assemblage's
-	### components.
-	def construct_for( world )
-		entity = world.create_entity
-		self.components.each do |component_type, args|
-			component = component_type.new( *args )
-			entity.add_component( component )
-		end
-
-		return entity
-	end
-
-end # module Chione::Assemblage

data/lib/chione/component.rb

@@ -80,4 +80,12 @@ class Chione::Component
 		return Marshal.load( Marshal.dump(value) )
 	end
 
+
+	### Return a slice of the specified +string+ truncated to at most +maxlen+
+	### characters. Returns the unchanged +string+ if it's not longer than +maxlen+.
+	def truncate_string( string, maxlen )
+		return string unless string.length > maxlen
+		return string[ 0, maxlen - 3 ] + '...'
+	end
+
 end # class Chione::Component

data/lib/chione/entity.rb

@@ -1,6 +1,7 @@
 # -*- ruby -*-
 #encoding: utf-8
 
+require 'deprecatable'
 require 'loggability'
 require 'securerandom'
 
@@ -8,7 +9,8 @@ require 'chione' unless defined?( Chione )
 
 # The Entity (identity) class
 class Chione::Entity
-	extend Loggability
+	extend Loggability,
+	       Deprecatable
 
 	# Loggability API -- send logs to the Chione logger
 	log_to :chione
@@ -47,6 +49,7 @@ class Chione::Entity
 	### Add the specified +component+ to the entity. It will replace any existing component
 	### of the same type.
 	def add_component( component )
+		component = Chione::Component( component )
 		self.components[ component.class ] = component
 		self.world.add_component_for( self, component )
 	end
@@ -54,11 +57,13 @@ class Chione::Entity
 
 	### Fetch the first Component of the specified +types+ that belongs to the entity. If the
 	### Entity doesn't have any of the specified types of Component, raises a KeyError.
-	def get_component( *types )
+	def find_component( *types )
 		found_type = types.find {|type| self.components[type] } or
 			raise KeyError, "entity %s doesn't have any of %p" % [ self.id, types ]
 		return self.components[ found_type ]
 	end
+	alias_method :get_component, :find_component
+	deprecate :get_component, message: 'Use #find_component instead', removal_version: '1.0'
 
 
 	### Returns +true+ if this entity has the specified +component+.

data/lib/chione/system.rb

@@ -63,4 +63,10 @@ class Chione::System
 	end
 
 
+	### Return an Enumerator that yields the entities which this system operators
+	### over.
+	def entities
+		return self.world.entities_for( self )
+	end
+
 end # class Chione::System

data/lib/chione/world.rb

@@ -274,10 +274,10 @@ class Chione::World
 
 
 	### Return a new Chione::Entity for the receiving World, using the optional
-	### +assemblage+ to populate it with components if it's specified.
-	def create_entity( assemblage=nil )
-		entity = if assemblage
-				assemblage.construct_for( self )
+	### +archetype+ to populate it with components if it's specified.
+	def create_entity( archetype=nil )
+		entity = if archetype
+				archetype.construct_for( self )
 			else
 				self.create_blank_entity
 			end
@@ -323,15 +323,16 @@ class Chione::World
 	### Register the specified +component+ as having been added to the specified
 	### +entity+.
 	def add_component_for( entity, component )
+		self.log.debug "Adding %p for %p" % [ component.class, entity ]
 		@entities_by_component[ component.class ].add( entity )
 	end
 
 
-	### Return the Entities that have a Component composition that is compatible with
-	### the specified +system+'s aspect.
+	### Return an Enumerator of the Entities that have a Component composition that
+	### is compatible with the specified +system+'s aspect.
 	def entities_for( system )
 		system = system.class unless system.is_a?( Class )
-		return self.entities_with( system.aspect )
+		return self.entities_with( system.aspect ).to_enum
 	end
 
 

data/spec/chione/archetype_spec.rb

@@ -0,0 +1,72 @@
+#!/usr/bin/env rspec -cfd
+
+require_relative '../spec_helper'
+
+require 'chione/archetype'
+require 'chione/component'
+require 'chione/entity'
+require 'chione/world'
+
+describe Chione::Archetype do
+
+	let( :world ) { Chione::World.new }
+
+	let( :location_component ) do
+		Class.new( Chione::Component ) do
+			field :x, default: 0
+			field :y, default: 0
+		end
+	end
+
+	let( :tags_component ) do
+		Class.new( Chione::Component ) do
+			field :tags, default: []
+		end
+	end
+
+
+	it "acts as a factory for entities with pre-set components" do
+		archetype = Module.new
+		archetype.extend( described_class )
+		archetype.add( location_component, x: 10, y: 8 )
+		archetype.add( tags_component, tags: [:foo, :bar] )
+
+		entity = archetype.construct_for( world )
+
+		expect( entity ).to be_a( Chione::Entity )
+		expect( entity.world ).to be( world )
+		expect( entity.components ).to include( location_component, tags_component )
+	end
+
+
+	it "can include other archetypes" do
+		general_archetype = Module.new
+		general_archetype.extend( described_class )
+		general_archetype.add( location_component, x: 10, y: 8 )
+
+		specific_archetype = Module.new
+		specific_archetype.extend( described_class )
+		specific_archetype.send( :include, general_archetype )
+		specific_archetype.add( tags_component, tags: [:foo, :bar] )
+
+		entity = specific_archetype.construct_for( world )
+
+		expect( entity ).to be_a( Chione::Entity )
+		expect( entity.world ).to be( world )
+		expect( entity.components ).to include( location_component, tags_component )
+	end
+
+
+	it "is still loadable as an `Assemblage`" do
+		expect {
+			expect( Chione::Assemblage ).to equal( described_class )
+		}.to output( /has been renamed/i ).to_stderr
+	end
+
+
+	it "still looks in the chione/assemblage directory for derivatives" do
+		expect( described_class.plugin_prefixes ).to include( 'chione/assemblage' )
+	end
+
+end
+

data/spec/chione/entity_spec.rb

@@ -8,27 +8,47 @@ require 'chione/component'
 
 describe Chione::Entity do
 
+	before( :all ) do
+		@component_classes = Chione::Component.derivatives.dup
+	end
+	before( :each ) do
+		Chione::Component.derivatives.clear
+	end
+	after( :all ) do
+		Chione::Component.derivatives.replace( @component_classes )
+	end
+
+
 	let( :world ) { Chione::World.new }
 
 	let( :location_component ) do
-		Class.new( Chione::Component ) do
+		klass = Class.new( Chione::Component ) do
+			def self::name; "Location"; end
 			field :x, default: 0
 			field :y, default: 0
 		end
+		Chione::Component.derivatives['location'] = klass
+		klass
 	end
 
 	let( :tags_component ) do
-		Class.new( Chione::Component ) do
+		klass = Class.new( Chione::Component ) do
+			def self::name; "Tags"; end
 			field :tags, default: []
 		end
+		Chione::Component.derivatives['tags'] = klass
+		klass
 	end
 
 	let( :bounding_box_component ) do
-		Class.new( Chione::Component ) do
+		klass = Class.new( Chione::Component ) do
+			def self::name; "BoundingBox"; end
 			field :width, default: 1
 			field :height, default: 1
 			field :depth, default: 1
 		end
+		Chione::Component.derivatives['bounding_box'] = klass
+		klass
 	end
 
 
@@ -58,8 +78,20 @@ describe Chione::Entity do
 
 
 		it "can have components added to it" do
-			entity.add_component( location_component.new )
-			entity.add_component( tags_component.new )
+			entity.add_component( location_component )
+			entity.add_component( tags_component )
+
+			expect( entity ).to have_component( location_component )
+			expect( entity ).to have_component( tags_component )
+		end
+
+
+		it "can have components added to it by name" do
+			location_component()
+			tags_component()
+
+			entity.add_component( :location )
+			entity.add_component( :tags )
 
 			expect( entity ).to have_component( location_component )
 			expect( entity ).to have_component( tags_component )
@@ -67,8 +99,18 @@ describe Chione::Entity do
 
 
 		it "lets components be fetched from it" do
-			entity.add_component( location_component.new )
-			entity.add_component( tags_component.new )
+			entity.add_component( location_component )
+			entity.add_component( tags_component )
+
+			expect(
+				entity.find_component( location_component )
+			).to eq( entity.components[location_component] )
+		end
+
+
+		it "supports backward-compatible component-fetcher method" do
+			entity.add_component( location_component )
+			entity.add_component( tags_component )
 
 			expect(
 				entity.get_component( location_component )
@@ -77,29 +119,29 @@ describe Chione::Entity do
 
 
 		it "lets one of a list of components be fetched from it" do
-			entity.add_component( location_component.new )
-			entity.add_component( tags_component.new )
+			entity.add_component( location_component )
+			entity.add_component( tags_component )
 
 			expect(
-				entity.get_component( bounding_box_component, location_component )
+				entity.find_component( bounding_box_component, location_component )
 			).to eq( entity.components[location_component] )
 		end
 
 
 		it "raises a KeyError if it doesn't have a fetched component" do
-			entity.add_component( tags_component.new )
+			entity.add_component( tags_component )
 
 			expect {
-				entity.get_component( location_component )
+				entity.find_component( location_component )
 			}.to raise_error( KeyError, /#{entity.id} doesn't have/i )
 		end
 
 
 		it "raises a KeyError if it doesn't have any of several fetched components" do
-			entity.add_component( tags_component.new )
+			entity.add_component( tags_component )
 
 			expect {
-				entity.get_component( location_component, bounding_box_component )
+				entity.find_component( location_component, bounding_box_component )
 			}.to raise_error( KeyError, /#{entity.id} doesn't have any of/i )
 		end
 

data/spec/chione/system_spec.rb

@@ -27,11 +27,12 @@ describe Chione::System do
 	end
 
 
-	describe "a subclass" do
+	describe "subclass" do
 
 		let( :subclass ) do
 			Class.new(described_class)
 		end
+		let( :world ) { Chione::World.new }
 
 
 		it "has a default Aspect which matches all entities" do
@@ -57,6 +58,39 @@ describe Chione::System do
 		end
 
 
+		describe "instance" do
+
+			let( :subclass ) do
+				subclass = super()
+				subclass.aspect all_of: volition_component,
+					one_of: [ tags_component, location_component ]
+				subclass
+			end
+
+			let( :instance ) do
+				subclass.new( world )
+			end
+
+
+			it "can enumerate the entities from the world that match its aspect" do
+				ent1 = world.create_entity
+				ent1.add_component( volition_component )
+				ent1.add_component( tags_component )
+
+				ent2 = world.create_entity
+				ent2.add_component( volition_component )
+				ent2.add_component( location_component )
+
+				ent3 = world.create_entity
+				ent3.add_component( volition_component )
+
+				expect( instance.entities ).to be_a( Enumerator )
+				expect( instance.entities ).to contain_exactly( ent1, ent2 )
+			end
+
+
+		end
+
 	end
 
 end

data/spec/chione/world_spec.rb

@@ -5,7 +5,7 @@ require_relative '../spec_helper'
 require 'chione/world'
 
 require 'chione/aspect'
-require 'chione/assemblage'
+require 'chione/archetype'
 require 'chione/component'
 require 'chione/entity'
 require 'chione/manager'
@@ -82,9 +82,9 @@ describe Chione::World do
 		end
 	end
 
-	let( :assemblage ) do
+	let( :archetype ) do
 		mod = Module.new
-		mod.extend( Chione::Assemblage )
+		mod.extend( Chione::Archetype )
 		mod.add( location_component, x: 10, y: 8 )
 		mod.add( tags_component, tags: [:foo, :bar] )
 		mod
@@ -255,11 +255,11 @@ describe Chione::World do
 		end
 
 
-		it "can create entities using an Assemblage" do
-			entity = world.create_entity( assemblage )
+		it "can create entities using an Archetype" do
+			entity = world.create_entity( archetype )
 
 			expect( entity ).to be_a( Chione::Entity )
-			expect( entity.components.keys ).to include( *assemblage.components.keys )
+			expect( entity.components.keys ).to include( *archetype.components.keys )
 		end
 
 

data/spec/chione_spec.rb

@@ -5,6 +5,35 @@ require_relative 'spec_helper'
 require 'chione'
 
 describe Chione do
+
+	after( :all ) do
+		Chione::Component.derivatives.clear
+	end
+
+
+	it "can coerce Chione::Component classes into instances" do
+		component_class = Class.new( Chione::Component )
+		expect( Chione::Component(component_class) ).to be_instance_of( component_class )
+	end
+
+
+	it "can coerce Chione::Component class names into instances" do
+		component_class = Class.new( Chione::Component ) do
+			def self::name; "Thermidore"; end
+		end
+		Chione::Component.derivatives[ 'thermidore' ] = component_class
+
+		expect( Chione::Component(:thermidore) ).to be_instance_of( component_class )
+	end
+
+
+	it "returns coerced Chione::Component unchanged" do
+		component_class = Class.new( Chione::Component )
+		instance = component_class.new
+
+		expect( Chione::Component(instance) ).to equal( instance )
+	end
+
 end
 
 # vim: set nosta noet ts=4 sw=4:

data/spec/spec_helper.rb

@@ -4,10 +4,13 @@
 require 'pathname'
 require 'simplecov' if ENV['COVERAGE']
 require 'rspec'
+require 'deprecatable'
 require 'loggability/spechelpers'
 
 require 'chione'
 
+Deprecatable.options.alert_frequency = :never
+Deprecatable.options.has_at_exit_report = false
 
 module Chione::TestHelpers
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chione
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Michael Granger
@@ -35,7 +35,7 @@ cert_chain:
   w8aNA5re5+Rt/Vvjxj5AcEnZnZiz5x959NaddQocX32Z1unHw44pzRNUur1GInfW
   p4vpx2kUSFSAGjtCbDGTNV2AH8w9OU4xEmNz8c5lyoA=
   -----END CERTIFICATE-----
-date: 2017-05-26 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: loggability
@@ -93,6 +93,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: deprecatable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
   requirement: !ruby/object:Gem::Requirement
@@ -218,6 +232,7 @@ files:
 - README.md
 - Rakefile
 - lib/chione.rb
+- lib/chione/archetype.rb
 - lib/chione/aspect.rb
 - lib/chione/assemblage.rb
 - lib/chione/behaviors.rb
@@ -227,8 +242,8 @@ files:
 - lib/chione/mixins.rb
 - lib/chione/system.rb
 - lib/chione/world.rb
+- spec/chione/archetype_spec.rb
 - spec/chione/aspect_spec.rb
-- spec/chione/assemblage_spec.rb
 - spec/chione/component_spec.rb
 - spec/chione/entity_spec.rb
 - spec/chione/manager_spec.rb
@@ -259,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: An Entity/Component System framework inspired by Artemis

data/spec/chione/assemblage_spec.rb

@@ -1,60 +0,0 @@
-#!/usr/bin/env rspec -cfd
-
-require_relative '../spec_helper'
-
-require 'chione/assemblage'
-require 'chione/component'
-require 'chione/entity'
-require 'chione/world'
-
-describe Chione::Assemblage do
-
-	let( :world ) { Chione::World.new }
-
-	let( :location_component ) do
-		Class.new( Chione::Component ) do
-			field :x, default: 0
-			field :y, default: 0
-		end
-	end
-
-	let( :tags_component ) do
-		Class.new( Chione::Component ) do
-			field :tags, default: []
-		end
-	end
-
-
-	it "acts as a factory for entities with pre-set components" do
-		assemblage = Module.new
-		assemblage.extend( described_class )
-		assemblage.add( location_component, x: 10, y: 8 )
-		assemblage.add( tags_component, tags: [:foo, :bar] )
-
-		entity = assemblage.construct_for( world )
-
-		expect( entity ).to be_a( Chione::Entity )
-		expect( entity.world ).to be( world )
-		expect( entity.components ).to include( location_component, tags_component )
-	end
-
-
-	it "can include other assemblages" do
-		general_assemblage = Module.new
-		general_assemblage.extend( described_class )
-		general_assemblage.add( location_component, x: 10, y: 8 )
-
-		specific_assemblage = Module.new
-		specific_assemblage.extend( described_class )
-		specific_assemblage.send( :include, general_assemblage )
-		specific_assemblage.add( tags_component, tags: [:foo, :bar] )
-
-		entity = specific_assemblage.construct_for( world )
-
-		expect( entity ).to be_a( Chione::Entity )
-		expect( entity.world ).to be( world )
-		expect( entity.components ).to include( location_component, tags_component )
-	end
-
-end
-