hara 0.0.2 → 0.1.0

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 1.9.3
+  - jruby-19mode

data/README.md

@@ -1,5 +1,8 @@
 # Hara
 
+[![Gem Version](https://badge.fury.io/rb/hara.png)](http://badge.fury.io/rb/hara)
+[![Build Status](https://travis-ci.org/jjyr/hara.png?branch=master)](https://travis-ci.org/jjyr/hara)
+
 Hara is a simple framework, help you build websocket server.
 
 ## Notice!!

data/Rakefile

@@ -1 +1,5 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new
+task :default => :spec

data/lib/hara/app.rb

@@ -46,14 +46,17 @@ module Hara
     def after_authentication
     end
 
-    def before_process action, args
+    def before_action action, args
     end
 
-    def after_process action, args
+    def after_action action, args
+    end
+
+    def after_process
     end
 
     def action_missing action, args
-      warn "#{Time.now} : #{socket.remote_ip} request action:  #{action} args: #{args}, action not defined"
+      info " #{socket.remote_ip} request action:  #{action} args: #{args.inspect}, action not defined"
     end
 
     def command
@@ -71,7 +74,7 @@ module Hara
 
     def setup
       init
-      info "#{Time.now} : #{socket.remote_ip} coming"
+      info "#{socket.remote_ip} coming"
       unless authentication
         authentication_failed
       else
@@ -89,7 +92,7 @@ module Hara
         end
       end
     rescue Reel::SocketError, EOFError #client disconnect
-      info "#{Time.now} : #{@socket.remote_ip} disconnect, user: #{@user ? @user.id : "none"}"
+      info "#{socket.remote_ip} disconnect"
       begin
         @closed = true unless @closed
         on_close
@@ -102,17 +105,18 @@ module Hara
       @command = JSON.parse(message)
       action = @command["action"]
       args = @command["args"]
-      info "#{Time.now} : #{@socket.remote_ip} request action:  #{action}"
-      before_process action, *args
+      info "#{socket.remote_ip} request action:  #{action} args: #{args.inspect}"
+      before_action action, *args
       call_action action, *args
+      after_action action, *args
     rescue JSON::ParserError
-      warn "#{Time.now} : #{@socket.remote_ip} message can't parse"
+      info "#{socket.remote_ip} message can't parse"
       terminate
     rescue StandardError => e
-      warn "#{Time.now} : #{@socket.remote_ip} want action:  #{action} args: #{args} but process error:\n#{e.inspect}"
+      info "#{socket.remote_ip} processing error:\n#{e.inspect}"
       terminate
     ensure
-      after_process action, *args
+      after_process
     end
 
     def call_action action, *args

data/lib/hara/base.rb

@@ -1,6 +1,5 @@
 require "hara/version"
 require 'hara/app'
-require 'hara/server'
 
 module Hara
   class << self
@@ -11,5 +10,15 @@ module Hara
     def env= env
       @_env = env
     end
+
+    def request_handler &blk
+      if blk
+        @_request_handler = blk
+      else
+        @_request_handler
+      end
+    end
   end
 end
+
+require 'hara/server'

data/lib/hara/server.rb

@@ -1,4 +1,5 @@
 require 'reel'
+require 'hara/base'
 
 module Hara
   class Server < Reel::Server
@@ -16,16 +17,16 @@ module Hara
           info "Received a WebSocket connection"
           handle_websocket request
         when Reel::Request
-          warn "Not support normal connection"
-          handle_request connection, request
+          Hara.request_handler.call connection, request
         else
-          warn "Not support normal connection"
+          warn "Connection not support"
           request.close
         end
       end
     end
 
-    def handle_request connection, request
+    Hara.request_handler do |connection, request|
+      info "#{request.remote_ip} request #{request.url}, not support"
       request.close
     end
 

data/lib/hara/version.rb

@@ -1,3 +1,3 @@
 module Hara
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/spec/app_spec.rb

@@ -7,12 +7,16 @@ describe Hara::App do
         @states = []
       end
 
-      def before_process action, *args
-        @states << [:before_process, action, args]
+      def before_action action, *args
+        @states << [:before_action, action, args]
       end
 
-      def after_process action, *args
-        @states << [:after_process, action, args]
+      def after_action action, *args
+        @states << [:after_action, action, args]
+      end
+
+      def after_process
+        @states << :after_process
       end
 
       def on_close
@@ -78,6 +82,14 @@ describe Hara::App do
     msg.should == 'hello world'
   end
 
+  it 'error remote call' do
+    @socket.client_send("a error call")
+    @app = Hara::Application.new @socket
+    sleep 0.1 while @app.alive?
+    msg = @socket.client_read
+    msg.should == nil
+  end
+
   it 'action_missing should work' do
     @socket.client_send({action: :hello_world, args: ['hello', 'world']}.to_json)
     @app = Hara::Application.new @socket
@@ -91,6 +103,7 @@ describe Hara::App do
     states = @app.states
     sleep 0.2
     @app.halt
-    states.should == [:success, [:before_process, "hello", [" world"]], [:after_process, "hello", [" world"]],:closed]
+    sleep 0.1 while @app.alive?
+    states.should == [:success, [:before_action, "hello", [" world"]], [:after_action, "hello", [" world"]], :after_process,:closed]
   end
 end

data/spec/hara_spec.rb

@@ -9,4 +9,14 @@ describe Hara do
   it 'Hara.env should be development' do
     Hara.env.should == :development
   end
+
+  it 'Hara.request_handler should work' do
+    handler = Hara.request_handler
+    handler.class.should == Proc
+    Hara.request_handler do |conn, req|
+      conn + req
+    end
+    Hara.request_handler.call(40, 2).should == 42
+    Hara.request_handler &handler
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hara
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-15 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reel
@@ -68,6 +68,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md