chione 0.3.0 → 0.4.0

data/spec/chione/world_spec.rb

@@ -259,7 +259,8 @@ describe Chione::World do
 			entity = world.create_entity( archetype )
 
 			expect( entity ).to be_a( Chione::Entity )
-			expect( entity.components.keys ).to include( *archetype.components.keys )
+			expect( world.components_for(entity).keys ).
+				to contain_exactly( *archetype.components.keys )
 		end
 
 
@@ -306,68 +307,27 @@ describe Chione::World do
 
 	describe "components" do
 
-		let( :world ) do
-			instance = super()
-			instance.defer_events = false
-			instance
-		end
-
-
-		let!( :entity1 ) do
-			obj = world.create_entity
-			obj.add_component( location_component.new )
-			obj
-		end
-
-		let!( :entity2 ) do
-			obj = world.create_entity
-			obj.add_component( location_component.new )
-			obj.add_component( tags_component.new )
-			obj
-		end
-
-		let!( :entity3 ) do
-			obj = world.create_entity
-			obj.add_component( tags_component.new )
-			obj
-		end
-
-		let( :location_aspect ) { Chione::Aspect.with_one_of(location_component) }
-		let( :tags_aspect ) { Chione::Aspect.with_one_of(tags_component) }
-		let( :colored_aspect ) { Chione::Aspect.with_one_of(color_component) }
-		let( :tagged_located_aspect ) do
-			Chione::Aspect.with_all_of( location_component, tags_component )
+		it "can add a component for an entity" do
+			entity = world.create_entity
+			world.add_component_to( entity, location_component )
+			expect( world ).to have_component_for( entity, location_component )
 		end
 
 
-		it "can look up sets of entities which match Aspects" do
-			entities_with_location = world.entities_with( location_aspect )
-			expect( entities_with_location ).to include( entity1, entity2 )
-			expect( entities_with_location ).to_not include( entity3 )
-
-			entities_with_tags = world.entities_with( tags_aspect )
-			expect( entities_with_tags ).to include( entity2, entity3 )
-			expect( entities_with_tags ).to_not include( entity1 )
-
-			entities_with_both = world.entities_with( tagged_located_aspect )
-			expect( entities_with_both ).to include( entity2 )
-			expect( entities_with_both ).to_not include( entity1, entity3 )
-
-			entities_with_color = world.entities_with( colored_aspect )
-			expect( entities_with_color ).to be_empty
+		it "can remove a component from an entity" do
+			entity = world.create_entity
+			world.add_component_to( entity, location_component )
+			world.remove_component_from( entity, location_component )
+			expect( world ).to_not have_component_for( entity, location_component )
 		end
 
 
-		it "can look up sets of entities which match a System's aspect" do
-			system = Class.new( Chione::System )
-			system.for_entities_that_have \
-				all_of: [ location_component ],
-				one_of: [ tags_component, color_component ]
-
-			entities = world.entities_for( system )
+		it "can test to see whether an entity has a component type" do
+			entity = world.create_entity
 
-			expect( entities ).to include( entity2 )
-			expect( entities ).to_not include( entity1, entity3 )
+			expect( world ).to_not have_component_for( entity, location_component )
+			world.add_component_to( entity, location_component )
+			expect( world ).to have_component_for( entity, location_component )
 		end
 
 	end
@@ -389,6 +349,14 @@ describe Chione::World do
 		end
 
 
+		it "can have Systems removed from it" do
+			world.add_system( test_system )
+			result = world.remove_system( test_system )
+			expect( world.systems ).to_not include( test_system )
+			expect( result ).to be_a( test_system )
+		end
+
+
 		it "can register Systems constructed with custom arguments" do
 			system = world.add_system( test_system, 1, 2 )
 			expect( system.args ).to eq([ 1, 2 ])
@@ -402,7 +370,19 @@ describe Chione::World do
 
 			sys = world.add_system( test_system )
 
-			expect( event_payload ).to eq([ 'system/added', [test_system.name] ])
+			expect( event_payload ).to eq([ 'system/added', [sys] ])
+		end
+
+
+		it "broadcasts a `system/removed` event when a System is removed" do
+			event_payload = nil
+			world.defer_events = false
+			world.subscribe( 'system/removed' ) {|*payload| event_payload = payload }
+
+			sys = world.add_system( test_system )
+			world.remove_system( test_system )
+
+			expect( event_payload ).to eq([ 'system/removed', [sys] ])
 		end
 
 
@@ -423,6 +403,60 @@ describe Chione::World do
 			expect( system.started ).to be_truthy
 		end
 
+
+		it "stops a system before it's removed if it was started" do
+			system = world.add_system( test_system )
+			world.start
+			sleep 0.1 until world.running?
+			world.remove_system( test_system )
+			expect( system.stopped ).to be_truthy
+			world.stop
+		end
+
+	end
+
+
+	describe "aspects" do
+
+		let( :entity1 ) do
+			obj = world.create_entity
+			obj.add_component( location_component.new )
+			obj
+		end
+		let( :entity2 ) do
+			obj = world.create_entity
+			obj.add_component( location_component.new )
+			obj.add_component( tags_component.new )
+			obj
+		end
+		let( :entity3 ) do
+			obj = world.create_entity
+			obj.add_component( tags_component.new )
+			obj
+		end
+
+		let( :location_aspect ) { Chione::Aspect.with_one_of(location_component) }
+		let( :tags_aspect ) { Chione::Aspect.with_one_of(tags_component) }
+		let( :colored_aspect ) { Chione::Aspect.with_one_of(color_component) }
+		let( :tagged_located_aspect ) do
+			Chione::Aspect.with_all_of( location_component, tags_component )
+		end
+
+
+		it "can look up sets of entities which match Aspects" do
+			entities_with_location = world.entities_with( location_aspect )
+			expect( entities_with_location ).to contain_exactly( entity1.id, entity2.id )
+
+			entities_with_tags = world.entities_with( tags_aspect )
+			expect( entities_with_tags ).to contain_exactly( entity2.id, entity3.id )
+
+			entities_with_both = world.entities_with( tagged_located_aspect )
+			expect( entities_with_both ).to contain_exactly( entity2.id )
+
+			entities_with_color = world.entities_with( colored_aspect )
+			expect( entities_with_color ).to be_empty
+		end
+
 	end
 
 
@@ -435,13 +469,20 @@ describe Chione::World do
 		end
 
 
-		it "can register Managers" do
+		it "can have Managers added to it" do
 			manager = world.add_manager( test_manager )
 			expect( world.managers ).to include( test_manager )
 			expect( world.managers[test_manager] ).to be( manager )
 		end
 
 
+		it "can have Managers removed from it" do
+			world.add_manager( test_manager )
+			world.remove_manager( test_manager )
+			expect( world.managers ).to_not include( test_manager )
+		end
+
+
 		it "can register Managers constructed with custom arguments" do
 			manager = world.add_manager( test_manager, 1, 2 )
 			expect( manager.args ).to eq([ 1, 2 ])
@@ -455,7 +496,19 @@ describe Chione::World do
 
 			manager = world.add_manager( test_manager )
 
-			expect( event_payload ).to eq([ 'manager/added', [test_manager.name] ])
+			expect( event_payload ).to eq([ 'manager/added', [manager] ])
+		end
+
+
+		it "broadcasts a `manager/removed` event when a Manager is removed" do
+			event_payload = nil
+			world.defer_events = false
+			world.subscribe( 'manager/removed' ) {|*payload| event_payload = payload }
+
+			world.add_manager( test_manager )
+			manager = world.remove_manager( test_manager )
+
+			expect( event_payload ).to eq([ 'manager/removed', [manager] ])
 		end
 
 
@@ -476,6 +529,16 @@ describe Chione::World do
 			expect( manager.started ).to be_truthy
 		end
 
+
+		it "stops a manager when it's removed if it was started" do
+			world.add_manager( test_manager )
+			world.start
+			sleep 0.1 until world.running?
+			manager = world.remove_manager( test_manager )
+			expect( manager.stopped ).to be_truthy
+			world.stop
+		end
+
 	end
 
 end

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ require 'simplecov' if ENV['COVERAGE']
 require 'rspec'
 require 'deprecatable'
 require 'loggability/spechelpers'
+require 'faker'
 
 require 'chione'
 
@@ -16,6 +17,8 @@ module Chione::TestHelpers
 end
 
 
+Faker::Config.locale = :en
+
 
 RSpec.configure do |config|
 	# include Chione::TestHelpers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chione
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Michael Granger
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIEbDCCAtSgAwIBAgIBATANBgkqhkiG9w0BAQsFADA+MQwwCgYDVQQDDANnZWQx
+  MIIEbDCCAtSgAwIBAgIBATANBgkqhkiG9w0BAQUFADA+MQwwCgYDVQQDDANnZWQx
   GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
-  HhcNMTYwODIwMTgxNzQyWhcNMTcwODIwMTgxNzQyWjA+MQwwCgYDVQQDDANnZWQx
+  HhcNMTcwOTI3MDAzMDQ0WhcNMTgwOTI3MDAzMDQ0WjA+MQwwCgYDVQQDDANnZWQx
   GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
   ggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC/JWGRHO+USzR97vXjkFgt
   83qeNf2KHkcvrRTSnR64i6um/ziin0I0oX23H7VYrDJC9A/uoUa5nGRJS5Zw/+wW
@@ -25,17 +25,17 @@ cert_chain:
   /D+K9JW9DDs3Yjgv9k4h7YMhW5gftosd+NkNC/+Y2CkCAwEAAaN1MHMwCQYDVR0T
   BAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFHKN/nkRusdqCJEuq3lgB3fJvyTg
   MBwGA1UdEQQVMBOBEWdlZEBGYWVyaWVNVUQub3JnMBwGA1UdEgQVMBOBEWdlZEBG
-  YWVyaWVNVUQub3JnMA0GCSqGSIb3DQEBCwUAA4IBgQAPJzKiT0zBU7kpqe0aS2qb
-  FI0PJ4y5I8buU4IZGUD5NEt/N7pZNfOyBxkrZkXhS44Fp+xwBH5ebLbq/WY78Bqd
-  db0z6ZgW4LMYMpWFfbXsRbd9TU2f52L8oMAhxOvF7Of5qJMVWuFQ8FPagk2iHrdH
-  inYLQagqAF6goWTXgAJCdPd6SNeeSNqA6vlY7CV1Jh5kfNJJ6xu/CVij1GzCLu/5
-  DMOr26DBv+qLJRRC/2h34uX71q5QgeOyxvMg+7V3u/Q06DXyQ2VgeeqiwDFFpEH0
-  PFkdPO6ZqbTRcLfNH7mFgCBJjsfSjJrn0sPBlYyOXgCoByfZnZyrIMH/UY+lgQqS
-  6Von1VDsfQm0eJh5zYZD64ZF86phSR7mUX3mXItwH04HrZwkWpvgd871DZVR3i1n
-  w8aNA5re5+Rt/Vvjxj5AcEnZnZiz5x959NaddQocX32Z1unHw44pzRNUur1GInfW
-  p4vpx2kUSFSAGjtCbDGTNV2AH8w9OU4xEmNz8c5lyoA=
+  YWVyaWVNVUQub3JnMA0GCSqGSIb3DQEBBQUAA4IBgQB/qyi5pCjK8ceoKalfVAjS
+  vG64FEnLnD1bm39T5UaFIRmo+abZtfpg2QhwKvPbPjOicau2+m+MDQ2Cc3tgyaC3
+  dZxcP6w8APFg4AId09uWAZKf0xajvBMS2aOz8Bbmag6fwqRRkTMqsNYnmqcF7aRT
+  DuEzbEMfaOUYjU9RuB48vr4q8yRft0ww+3jq5iwNkrX1buL2pwBbyvgms6D/BV41
+  MaTVMjsHqJUwU2xVfhGtxGAWAer5S1HGYHkbio6mGVtiie0uWjmnzi7ppIlMr48a
+  7BNTsoZ+/JRk3iQWmmNsyFT7xfqBKye7cH11BX8V8P4MeGB5YWlMI+Myj5DZY3fQ
+  st2AGD4rb1l0ia7PfubcBThSIdz61eCb8gRi/RiZZwb3/7+eyEncLJzt2Ob9fGSF
+  X0qdrKi+2aZZ0NGuFj9AItBsVmAvkBGIpX4TEKQp5haEbPpmaqO5nIIhV26PXmyT
+  OMKv6pWsoS81vw5KAGBmfX8nht/Py90DQrbRvakATGI=
   -----END CERTIFICATE-----
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2017-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: loggability
@@ -107,6 +107,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: fluent_fixtures
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: faker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
   requirement: !ruby/object:Gem::Requirement
@@ -238,6 +266,9 @@ files:
 - lib/chione/behaviors.rb
 - lib/chione/component.rb
 - lib/chione/entity.rb
+- lib/chione/fixtures.rb
+- lib/chione/fixtures/entities.rb
+- lib/chione/iterating_system.rb
 - lib/chione/manager.rb
 - lib/chione/mixins.rb
 - lib/chione/system.rb
@@ -246,6 +277,7 @@ files:
 - spec/chione/aspect_spec.rb
 - spec/chione/component_spec.rb
 - spec/chione/entity_spec.rb
+- spec/chione/iterating_system_spec.rb
 - spec/chione/manager_spec.rb
 - spec/chione/mixins_spec.rb
 - spec/chione/system_spec.rb
@@ -274,7 +306,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: An Entity/Component System framework inspired by Artemis