flonkerton 0.0.1 → 0.0.2

data/README.md

@@ -72,8 +72,11 @@ See [examples](/apillet/flonkerton/tree/master/examples/).
 ## Related Projects
 
 * [Chingu](http://github.com/ippa/chingu)
+* [Compote](http://github.com/HakubJozak/compote)
 * [Exuberant](http://github.com/adamsanderson/lexery/tree/master/lib/exuberant)
 * [FWD](http://github.com/walski/FWD)
+* [Gosu Extensions](http://github.com/floere/gosu_extensions)
+* [Grandpa](http://github.com/arirusso/grandpa)
 * [Lotu](http://github.com/lobo-tuerto/lotu)
 * [Nimo](http://github.com/moonpxi/nimo)
 * [PuitUniverse](http://github.com/oneup/puituniverse)

data/flonkerton.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = "flonkerton"
-  s.version           = "0.0.1"
+  s.version           = "0.0.2"
   s.summary           = "Gosu toys for the bored rubyist."
   s.description       = "A simple framework that aims to improve your Gosu experience."
   s.authors           = ["Ariel H. Pillet"]
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "flonkerton"
   s.add_dependency "gosu", ">= 0.7.19"
-  s.add_development_dependency "protest", ">= 0.3.1"
-  s.add_development_dependency "rr", ">= 0.10.11"
+  s.add_development_dependency "protest", ">= 0.4.1"
+  s.add_development_dependency "override", ">= 0.0.10"
   s.add_development_dependency "watchr", ">= 0.6"
 end

data/lib/flonkerton.rb

@@ -8,7 +8,7 @@ class File
 end
 
 module Flonkerton
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
   LIB_PATH = File.dirname(File.expand_path(__FILE__))
   CURRENT_PATH = File.dirname(File.expand_path($0))
 

data/test/integration_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
 
 Protest.context('A Game example') do
   module Example
@@ -108,8 +108,6 @@ Protest.context('A Game example') do
   end
 
   it "should work." do
-    assert_nothing_raised do
-      Flonkerton::Game.start(Example::LogoScreen)
-    end
+    Flonkerton::Game.start(Example::LogoScreen)
   end
 end

data/test/test_helper.rb

@@ -1,9 +1,7 @@
 require 'protest'
-require 'rr'
+require 'override'
 require File.dirname(__FILE__) + '/../lib/flonkerton'
 
-class Protest::TestCase
-  include RR::Adapters::TestUnit
-end
+include Override
 
-Protest.report_with(:documentation)
+Protest.report_with(:documentation)

data/test/unit_tests.rb

@@ -1,4 +1,10 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+
+class Protest::TestCase
+  def window
+    @@window ||= Flonkerton::Window.new
+  end
+end
 
 Protest.describe('Flonkerton') do
   it 'has a CONFIG hash.' do
@@ -37,72 +43,82 @@ Protest.describe('Flonkerton') do
 end
 
 Protest.describe('A Game Window') do
-  setup do
-    @window = Flonkerton::Window.new
-  end
-
   it 'has a current screen. (default: WelcomeScreen)' do
-    assert_kind_of Flonkerton::WelcomeScreen, @window.screen
+    assert window.screen.is_a?(Flonkerton::WelcomeScreen)
   end
 
   it 'has a next screen. (default: nil)' do
-    assert_nil @window.next_screen
-  end
-
-  it 'updates the current screen.' do
-    mock(@window.screen).update
-    @window.update
+    assert window.next_screen.nil?
   end
 
-  it 'draws the current screen.' do
-    mock(@window.screen).draw
-    @window.draw
-  end
+  context('when running') do
+    module Example
+      class LogoScreen < Flonkerton::Screen
+        def setup
+          params[:log] = Array.new
+        end
 
-  it 'passes button_down events to the current screen.' do
-    mock(@window.screen).button_down(Gosu::KbA)
-    @window.button_down(Gosu::KbA)
-  end
+        def button_down(id)
+          params[:log] << 'press'
+        end
 
-  it 'passes button_up events to the current screen.' do
-    mock(@window.screen).button_up(Gosu::KbA)
-    @window.button_up(Gosu::KbA)
-  end
+        def button_up(id)
+          params[:log] << 'release'
+        end
 
-  context('when working with several screens') do
-    module Example
-      class LogoScreen < Flonkerton::Screen
         def update
+          params[:log] << 'update'
+        end
+
+        def draw
+          params[:log] << 'draw'
           go_to(GameScreen)
         end
       end
       class GameScreen < Flonkerton::Screen
-        def update
-          go_to(CreditsScreen)
+        def setup
+          params[:log] << 'new screen'
         end
       end
-      class CreditsScreen < Flonkerton::Screen; end
     end
 
-    it 'can switch between them.' do
-      @window = Flonkerton::Window.new(Example::LogoScreen)
-      assert_kind_of Example::LogoScreen, @window.screen
-      @window.update
-      assert_kind_of Example::GameScreen, @window.screen
-      @window.update
-      assert_kind_of Example::CreditsScreen, @window.screen
+    setup do
+      window.next_screen = Example::LogoScreen
+      window.update
+    end
+
+    it 'draw and update the current screen.' do
+      assert window.params[:log].empty?
+
+      # Fake a Gosu::Window.show loop iteration
+      #
+      window.button_down(Gosu::KbSpace)
+      window.button_up(Gosu::KbSpace)
+      window.update
+      window.draw
+
+      result = {:log => ['press', 'release', 'update', 'draw']}
+      assert_equal result, window.params
+
+      # Change screen on next tick
+      window.update
+
+      assert window.params[:log].include?('new screen')
+    end
+
+    after do
+      window.params.clear
     end
   end
 
   it 'has a params hash.' do
-    assert_equal Hash.new, @window.params
+    assert_equal Hash.new, window.params
   end
 end
 
 Protest.describe('A Screen') do
   setup do
-    @game = Flonkerton::Window.new
-    @screen = Flonkerton::Screen.new(@game)
+    @screen = Flonkerton::Screen.new(window)
   end
 
   # Gosu::Window methods
@@ -116,18 +132,20 @@ Protest.describe('A Screen') do
   end
 
   it 'has mouse coordinates.' do
-    assert_kind_of Numeric, @screen.mouse_x
-    assert_kind_of Numeric, @screen.mouse_y
+    assert @screen.mouse_x.is_a?(Numeric)
+    assert @screen.mouse_y.is_a?(Numeric)
   end
 
   it 'closes itself when Escape is pressed.' do
-    mock(@screen).close
+    override(@screen, :close => lambda { params[:close] = true })
+
+    assert @screen.params.empty?
     @screen.button_down(Gosu::KbEscape)
+    assert !@screen.params.empty?
   end
 
   it 'knows if a button is down.' do
-    stub(@game).button_down?(Gosu::KbA) { true }
-    stub(@game).button_down?(Gosu::KbZ) { false }
+    override(window, :button_down? => lambda {|id| id == Gosu::KbA })
     assert @screen.button_down?(Gosu::KbA)
     assert !@screen.button_down?(Gosu::KbZ)
   end
@@ -135,38 +153,19 @@ Protest.describe('A Screen') do
   # Empty methods to override.
   #
   it 'can setup before game loop.' do
-    assert_respond_to @screen, :setup
+    assert @screen.respond_to?(:setup)
   end
 
   it 'check button_up events while in game loop.' do
-    assert_respond_to @screen, :button_up
+    assert @screen.respond_to?(:button_up)
   end
 
   it 'updates game logic while in game loop.' do
-    assert_respond_to @screen, :update
+    assert @screen.respond_to?(:update)
   end
 
   it 'draws while in game loop.' do
-    assert_respond_to @screen, :draw
-  end
-
-  it 'can switch to another screen.' do
-    module Example
-      class LogoScreen < Flonkerton::Screen
-        def update
-          go_to(GameScreen)
-        end
-      end
-      class GameScreen < Flonkerton::Screen
-        def update
-          close
-        end
-      end
-    end
-
-    @game = Flonkerton::Window.new(Example::LogoScreen)
-    mock(@game).next_screen=(Example::GameScreen)
-    @game.update
+    assert @screen.respond_to?(:draw)
   end
 
   it 'shares a params hash with other screens.' do
@@ -196,13 +195,11 @@ Protest.describe('A Screen') do
   end
 
   it 'can close itself.' do
-    mock(@game).close
-    @screen.close
+    assert @screen.respond_to?(:close) # ...
   end
 
   it 'can clip an image.' do
-    mock(@game).clip_to(10, 20, 200, 300)
-    @screen.clip_to(10, 20, 200, 300)
+    assert @screen.respond_to?(:clip_to) # ...
   end
 
   it 'calls setup method after initialization.' do
@@ -219,75 +216,82 @@ Protest.describe('A Screen') do
 end
 
 Protest.describe('A WelcomeScreen') do
+  module DrawLog
+    def data
+      @data ||= []
+    end
+
+    def draw options = {}
+      data << options[:text]
+    end
+
+    def wrote? text
+      data.include? text
+    end
+  end
+  Flonkerton::Font.send(:include, DrawLog)
+
   setup do
-    @game = Flonkerton::Window.new
-    @welcome_screen = Flonkerton::WelcomeScreen.new(@game)
+    @welcome_screen = Flonkerton::WelcomeScreen.new(window)
   end
 
   it 'shows a brief explanation about Flonkerton.' do
-    mock(Flonkerton::Fonts[:default]).draw(:text => 'Welcome')
+    font = Flonkerton::Fonts[:default]
+    assert !font.wrote?('Welcome')
     @welcome_screen.draw
+    assert font.wrote?('Welcome')
   end
 end
 
 Protest.describe('A Sample') do
   setup do
-    @game = Flonkerton::Window.new
-    @sample = Flonkerton::Sample.new(@game, 'media/select.wav')
+    @sample = Flonkerton::Sample.new(window, 'media/select.wav')
   end
 
   it 'is a Gosu::Sample.' do
-    assert_kind_of Gosu::Sample, @sample
+    assert @sample.is_a?(Gosu::Sample)
   end
 end
 
 Protest.describe('A Song') do
   setup do
-    @game = Flonkerton::Window.new
-    @song = Flonkerton::Song.new(@game, 'media/catch_me_song.ogg')
+    @song = Flonkerton::Song.new(window, 'media/catch_me_song.ogg')
   end
 
   it 'is a Gosu::Song.' do
-    assert_kind_of Gosu::Song, @song
+    assert @song.is_a?(Gosu::Song)
   end
 
   it 'has a loop method.' do
-    mock(@song).play(true)
-    @song.loop
+    assert @song.respond_to?(:loop) # ...
   end
 end
 
 Protest.describe('A Font') do
   setup do
-    @game = Flonkerton::Window.new
-    @font = Flonkerton::Font.new(@game, 'media/ArcadeClassic.ttf')
+    @font = Flonkerton::Font.new(window, 'media/ArcadeClassic.ttf')
   end
 
   it 'is a Gosu::Font.' do
-    assert_kind_of Gosu::Font, @font
+    assert @font.is_a?(Gosu::Font)
   end
 
   it 'has a draw method that takes an options hash.' do
-    assert_nothing_raised do
-      @font.draw :text => 'test', :color => Gosu::Color::RED
-    end
+    @font.draw :text => 'test', :color => Gosu::Color::RED
   end
 end
 
 Protest.describe('An Image') do
   setup do
-    @game = Flonkerton::Window.new
-    @image = Flonkerton::Image.new(@game, 'media/gosu_logo.png')
+    @image = Flonkerton::Image.new(window, 'media/gosu_logo.png')
   end
 
   it 'is a Gosu::Image.' do
-    assert_kind_of Gosu::Image, @image
+    assert @image.is_a?(Gosu::Image)
   end
 
   it 'has a draw method that takes an options hash.' do
-    assert_nothing_raised do
-      @image.draw :x => 20, :mode => :additive
-    end
+    @image.draw :x => 20, :mode => :additive
   end
 end
 
@@ -299,7 +303,7 @@ end
 
 Protest.describe('Resource - Fonts') do
   it 'has a :default font.' do
-    assert_kind_of Flonkerton::Font, Flonkerton::Fonts[:default]
+    assert Flonkerton::Fonts[:default].is_a?(Flonkerton::Font)
   end
 
   it 'loads all fonts in CONFIG[:media_path].' do
@@ -368,12 +372,10 @@ Protest.describe('Resource - Tiles') do
 
     # returns Gosu::Image
     image = tiles.first.first
-    assert_kind_of Gosu::Image, image
+    assert image.is_a?(Gosu::Image)
 
     # ..but draw takes a hash, same as Flonkerton::Image
-    assert_nothing_raised do
-      image.draw :x => 20, :mode => :additive
-    end
+    image.draw :x => 20, :mode => :additive
   end
 end
 

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: flonkerton
 version: !ruby/object:Gem::Version 
-  hash: 29
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Ariel H. Pillet
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-27 00:00:00 -03:00
+date: 2010-09-17 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 37
         segments: 
         - 0
         - 7
@@ -42,28 +40,26 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
         segments: 
         - 0
-        - 3
+        - 4
         - 1
-        version: 0.3.1
+        version: 0.4.1
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rr
+  name: override
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 33
         segments: 
         - 0
+        - 0
         - 10
-        - 11
-        version: 0.10.11
+        version: 0.0.10
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -74,7 +70,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 0
         - 6
@@ -144,7 +139,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -153,7 +147,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"