hara 0.0.1 → 0.0.2

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
+gem 'rspec'
+
 # Specify your gem's dependencies in hara.gemspec
 gemspec

data/README.md

@@ -2,7 +2,7 @@
 
 Hara is a simple framework, help you build websocket server.
 
-## Notice
+## Notice!!
 
 Current API is unstable, you should lock the version.
 
@@ -46,7 +46,11 @@ ws.send(msg)
 *start server*
 `ruby test.rb`
 
-`ruby test.rb -h` to view details
+`ruby test.rb -h` to view options
+
+*Other Usage*
+
+checkout tests
 
 ## Contributing
 

data/lib/hara/app.rb

@@ -10,18 +10,27 @@ module Hara
 
     alias halt terminate
 
+    finalizer :app_finalizer
+
     Actions = {}
 
-    def self.inherited klass
-      ::Hara.const_set :Application, klass
-    end
+    class << self
+      def inherited klass
+        ::Hara.const_set :Application, klass
+      end
 
-    def initialize socket
-      @socket = socket
-      async.setup
+      def define_action action, &block
+        action = action.to_s
+        warn "Action #{action} duplication defined" if Actions.has_key? action
+        Hara::Application.send :define_method, action, &block
+        method = Hara::Application.send :instance_method, action
+        Hara::Application.send :remove_method, action
+        Actions[action] = method
+      end
     end
 
-    def after_connect
+
+    def init
     end
 
     #return true or false
@@ -33,37 +42,10 @@ module Hara
       halt
     end
 
+    #after_authentication only called when authentication succeeded
     def after_authentication
     end
 
-    class << self
-      def define_action action, &block
-        action = action.to_s
-        warn "Action #{action} duplication defined" if Actions.has_key? action
-        Hara::Application.send :define_method, action, &block
-        method = Hara::Application.send :instance_method, action
-        Hara::Application.send :remove_method, action
-        Actions[action] = method
-      end
-    end
-
-    def process message
-      @command = JSON.parse(message)
-      action = @command["action"]
-      args = @command["args"]
-      info "#{Time.now} : #{@socket.remote_ip} request action:  #{action}"
-      before_process action, args
-      call_action action, *args
-    rescue JSON::ParserError
-      warn "#{Time.now} : #{@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}"
-      terminate
-    ensure
-      after_process action, args
-    end
-
     def before_process action, args
     end
 
@@ -81,6 +63,23 @@ module Hara
     def on_close
     end
 
+    private
+    def initialize socket
+      @socket = socket
+      async.setup
+    end
+
+    def setup
+      init
+      info "#{Time.now} : #{socket.remote_ip} coming"
+      unless authentication
+        authentication_failed
+      else
+        after_authentication
+        async.run
+      end
+    end
+
     def run
       while msg = @socket.read
         process msg
@@ -99,30 +98,35 @@ module Hara
       end
     end
 
-    def finalizer
-      on_close unless @closed
+    def process message
+      @command = JSON.parse(message)
+      action = @command["action"]
+      args = @command["args"]
+      info "#{Time.now} : #{@socket.remote_ip} request action:  #{action}"
+      before_process action, *args
+      call_action action, *args
+    rescue JSON::ParserError
+      warn "#{Time.now} : #{@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}"
+      terminate
     ensure
-      @socket.close if @socket
-    end
-
-    private
-    def setup
-      info "#{Time.now} : #{socket.remote_ip} coming"
-      after_connect
-      unless authentication
-        authentication_failed
-      else
-        after_authentication
-        async.run
-      end
+      after_process action, *args
     end
 
     def call_action action, *args
       if Actions.has_key? action
         Actions[action].bind(self).call *args
       else
-        action_missing action, args
+        action_missing action, *args
       end
     end
+
+    def app_finalizer
+      on_close unless @closed
+    ensure
+      @socket.close if @socket
+    end
   end
 end

data/lib/hara/base.rb

@@ -3,11 +3,13 @@ require 'hara/app'
 require 'hara/server'
 
 module Hara
-  def env
-    @_env ||= :development
-  end
+  class << self
+    def env
+      @_env ||= (ENV['APP_ENV'] || :development).to_sym
+    end
 
-  def env= env
-    @_env = env
+    def env= env
+      @_env = env
+    end
   end
 end

data/lib/hara/version.rb

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

data/spec/app_spec.rb

@@ -0,0 +1,96 @@
+require 'spec_helper'
+
+describe Hara::App do
+  before :all do
+    Class.new Hara::App do
+      def init
+        @states = []
+      end
+
+      def before_process action, *args
+        @states << [:before_process, action, args]
+      end
+
+      def after_process action, *args
+        @states << [:after_process, action, args]
+      end
+
+      def on_close
+        @states << :closed
+      end
+
+      def action_missing action, *args
+        socket << [:action_missing, action, args]
+      end
+
+      define_action :hello do |msg|
+        socket << "hello#{msg}"
+      end
+
+      def authentication
+        socket.remote_ip == 'localhost'
+      end
+
+      def authentication_failed
+        @states << :fail
+        sleep 0.1
+      end
+
+      def after_authentication
+        @states << :success
+        sleep 0.1
+      end
+
+      def states
+        @states
+      end
+    end
+  end
+
+  before :each do
+    @socket = FayeSocket.new
+    @socket.remote_ip = 'localhost'
+  end
+
+  after :each do
+    if @app && @app.alive?
+      @app.terminate!
+    end
+  end
+
+  it 'authentication_failed' do
+    @socket.remote_ip = '0.0.0.0'
+    @app = Hara::Application.new @socket
+    sleep 0.1 while @app.states.size == 0
+    @app.states.should == [:fail]
+  end
+
+  it 'authentication_succeeded' do
+    @app = Hara::Application.new @socket
+    sleep 0.1 while @app.states.size == 0
+    @app.states.should == [:success]
+  end
+
+  it 'remote call actions' do
+    @socket.client_send({action: :hello, args: [' world']}.to_json)
+    @app = Hara::Application.new @socket
+    sleep 0.1 until msg = @socket.client_read
+    msg.should == 'hello world'
+  end
+
+  it 'action_missing should work' do
+    @socket.client_send({action: :hello_world, args: ['hello', 'world']}.to_json)
+    @app = Hara::Application.new @socket
+    sleep 0.1 until msg = @socket.client_read
+    msg.should == [:action_missing, 'hello_world', ['hello', 'world']]
+  end
+
+  it 'callbacks should work' do
+    @app = Hara::Application.new @socket
+    @socket.client_send({action: :hello, args: [' world']}.to_json)
+    states = @app.states
+    sleep 0.2
+    @app.halt
+    states.should == [:success, [:before_process, "hello", [" world"]], [:after_process, "hello", [" world"]],:closed]
+  end
+end

data/spec/hara_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe Hara do
+  it 'Hara::Application should equal with App' do
+    App = Class.new Hara::App
+    App.should == Hara::Application
+  end
+
+  it 'Hara.env should be development' do
+    Hara.env.should == :development
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,38 @@
+require 'hara/base'
+
+require 'json'
+
+Celluloid.logger = nil
+
+class FayeSocket
+  attr_accessor :remote_ip
+
+  def initialize
+    @client_messages = []
+    @server_messages = []
+  end
+
+  def alive?
+    @alive
+  end
+
+  def close
+    @alive = false
+  end
+
+  def read
+    @server_messages.shift
+  end
+
+  def << message
+    @client_messages << message
+  end
+
+  def client_read
+    @client_messages.shift
+  end
+
+  def client_send message
+    @server_messages << message
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hara
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reel
@@ -79,6 +79,9 @@ files:
 - lib/hara/main.rb
 - lib/hara/server.rb
 - lib/hara/version.rb
+- spec/app_spec.rb
+- spec/hara_spec.rb
+- spec/spec_helper.rb
 homepage: http://github.com/jjyr/hara
 licenses:
 - MIT
@@ -104,4 +107,7 @@ rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Hara can help your build [web ]socket server easier.
-test_files: []
+test_files:
+- spec/app_spec.rb
+- spec/hara_spec.rb
+- spec/spec_helper.rb