socky 0.1.1 → 0.1.2

data/CHANGELOG.textile

@@ -1,5 +1,13 @@
 h1. Changelog
 
+h2. 0.1.2 / 2010-09-21
+
+* new features:
+** none
+* bugfixes:
+** fix routes to spec_helper in ruby 1.9.2
+** ruby 1.9 will no longer raise errors on String to_a call
+
 h2. 0.1.1 / 2010-08-25
 
 * new features:

data/README.textile

@@ -1,6 +1,6 @@
 h1. Socky
 
-Socky is push server for Ruby on Rails based on WebSockets. It allows you to breake border between your application and client browser by letting the server initialize a connection and push data to the client.
+Socky is push server for Ruby on Rails based on WebSockets. It allows you to break border between your application and client browser by letting the server initialize a connection and push data to the client.
 
 h2. Getting Started
 

data/Rakefile

@@ -24,12 +24,3 @@ begin
 rescue LoadError
   puts "Jeweler not available. Install it with: gem install jeweler"
 end
-
-begin
-  require 'metric_fu'
-  MetricFu::Configuration.run do |config|
-    # config.graph_engine = :gchart
-  end
-rescue LoadError
-  puts "MetricFu not available. Install it with: gem install metric_fu"
-end

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/socky/connection/finders.rb

@@ -28,8 +28,8 @@ module Socky
           # Empty table means "no users" - nil means "all users"
           return [] if (included_clients.is_a?(Array) && included_clients.empty?)
 
-          included_clients = included_clients.to_a
-          excluded_clients = excluded_clients.to_a
+          included_clients = to_array(included_clients)
+          excluded_clients = to_array(excluded_clients)
 
           connections.collect do |connection|
             connection if (included_clients.empty? || included_clients.include?(connection.client)) && !excluded_clients.include?(connection.client)
@@ -40,8 +40,8 @@ module Socky
           # Empty table means "no channels" - nil means "all channels"
           return [] if (included_channels.is_a?(Array) && included_channels.empty?)
 
-          included_channels = included_channels.to_a
-          excluded_channels = excluded_channels.to_a
+          included_channels = to_array(included_channels)
+          excluded_channels = to_array(excluded_channels)
 
           connections.collect do |connection|
             connection if connection.channels.any? do |channel|
@@ -50,6 +50,12 @@ module Socky
           end.compact
         end
 
+        def to_array(obj)
+          return [] if obj.nil?
+          return obj if obj.is_a?(Array)
+          [obj]
+        end
+
       end
 
     end

data/spec/em-websocket_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe EM::WebSocket::Connection do
 

data/spec/socky/connection/authentication_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Socky::Connection::Authentication do
   include Socky::Connection::Authentication

data/spec/socky/connection/finders_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Socky::Connection::Finders do
   include Socky::Connection::Finders

data/spec/socky/connection_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Socky::Connection do
 

data/spec/socky/message_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Socky::Message do
   before(:each) do

data/spec/socky/misc_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Socky::Misc do
   include Socky::Misc

data/spec/socky/net_request_spec.rb

@@ -1,5 +1,5 @@
-require 'spec/spec_helper'
-require 'spec/stallion'
+require 'spec_helper'
+require 'stallion'
 
 describe Socky::NetRequest do
   
@@ -23,7 +23,7 @@ describe Socky::NetRequest do
       end
       it "should call block with false if request return status other than 200" do
         EM.run do
-          described_class.post("http://127.0.0.1:8080/fail") do |response|
+          described_class.post("http://127.0.0.1:8765/fail") do |response|
             response.should be_false
             EM.stop
           end.should be_true
@@ -31,7 +31,7 @@ describe Socky::NetRequest do
       end
       it "should call block with true if request return status 200" do
         EM.run do
-          described_class.post("http://127.0.0.1:8080/") do |response|
+          described_class.post("http://127.0.0.1:8765/") do |response|
             response.should be_true
             EM.stop
           end.should be_true

data/spec/socky/options/config_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 FILES_DIR = File.join(File.dirname(__FILE__), '..', '..', 'files')
 

data/spec/socky/options/parser_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Socky::Options::Parser do
   

data/spec/socky/options_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Socky::Options do
   

data/spec/socky/runner_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Socky::Runner do
   

data/spec/socky_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Socky do
   

data/spec/spec_helper.rb

@@ -2,5 +2,5 @@ require 'rubygems'
 require 'spec'
 require "spec/autorun"
 
-require 'lib/socky'
+require 'socky'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}

data/spec/stallion.rb

@@ -87,7 +87,7 @@ end
 
 Thread.new do
   begin
-    Stallion.run :Host => '127.0.0.1', :Port => 8080
+    Stallion.run :Host => '127.0.0.1', :Port => 8765
   rescue Exception => e
     print e
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: socky
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Bernard Potocki
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-25 00:00:00 +02:00
+date: 2010-09-21 00:00:00 +02:00
 default_executable: socky
 dependencies: 
 - !ruby/object:Gem::Dependency