rocket 0.0.1 → 0.0.2

data/.gitignore

@@ -1,22 +1,11 @@
-## MAC OS
 .DS_Store
-
-## TEXTMATE
 *.tmproj
 tmtags
-
-## EMACS
 *~
 \#*
 .\#*
-
-## VIM
 *.swp
-
-## PROJECT::GENERAL
 coverage
 rdoc
 pkg
-
-## PROJECT::SPECIFIC
 *.rdb

data/Rakefile

@@ -1,49 +1,19 @@
 # -*- ruby -*-
-
 $:.unshift(File.expand_path('../lib', __FILE__))
-
+$:.unshift(File.expand_path('../../rocket-core/lib', __FILE__))
 require 'rspec/core/rake_task'
 require 'rake/rdoctask'
 require 'rocket/version'
 
-SUMMARY = %Q{Event-oriented WebSockets server and toolkit.}
-DESCRIPTION = %Q{
-Rocket is a very fast and reliable web socket server built upon em-websockets library.
-Rocket provides also JavaScript toolkit to serve up instructions to clients, and
-ruby library which handles events triggering. This Project was strongly inspired 
-by awesome PusherApp.
-}
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |g|
-    g.version = Rocket.version
-    g.name = "rocket"
-    g.email = "chris@nu7hat.ch"
-    g.homepage = "http://github.com/araneo/rocket"
-    g.authors = ["Araneo", "Chris Kowalik"]
-    g.summary = SUMMARY
-    g.description = DESCRIPTION
-    g.add_dependency "rocket-server", "0.0.1"
-    g.add_dependency "rocket-js", "0.0.1"
-    g.add_dependency "json", "~> 1.4"
-    g.add_development_dependency "rspec", "~> 2.0"
-    g.add_development_dependency "mocha", "~> 0.9"
-  end
-  Jeweler::GemcutterTasks.new
-rescue
-  puts 'Jeweler is not available here'
-end
-
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern = 'spec/**/*_spec.rb'
-  t.rspec_opts = %q[-Ilib -c -b]
+  t.rspec_opts = %q[-I../rocket-core/lib -Ilib -c -b]
 end
 
 RSpec::Core::RakeTask.new(:rcov) do |t|
   t.rcov = true
-  t.rspec_opts = %q[-Ilib -c -b]
-  t.rcov_opts = %q[-Ilib -T -x "spec"]
+  t.rspec_opts = %q[-I../rocket-core/lib -Ilib -c -b]
+  t.rcov_opts = %q[-I../rocket-core/lib -Ilib -T -x "spec"]
 end
 
 Rake::RDocTask.new do |rdoc|
@@ -53,4 +23,21 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
+desc "Build current version as a rubygem"
+task :build do
+  sh "gem build rocket.gemspec"
+  sh "mkdir -p pkg"
+  sh "mv rocket-*.gem pkg/"
+end
+
+desc "Relase current version to rubygems.org"
+task :release => :build do
+  sh "gem push pkg/rocket-#{Rocket.version}.gem"
+end
+
+desc "Perform installation via rubygems"
+task :install => :build do
+  sh "gem install pkg/rocket-#{Rocket.version}.gem"
+end
+
 task :default => :spec

data/lib/rocket.rb

@@ -1,10 +1,5 @@
 module Rocket
-
-  autoload :Helpers,   'rocket/helpers'
-  autoload :Client,    'rocket/event'
-  autoload :Channel,   'rocket/channel'
-  autoload :WebSocket, 'rocket/websocket'
-
 end # Rocket
 
+require 'rocket-core'
 require 'rocket/version'

data/lib/rocket/version.rb

@@ -2,7 +2,7 @@ module Rocket
   module Version # :nodoc:
     MAJOR  = 0
     MINOR  = 0
-    TINY   = 1
+    TINY   = 2
     STRING = [MAJOR, MINOR, TINY].join(".")
   end # Version
   

data/rocket.gemspec

@@ -1,72 +1,24 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
+# -*- ruby -*-
+$:.unshift(File.expand_path('../lib', __FILE__))
+$:.unshift(File.expand_path('../../rocket/lib', __FILE__))
+require 'rocket/version'
 
 Gem::Specification.new do |s|
-  s.name = %q{rocket}
-  s.version = "0.0.1"
+  s.name               = 'rocket'
+  s.version            = Rocket.version
+  s.homepage           = 'http://github.com/araneo/rocket'
+  s.email              = ['chris@nu7hat.ch']
+  s.authors            = ['Araneo Ltd.', 'Chris Kowalik']
+  s.summary            = %q{Event-oriented WebSockets server and toolkit.}
+  s.description        = %q{Rocket is a very fast and reliable web socket server built upon em-websockets library. Rocket provides also JavaScript toolkit to serve up instructions to clients, and ruby library which handles events triggering. This Project was strongly inspired by awesome PusherApp.}
+  s.files              = `git ls-files`.split("\n")
+  s.test_files         = `git ls-files -- {spec}/*`.split("\n")
+  s.require_paths      = %w[lib]
+  s.extra_rdoc_files   = %w[LICENSE README.md]
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Araneo", "Chris Kowalik"]
-  s.date = %q{2010-11-03}
-  s.description = %q{
-Rocket is a very fast and reliable web socket server built upon em-websockets library.
-Rocket provides also JavaScript toolkit to serve up instructions to clients, and
-ruby library which handles events triggering. This Project was strongly inspired 
-by awesome PusherApp.
-}
-  s.email = %q{chris@nu7hat.ch}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.md"
-  ]
-  s.files = [
-    ".gitignore",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "bin/rocket",
-     "lib/rocket.rb",
-     "lib/rocket/channel.rb",
-     "lib/rocket/client.rb",
-     "lib/rocket/helpers.rb",
-     "lib/rocket/version.rb",
-     "lib/rocket/websocket.rb",
-     "rocket.gemspec",
-     "spec/helpers_spec.rb",
-     "spec/rocket_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/araneo/rocket}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Event-oriented WebSockets server and toolkit.}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rocket-server>, ["= 0.0.1"])
-      s.add_runtime_dependency(%q<rocket-js>, ["= 0.0.1"])
-      s.add_runtime_dependency(%q<json>, ["~> 1.4"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.0"])
-      s.add_development_dependency(%q<mocha>, ["~> 0.9"])
-    else
-      s.add_dependency(%q<rocket-server>, ["= 0.0.1"])
-      s.add_dependency(%q<rocket-js>, ["= 0.0.1"])
-      s.add_dependency(%q<json>, ["~> 1.4"])
-      s.add_dependency(%q<rspec>, ["~> 2.0"])
-      s.add_dependency(%q<mocha>, ["~> 0.9"])
-    end
-  else
-    s.add_dependency(%q<rocket-server>, ["= 0.0.1"])
-    s.add_dependency(%q<rocket-js>, ["= 0.0.1"])
-    s.add_dependency(%q<json>, ["~> 1.4"])
-    s.add_dependency(%q<rspec>, ["~> 2.0"])
-    s.add_dependency(%q<mocha>, ["~> 0.9"])
-  end
+  s.add_runtime_dependency     'rocket-core',   [Rocket.version]
+  s.add_runtime_dependency     'rocket-js',     [Rocket.version]
+  s.add_runtime_dependency     'rocket-server', [Rocket.version]
+  s.add_development_dependency 'rspec',         ["~> 2.0"]
+  s.add_development_dependency 'mocha',         [">= 0.9"]
 end
-

metadata

@@ -1,38 +1,38 @@
 --- !ruby/object:Gem::Specification 
 name: rocket
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
-- Araneo
+- Araneo Ltd.
 - Chris Kowalik
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-11-03 00:00:00 +01:00
+date: 2010-11-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rocket-server
+  name: rocket-core
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 27
         segments: 
         - 0
         - 0
-        - 1
-        version: 0.0.1
+        - 2
+        version: 0.0.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -43,27 +43,28 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 27
         segments: 
         - 0
         - 0
-        - 1
-        version: 0.0.1
+        - 2
+        version: 0.0.2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: rocket-server
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 27
         segments: 
-        - 1
-        - 4
-        version: "1.4"
+        - 0
+        - 0
+        - 2
+        version: 0.0.2
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -87,7 +88,7 @@ dependencies:
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 25
         segments: 
@@ -96,14 +97,9 @@ dependencies:
         version: "0.9"
   type: :development
   version_requirements: *id005
-description: |
-  
-  Rocket is a very fast and reliable web socket server built upon em-websockets library.
-  Rocket provides also JavaScript toolkit to serve up instructions to clients, and
-  ruby library which handles events triggering. This Project was strongly inspired 
-  by awesome PusherApp.
-
-email: chris@nu7hat.ch
+description: Rocket is a very fast and reliable web socket server built upon em-websockets library. Rocket provides also JavaScript toolkit to serve up instructions to clients, and ruby library which handles events triggering. This Project was strongly inspired by awesome PusherApp.
+email: 
+- chris@nu7hat.ch
 executables: []
 
 extensions: []
@@ -116,24 +112,16 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bin/rocket
 - lib/rocket.rb
-- lib/rocket/channel.rb
-- lib/rocket/client.rb
-- lib/rocket/helpers.rb
 - lib/rocket/version.rb
-- lib/rocket/websocket.rb
 - rocket.gemspec
-- spec/helpers_spec.rb
-- spec/rocket_spec.rb
-- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/araneo/rocket
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/bin/rocket

@@ -1 +0,0 @@
-#!/usr/bin/env ruby

data/lib/rocket/channel.rb

@@ -1,20 +0,0 @@
-require 'json'
-
-module Rocket
-  class Channel
-  
-    attr_reader :client
-  
-    def initialize(client, channel)
-      @client  = client
-      @channel = channel
-    end
-    
-    def trigger(event, data)
-      client.connection do |socket|
-        socket.send({ :event => event, :channel => channel, :data => data }.to_json)
-      end
-    end
-    
-  end # Channel
-end # Rocket

data/lib/rocket/client.rb

@@ -1,31 +0,0 @@
-require 'json'
-
-module Rocket
-  # This Rocket client allows for triggering events via Rocket server. 
-  # 
-  #   rocket = Rocket::Client.new("ws://host.com:9772", "my-app", "my53cr37k3y")
-  #   rocket['my-channel'].trigger('event', { :hello => :world })
-  #
-  class Client
-    
-    attr_reader :url
-    attr_reader :app_id
-    attr_reader :secret
-    
-    def initialize(url, app_id, secret)
-      @url    = File.join(url, 'app', app_id) + '?secret=' + secret
-      @app_id = app_id
-    end
-    
-    def connection(&block)
-      socket = WebSocket.new(url)
-      yield(socket)
-      socket.close if socket && !socket.tcp_socket.closed?
-    end
-    
-    def [](channel)
-      Channel.new(self, channel)
-    end
-    
-  end # Client
-end # Rocket

data/lib/rocket/helpers.rb

@@ -1,23 +0,0 @@
-module Rocket
-  module Helpers
-    
-    # Hash given, returns it version with symbolized keys. 
-    #
-    #   p symbolize_keys("hello" => "world", ["Array here"] => "yup")
-    #   p symbolize_keys(:one => 1, "two" => 2)
-    #
-    # produces:
-    #
-    #  {:hello => "world", ["Array here"] => "yup"}
-    #  {:one => 1, :two => 2}
-    #
-    def symbolize_keys(hash)
-      return hash unless hash.is_a?(Hash)
-      hash.inject({}) do |options, (key, value)|
-        options[(key.to_sym if key.respond_to?(:to_sym)) || key] = value
-        options
-      end
-    end
-    
-  end # Helpers
-end # Rocket

data/lib/rocket/websocket.rb

@@ -1,225 +0,0 @@
-# Copyright: Hiroshi Ichikawa <http://gimite.net/en/>
-# Lincense: New BSD Lincense
-# Reference: http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol
-
-require "socket"
-require "uri"
-require "digest/md5"
-require "openssl"
-
-module Rocket
-  class WebSocket
-
-    class Error < RuntimeError; end
-
-    class << self
-      attr_accessor :debug
-    end
-
-    attr_reader :header
-    attr_reader :path
-
-    def initialize(arg, params = {})
-      uri = arg.is_a?(String) ? URI.parse(arg) : arg
-
-      if uri.scheme == "ws"
-        default_port = 80
-      elsif uri.scheme = "wss"
-        default_port = 443
-      else
-        raise(WebSocket::Error, "unsupported scheme: #{uri.scheme}")
-      end
-
-      @path = (uri.path.empty? ? "/" : uri.path) + (uri.query ? "?" + uri.query : "")
-      host = uri.host + (uri.port == default_port ? "" : ":#{uri.port}")
-      origin = params[:origin] || "http://#{uri.host}"
-      key1 = generate_key()
-      key2 = generate_key()
-      key3 = generate_key3()
-
-      socket = TCPSocket.new(uri.host, uri.port || default_port)
-
-      if uri.scheme == "ws"
-        @socket = socket
-      else
-        @socket = ssl_handshake(socket)
-      end
-
-      write(
-        "GET #{@path} HTTP/1.1\r\n" +
-        "Upgrade: WebSocket\r\n" +
-        "Connection: Upgrade\r\n" +
-        "Host: #{host}\r\n" +
-        "Origin: #{origin}\r\n" +
-        "Sec-WebSocket-Key1: #{key1}\r\n" +
-        "Sec-WebSocket-Key2: #{key2}\r\n" +
-        "\r\n" +
-        "#{key3}")
-      flush()
-
-      line = gets().chomp()
-      raise(WebSocket::Error, "bad response: #{line}") if !(line =~ /\AHTTP\/1.1 101 /n)
-      read_header()
-      if @header["Sec-WebSocket-Origin"] != origin
-        raise(WebSocket::Error,
-          "origin doesn't match: '#{@header["WebSocket-Origin"]}' != '#{origin}'")
-      end
-      reply_digest = read(16)
-      expected_digest = security_digest(key1, key2, key3)
-      if reply_digest != expected_digest
-        raise(WebSocket::Error,
-          "security digest doesn't match: %p != %p" % [reply_digest, expected_digest])
-      end
-      @handshaked = true
-      @closing_started = false
-    end
-
-    def send(data)
-      if !@handshaked
-        raise(WebSocket::Error, "call WebSocket\#handshake first")
-      end
-      data = force_encoding(data.dup(), "ASCII-8BIT")
-      write("\x00#{data}\xff")
-      flush()
-    end
-
-    def receive()
-      if !@handshaked
-        raise(WebSocket::Error, "call WebSocket\#handshake first")
-      end
-      packet = gets("\xff")
-      return nil if !packet
-      if packet =~ /\A\x00(.*)\xff\z/nm
-        return force_encoding($1, "UTF-8")
-      elsif packet == "\xff" && read(1) == "\x00" # closing
-        if @server
-          @socket.close()
-        else
-          close()
-        end
-        return nil
-      else
-        raise(WebSocket::Error, "input must be either '\\x00...\\xff' or '\\xff\\x00'")
-      end
-    end
-
-    def tcp_socket
-      return @socket
-    end
-
-    def host
-      return @header["Host"]
-    end
-
-    def origin
-      return @header["Origin"]
-    end
-
-    # Does closing handshake.
-    def close()
-      return if @closing_started
-      write("\xff\x00")
-      @socket.close() if !@server
-      @closing_started = true
-    end
-
-    def close_socket()
-      @socket.close()
-    end
-
-    private
-
-    NOISE_CHARS = ("\x21".."\x2f").to_a() + ("\x3a".."\x7e").to_a()
-
-    def read_header()
-      @header = {}
-      while line = gets()
-        line = line.chomp()
-        break if line.empty?
-        if !(line =~ /\A(\S+): (.*)\z/n)
-          raise(WebSocket::Error, "invalid request: #{line}")
-        end
-        @header[$1] = $2
-      end
-      if @header["Upgrade"] != "WebSocket"
-        raise(WebSocket::Error, "invalid Upgrade: " + @header["Upgrade"])
-      end
-      if @header["Connection"] != "Upgrade"
-        raise(WebSocket::Error, "invalid Connection: " + @header["Connection"])
-      end
-    end
-
-    def gets(rs = $/)
-      line = @socket.gets(rs)
-      $stderr.printf("recv> %p\n", line) if WebSocket.debug
-      return line
-    end
-
-    def read(num_bytes)
-      str = @socket.read(num_bytes)
-      $stderr.printf("recv> %p\n", str) if WebSocket.debug
-      return str
-    end
-
-    def write(data)
-      if WebSocket.debug
-        data.scan(/\G(.*?(\n|\z))/n) do
-          $stderr.printf("send> %p\n", $&) if !$&.empty?
-        end
-      end
-      @socket.write(data)
-    end
-
-    def flush()
-      @socket.flush()
-    end
-
-    def security_digest(key1, key2, key3)
-      bytes1 = websocket_key_to_bytes(key1)
-      bytes2 = websocket_key_to_bytes(key2)
-      return Digest::MD5.digest(bytes1 + bytes2 + key3)
-    end
-
-    def generate_key()
-      spaces = 1 + rand(12)
-      max = 0xffffffff / spaces
-      number = rand(max + 1)
-      key = (number * spaces).to_s()
-      (1 + rand(12)).times() do
-        char = NOISE_CHARS[rand(NOISE_CHARS.size)]
-        pos = rand(key.size + 1)
-        key[pos...pos] = char
-      end
-      spaces.times() do
-        pos = 1 + rand(key.size - 1)
-        key[pos...pos] = " "
-      end
-      return key
-    end
-
-    def generate_key3()
-      return [rand(0x100000000)].pack("N") + [rand(0x100000000)].pack("N")
-    end
-
-    def websocket_key_to_bytes(key)
-      num = key.gsub(/[^\d]/n, "").to_i() / key.scan(/ /).size
-      return [num].pack("N")
-    end
-
-    def force_encoding(str, encoding)
-      if str.respond_to?(:force_encoding)
-        return str.force_encoding(encoding)
-      else
-        return str
-      end
-    end
-
-    def ssl_handshake(socket)
-      ssl_context = OpenSSL::SSL::SSLContext.new()
-      ssl_socket = OpenSSL::SSL::SSLSocket.new(socket, ssl_context)
-      ssl_socket.sync_close = true
-      ssl_socket.connect()
-      return ssl_socket
-    end
-  end # WebSocket
-end # Rocket

data/spec/helpers_spec.rb

@@ -1,21 +0,0 @@
-require File.expand_path("../spec_helper", __FILE__)
-
-class HelpersPoweredClass
-  include Rocket::Helpers
-end
-
-describe Rocket::Helpers do
-  subject do
-    HelpersPoweredClass.new
-  end
-  
-  describe "#symbolize_keys" do
-    it "should return given object when it's not a Hash" do
-      subject.symbolize_keys(obj = Object.new).should == obj
-    end
-    
-    it "should symbolize given hash keys" do
-      subject.symbolize_keys({"hello" => "world"}).should == {:hello => "world"}
-    end
-  end
-end

data/spec/rocket_spec.rb

@@ -1,11 +0,0 @@
-require File.expand_path("../spec_helper", __FILE__)
-
-describe Rocket do
-  subject do
-    Rocket
-  end
-  
-  it ".version should be valid" do
-    subject.version.should =~ /\d+(.\d+){1,2}.*/
-  end
-end

data/spec/spec_helper.rb

@@ -1,8 +0,0 @@
-require 'rubygems'
-require 'mocha'
-require 'rspec'
-require 'rocket'
-
-RSpec.configure do |config|
-  config.mock_with :mocha
-end