drunkmonkey 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 19d6e3cc109628d8686e1994aa9e97f67c74e157
-  data.tar.gz: 105874a81de22fde196db492685c77f1a6938690
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZDFkMWFjNjRmMzIwZjdjYTUzZGU3MDI4MzA4ZTlhYzYwNzM2NzI3NA==
+  data.tar.gz: !binary |-
+    ZGY5NWRiMmRhYzFhMjY4NTMzYTUxZjZmNWQyMjhmYjQwOGVjOGZmMA==
 SHA512:
-  metadata.gz: 9be7bdf707ae8baabdf59e94d85f6b324efe4c76001c42ca0548159fb1a32129dd82c8fbc55cd4b86b4be96f16ddd1cb46c39111ff5dccba4e0acac1aecd2ce9
-  data.tar.gz: 68d289778433af7a80f56ad610df5104a4bd949d4ec6be1e78b5b882dc1196e1609b30ec91b3bb8ea2cdab4c38c2457e6f8abed0dbf443eada7903bca11f7f80
+  metadata.gz: !binary |-
+    OTc0NDc2NWFmODIxYzczZDNiNDA4Njc4ZmQyZDAzYzJjOTRkYWM1ZDdjMDM2
+    ZWIyNTUyZGI0ZTE4YzlhYWRiNjdhNTYyMjdmODcxZWQ2MmZhNmFhYzEyMzEz
+    N2ViYzZmYTJlMDNjNTBmODkyODUyZTA2YjlhODE0ZDNmMzllOGM=
+  data.tar.gz: !binary |-
+    ZWEzNWE2ZWFlMTgxODZlMDRlOGQyMzI2YmUxNWRhZGRkNGU5MjNmZmJlZGRk
+    OGU3MDBkMTQwMDI4NjliZGVlZDQ0ZmViNGI1MGFjODc3OGRhOWEwMWY1NWZi
+    NmU2NjJmYjQ3YjA2MGFlYjFhZDc4M2VmODkwZTlkNjQzZWM5MWY=

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+- 1.9.3
+- 2.0.0

data/README.md

@@ -1,5 +1,7 @@
 # DrunkMonkey
 
+[![Build Status](https://travis-ci.org/minoritea/drunkmonkey.png?branch=master)](https://travis-ci.org/minoritea/drunkmonkey)
+
 DrunkMonkey is a rack middleware providing realtime two-way http communication with API for [Portal](https://github.com/flowersinthesand/portal/ "Portal").
 
 ## Supported servers

data/Rakefile

@@ -1 +1,4 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new(:spec) 
+task default: :spec

data/drunkmonkey.gemspec

@@ -22,10 +22,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
   
-  spec.add_dependency "celluloid", ">= 0.15"
-  spec.add_dependency "rack", ">= 1.5"
-  spec.add_dependency "websocket", ">= 1.1"
+  spec.add_runtime_dependency "celluloid", ">= 0.15"
+  spec.add_runtime_dependency "rack", ">= 1.5"
+  spec.add_runtime_dependency "websocket", ">= 1.1"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-end
+  spec.add_development_dependency "rspec", ">= 2.14"
+  
+  spec.required_ruby_version = ">= 1.9.3"
+end

data/lib/drunkmonkey/transport.rb

@@ -3,27 +3,27 @@ require "websocket"
 module DrunkMonkey
   module Transport
     # Taken from https://github.com/simulacre/sinatra-websocket/
-    # Originally taken from skinny https://github.com/sj26/skinny and updated to support Firefox
+    # Originally taken from skinny https://github.com/sj26/skinny
     def self.websocket? env
       env['HTTP_CONNECTION'] && env['HTTP_UPGRADE'] &&
         env['HTTP_CONNECTION'].split(',').map(&:strip).map(&:downcase).include?('upgrade') &&
         env['HTTP_UPGRADE'].downcase == 'websocket'
     end
     
-    def self.connection_from env, options
+    def self.call env, options = {}
       request = Rack::Request.new(env)
       if websocket? env
-        WebSocket.resume request, **options
+        WebSocket.resume request, options
         [500,{},[]]
       else
-        body = Comet.resume request, **options
+        body = Comet.resume request, options
         [200,{},[body]]
       end
     end
     
     class Base
       class << self
-        def resume request, **options
+        def resume request, options = {}
           @sessions ||= {}
         
           params = parse_params request
@@ -32,7 +32,7 @@ module DrunkMonkey
           session = @sessions[id]
         
           return session if session
-          @sessions[id] = new **options
+          @sessions[id] = new options
         end
       
         def parse_params request
@@ -48,7 +48,7 @@ module DrunkMonkey
         end
       end
     
-      def initialize **options
+      def initialize options = {}
         @controller = Celluloid::Actor[options[:controller_name]]
         @messages = []
       end
@@ -64,7 +64,7 @@ module DrunkMonkey
     class WebSocket < Base
       include Celluloid
     
-      def self.resume request, **options
+      def self.resume request, options = {}
         websocket = super
         websocket.handle_connection request
       end
@@ -120,7 +120,7 @@ module DrunkMonkey
     class Comet < Base
       include Celluloid
 
-      def self.resume request, **options
+      def self.resume request, options = {}
         comet = super
         comet.handle_connection(request)
       end

data/lib/drunkmonkey/version.rb

@@ -1,3 +1,3 @@
 module DrunkMonkey
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/drunkmonkey.rb

@@ -26,7 +26,7 @@ module DrunkMonkey
     end
   end
   
-  class Builder < ::Rack::Builder
+  class Base
     extend Forwardable
     
     DEFAULT_OPTIONS = {
@@ -34,53 +34,52 @@ module DrunkMonkey
       controller_name: :default_controller
     }.freeze
     
-    def_delegator :controller, :on
+    def_delegator :@controller, :on
+    def_delegator :@map, :call
     
-    def controller
-      self.class.controller
-    end
-    
-    def controller= instance
-      self.class.controller=instance
+    def initialize app = nil, options = {}, &block
+      options = DEFAULT_OPTIONS.merge(options)
+      @controller = Celluloid::Actor[options[:controller_name]] ||
+        Controller.new(options[:controller_name])
+      
+      mapping = Hash.new
+      mapping[options[:path]] = -> env do
+        Transport.call env, options
+      end
+      
+      @base_mapping = mapping.dup
+      
+      mapping["/"] = app if app
+      
+      @map = Rack::URLMap.new mapping
     end
     
-    class << self
-      attr_accessor :controller
+    def remap app = nil
+      mapping = @base_mapping.dup
+      mapping["/"] = app if app
+      @map = Rack::URLMap.new mapping
     end
     
-    def initialize default_app = nil, **options , &block
-      options = DEFAULT_OPTIONS.merge(options)
-      self.controller ||= Controller.new(options[:controller_name])
-      
-      super(default_app, &block)
-      
-      map options[:path] do
-        run -> env do
-          Transport.connection_from env, options
+    def self.middleware
+      Class.new do
+        class << self
+          attr_accessor :base
         end
-      end  
-    end
-  end
-  
-  def self.middleware
-    Class.new do
-      class << self
-        attr_accessor :builder
-      end
-
-      def initialize app, **options, &block
-        if self.class.builder
-          self.class.builder.run app
-        else
-          self.class.builder = Builder.new app, **options, &block
+        
+        def initialize app = nil, options = {}, &block
+          if self.class.base
+            self.class.base.remap app
+          else
+            self.class.base = Base.new(app,options,&block)
+          end
         end
-      end
       
-      def call env
-        self.class.builder.call env
+        def call env
+          self.class.base.call env
+        end
       end
     end
   end
   
-  Middleware = self.middleware
+  Middleware = Base.middleware
 end

data/sample/app.rb

@@ -2,7 +2,9 @@ require "puma"
 require "rack/handler/puma"
 require "drunkmonkey"
 
+#stock sessions on the global space
 sockets = {}
+
 Rack::Handler::Puma.run(Rack::Builder.new{
   root = File.dirname(__FILE__)
   use DrunkMonkey::Middleware do

data/spec/controller_spec.rb

@@ -0,0 +1,35 @@
+require "spec_helper"
+require "drunkmonkey"
+
+module DrunkMonkey
+  describe Controller do
+    describe "#initialize" do
+      specify do
+        expect(Celluloid::Actor[:test_controller]).to be_nil
+        controller = Controller.new :test_controller
+        expect(controller).to eq(Celluloid::Actor[:test_controller])
+        expect(controller.instance_variable_get(:@handlers)).to eq(Hash.new)
+      end
+    end
+    
+    describe "#on" do
+      specify do
+        controller = Controller.new :test_controller
+        handler = proc do |socket, message|
+        end
+        controller.on :message, &handler
+        expect(controller.instance_variable_get(:@handlers)).to eq({message: handler})
+      end
+    end
+    
+    describe "#fire" do
+      specify do
+        controller = Controller.new :test_controller
+        controller.on :message do |socket, message|
+          raise StandardError, [socket, message].to_s
+        end
+        expect{controller.fire :message, 1, 2}.to raise_error([1,2].to_s)
+      end
+    end
+  end
+end

data/spec/middleware_spec.rb

@@ -0,0 +1,62 @@
+require "spec_helper"
+require "drunkmonkey"
+
+module DrunkMonkey
+  describe Base do
+    describe "DEFAULT_OPTIONS" do
+      specify do
+        option = {
+          path: "/drunkmonkey",
+          controller_name: :default_controller
+        }
+        expect(Base::DEFAULT_OPTIONS).to eq(option)
+      end
+    end
+    
+    describe "@controller" do
+      specify do
+        base = Base.new
+        expect(base.instance_variable_get(:@controller)).to eq(Celluloid::Actor[:default_controller])
+      end
+    end
+    
+    describe "#on" do
+      specify do
+        base = Base.new controller_name: :default_controller
+        handler = proc{|socket,message|  }
+        base.on :message, &handler
+        controller = Celluloid::Actor[:default_controller]
+        expect(controller.instance_variable_get(:@handlers)[:message]).to eq(handler)
+      end
+    end
+  end
+  
+  describe Middleware do
+    describe "#initialize" do
+      specify do
+        app = -> env {[200,{},[]]}
+        middleware = Middleware.new(app,{}){}
+        expect(Middleware.new(app,{}){}.class.base).to eq(middleware.class.base)
+      end
+    end
+    
+    describe "#call" do
+      specify do
+        app = -> env {[200,{},[env]]}
+        middleware = Middleware.new(app,{}){}
+        env = {
+          "REQUEST_METHOD" => "GET",
+          "SCRIPT_NAME" => "",
+          "PATH_INFO" => "/",
+          "QUERY_STRING" => "",
+          "SERVER_NAME" => "localhost",
+          "SERVER_PORT" => "80",
+          "rack.input" => StringIO.new("")
+          
+        }
+        
+        expect(middleware.call(env)).to eq(Middleware.base.call(env))
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,5 @@
+require "rubygems"
+require "bundler/setup"
+require "rspec"
+require "celluloid"
+Celluloid.logger = nil

data/spec/transport_spec.rb

@@ -0,0 +1,108 @@
+require "spec_helper"
+require "drunkmonkey"
+
+module Helpers
+  def websocket_env
+    env = Hash.new
+    env['HTTP_CONNECTION'] = "UPGRADE"
+    env['HTTP_UPGRADE']    = "WEBSOCKET"
+    env
+  end
+end
+
+RSpec.configure do |c|
+  c.include Helpers
+end
+
+module DrunkMonkey
+  describe Transport do
+    describe ".websocket?" do
+      specify do
+        env = websocket_env
+        expect(Transport.websocket?(env)).to eq(true)
+      end
+      specify do
+        env = Hash.new
+        env['HTTP_CONNECTION'] = ""
+        env['HTTP_UPGRADE']    = ""
+        expect(Transport.websocket?(env)).to eq(false)
+      end
+    end
+  end
+  
+  module Transport
+    describe Base do
+      describe "#initialize" do
+        specify do
+          base = Base.new controller_name: :controller
+          expect(base.instance_variable_get(:@messages)).to eq([])
+        end
+      end
+      
+      describe "#portal" do
+        specify do
+          base = Base.new controller_name: :controller
+          expect(base.portal("hello")).to eq({type:"message", data:"hello", id:1,reply:false}.to_json)
+        end
+      end
+      
+      describe ".parse_params" do
+        specify do
+          env = websocket_env
+          env["REQUEST_METHOD"] = "POST"
+          env["rack.input"] = StringIO.new(%(data={"data":"aaa"}))
+          expect(Base.parse_params(Rack::Request.new(env))).to eq({"data" => "aaa"})
+        end
+        
+        specify do
+          env = websocket_env
+          env["REQUEST_METHOD"] = "GET"
+          env["rack.input"] = StringIO.new("")
+          env["QUERY_STRING"] = "data=aaa"
+          expect(Base.parse_params(Rack::Request.new(env))).to eq({"data" => "aaa"})
+        end
+      end
+      
+      describe ".resume" do
+        specify do
+          env = websocket_env
+          env["REQUEST_METHOD"] = "GET"
+          env["rack.input"] = StringIO.new("")
+          env["QUERY_STRING"] = "id=111"
+          session = Base.resume(Rack::Request.new(env), controller_name: :default_controller)
+          expect(Base.resume(Rack::Request.new(env),
+            controller_name: :default_controller)).to eq(session)
+        end
+        
+        specify do
+          env = websocket_env
+          env["REQUEST_METHOD"] = "POST"
+          env["rack.input"] = StringIO.new(%(data={"id":"1234"}))
+          session = Base.resume(Rack::Request.new(env), controller_name: :default_controller)
+          expect(Base.resume(Rack::Request.new(env),
+            controller_name: :default_controller)).to eq(session)
+        end
+      end
+    end
+    
+    describe WebSocket do
+      describe "#push" do
+        specify do
+          websocket = WebSocket.new(controller_name: :default_controller)
+          websocket.push "aaa"
+          expect(websocket.instance_variable_get(:@messages)).to eq(["aaa"])
+        end
+      end
+    end
+    
+    describe Comet do
+      describe "#push" do
+        specify do
+          comet = Comet.new(controller_name: :default_controller)
+          comet.push "aaa"
+          expect(comet.instance_variable_get(:@messages)).to eq(["aaa"])
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: drunkmonkey
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Minori Tokuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2013-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.15'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
@@ -70,20 +70,34 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: |2
-      DrunkMonkey is a rack middleware providing realtime two-way http communication with API for Portal, a javascript messaging library.
-      It provides just two protocols currently; websocket and longpoll comet.
-      You can write code once for each protocols.
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.14'
+description: ! "    DrunkMonkey is a rack middleware providing realtime two-way http
+  communication with API for Portal, a javascript messaging library.\n    It provides
+  just two protocols currently; websocket and longpoll comet.\n    You can write code
+  once for each protocols.\n"
 email:
 - minorityland@gmail.jp
 executables: []
@@ -91,6 +105,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -102,6 +117,10 @@ files:
 - sample/app.rb
 - sample/public/index.html
 - sample/public/portal.js
+- spec/controller_spec.rb
+- spec/middleware_spec.rb
+- spec/spec_helper.rb
+- spec/transport_spec.rb
 homepage: https://github.com/minoritea/drunkmonkey
 licenses:
 - MIT
@@ -112,19 +131,23 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: DrunkMonkey is a rack middleware providing realtime two-way http communication
   with API for Portal.
-test_files: []
+test_files:
+- spec/controller_spec.rb
+- spec/middleware_spec.rb
+- spec/spec_helper.rb
+- spec/transport_spec.rb