tamashii 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 971b0a636366074f7e051af483166d7056753fcf
-  data.tar.gz: c75d1df8a9e5c487b1c989170e7aaf09594e315b
+  metadata.gz: f7740a43e6b86d1673461a03ec8af4a48279b3b2
+  data.tar.gz: 0e2320ea7184d79a380d223ff8b7a02bb402c58e
 SHA512:
-  metadata.gz: '08bd487845177364886ecf70e5cb745446a1801cc6264b3dc4c477cc717ddfa172e00ba4b4edc97a0aba8054d2f151599a2f58e79c6965bda2a7e0f2ba28c7d3'
-  data.tar.gz: 3098ada65a89ee03fcce8ae3c1a99572e20fc70fcd51f282ddb233df58ec7f4ea658c935cf612e56f39e340bc3e73692fb522428d8f967f29f938beed870f9ad
+  metadata.gz: 7e989819b700f4a999aa452f7ca08878bc4361c7354a055ebc605ea87a7390f2e649b06f052ee47ccc7d57fa7666b1d7c3680211872bb9e8afac96a929913345
+  data.tar.gz: 1f463edf6b95e70adffd37c4ec6dfa78dd32d1ea070013f88c726a71cac112c2a6b5bbfe0f5b3ad9647601284824815c4959a22d37a6cbb0f7a4ad240e81ffb8

data/.gitlab-ci.yml

@@ -21,6 +21,7 @@ rspec:
   stage: test
   script:
     - bundle exec rspec -p
+    - bundle exec codeclimate-test-reporter
 
 rubocop:
   stage: test

data/.travis.yml

@@ -1,5 +1,5 @@
 sudo: false
+cache: bundler
 language: ruby
 rvm:
   - 2.4.1
-before_install: gem install bundler -v 1.14.6

data/README.md

@@ -1,4 +1,6 @@
-# Tamashii
+Tamashii [![Gem Version](https://badge.fury.io/rb/tamashii.svg)](https://badge.fury.io/rb/tamashii) [![Build Status](https://travis-ci.org/5xRuby/tamashii.svg?branch=master)](https://travis-ci.org/5xRuby/tamashii) [![Test Coverage](https://codeclimate.com/github/5xRuby/tamashii/badges/coverage.svg)](https://codeclimate.com/github/5xRuby/tamashii/coverage) [![Code Climate](https://codeclimate.com/github/5xRuby/tamashii/badges/gpa.svg)](https://codeclimate.com/github/5xRuby/tamashii)
+===
+
 
 Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/tamashii`. To experiment with that code, run `bin/console` for an interactive prompt.
 

data/lib/tamashii/configurable.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Tamashii
+  # :nodoc:
+  module Configurable
+    # :nodoc:
+    module ClassMethods
+      def register(key, default, &_block)
+        @defaults ||= {}
+        return @defaults[key.to_sym] = yield if block_given?
+        @defaults[key.to_sym] = default
+      end
+
+      def exist?(key)
+        @defaults.key?(key.to_sym) || @defaults.key?(key.to_s[0..-2].to_sym)
+      end
+
+      def default_value(key)
+        @defaults[key.to_sym]
+      end
+    end
+
+    def self.included(klass)
+      klass.extend ClassMethods
+    end
+
+    def config(key, value = nil, &_block)
+      @configs ||= {}
+      return unless self.class.exist?(key)
+      return @configs[key.to_sym] || self.class.default_value(key) if value.nil?
+      return @configs[key.to_sym] = yield if block_given?
+      @configs[key.to_sym] = value
+    end
+
+    def respond_to_missing?(name)
+      self.class.exist?(name)
+    end
+
+    def method_missing(name, *args, &block)
+      return super unless self.class.exist?(name)
+      return config(name.to_sym) unless name.to_s.end_with?('=')
+      config(name.to_s[0..-2].to_sym, args.first, &block)
+    end
+  end
+end

data/lib/tamashii/server.rb

@@ -18,6 +18,13 @@ module Tamashii
     autoload :Client,       'tamashii/server/client'
     autoload :Connection,   'tamashii/server/connection'
     autoload :Subscription, 'tamashii/server/subscription'
+    autoload :Config,       'tamashii/server/config'
+
+    def self.config(&block)
+      @config ||= Config.new
+      return instance_exec(@config, &block) if block_given?
+      @config
+    end
 
     def self.logger
       # TODO: Add config to set logger path

data/lib/tamashii/server/base.rb

@@ -17,7 +17,7 @@ module Tamashii
 
       def pubsub
         @pubsub || mutex.synchronize do
-          @pubsub ||= Subscription::Redis.new(self)
+          @pubsub ||= Server.config.pubsub_class.new(self)
         end
       end
 

data/lib/tamashii/server/config.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'tamashii/configurable'
+
+module Tamashii
+  module Server
+    # :nodoc:
+    class Config
+      include Tamashii::Configurable
+
+      register :connection_class, Connection::Base
+      register :pubsub_class, Subscription::Redis
+    end
+  end
+end

data/lib/tamashii/server/connection.rb

@@ -4,6 +4,7 @@ module Tamashii
   module Server
     # :nodoc:
     module Connection
+      autoload :Base,            'tamashii/server/connection/base'
       autoload :ClientSocket,    'tamashii/server/connection/client_socket'
       autoload :StreamEventLoop, 'tamashii/server/connection/stream_event_loop'
       autoload :Stream,          'tamashii/server/connection/stream'

data/lib/tamashii/server/connection/base.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Tamashii
+  module Server
+    module Connection
+      # :nodoc:
+      class Base
+        def initialize(server, env, event_loop)
+          @server = server
+          @env = env
+          @event_loop = event_loop
+
+          @socket = nil
+        end
+
+        def init
+          @socket = ClientSocket.new(@server, self, @env, @event_loop)
+          @socket.rack_response
+        end
+
+        def on_open
+        end
+
+        def on_message(data)
+          @server.pubsub.broadcast(data)
+        end
+
+        def on_error
+        end
+
+        def on_close
+        end
+      end
+    end
+  end
+end

data/lib/tamashii/server/connection/client_socket.rb

@@ -20,16 +20,23 @@ module Tamashii
           false
         end
 
+        CONNECTING = 0
+        OPEN       = 1
+        CLOSING    = 2
+        CLOSED     = 3
+
         attr_reader :env, :url
         attr_accessor :id
 
         # TODO: Support define protocols
-        def initialize(server, env, event_loop)
+        def initialize(server, conn, env, event_loop)
           @server = server
+          @conn = conn
           @env = env
           @event_loop = event_loop
 
           @id ||= env['REMOTE_ADDR']
+          @state = CONNECTING
 
           @url = ClientSocket.determine_url(@env)
           @driver = setup_driver
@@ -100,25 +107,38 @@ module Tamashii
         end
 
         def open
-          Server::Client.register(self)
+          return unless @state == CONNECTING
+          @state = OPEN
+          @conn.on_open
+          Client.register(self)
         end
 
         def receive_message(data)
-          @server.pubsub.broadcast(data)
+          return unless @state == OPEN
+          @conn.on_message(data)
         end
 
         def emit_error(message)
+          return if @state >= CLOSING
           Server.logger.error("Client #{id} has some error: #{message}")
+          @conn.on_error(message)
         end
 
         def begin_close(_reason, _code)
+          # TODO: Define reason and code
+          return if @state == CLOSED
+          @state = CLOSING
+
           Server.logger.info("Close connection to #{id}")
+          @conn.on_close
           Client.unregister(self)
           finialize_close
         end
 
         def finialize_close
-          # TODO: Processing close
+          return if @state == CLOSED
+          @state = CLOSED
+
           @stream.close
         end
       end

data/lib/tamashii/server/rack.rb

@@ -19,7 +19,8 @@ module Tamashii
       private
 
       def start_websocket(env)
-        Connection::ClientSocket.new(@server, env, @event_loop).rack_response
+        conn = Server.config.connection_class.new(@server, env, @event_loop)
+        conn.init
       end
 
       def start_http(_)

data/lib/tamashii/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tamashii
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/tamashii.gemspec

@@ -45,4 +45,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-rspec"
+  spec.add_development_dependency "codeclimate-test-reporter"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tamashii
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - 蒼時弦也
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2017-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -208,6 +208,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  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: The WebSocket framework implement inspired by ActionCable
 email:
 - elct9620@frost.tw
@@ -230,10 +244,13 @@ files:
 - bin/console
 - bin/setup
 - lib/tamashii.rb
+- lib/tamashii/configurable.rb
 - lib/tamashii/server.rb
 - lib/tamashii/server/base.rb
 - lib/tamashii/server/client.rb
+- lib/tamashii/server/config.rb
 - lib/tamashii/server/connection.rb
+- lib/tamashii/server/connection/base.rb
 - lib/tamashii/server/connection/client_socket.rb
 - lib/tamashii/server/connection/stream.rb
 - lib/tamashii/server/connection/stream_event_loop.rb