chingu 0.9rc2 → 0.9rc3

data/Rakefile

@@ -16,8 +16,6 @@ begin
     gemspec.version = Chingu::VERSION
     
     gemspec.add_dependency 'gosu', '>= 0.7.27.1'
-    gemspec.add_dependency 'rest-client'
-    gemspec.add_dependency 'crack'    
     gemspec.add_development_dependency 'rspec', '>= 2.1.0'
     gemspec.add_development_dependency 'watchr'
     gemspec.add_development_dependency 'rcov'

data/chingu.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chingu}
-  s.version = "0.9rc2"
+  s.version = "0.9rc3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippa"]
@@ -270,23 +270,17 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<gosu>, [">= 0.7.27.1"])
-      s.add_runtime_dependency(%q<rest-client>, [">= 0"])
-      s.add_runtime_dependency(%q<crack>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 2.1.0"])
       s.add_development_dependency(%q<watchr>, [">= 0"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<gosu>, [">= 0.7.27.1"])
-      s.add_dependency(%q<rest-client>, [">= 0"])
-      s.add_dependency(%q<crack>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 2.1.0"])
       s.add_dependency(%q<watchr>, [">= 0"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
     s.add_dependency(%q<gosu>, [">= 0.7.27.1"])
-    s.add_dependency(%q<rest-client>, [">= 0"])
-    s.add_dependency(%q<crack>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 2.1.0"])
     s.add_dependency(%q<watchr>, [">= 0"])
     s.add_dependency(%q<rcov>, [">= 0"])

data/lib/chingu.rb

@@ -25,9 +25,8 @@ ROOT = File.dirname(File.expand_path($0))
 require 'rubygems' unless RUBY_VERSION =~ /1\.9/
 require 'gosu'
 require 'yaml'
-require 'rest_client'
-require 'crack/xml'
-
+require 'timeout'
+require 'socket'
 require File.join(CHINGU_ROOT,"chingu","require_all") # Thanks to http://github.com/tarcieri/require_all !
 
 # Seems like we need to include chingu/helpers first for BasicGameObject
@@ -39,7 +38,7 @@ require_all "#{CHINGU_ROOT}/chingu/async_tasks"
 require_all "#{CHINGU_ROOT}/chingu"
 
 module Chingu
-  VERSION = "0.9rc2"
+  VERSION = "0.9rc3"
   
   DEBUG_COLOR = Gosu::Color.new(0xFFFF0000)
   DEBUG_ZORDER = 9999

data/lib/chingu/game_states/network_client.rb

@@ -92,8 +92,8 @@ module Chingu
       # 3) #on_data(data) will call #on_msgs(msg)
       #
       def update
-        super
         handle_incoming_data
+        super
       end
       
       #

data/lib/chingu/game_states/network_server.rb

@@ -80,6 +80,7 @@ module Chingu
         @socket = nil
         @sockets = []
         @buffered_output = YAML::Stream.new
+        @max_read_per_update = options[:max_read_per_update] || 20000
         
         @packet_counter = 0
         @packet_buffers = Hash.new
@@ -130,11 +131,13 @@ module Chingu
       # 5) send all buffered broadcast data in one fell swoop
       #
       def update
-        super
         if @socket && !@socket.closed?
           handle_incoming_connections
           handle_incoming_data
+          super
           handle_outgoing_data
+        else
+          super
         end
       end
       
@@ -166,7 +169,7 @@ module Chingu
       # Call this from your update() to read from socket.
       # handle_incoming_data will call on_data(raw_data) when stuff comes on on the socket.
       #
-      def handle_incoming_data(max_size = 1500)
+      def handle_incoming_data(max_size = @max_read_per_update)
         @sockets.each do |socket|
           if IO.select([socket], nil, nil, 0.0)
             begin

data/lib/chingu/high_score_list.rb

@@ -37,7 +37,7 @@ module Chingu
       @file = options[:file] || "high_score_list.yml"
       @size = options[:size] || 100
       @sort_on = options[:sort_on] || :score
-      @high_scores = Array.new
+      @high_scores = Array.new      
     end
     
     #

data/lib/chingu/online_high_score_list.rb

@@ -37,6 +37,17 @@ module Chingu
       @login = options[:login] || options[:user]
       @password = options[:password]
       @game_id = options[:game_id]
+      
+      begin
+        require 'rest_client'
+        require 'crack/xml'
+      rescue
+        puts "HighScoreList requires 2 gems, please install with:"
+        puts "gem install rest-client"
+        puts "gem install crack"
+        exit
+      end
+      
       @resource = RestClient::Resource.new("http://api.gamercv.com/games/#{@game_id}/high_scores", 
                                               :user => @login, :password => @password, :timeout => 20, :open_timeout => 5)
                                               

data/spec/chingu/network_spec.rb

@@ -1,30 +1,39 @@
 require 'spec_helper'
 
+def data_set
+  {
+    "a Hash" => [{ :foo => :bar }],
+    "a String" => ["Woof!"],
+    "an Array" => [[1, 2, 3]],
+    "a stream of packets" => [{ :foo => :bar }, "Woof!", [1, 2, 3]],
+    "huge packet" => [[:frogspawn] * 1000]
+  }
+end
+
 module Chingu
   describe "Network" do
     
-    describe "Network Server" do
-
+    describe Chingu::GameStates::NetworkServer do
       it "should open listening port on start()" do
-        @server = Chingu::GameStates::NetworkServer.new(:ip => "0.0.0.0", :port => 9999)
+        @server = described_class.new(:ip => "0.0.0.0", :port => 9999)
         @server.should_receive(:on_start)
         @server.start
         @server.stop
       end
 
       it "should call on_start_error() if failing" do
-        @server = Chingu::GameStates::NetworkServer.new(:ip => "1.2.3.999", :port => 12345678) # crazy ip:port
+        @server = described_class.new(:ip => "1.2.3.999", :port => 12345678) # crazy ip:port
         @server.should_receive(:on_start_error)
         @server.start
         @server.stop
       end
 
       it "should call on_connect() and on_disconnect() when client connects" do
-        @server = Chingu::GameStates::NetworkServer.new(:ip => "0.0.0.0", :port => 9999)
+        @server = described_class.new(:ip => "0.0.0.0", :port => 9999)
         @client = Chingu::GameStates::NetworkClient.new(:ip => "127.0.0.1", :port => 9999)
         
         @server.should_receive(:on_start)
-        @server.should_receive(:on_connect).with(anything())  # anything() == a socket
+        @server.should_receive(:on_connect).with(an_instance_of(TCPSocket))
         @client.should_receive(:on_connect)
         @server.start
         @client.connect
@@ -36,43 +45,69 @@ module Chingu
 
     end
     
-    describe "Network Client" do
+    describe Chingu::GameStates::NetworkClient do
       it "should call on_connection_refused callback when connecting to closed port" do
-        @client = Chingu::GameStates::NetworkClient.new(:ip => "127.0.0.1", :port => 55421) # closed we assume
+        @client = described_class.new(:ip => "127.0.0.1", :port => 55421) # closed we assume
         @client.should_receive(:on_connection_refused)
         @client.connect
       end
     end
     
     describe "Network communication" do
-      before do
-        @server = Chingu::GameStates::NetworkServer.new(:ip => "0.0.0.0", :port => 9999).start
+      before :each do
+        @server = Chingu::GameStates::NetworkServer.new(:port => 9999).start
         @client = Chingu::GameStates::NetworkClient.new(:ip => "127.0.0.1", :port => 9999).connect
+        @client2 = Chingu::GameStates::NetworkClient.new(:ip => "127.0.0.1", :port => 9999).connect
       end
       
-      after do
+      after :each do
         @server.close
         @client.close
+        @client2.close
       end
-      
-      it "should send/recv strings" do
-        @server.should_receive(:on_msg).with(anything(), "woff!")
-        @client.send_msg("woff!")
-        @server.update
-      end
-      
-      it "should send/recv hashes" do
-        @server.should_receive(:on_msg).with(anything(), {:foo => :bar})
-        @client.send_msg({:foo => :bar})
-        @server.update
+
+      describe "From client to server" do
+        data_set.each do |name, data|
+          it "should send/recv #{name}" do
+            data.each {|packet| @server.should_receive(:on_msg).with(an_instance_of(TCPSocket), packet) }
+            data.each {|packet| @client.send_msg(packet) }
+
+            @server.update
+          end
+        end
       end
 
-      it "should send/recv arrays" do
-        @server.should_receive(:on_msg).with(anything(), [1,2,3])
-        @client.send_msg([1,2,3])
-        @server.update
+      describe "From server to a specific client" do
+        data_set.each do |name, data|
+          it "should send/recv #{name}" do
+            data.each {|packet| @client.should_receive(:on_msg).with(packet) }
+            @server.update # Accept the client before sending, so we know of its socket.
+            data.each { |packet| @server.send_msg(@server.sockets[0], packet) }
+
+            @client.update
+          end
+        end
       end
 
+      describe "From server to all clients" do
+        data_set.each do |name, data|
+          it "should send/recv #{name}" do
+            @server.update # Accept the clients, so know about their existence to broadcast.
+
+            # Data should be cached.
+            data.each {|packet| @server.broadcast_msg(packet) }
+
+            data.each do |packet|
+              @client.should_receive(:on_msg).with(packet)
+              @client2.should_receive(:on_msg).with(packet)
+            end
+
+            @server.update # Push the cached messages.
+            @client.update
+            @client2.update
+          end
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chingu
 version: !ruby/object:Gem::Version
-  version: 0.9rc2
+  version: 0.9rc3
   prerelease: 3
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
-  requirement: &24735936 !ruby/object:Gem::Requirement
+  requirement: &24030588 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,32 +22,10 @@ dependencies:
         version: 0.7.27.1
   type: :runtime
   prerelease: false
-  version_requirements: *24735936
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: &24735504 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *24735504
-- !ruby/object:Gem::Dependency
-  name: crack
-  requirement: &24735072 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *24735072
+  version_requirements: *24030588
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &24734628 !ruby/object:Gem::Requirement
+  requirement: &24030108 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +33,10 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *24734628
+  version_requirements: *24030108
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &24734268 !ruby/object:Gem::Requirement
+  requirement: &24029616 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24734268
+  version_requirements: *24029616
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &24733848 !ruby/object:Gem::Requirement
+  requirement: &24029220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24733848
+  version_requirements: *24029220
 description: OpenGL accelerated 2D game framework for Ruby. Builds on Gosu (Ruby/C++)
   which provides all the core functionality. Chingu adds simple yet powerful game
   states, prettier input handling, deployment safe asset-handling, a basic re-usable