gosu_extensions 0.2.9 → 0.3.0

data/lib/units/thing.rb

@@ -14,6 +14,10 @@ class Thing < Sprite
     100.0
   end
   
+  def layer
+    Layer::Players
+  end
+  
   class << self
     @@form_shape_class_mapping = {
       :circle  => CP::Shape::Circle, # :circle, radius
@@ -76,12 +80,6 @@ class Thing < Sprite
     
   end
   
-  # Unregister with the environment if destroyed.
-  #
-  def destroy!
-    self.window.unregister self if super
-  end
-  
   # Add this thing to an environment.
   #
   # Note: Adds the body and the shape.
@@ -93,6 +91,7 @@ class Thing < Sprite
   
   # Movement and Position
   #
+  def move;end
   
   #
   #

data/spec/lib/traits/attachable_spec.rb

@@ -3,24 +3,25 @@ require File.join(File.dirname(__FILE__), '/../../spec_helper')
 describe Attachable do
   
   before(:each) do
-    @attachable = test_class_with(Attachable).new stub(:window)
+    @window = stub :window, :things => []
+    @pod = stub :pod, :relative_position => :relative_position, :rotation => :some_rotation
+    @attachable = test_class_with(Attachable).new @window
+    @attachable.pod = @pod
   end
   
   describe "move_relative" do
     before(:each) do
       @attachable.stub! :position= => nil, :rotation= => nil
-      
-      @pod = stub :pod, :relative_position => :relative_position, :rotation => :some_rotation
     end
     it "should set the position to the pod's position plus the relative position" do
       @attachable.should_receive(:position=).once.with :relative_position
       
-      @attachable.move_relative @pod
+      @attachable.move_relative
     end
     it "should set the rotation to the pod's rotation" do
       @attachable.should_receive(:rotation=).once.with :some_rotation
       
-      @attachable.move_relative @pod
+      @attachable.move_relative
     end
   end
   

data/spec/lib/traits/controllable_spec.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), '/../../spec_helper')
 describe Controllable do
   
   before(:each) do
-    @window = stub :window
+    @window = stub :window, :things => []
   end
   
   describe "controls" do

data/spec/lib/traits/damaging_spec.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), '/../../spec_helper')
 describe Damaging do
   
   before(:each) do
-    @window = stub :window
+    @window = stub :window, :things => []
   end
   
   context 'damage given as block' do

data/spec/lib/traits/imageable_spec.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), '/../../spec_helper')
 describe Imageable do
   
   before(:each) do
-    @window = stub :window
+    @window = stub :window, :things => []
     Resources.stub! :root => 'some/root'
   end
   

data/spec/lib/traits/shooter_spec.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), '/../../spec_helper')
 describe Shooter do
   
   before(:each) do
-    @window = stub :window
+    @window = stub :window, :things => []
     
     @shooter = test_class_with(Shooter).new @window
   end
@@ -98,7 +98,7 @@ describe Shooter do
         end
       end
       it 'should set the shooting_range' do
-        @shooter_class.new(:some_window).muzzle_rotation.should == :some_rotation_calculation_result
+        @shooter_class.new(@window).muzzle_rotation.should == :some_rotation_calculation_result
       end
     end
   end
@@ -118,7 +118,7 @@ describe Shooter do
         end
       end
       it 'should set the shooting_range' do
-        @shooter_class.new(:some_window).muzzle_velocity.should == :some_velocity_calculation_result
+        @shooter_class.new(@window).muzzle_velocity.should == :some_velocity_calculation_result
       end
     end
   end
@@ -138,7 +138,7 @@ describe Shooter do
         end
       end
       it 'should set the shooting_range' do
-        @shooter_class.new(:some_window).muzzle_position.should == :some_position_calculation_result
+        @shooter_class.new(@window).muzzle_position.should == :some_position_calculation_result
       end
     end
   end
@@ -150,7 +150,7 @@ describe Shooter do
       end
     end
     it 'should set the shooting_range' do
-      @shooter_class.new(:some_window).shot_type.should == :some_type
+      @shooter_class.new(@window).shot_type.should == :some_type
     end
   end
   
@@ -161,7 +161,7 @@ describe Shooter do
       end
     end
     it 'should set the shooting_rate' do
-      @shooter_class.new(:some_window).shooting_rate.should be_close(16, 0.1)
+      @shooter_class.new(@window).shooting_rate.should be_close(16, 0.1)
     end
   end
   
@@ -172,7 +172,7 @@ describe Shooter do
       end
     end
     it 'should set the shooting_range' do
-      @shooter_class.new(:some_window).shooting_range.should == :some_range
+      @shooter_class.new(@window).shooting_range.should == :some_range
     end
   end
   

data/spec/lib/traits/shot_spec.rb

@@ -22,9 +22,8 @@ describe Shot do
   
   describe "shoot_from" do
     before(:each) do
-      @window = stub :window, :null_object => true
-      @shot.stub :position= => nil
-      @shot.stub :window => @window
+      @shot.stub :position= => nil, :show => nil
+      @shot.stub :window => stub(:window)
       @shooter = stub :shooter, :muzzle_position => :some_muzzle_position
     end
     it "should return itself" do
@@ -40,9 +39,8 @@ describe Shot do
       
       @shot.shoot_from @shooter
     end
-    it "should register itself with the window" do
-      # TODO Or should it?
-      @window.should_receive(:register).once.with @shot
+    it "should show itself" do
+      @shot.should_receive(:show).once
       
       @shot.shoot_from @shooter
     end

data/spec/lib/traits/user_interface_spec.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), '/../../spec_helper')
 describe UserInterface do
   
   before(:each) do
-    @window = stub :window
+    @window = stub :window, :things => []
     @user_interface = test_class_with(UserInterface).new @window
   end
   

data/spec/lib/units/thing_spec.rb

@@ -3,7 +3,8 @@ require File.join(File.dirname(__FILE__), '/../../spec_helper')
 describe Thing do
   
   before(:each) do
-    @window = stub :window
+    @things = stub :things
+    @window = stub :window, :things => @things
     @thing = Thing.new @window
   end
   
@@ -82,10 +83,10 @@ describe Thing do
     end
     context 'not yet destroyed' do
       before(:each) do
-        @window.stub! :unregister => nil
+        @things.stub! :remove => nil
       end
-      it "should unregister" do
-        @window.should_receive(:unregister).once.with @thing
+      it "should remove" do
+        @things.should_receive(:remove).once.with @thing
         
         @thing.destroy!
       end
@@ -98,8 +99,8 @@ describe Thing do
   end
   
   describe "destroyed?" do
-    it "should be false after creating the object" do
-      @thing.destroyed?.should == false
+    it "should be nil after creating the object" do
+      @thing.destroyed?.should == nil
     end
   end
   describe "destroyed=" do
@@ -121,7 +122,7 @@ describe Thing do
         end
       end
       it "should be on the non default layer" do
-        Thong.new(:some_window).layer.should == :non_default_layer
+        Thong.new(@window).layer.should == :non_default_layer
       end
     end
   end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 9
-  version: 0.2.9
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Florian Hanke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-13 00:00:00 +02:00
+date: 2010-04-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,11 +63,12 @@ files:
 - lib/core/initializer_hooks.rb
 - lib/core/it_is_a.rb
 - lib/core/layer.rb
-- lib/core/moveables.rb
-- lib/core/remove_shapes.rb
+- lib/core/objects.rb
 - lib/core/resources.rb
 - lib/core/rotation.rb
 - lib/core/scheduling.rb
+- lib/core/sprites.rb
+- lib/core/things.rb
 - lib/core/trait.rb
 - lib/core/traits.rb
 - lib/core/vector_utilities.rb
@@ -135,8 +136,6 @@ test_files:
 - spec/lib/core/initializer_hooks_spec.rb
 - spec/lib/core/it_is_a_spec.rb
 - spec/lib/core/layer_spec.rb
-- spec/lib/core/moveables_spec.rb
-- spec/lib/core/remove_shapes_spec.rb
 - spec/lib/core/trait_spec.rb
 - spec/lib/core/traits_spec.rb
 - spec/lib/extensions/module_spec.rb

data/lib/core/moveables.rb

@@ -1,33 +0,0 @@
-# Holds the moveables that are moved and drawn.
-#
-class Moveables
-  
-  delegate :each, :to => :@elements
-  
-  def initialize elements = []
-    @elements = elements
-  end
-  
-  def register moveable
-    @elements << moveable
-  end
-  def registered? moveable
-    @elements.include? moveable
-  end
-  def remove shape
-    @elements.delete_if { |element| element.shape == shape }
-  end
-  
-  def draw
-    @elements.each &:draw
-  end
-  def move
-    @elements.each &:move
-  end
-  def targeting
-    @elements.select { |m| m.respond_to? :target }.each do |gun|
-      gun.target *@elements.select { |m| m.kind_of? Enemy }
-    end
-  end
-  
-end

data/lib/core/remove_shapes.rb

@@ -1,37 +0,0 @@
-#
-#
-class RemoveShapes
-  
-  attr_reader :shapes
-  delegate :clear, :empty?, :to => :@shapes
-  
-  def initialize
-    @shapes = []
-  end
-  
-  #
-  #
-  def add shape
-    shapes << shape
-  end
-  
-  #
-  #
-  def remove_from environment, moveables
-    # This iterator makes an assumption of one Shape per Star making it safe to remove
-    # each Shape's Body as it comes up
-    # If our Stars had multiple Shapes, as would be required if we were to meticulously
-    # define their true boundaries, we couldn't do this as we would remove the Body
-    # multiple times
-    # We would probably solve this by creating a separate @remove_bodies array to remove the Bodies
-    # of the Stars that were gathered by the Player
-    #
-    return if empty?
-    shapes.each do |shape|
-      environment.remove shape
-      moveables.remove shape # TODO Should the environment be the owner of the moveables? Probably, yes.
-    end
-    clear
-  end
-  
-end

data/spec/lib/core/moveables_spec.rb

@@ -1,91 +0,0 @@
-require File.join(File.dirname(__FILE__), '/../../spec_helper')
-
-describe Moveables do
-  
-  # TODO targeting
-  
-  describe "move" do
-    before(:each) do
-      @element1 = stub :element1
-      @element2 = stub :element2
-      @elements = [@element1, @element2]
-      @moveables = Moveables.new @elements
-    end
-    it "should delegate to each" do
-      @element1.should_receive(:move).once.with
-      @element2.should_receive(:move).once.with
-      
-      @moveables.move
-    end
-  end
-  
-  describe "draw" do
-    before(:each) do
-      @element1 = stub :element1
-      @element2 = stub :element2
-      @elements = [@element1, @element2]
-      @moveables = Moveables.new @elements
-    end
-    it "should delegate to each" do
-      @element1.should_receive(:draw).once.with
-      @element2.should_receive(:draw).once.with
-      
-      @moveables.draw
-    end
-  end
-  
-  describe "remove" do
-    before(:each) do
-      @ok    = stub :ok,    :shape => :the_shape_to_be_removed
-      @wrong = stub :wrong, :shape => :not_the_right_shape
-      @elements = [@wrong, @wrong, @ok, @wrong]
-      @moveables = Moveables.new @elements
-    end
-    it "should remove the ok element" do
-      @moveables.remove(:the_shape_to_be_removed).should == [@wrong, @wrong, @wrong]
-    end
-  end
-  
-  context 'default' do
-    before(:each) do
-      @elements  = stub :elements
-      @moveables = Moveables.new @elements
-    end
-  
-    describe "registered?" do
-      context 'not yet registered' do
-        before(:each) do
-          @elements.should_receive(:include?).once.with(:some_moveable).and_return false
-        end
-        it "should return false" do
-          @moveables.registered?(:some_moveable).should == false
-        end
-      end
-      context 'already registered' do
-        before(:each) do
-          @elements.should_receive(:include?).once.with(:some_moveable).and_return true
-        end
-        it "should return true" do
-          @moveables.registered?(:some_moveable).should == true
-        end
-      end
-    end
-  
-    describe "register" do
-      it "should register a moveable" do
-        @elements.should_receive(:<<).once.with :some_moveable
-      
-        @moveables.register :some_moveable
-      end
-    end
-  
-    describe "each" do
-      it "should delegate each to its elements" do
-        @elements.should_receive(:each).once
-      
-        @moveables.each
-      end
-    end
-  end
-  
-end

data/spec/lib/core/remove_shapes_spec.rb

@@ -1,53 +0,0 @@
-require File.join(File.dirname(__FILE__), '/../../spec_helper')
-
-describe RemoveShapes do
-  
-  before(:each) do
-    @remove_shapes = RemoveShapes.new
-  end
-  
-  it "should have no shapes, unprimed" do
-    @remove_shapes.empty?.should == true
-  end
-  
-  describe "add" do
-    before(:each) do
-      @shapes = stub :shapes
-      @remove_shapes.stub! :shapes => @shapes
-    end
-    it "should << the shape to the shapes" do
-      @shapes.should_receive(:<<).once.with :some_shape
-      
-      @remove_shapes.add :some_shape
-    end
-  end
-  
-  describe "remove_from" do
-    context 'without shapes' do
-      before(:each) do
-        @remove_shapes.stub! :empty? => true
-      end
-      it "should just return" do
-        @remove_shapes.should_receive(:shapes).never
-        
-        @remove_shapes.remove_from stub, stub
-      end
-    end
-    context 'with shapes' do
-      before(:each) do
-        @shape = stub :shape
-        @remove_shapes.stub! :empty? => false, :shapes => [@shape]
-      end
-      it "should remove the shapes from the environment and the moveables" do
-        environment = stub :environment
-        moveables   = stub :moveables
-        
-        environment.should_receive(:remove).once.with @shape
-        moveables.should_receive(:remove).once.with @shape
-        
-        @remove_shapes.remove_from environment, moveables
-      end
-    end
-  end
-  
-end