baku 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1d2763ede4661622889dd5408420549df6cd9abc
-  data.tar.gz: 03d33e683578f3df73f38d41a458492864281dcb
+SHA256:
+  metadata.gz: 53f4e7b623eac99e2c4ecbbc31d94cfddb83f385ce312b4dcd140d53b22c9ba7
+  data.tar.gz: a0e5df631d32755e2cf7c783981bede609d92e6bb1526229e1936bfe2549cb12
 SHA512:
-  metadata.gz: 712e0526dfdff24c604c5ebdda331c30b4b27c3be0e4b3b6cfc2340c7293ef9f6221f9e93763ae38811dcfae8ce97a75b5aa5111de22bba760d4d206c08dc76d
-  data.tar.gz: 650c477a001bc33e34ea1ad2544529bea93ecfb0a51d9faa2e7ac59a0f23f0b932c98c699f9521b573e1aa42b33624e97d29e0fcc5accc845740c3a156244a55
+  metadata.gz: 4fe0db7915bc10d2f523a6a8961b63a0ab4bb013d1cec3c4b28d3dfa922f785dd4b54ab7365fa80d518d302b7473c5f2fd01bc2f4ecb53b5500cbce9a49cac7b
+  data.tar.gz: a8f2c0261f124e16045135205dc87955b18818cb0e12f18f227b159a2e6718b9047e713478c6058da2a191dc27704b1dcc7251e469b10e1ef05117cae043422f

data/.gitignore

@@ -1,15 +1,52 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
+*.gem
+*.rbc
+/.config
 /coverage/
-/doc/
+/InstalledFiles
 /pkg/
 /spec/reports/
+/spec/examples.txt
+/test/tmp/
+/test/version_tmp/
 /tmp/
 
-# rspec failure tracking
-.rspec_status
-.byebug_history
+# Used by dotenv library to load environment variables.
+# .env
+
+## Specific to RubyMotion:
+.dat*
+.repl_history
+build/
+*.bridgesupport
+build-iPhoneOS/
+build-iPhoneSimulator/
+
+## Specific to RubyMotion (use of CocoaPods):
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# vendor/Pods/
+
+## Documentation cache and generated files:
+/.yardoc/
+/_yardoc/
+/doc/
+/rdoc/
+
+## Environment normalization:
+/.bundle/
+/vendor/bundle
+/lib/bundler/man/
+
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+Gemfile.lock
 .ruby-version
-.ruby-gemset
+.ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc
+
+.rspec_status

data/CHANGELOG.md

@@ -1,6 +1,10 @@
+# 0.3.0
+
+* Add tag system that processes entities by tag.
+
 # 0.2.6
 
-* Fix bug with entity component removal.
+* Replace internal event listener with miru gem.
 
 # 0.2.5
 

data/baku.gemspec

@@ -1,28 +1,28 @@
-# coding: utf-8
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "baku/version"
+require 'baku/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "baku"
+  spec.name          = 'baku'
   spec.version       = Baku::VERSION
-  spec.authors       = ["John Tuttle"]
-  spec.email         = ["jtuttle.develops@gmail.com"]
+  spec.authors       = ['John Tuttle']
+  spec.email         = ['jtuttle.develops@gmail.com']
 
-  spec.summary       = "An Entity Component System framework for Ruby"
-  spec.description   = "An Entity Component System framework for Ruby"
-  spec.homepage      = "https://github.com/jtuttle/baku"
-  spec.license       = "MIT"
+  spec.summary       = 'An Entity Component System framework for Ruby'
+  spec.description   = 'An Entity Component System framework for Ruby'
+  spec.homepage      = 'https://github.com/jtuttle/baku'
+  spec.license       = 'MIT'
 
+  # use double quotes for "\x0" (https://github.com/bundler/bundler/issues/4133)
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.15"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "pry-byebug", "~> 3.5.0"
+  spec.add_development_dependency 'bundler', '~> 2.0.2'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'pry-byebug', '~> 3.5.0'
+
+  spec.add_dependency 'miru', '~> 0.1.0'
 end

data/lib/baku/component_system.rb

@@ -0,0 +1,35 @@
+require_relative 'system'
+
+module Baku
+  class ComponentSystem < System
+    attr_reader :components
+    
+    def initialize(components, game_loop_step)
+      @components = components
+      @game_loop_step = game_loop_step
+    end
+
+    def register_world(world)
+      super(world)
+
+      world.entity_manager.register_component_mask(component_mask)
+    end
+
+    def process_entities(entities)
+      entities.each do |entity|
+        entity_components = @components.map { |c| entity.get_component(c) }
+        process_entity(entity, *entity_components)
+      end
+    end
+
+    def component_mask
+      @component_mask ||= ComponentMask.from_components(@components)
+    end
+    
+    protected
+
+    def retrieve_entities
+      @world.entity_manager.get_entities(component_mask)
+    end
+  end
+end

data/lib/baku/entity.rb

@@ -1,6 +1,6 @@
 module Baku
   class Entity
-    include Baku::EventDispatcher
+    include Miru::EventDispatcher
     
     attr_reader :components, :tags
     

data/lib/baku/entity_manager.rb

@@ -21,10 +21,14 @@ module Baku
     def add_entity(entity)
       add_entity_to_matching_component_lists(entity)
       
-      entity.add_event_listener(:component_added,
-                                method(:on_entity_component_added))
-      entity.add_event_listener(:component_removed,
-                                method(:on_entity_component_removed))
+      entity.add_event_listener(
+        :component_added,
+        method(:on_entity_component_added)
+      )
+      entity.add_event_listener(
+        :component_removed,
+        method(:on_entity_component_removed)
+      )
 
       entity.tags.each do |tag|
         @entities_by_tag[tag] ||= []
@@ -37,10 +41,14 @@ module Baku
         @entities_by_tag[tag].delete(entity)
       end
       
-      entity.remove_event_listener(:component_added,
-                                   method(:on_entity_component_added))
-      entity.remove_event_listener(:component_removed,
-                                   method(:on_entity_component_removed))
+      entity.remove_event_listener(
+        :component_added,
+        method(:on_entity_component_added)
+      )
+      entity.remove_event_listener(
+        :component_removed,
+        method(:on_entity_component_removed)
+      )
 
       @entities_by_component_mask.each do |component_mask, entities|
         if component_mask.matches?(entity.component_mask)

data/lib/baku/system.rb

@@ -1,42 +1,34 @@
 module Baku
   class System
     attr_reader :components, :game_loop_step
-    attr_writer :world
     
     def initialize(components, game_loop_step)
       @components = components
       @game_loop_step = game_loop_step
     end
 
+    def register_world(world)
+      @world = world
+    end
+
     def execute
       if @world.nil?
         raise StandardError.new("Must set :world property of System.")
       end
       
-      entities = @world.entity_manager.get_entities(component_mask)
+      entities = retrieve_entities
 
       process_entities(entities)
     end
-
-    def process_entities(entities)
-      entities.each do |entity|
-        entity_components = @components.map { |c| entity.get_component(c) }
-        process_entity(entity, *entity_components)
-      end
-    end
     
     def process_entity(entity)
       raise NotImplementedError
     end
 
-    def component_mask
-      @component_mask ||= ComponentMask.from_components(@components)
-    end
-
-    private
+    protected
 
     def retrieve_entities
-      @world.entity_manager.get_entities(component_mask)
+      raise NotImplementedError
     end
   end
 end

data/lib/baku/tag_system.rb

@@ -0,0 +1,24 @@
+require_relative 'system'
+
+module Baku
+  class TagSystem < System
+    attr_reader :tag
+    
+    def initialize(tag, game_loop_step)
+      @tag = tag
+      @game_loop_step = game_loop_step
+    end
+
+    def process_entities(entities)
+      entities.each do |entity|
+        process_entity(entity)
+      end
+    end
+    
+    protected
+    
+    def retrieve_entities
+      @world.entity_manager.get_entities_by_tag(@tag)
+    end
+  end
+end

data/lib/baku/version.rb

@@ -1,3 +1,3 @@
 module Baku
-  VERSION = "0.2.6"
+  VERSION = "0.3.0"
 end

data/lib/baku/world.rb

@@ -31,12 +31,10 @@ module Baku
       if system_list.map(&:class).include?(system.class)
         raise StandardError.new("Already added #{system.class} system to world.")
       end
-      
-      system_list << system
 
-      @entity_manager.register_component_mask(system.component_mask)
+      system.register_world(self)
       
-      system.world = self
+      system_list << system
     end
 
     def create_entity(tags = [])

data/lib/baku.rb

@@ -6,9 +6,10 @@ module Baku
   rescue LoadError
     # development dependencies
   end
-    
+
   require 'set'
+  
+  require 'miru'
 
-  require_relative "baku/event_dispatcher.rb"
   Gem.find_files("baku/**/*.rb").each { |path| require path }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baku
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - John Tuttle
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2018-05-05 00:00:00.000000000 Z
+date: 2019-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: 2.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.5.0
+- !ruby/object:Gem::Dependency
+  name: miru
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 description: An Entity Component System framework for Ruby
 email:
 - jtuttle.develops@gmail.com
@@ -87,10 +101,11 @@ files:
 - lib/baku.rb
 - lib/baku/component.rb
 - lib/baku/component_mask.rb
+- lib/baku/component_system.rb
 - lib/baku/entity.rb
 - lib/baku/entity_manager.rb
-- lib/baku/event_dispatcher.rb
 - lib/baku/system.rb
+- lib/baku/tag_system.rb
 - lib/baku/version.rb
 - lib/baku/world.rb
 homepage: https://github.com/jtuttle/baku
@@ -112,8 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: An Entity Component System framework for Ruby

data/lib/baku/event_dispatcher.rb

@@ -1,19 +0,0 @@
-module Baku
-  module EventDispatcher
-    def add_event_listener(event_name, method)
-      @event_listeners ||= {}
-      @event_listeners[event_name] ||= []
-
-      @event_listeners[event_name] << method
-    end
-
-    def remove_event_listener(event_name, method)
-      @event_listeners[event_name].delete(method)
-    end
-    
-    def dispatch_event(event_name, *args)
-      return unless @event_listeners && @event_listeners.has_key?(event_name)
-      @event_listeners[event_name].each { |f| f.call(*args) }
-    end
-  end
-end