socky 0.2.1 → 0.4.0

data/README.textile

@@ -1,27 +1,5 @@
 h1. Socky
 
-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
-
-* "Install":http://wiki.github.com/imanel/socky_gem/install the gem
-* Read up about its "Usage":http://wiki.github.com/imanel/socky_gem/usage and "Configuration":http://wiki.github.com/imanel/socky_gem/configuration
-* Try "Example Application":http://github.com/imanel/socky_example or "demo page":http://sockydemo.imanel.org
-* Fork and Contribute your own modifications
-
-h2. Runtime Dependencies
-
-* EM-WebSocket: Backend for WebSocket server
-* EM-HTTP-Client: Sending authorize requests
-
-h2. License
-
-(The MIT License)
-
-Copyright (c) 2010 Bernard Potocki
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+"socky" ruby server gem changed name to "socky-server".
+This is only transitional package. Please change install socky-server gem and remove this one.
+You can find repository "here":http://github.com/socky/socky-server-ruby

data/lib/socky.rb

@@ -1,75 +1 @@
-require 'rubygems'
-require 'logger'
-require 'fileutils'
-require 'em-websocket'
-$:.unshift(File.dirname(__FILE__))
-require 'em-websocket_hacks'
-
-# Socky is a WebSocket server and client for Ruby on Rails 
-# @author Bernard "Imanel" Potocki
-# @see http://github.com/imanel/socky_gem main repository
-module Socky
-
-  class SockyError < StandardError; end #:nodoc:
-
-  # server version
-  VERSION = File.read(File.dirname(__FILE__) + '/../VERSION').strip
-
-  class << self
-    # read server-wide options
-    def options
-      @options ||= {}
-    end
-
-    # write server-wide options
-    def options=(val)
-      @options = val
-    end
-
-    # access or initialize logger
-    # default logger writes to STDOUT
-    def logger
-      return @logger if defined?(@logger) && !@logger.nil?
-      path = log_path
-      FileUtils.mkdir_p(File.dirname(path))
-      prepare_logger(path)
-    rescue
-      prepare_logger(STDOUT)
-    end
-
-    # overwrite default logger
-    def logger=(logger)
-      @logger = logger
-    end
-
-    # default log path
-    def log_path
-      options[:log_path] || nil
-    end
-
-    # default pid path
-    def pid_path
-      options[:pid_path] || File.join(%w( / var run socky.pid ))
-    end
-
-    # default config path
-    def config_path
-      options[:config_path] || File.join(%w( / var run socky.yml ))
-    end
-
-    private
-
-    def prepare_logger(output)
-      @logger = Logger.new(output)
-      @logger.level = Logger::INFO unless options[:debug]
-      @logger
-    end
-  end
-end
-
-require 'socky/misc'
-require 'socky/options'
-require 'socky/runner'
-require 'socky/connection'
-require 'socky/net_request'
-require 'socky/message'
+# Placeholder

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: socky
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Bernard Potocki
@@ -15,97 +15,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-09 00:00:00 +02:00
-default_executable: socky
+date: 2010-10-28 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: em-websocket
+  name: socky-server
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 15
         segments: 
         - 0
-        - 1
         - 4
-        version: 0.1.4
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: em-http-request
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        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"
+        version: 0.4.0
   type: :runtime
-  version_requirements: *id003
-description: Socky is a WebSocket server and client for Ruby on Rails
-email: b.potocki@imanel.org
-executables: 
-- socky
+  version_requirements: *id001
+description: Transitional package for socky-server gem
+email: bernard.potocki@imanel.org
+executables: []
+
 extensions: []
 
 extra_rdoc_files: 
 - README.textile
 files: 
-- CHANGELOG.textile
+- .gitignore
 - README.textile
-- Rakefile
-- VERSION
-- bin/socky
-- lib/em-websocket_hacks.rb
 - lib/socky.rb
-- lib/socky/connection.rb
-- lib/socky/connection/authentication.rb
-- lib/socky/connection/finders.rb
-- lib/socky/message.rb
-- lib/socky/misc.rb
-- lib/socky/net_request.rb
-- lib/socky/options.rb
-- lib/socky/options/config.rb
-- lib/socky/options/parser.rb
-- lib/socky/runner.rb
-- spec/em-websocket_spec.rb
-- spec/files/default.yml
-- spec/files/invalid.yml
-- spec/socky/connection/authentication_spec.rb
-- spec/socky/connection/finders_spec.rb
-- spec/socky/connection_spec.rb
-- spec/socky/message_spec.rb
-- spec/socky/misc_spec.rb
-- spec/socky/net_request_spec.rb
-- spec/socky/options/config_spec.rb
-- spec/socky/options/parser_spec.rb
-- spec/socky/options_spec.rb
-- spec/socky/runner_spec.rb
-- spec/socky_spec.rb
-- spec/spec_helper.rb
-- spec/support/stallion.rb
 has_rdoc: true
-homepage: http://github.com/imanel/socky_gem
+homepage: http://github.com/socky/socky-server-ruby
 licenses: []
 
 post_install_message: 
@@ -137,19 +79,6 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Socky is a WebSocket server and client for Ruby on Rails
-test_files: 
-- spec/em-websocket_spec.rb
-- spec/socky/connection/authentication_spec.rb
-- spec/socky/connection/finders_spec.rb
-- spec/socky/connection_spec.rb
-- spec/socky/message_spec.rb
-- spec/socky/misc_spec.rb
-- spec/socky/net_request_spec.rb
-- spec/socky/options/config_spec.rb
-- spec/socky/options/parser_spec.rb
-- spec/socky/options_spec.rb
-- spec/socky/runner_spec.rb
-- spec/socky_spec.rb
-- spec/spec_helper.rb
-- spec/support/stallion.rb
+summary: Transitional package for socky-server gem
+test_files: []
+

data/CHANGELOG.textile

@@ -1,88 +0,0 @@
-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:
-** inline documentation
-* bugfixes:
-** send authentication after finishing handshake
-** tests less using stubs and more real cases
-** fix some tests
-
-h2. 0.1.3 / 2010-09-23
-
-* new features:
-** none
-* bugfixes:
-** fix query :show_connections in ruby 1.9
-** fix user authentication when url subscribe/unsubscribe is disabled
-
-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:
-** socky has now support for signed certificates by :tls_options config option
-* bugfixes:
-** none
-
-h2. 0.1.0 / 2010-08-03
-
-*IMPORTANT! This version will not work with plugin version lower than 0.1.0*
-
-* new features:
-** server now send authentication status
-** new syntax
-** option to exclude clients/channels
-* bugfixes:
-** none
-
-h2. 0.0.9 / 2010-06-20
-
-*IMPORTANT! This version will not work with plugin version lower than 0.0.9*
-
-* new features:
-** support for next version of em-websocket debug options(based on mloughran branch)
-** support for websocket draft 76
-** support for wss/SSL connections
-** socky can now be started in 'daemon' mode
-** socky now sending all messages in JSON format
-* bugfixes:
-** socky will no longer crash when when request query is invalid - i.e. chrome 6.0.*(with websocket draft76) and em-websocket 0.0.6
-
-h2. 0.0.8 / 2010-06-06
-
-* new features:
-** full rspec suite
-** allow admin param to be both "1" and "true"
-* bugfixes:
-** proper configuration options parsing order
-** rescue from invalid config file
-** rescue from invalid args
-** symbolize_keys will no longer raise error if argument is not hash
-** modules will no longer depend on parent class
-** message will no longer raise exeption is JSON is invalid
-
-h2. 0.0.7 / 2010-05-25
-
-* new features:
-** user authentication is now async
-* bugfixes:
-** server will no longer fail when starting from source instead of gem
-
-h2. 0.0.6 / 2010-05-24
-
-* initial release

data/Rakefile

@@ -1,30 +0,0 @@
-require 'rake'
-require 'rake/clean'
-CLEAN.include %w(**/*.{log,rbc})
-
-require 'spec/rake/spectask'
-
-task :default => :spec
-
-Spec::Rake::SpecTask.new do |t|
-  t.ruby_opts = ['-rtest/unit']
-  t.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "socky"
-    gemspec.summary = "Socky is a WebSocket server and client for Ruby on Rails"
-    gemspec.description = "Socky is a WebSocket server and client for Ruby on Rails"
-    gemspec.email = "b.potocki@imanel.org"
-    gemspec.homepage = "http://github.com/imanel/socky_gem"
-    gemspec.authors = ["Bernard Potocki"]
-    gemspec.add_dependency('em-websocket', '>= 0.1.4')
-    gemspec.add_dependency('em-http-request')
-    gemspec.add_dependency('json')
-    gemspec.files.exclude ".gitignore"
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: gem install jeweler"
-end

data/VERSION

@@ -1 +0,0 @@
-0.2.1

data/bin/socky

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require File.join(File.dirname(File.expand_path(__FILE__)), '..', 'lib', 'socky')
-Socky::Runner.run

data/lib/em-websocket_hacks.rb

@@ -1,15 +0,0 @@
-if defined?(EventMachine::WebSocket::Debugger)
-  klass = EventMachine::WebSocket::Debugger
-else
-  klass = EventMachine::WebSocket::Connection
-end
-
-klass.class_eval do
-
-  def debug(*data)
-    if @debug
-      Socky.logger.debug "Socket " + data.flatten.collect{|line| line.to_s.gsub("\r\n","\n").gsub("\n","\\n")}.join(" ")
-    end
-  end
-
-end

data/lib/socky/connection.rb

@@ -1,137 +0,0 @@
-require 'json'
-require 'socky/connection/authentication'
-require 'socky/connection/finders'
-
-module Socky
-  # every connection to server creates one instance of Connection
-  class Connection
-    include Socky::Misc
-    include Socky::Connection::Authentication
-    extend Socky::Connection::Finders
-
-    # reference to connection socket
-    attr_reader :socket
-
-    class << self
-      # list of all connections in pool
-      # @return [Array] list of connections
-      def connections
-        @connections ||= []
-      end
-    end
-    
-    # initialize new connection
-    # @param [WebSocket] socket valid connection socket
-    def initialize(socket)
-      @socket = socket
-    end
-
-    # read query data from socket request
-    # @return [Hash] hash of query data
-    def query
-      socket.request["Query"] || {}
-    end
-
-    # return if user appear to be admin
-    # this one should not be base to imply that user actually is
-    # admin - later authentication is needed
-    # @return [Boolean] is user claim to be admin?
-    def admin
-      ["true","1"].include?(query["admin"])
-    end
-
-    # client individual id - multiple connection can be organized
-    # by client id and later accessed at once
-    # @return [String] client id(might be nil)
-    def client
-      query["client_id"]
-    end
-
-    # client individual secret - used to check if user is admin
-    # and to sending authentication data to server(by subscribe_url)
-    # @return [String] client secret(might be nil)
-    def secret
-      query["client_secret"]
-    end
-
-    # client channel list - one client can have multiple channels
-    # every client have at last channel - if no channels are provided
-    # at default then user is assigned to nil channel
-    # @return [Array] list of client channels
-    def channels
-      @channels ||= query["channels"].to_s.split(",").collect(&:strip).reject(&:empty?)
-      @channels[0] ||= nil # Every user should have at last one channel
-      @channels
-    end
-
-    # check if client is valid and add him to pool or disconnect
-    def subscribe
-      debug [self.name, "incoming"]
-      subscribe_request
-    end
-
-    # remove client from pool and disconnect
-    def unsubscribe
-      debug [self.name, "terminated"]
-      unsubscribe_request
-    end
-
-    # check if client can send messages and process it
-    # @see Socky::Message.process
-    # @param [String] msg message to send in json format
-    def process_message(msg)
-      if admin && authenticated?
-        Socky::Message.process(self, msg)
-      else
-        self.send_message "You are not authorized to post messages"
-      end
-    end
-
-    # send message to client
-    # @param [Object] msg data to send(will be converted to json using to_json method)
-    def send_message(msg)
-      send_data({:type => :message, :body => msg})
-    end
-
-    # disconnect connection
-    def disconnect
-      socket.close_connection_after_writing
-    end
-
-    # convert connection to json(used in show_connection query)
-    # @param [Any] args it is required by different versions of ruby
-    # @return [JSon] id, client_id and channel list data
-    def to_json(*args)
-      {
-        :id => self.object_id,
-        :client_id => self.client,
-        :channels => self.channels.reject{|channel| channel.nil?}
-      }.to_json
-    end
-
-    private
-
-    def send_data(data)
-      json_data = data.to_json
-      debug [self.name, "sending data", json_data]
-      socket.send json_data
-    end
-
-    def connection_pool
-      self.class.connections
-    end
-
-    def in_connection_pool?
-      connection_pool.include?(self)
-    end
-
-    def add_to_pool
-      connection_pool << self unless self.admin || in_connection_pool?
-    end
-
-    def remove_from_pool
-      connection_pool.delete(self)
-    end
-
-  end
-end