socky 0.2.0 → 0.2.1

data/CHANGELOG.textile

@@ -1,5 +1,12 @@
 h1. Changelog
 
+h2. 0.2.1 / 2010-10-09
+
+* new features:
+** default config should have subscribe url's commented out for starting users
+* bugfixes:
+** show sent messages in true form instead of "inspect" one
+
 h2. 0.2.0 / 2010-10-03
 
 * new features:

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/socky/connection.rb

@@ -112,8 +112,9 @@ module Socky
     private
 
     def send_data(data)
-      debug [self.name, "sending data", data.inspect]
-      socket.send data.to_json
+      json_data = data.to_json
+      debug [self.name, "sending data", json_data]
+      socket.send json_data
     end
 
     def connection_pool

data/lib/socky/connection/finders.rb

@@ -41,8 +41,8 @@ module Socky
         # Empty table means "no users" - nil means "all users"
         return [] if (included_clients.is_a?(Array) && included_clients.empty?)
 
-        included_clients = to_array(included_clients)
-        excluded_clients = to_array(excluded_clients)
+        included_clients = Array(included_clients)
+        excluded_clients = Array(excluded_clients)
 
         connections.collect do |connection|
           connection if (included_clients.empty? || included_clients.include?(connection.client)) && !excluded_clients.include?(connection.client)
@@ -53,8 +53,8 @@ module Socky
         # Empty table means "no channels" - nil means "all channels"
         return [] if (included_channels.is_a?(Array) && included_channels.empty?)
 
-        included_channels = to_array(included_channels)
-        excluded_channels = to_array(excluded_channels)
+        included_channels = Array(included_channels)
+        excluded_channels = Array(excluded_channels)
 
         connections.collect do |connection|
           connection if connection.channels.any? do |channel|
@@ -62,13 +62,6 @@ module Socky
           end
         end.compact
       end
-
-      # This is implemented due to differences between methods of handling to_a in ruby 1.8 and 1.9
-      def to_array(obj)
-        return [] if obj.nil?
-        return obj if obj.is_a?(Array)
-        [obj]
-      end
     end
   end
 end

data/lib/socky/options/config.rb

@@ -56,8 +56,8 @@ module Socky
 :port: 8080
 :debug: false
 
-:subscribe_url: http://localhost:3000/socky/subscribe
-:unsubscribe_url: http://localhost:3000/socky/unsubscribe
+# :subscribe_url: http://localhost:3000/socky/subscribe
+# :unsubscribe_url: http://localhost:3000/socky/unsubscribe
 
 :secret: my_secret_key
 

data/spec/files/default.yml

@@ -1,8 +1,8 @@
 :port: 8080
 :debug: false
 
-:subscribe_url: http://localhost:3000/socky/subscribe
-:unsubscribe_url: http://localhost:3000/socky/unsubscribe
+# :subscribe_url: http://localhost:3000/socky/subscribe
+# :unsubscribe_url: http://localhost:3000/socky/unsubscribe
 
 :secret: my_secret_key
 

data/spec/socky/options/config_spec.rb

@@ -64,8 +64,6 @@ describe Socky::Options::Config do
     {
       :port => 8080,
       :debug => false,
-      :subscribe_url => "http://localhost:3000/socky/subscribe",
-      :unsubscribe_url => "http://localhost:3000/socky/unsubscribe",
       :secret => "my_secret_key",
       :secure => false
     }

metadata

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