socky 0.1.3 → 0.2.0

data/spec/socky/connection_spec.rb

@@ -103,7 +103,7 @@ describe Socky::Connection do
     it "#send_data should send message by socket in json format" do
       @connection.socket.stub!(:send)
       @connection.socket.should_receive(:send).with({:test => "abstract"}.to_json)
-      @connection.send_data({:test => "abstract"})
+      @connection.send(:send_data, {:test => "abstract"})
     end
     it "#disconnect should close connection after writing" do
       @connection.socket.stub!(:close_connection_after_writing)
@@ -113,7 +113,7 @@ describe Socky::Connection do
     context "#add_to_pool" do
       it "should add self to class connection list if self isn't already on list or self isn't admin" do
         @connection.stub!(:admin).and_return(false)
-        @connection.add_to_pool
+        @connection.send(:add_to_pool)
         described_class.connections.should include(@connection)
         described_class.connections.should have(1).item
       end
@@ -121,20 +121,20 @@ describe Socky::Connection do
         described_class.connections << @connection
         described_class.connections.should have(1).item
         @connection.stub!(:admin).and_return(false)
-        @connection.add_to_pool
+        @connection.send(:add_to_pool)
         described_class.connections.should include(@connection)
         described_class.connections.should have(1).item
       end
       it "should not add self to class connection list if self is admin" do
         @connection.stub!(:admin).and_return(true)
-        @connection.add_to_pool
+        @connection.send(:add_to_pool)
         described_class.connections.should_not include(@connection)
       end
     end
     it "#remove_from_pool should delete self from class connection list" do
       described_class.connections << @connection
       described_class.connections.should have(1).item
-      @connection.remove_from_pool
+      @connection.send(:remove_from_pool)
       described_class.connections.should_not include(@connection)
       described_class.connections.should have(0).items
     end

data/spec/socky/message_spec.rb

@@ -47,89 +47,56 @@ describe Socky::Message do
   context "instance" do
     before(:each) { @message = described_class.new(@connection, {}.to_json) }
     context "#process" do
-      it "should call #broadcast if message command is :broadcast" do
-        @message.stub!(:params).and_return({:command => :broadcast})
-        @message.stub!(:broadcast)
-        @message.should_receive(:broadcast)
-        @message.process
-      end
-      it "should not distinguish between string and symbol in command" do
-        @message.stub!(:params).and_return({:command => 'broadcast'})
-        @message.stub!(:broadcast)
-        @message.should_receive(:broadcast)
-        @message.process
-      end
-      it "should call #query if message command is :query" do
-        @message.stub!(:params).and_return({:command => :query})
-        @message.stub!(:query)
-        @message.should_receive(:query)
-        @message.process
+      before(:each) do
+        @message.stub!(:send_message)
       end
       it "should raise error if message command is nil" do
         @message.stub!(:params).and_return({:command => nil})
-        lambda {@message.process}.should raise_error Socky::SockyError
+        lambda {@message.process}.should raise_error(Socky::SockyError, "unknown command")
       end
       it "should raise error if message command is neither :broadcast nor :query" do
-        @message.stub!(:params).and_return({:command => "invalid"})
-        lambda {@message.process}.should raise_error Socky::SockyError
-      end
-    end
-    context "#broadcast" do
-      it "should select target connections basing on params" do
-        @message.stub!(:params).and_return({:some => :abstract})
-        @message.stub!(:send_message)
-        Socky::Connection.should_receive(:find).with({:some => :abstract})
-        @message.broadcast
-      end
-      it "should call #send_message with message body and connection list" do
-        @message.stub!(:params).and_return({:body => "some message"})
-        Socky::Connection.stub!(:find).and_return(["first","second"])
-        @message.should_receive(:send_message).with("some message", ["first", "second"])
-        @message.broadcast
-      end
-    end
-    context "#query" do
-      it "should call #query_show_connections if message type is :show_connections" do
-        @message.stub!(:params).and_return({:type => :show_connections})
-        @message.stub!(:query_show_connections)
-        @message.should_receive(:query_show_connections)
-        @message.query
+        @message.stub!(:params).and_return({:command => :invalid})
+        lambda {@message.process}.should raise_error(Socky::SockyError, "unknown command")
       end
-      it "should not distinguish between string and symbol in type" do
-        @message.stub!(:params).and_return({:type => 'show_connections'})
-        @message.stub!(:query_show_connections)
-        @message.should_receive(:query_show_connections)
-        @message.query
-      end
-      it "should raise error if message type is nil" do
-        @message.stub!(:params).and_return({:type => nil})
-        lambda{ @message.query }.should raise_error Socky::SockyError
-      end
-      it "should raise error if message type is not :show_connections" do
-        @message.stub!(:params).and_return({:type => "invalid"})
-        lambda{ @message.query }.should raise_error Socky::SockyError
-      end
-    end
-    context "#query_show_connections" do
-      before(:each) do
-        Socky::Connection.stub!(:find_all).and_return("find results")
-        @message.stub!(:respond)
-      end
-      it "should ask for all connections" do
-        Socky::Connection.should_receive(:find_all)
-        @message.query_show_connections
-      end
-      it "should respond current connection list" do
-        @message.should_receive(:respond).with("find results")
-        @message.query_show_connections
-      end
-    end
-    context "#respond" do
-      it "should call creator #send_message" do
-        @connection.should_receive(:send_message)
-        @message.respond({:test => true})
+      it "should not distinguish between string and symbol in command" do
+        @message.stub!(:params).and_return({:command => 'broadcast'})
+        lambda {@message.process}.should_not raise_error(Socky::SockyError, "unknown command")
+      end
+      context ":broadcast" do
+        it "should select target connections basing on params" do
+          @message.stub!(:params).and_return({:command => :broadcast, :some => :abstract})
+          Socky::Connection.should_receive(:find).with(:some => :abstract)
+          @message.process
+        end
+        it "should send_message with message body and connection list" do
+          @message.stub!(:params).and_return({:command => :broadcast, :body => "some message"})
+          Socky::Connection.stub!(:find).and_return(["first","second"])
+          @message.should_receive(:send_message).with("some message", ["first", "second"])
+          @message.process
+        end
+      end
+      context ":query" do
+        it "should raise error if query type is nil" do
+          @message.stub!(:params).and_return(:command => :query, :type => nil)
+          lambda{ @message.process }.should raise_error(Socky::SockyError, "unknown query type")
+        end
+        it "should raise error if query type is invalid" do
+          @message.stub!(:params).and_return(:command => :query, :type => :invalid)
+          lambda{ @message.process }.should raise_error(Socky::SockyError, "unknown query type")
+        end
+        it "should not distinguish between string and symbol in command" do
+          @message.stub!(:params).and_return({:command => :query, :type => "show_connections"})
+          lambda {@message.process}.should_not raise_error(Socky::SockyError, "unknown query type")
+        end
+        context "=> :show_connections" do
+          it "should return current connection list to creator" do
+            @message.stub!(:params).and_return(:command => :query, :type => :show_connections)
+            Socky::Connection.stub!(:find_all).and_return(["find results"])
+            @connection.should_receive(:send_message).with(["find results"])
+            @message.process
+          end
+        end
       end
     end
-
   end
 end

data/spec/socky/net_request_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'stallion'
 
 describe Socky::NetRequest do
   

data/spec/socky/runner_spec.rb

@@ -30,9 +30,13 @@ describe Socky::Runner do
     end
     context "#new" do
       it "should prepare options from args" do
-        Socky::Options.stub!(:prepare)
-        Socky::Options.should_receive(:prepare).with("some args")
-        described_class.new("some args")
+        begin
+          described_class.new(["-c", File.dirname(__FILE__) + "/../files/default.yml"])
+          Socky.options.class.should eql(Hash)
+          Socky.options.should_not be_empty
+        ensure
+          Socky.options = nil
+        end
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: socky
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Bernard Potocki
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-23 00:00:00 +02:00
+date: 2010-10-03 00:00:00 +02:00
 default_executable: socky
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,6 +48,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 description: Socky is a WebSocket server and client for Ruby on Rails
 email: b.potocki@imanel.org
 executables: 
@@ -89,7 +103,7 @@ files:
 - spec/socky/runner_spec.rb
 - spec/socky_spec.rb
 - spec/spec_helper.rb
-- spec/stallion.rb
+- spec/support/stallion.rb
 has_rdoc: true
 homepage: http://github.com/imanel/socky_gem
 licenses: []
@@ -138,4 +152,4 @@ test_files:
 - spec/socky/runner_spec.rb
 - spec/socky_spec.rb
 - spec/spec_helper.rb
-- spec/stallion.rb
+- spec/support/stallion.rb