gamebox 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29d17db2fdbdf1732b5e68f6b8584d12270e8c3d
-  data.tar.gz: b955424dab5554402acf08f8dd425c1af86649c3
+  metadata.gz: 596c34ae3dddc838592f0ad6446aa76e9707566f
+  data.tar.gz: 9841d8e860c8eb0d21843cde072b64d9cdd5855a
 SHA512:
-  metadata.gz: 17cbdefcebc2f904c9ccfb4a4d44477b5ffc07a0a5eac840933fc7ff2e68da7fe7e343835eb3a69a98c52ec1fdd5d63d84a228dcebe55676690b883571c7c133
-  data.tar.gz: 1e3ac16757af09d3404decd43298a5509fbb0461fff5bfe1cbbcca7af86562ef6f6d5e6c60a88bdd82d8603bf40ae3b86e070400980445be80f5f9a6ecf1457f
+  metadata.gz: 383de6900d2dff39287008d85a5e4633eefbac6207ae290d0340007b6326645bbb276d25d74e5af5a3d8817a9c296fd73e92cfa4491c651956cbb4b5ff691557
+  data.tar.gz: 412dbf66737bb8ca48f32de711626eab89c958ff2f7faba758ef1da6cc53fe4e1f682f041f49d3144671041a01677a440ed69a3984093d0588ae2aebbed4c358

data/lib/gamebox.rb

@@ -1,4 +1,5 @@
 GAMEBOX_PATH = File.join(File.dirname(__FILE__),"gamebox/")
+require 'publisher'
 require 'conject'
 require 'kvo'
 require 'tween'

data/lib/gamebox/actors/score.rb

@@ -1,5 +1,5 @@
 define_behavior :score_keeper do
-  requires :backstage, :stage
+  requires :stage
 
   setup do
     # TODO helper for "attached subactor"

data/lib/gamebox/core/actor.rb

@@ -76,33 +76,16 @@ class Actor
   end
 
   def to_s
-    attrs = []
-    attributes.keys.sort.each do |name|
-      attrs << "#{name}: #{printable_value(attributes[name])}"
-    end
     """
     #{actor_type}:#{self.object_id}
     Behaviors:
     #{@behaviors.keys.sort}
     Attributes:
-    #{attrs.join("\n")}
-    """
+    #{attributes.map{|name, val| "#{name}: #{val}"}.join("\n")} """
   end
   alias pretty_inspect to_s
 
   private
-  def printable_value(value)
-    case value
-    when String, Float, Fixnum, TrueClass, FalseClass, Vector2
-      value
-    when Array
-      value.map do |pv|
-        printable_value(pv)
-      end
-    else
-      value.class
-    end
-  end
 
   class << self
 

data/lib/gamebox/core/input_manager.rb

@@ -1,5 +1,3 @@
-require 'publisher'
-
 # InputManager handles the pumping for events and distributing of said events.
 # You can gain access to these events by registering for all events, 
 # or just the ones you care about.
@@ -31,6 +29,7 @@ class InputManager
     @hooks = {}
     @non_id_hooks = {}
     @down_ids = {}
+    @block_self_lookup = {}
 
     setup
   end
@@ -87,6 +86,7 @@ class InputManager
     event_class = :up if UP_EVENTS.include? event_class
     return unless block_given?
     listener = eval("self", block.binding) 
+    @block_self_lookup[block] = listener
     _register_hook listener, event_class, *event_ids, &block
   end
   alias reg register_hook
@@ -138,7 +138,8 @@ class InputManager
       for event_klass, id_listeners in @hooks
         for key in id_listeners.keys.dup
           id_listeners[key].delete_if do |block|
-            eval('self',block.binding).equal?(listener)
+            block_self = @block_self_lookup.delete block
+            block_self.equal?(listener)
           end
         end
       end

data/lib/gamebox/lib/conject_ext.rb

@@ -0,0 +1,23 @@
+module Conject
+  class ObjectContext
+    def has_config?(name)
+      @object_configs.has_key?(name.to_sym)
+    end
+    def directly_has?(name)
+      @cache.has_key?(name.to_sym) or has_config?(name.to_sym)
+    end
+    def get(name)
+      name = name.to_sym
+      return @cache[name] if @cache.has_key?(name)
+      
+      if !has_config?(name) and parent_context and parent_context.has?(name)
+        return parent_context.get(name)
+      else
+        object = object_factory.construct_new(name,self)
+        object.instance_variable_set(:@_conject_contextual_name, name.to_s)
+        @cache[name] = object unless no_cache?(name)
+        return object
+      end
+    end
+  end
+end

data/lib/gamebox/lib/hash_ext.rb

@@ -0,0 +1,13 @@
+class Hash
+  def symbolize_keys
+    inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
+  end
+
+  def slice(*keys)
+    keys = keys.map! { |key| convert_key(key) } if respond_to?(:convert_key, true)
+    hash = self.class.new
+    keys.each { |k| hash[k] = self[k] if has_key?(k) }
+    hash
+  end
+end
+

data/lib/gamebox/lib/publisher_ext.rb

@@ -1,10 +1,12 @@
 module Publisher
   module InstanceMethods
+    def ensure_valid(*args)
+      true
+    end
     def can_fire?(event) 
-      events = self.class.class_eval { @published_events }
-      events = self.class.published_events
-      return true if events == :any_event_is_ok
-      return false unless events and events.include?(event)
+      # events = self.class.published_events
+      # return true if events == :any_event_is_ok
+      # return false unless events and events.include?(event)
       return true
     end
     def unsubscribe_all(listener)

data/lib/gamebox/lib/vector2.rb

@@ -25,9 +25,12 @@
 # 
 class Vector2
   include Enumerable
+  include MinMaxHelpers
 
   RAD_TO_DEG = 180.0 / Math::PI
   DEG_TO_RAD = Math::PI / 180.0
+  MAX_DOT_PRODUCT = 1.0
+  MIN_DOT_PRODUCT = -1.0
 
   class << self
 
@@ -284,7 +287,14 @@ class Vector2
 
   # Returns the dot product between this vector and the other vector.
   def dot( vector )
-    (@x * vector.at(0)) + (@y * vector.at(1))
+    unclamped_dot = (@x * vector.at(0)) + (@y * vector.at(1))
+    max(min(unclamped_dot, MAX_DOT_PRODUCT), MIN_DOT_PRODUCT)
+  end
+
+
+  # Returns the cross product between this vector and the other vector.
+  def cross( vector )
+    (@x * vector.y) - (@y * vector.x)
   end
 
 

data/lib/gamebox/spec/helper.rb

@@ -477,11 +477,21 @@ module GameboxAcceptanceSpecHelpers
       end
     end
 
+
     RSpec::Matchers.define :have_attrs do |expected_attributes|
       match do |actor|
-        expected_attributes.each do |key, val|
-          actor.send(key).should == val
-        end
+        relevant_attrs = actual.attributes.slice(*expected[0].keys)
+        relevant_attrs.should == expected_attributes
+      end
+
+      failure_message_for_should do |actual|
+        relevant_attrs = actual.attributes.slice(*expected[0].keys)
+        "#{relevant_attrs} did not match #{expected[0]}"
+      end
+
+      failure_message_for_should_not do |actual|
+        relevant_attrs = actual.attributes.slice(*expected[0].keys)
+        "#{relevant_attrs} matched #{expected[0]}"
       end
     end
 
@@ -491,6 +501,17 @@ module GameboxAcceptanceSpecHelpers
           actor.has_attribute?(name).should be_false
         end
       end
+
+      failure_message_for_should do |actual|
+        relevant_attrs = actual.attributes.slice(*expected[0].keys)
+        "#{relevant_attrs} matched #{expected[0]}"
+      end
+
+      failure_message_for_should_not do |actual|
+        relevant_attrs = actual.attributes.slice(*expected[0].keys)
+        "#{relevant_attrs} matched but should not have #{expected[0]}"
+      end
+
     end
   end
 end

data/lib/gamebox/version.rb

@@ -2,7 +2,7 @@ module Gamebox
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 5
-    TINY  = 0
+    TINY  = 1
     RC    = 0
 
     if RC > 0

data/spec/core/actor_spec.rb

@@ -155,6 +155,23 @@ describe Actor do
         subject.remove
       end
     end
+
+    describe "#to_s" do
+      it 'prints meta data about the actor' do
+        subject.to_s.should include(subject.object_id.to_s)
+      end
+
+      it 'prints the attributes' do
+        subject.has_attribute :foo, :bar
+        subject.to_s.should include('foo')
+        subject.to_s.should include('bar')
+      end
+
+      it 'prints the behaviors' do
+        subject.add_behavior :foo, :bar
+        subject.to_s.should include('foo')
+      end
+    end
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gamebox
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Shawn Anderson
@@ -10,286 +10,286 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: publisher
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: conject
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.8
 - !ruby/object:Gem::Dependency
   name: tween
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: kvo
   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
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.7
 - !ruby/object:Gem::Dependency
   name: pry-remote
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: polaris
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: chipmunk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Framework for building and distributing games using Gosu
@@ -389,6 +389,8 @@ files:
 - lib/gamebox/lib/aliasing.rb
 - lib/gamebox/lib/array_ext.rb
 - lib/gamebox/lib/code_statistics.rb
+- lib/gamebox/lib/conject_ext.rb
+- lib/gamebox/lib/hash_ext.rb
 - lib/gamebox/lib/inflections.rb
 - lib/gamebox/lib/inflector.rb
 - lib/gamebox/lib/linked_list.rb
@@ -494,12 +496,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []