gosu_extensions 0.1.11 → 0.1.12

data/VERSION

@@ -1 +1 @@
-0.1.11
+0.1.12

data/lib/gosu_extensions.rb

@@ -37,6 +37,7 @@ require 'targetable'
 require 'turnable'
 require 'controllable'
 require 'moveable'
+require 'imageable'
 require 'short_lived'
 
 $:.unshift File.join(File.dirname(__FILE__), '/units')

data/lib/traits/damaging.rb

@@ -26,9 +26,19 @@
 #
 module Damaging
   
-  # TODO Explain better what to do.
-  #
-  class DamageMissingError < StandardError; end
+  class DamageMissingError < RuntimeError
+    def initialize
+      super <<-MESSAGE
+        In a Damaging thing, you need to define method
+          damage damage = nil, &block
+        with params
+          damage 13 # some value
+        or
+          damage { 13 + rand(7) } # some block
+        to define how much damage the thing does.
+      MESSAGE
+    end
+  end
   
   def self.included klass
     klass.extend ClassMethods

data/lib/traits/imageable.rb

@@ -0,0 +1,49 @@
+module Imageable
+  
+  class ImageMissingError < RuntimeError
+    def initialize
+      super <<-MESSAGE
+        In an Imageable, you either need to define method
+          image path, *args
+        for an unchanging image
+        or
+          sequenced_image path, width, height, frequency = 10, &block
+        for a sprite sequence.
+      MESSAGE
+    end
+  end
+  
+  def self.included klass
+    klass.extend ClassMethods
+  end
+  
+  def initialize window
+    raise ImageMissingError.new unless self.respond_to? :image
+    super window
+  end
+  
+  module ClassMethods
+    
+    def image path, *args
+      InitializerHooks.register self do
+        @image = Gosu::Image.new self.window, File.join(Resources.root, path), *args
+      end
+      define_method :image do
+        @image
+      end
+    end
+    
+    def sequenced_image path, width, height, frequency = 10, &block
+      InitializerHooks.register self do
+        @image_sequence_started = Time.now
+        @image = Gosu::Image::load_tiles self.window, File.join(Resources.root, path), width, height, false
+      end
+      # divider = 1000 / frequency
+      define_method :image do
+        @image[(block ? block : lambda { (Time.now - @image_sequence_started)*frequency % @image.size })[]]
+      end
+    end
+    
+  end
+  
+end

data/lib/traits/short_lived.rb

@@ -1,8 +1,18 @@
 module ShortLived
   
-  # TODO Explain better what to do.
-  #
-  class LifetimeMissingError < StandardError; end
+  class LifetimeMissingError < RuntimeError
+    def initialize
+      super <<-MESSAGE
+        A ShortLived thing must define method
+          lifetime lifetime = nil, &block
+        with either params
+          lifetime 74 # some value
+        or
+          lifetime { 50 + rand(50) } # some block
+        to define how long the thing should live until it is destroyed.
+      MESSAGE
+    end
+  end
   
   def self.included klass
     klass.extend ClassMethods

data/lib/units/thing.rb

@@ -4,8 +4,9 @@ class Thing
   include InitializerHooks
   include ItIsA
   
-  # TODO Move this.
+  # TODO Move these.
   #
+  # it_is Imageable
   it_is Moveable
   
   attr_writer :layer
@@ -26,27 +27,6 @@ class Thing
   end
   
   class << self
-    
-    # TODO Move to module.
-    #
-    def image path, *args
-      InitializerHooks.register self do
-        @image = Gosu::Image.new self.window, File.join(Resources.root, path), *args
-      end
-      define_method :image do
-        @image
-      end
-    end
-    def sequenced_image path, width, height, frequency = 10, &block
-      InitializerHooks.register self do
-        @image_sequence_started = Time.now
-        @image = Gosu::Image::load_tiles self.window, File.join(Resources.root, path), width, height, false
-      end
-      # divider = 1000 / frequency
-      define_method :image do
-        @image[(block ? block : lambda { (Time.now - @image_sequence_started)*frequency % @image.size })[]]
-      end
-    end
     @@form_shape_class_mapping = { :circle => CP::Shape::Circle }
     def shape form
       form_shape_class_mapping = @@form_shape_class_mapping

data/spec/lib/traits/damaging_spec.rb

@@ -33,6 +33,18 @@ describe Damaging do
     it "should raise a DamageMissingError" do
       lambda { @damaging_class.new(@window) }.should raise_error(Damaging::DamageMissingError)
     end
+    it "should raise with the right message" do
+      lambda { @damaging_class.new(@window) }.should raise_error(Damaging::DamageMissingError, <<-MESSAGE
+        In a Damaging thing, you need to define method
+          damage damage = nil, &block
+        with params
+          damage 13 # some value
+        or
+          damage { 13 + rand(7) } # some block
+        to define how much damage the thing does.
+      MESSAGE
+      )
+    end
   end
   
 end

data/spec/lib/traits/imageable_spec.rb

@@ -0,0 +1,59 @@
+require File.join(File.dirname(__FILE__), '/../../spec_helper')
+
+describe Imageable do
+  
+  before(:each) do
+    @window = stub :window
+    Resources.stub! :root => 'some/root'
+  end
+  
+  context 'image defined on class' do
+    before(:each) do
+      @imageable_class = test_class_with(Imageable) do
+        image 'some/path.png'
+      end
+    end
+    it "should define a method lifetime which returns the result of the block" do
+      Gosu::Image.stub! :new => :some_image
+      
+      @imageable_class.new(@window).image.should == :some_image
+    end
+  end
+  context 'sequenced image defined on class' do
+    before(:each) do
+      @imageable_class = test_class_with(Imageable) do
+        sequenced_image 'some/path', :some_width, :some_height, 10.0
+      end
+    end
+    it "should define a method damage which returns the set value" do
+      image = stub :image
+      sequenced_image = stub :image, :size => 10, :[] => image
+      
+      Gosu::Image.stub! :load_tiles => sequenced_image
+      
+      @imageable_class.new(@window).image.should == image
+    end
+  end
+  context 'no image given – what now?' do
+    before(:each) do
+      @imageable_class = Class.new do
+        include Imageable
+      end
+    end
+    it "should raise a ImageMissingError" do
+      lambda { @imageable_class.new(@window) }.should raise_error(Imageable::ImageMissingError)
+    end
+    it "should raise with the right message" do
+      lambda { @imageable_class.new(@window) }.should raise_error(Imageable::ImageMissingError, <<-MESSAGE
+        In an Imageable, you either need to define method
+          image path, *args
+        for an unchanging image
+        or
+          sequenced_image path, width, height, frequency = 10, &block
+        for a sprite sequence.
+      MESSAGE
+      )
+    end
+  end
+  
+end

data/spec/lib/traits/short_lived_spec.rb

@@ -48,13 +48,23 @@ describe ShortLived do
   end
   context 'no lifetime given – what now?' do
     before(:each) do
-      @short_lived_class = Class.new(SuperClass) do
-        include ShortLived
-      end
+      @short_lived_class = test_class_with ShortLived
     end
     it "should raise a LifetimeMissingError" do
       lambda { @short_lived_class.new(@window) }.should raise_error(ShortLived::LifetimeMissingError)
     end
+    it "should raise with the right message" do
+      lambda { @short_lived_class.new(@window) }.should raise_error(ShortLived::LifetimeMissingError, <<-MESSAGE
+        A ShortLived thing must define method
+          lifetime lifetime = nil, &block
+        with either params
+          lifetime 74 # some value
+        or
+          lifetime { 50 + rand(50) } # some block
+        to define how long the thing should live until it is destroyed.
+      MESSAGE
+      )
+    end
   end
   
 end

data/spec/lib/units/thing_spec.rb

@@ -0,0 +1,32 @@
+require File.join(File.dirname(__FILE__), '/../../spec_helper')
+
+describe Thing do
+  
+  before(:each) do
+    @window = stub :window
+    @thing = Thing.new @window
+  end
+  
+  describe "window" do
+    it "should return the window" do
+      @thing.window.should == @window
+    end
+  end
+  
+  describe "layer" do
+    context 'default' do
+      it "should be on the player layer" do
+        @thing.layer.should == Layer::Players
+      end
+    end
+    context 'non-default' do
+      before(:each) do
+        @thing.layer = :non_default_layer
+      end
+      it "should be on the non default layer" do
+        @thing.layer.should == :non_default_layer
+      end
+    end
+  end
+  
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 11
-  version: 0.1.11
+  - 12
+  version: 0.1.12
 platform: ruby
 authors: 
 - Florian Hanke
@@ -66,6 +66,7 @@ files:
 - lib/traits/controllable.rb
 - lib/traits/damaging.rb
 - lib/traits/generator.rb
+- lib/traits/imageable.rb
 - lib/traits/initializer_hooks.rb
 - lib/traits/it_is_a.rb
 - lib/traits/lives.rb
@@ -116,9 +117,11 @@ test_files:
 - spec/lib/extensions/numeric_spec.rb
 - spec/lib/traits/attachable_spec.rb
 - spec/lib/traits/damaging_spec.rb
+- spec/lib/traits/imageable_spec.rb
 - spec/lib/traits/shooter_spec.rb
 - spec/lib/traits/short_lived_spec.rb
 - spec/lib/traits/shot_spec.rb
 - spec/lib/traits/targetable_spec.rb
 - spec/lib/traits/targeting_spec.rb
 - spec/lib/traits/turnable_spec.rb
+- spec/lib/units/thing_spec.rb