sloth-reel 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 706dfba4a0493e2f17b2eaddbe2ff554bec480daf299e594b7ef6097bc93dbd5
-  data.tar.gz: 26d80753d69cadacf314de7f84ae7e14fb3b2d42d095b6ea4ee7b043c8e815a0
+  metadata.gz: eedcf0f7634e65f24256b510c3c933140670ee8edd98a85e1b5e2e247c1e9839
+  data.tar.gz: fdd7e64c2eeeeadb08be68b06f992d37b637927c3af1deed8df4974b7d0dbf62
 SHA512:
-  metadata.gz: d209cf1c4e7513e622654073940802ae537da1af7225bae0ebe5bb1ccbfe3041eb89c50cdfbf56a39639fa9ebadbe29d5921240e37148618885d61c5572efa75
-  data.tar.gz: d3f2e8fde962829942ccc4f9035cdeae2febedac7ceb60d1ace350cabf8b18eacd0d81d4a69afafaee159ed18260149dbad49cf3866a34b744bb7d0abffac4ee
+  metadata.gz: 16178b74376817e4f90f83ad35a6f652f7c4a3d281bfdf3933e25748a1b6bfb32e7d49fdcce9950dd7256794fbe1ae958611d51a856395a0400fabeb1d574b1a
+  data.tar.gz: e07e151ed0449c260716ac80a4b46c7e2b42de4cb697c0ed60882f3b6cd49a765ac0428698aae45b5d0d4c1216658c5c579172d7ce554d696faf8e413e1c8481

data/.rubocop.yml

@@ -0,0 +1,73 @@
+
+AllCops:
+  Exclude:
+    - '.*'
+    - '*'
+    - '*.gemspec'
+    - 'Gemfile*'
+    - 'bin/**'
+    - 'exe/**'
+    - 'config/**/*'
+    - 'spec/**/*'
+    - 'tmp/**/*'
+    - 'vendor/**/*'
+  TargetRubyVersion: 2.7
+
+Layout/ExtraSpacing:
+  Enabled: false
+
+Layout/SpaceAroundOperators:
+  Enabled: false
+
+Layout/SpaceBeforeFirstArg:
+  Enabled: false
+
+Layout/SpaceInsideParens:
+  Enabled: false
+
+Layout/SpaceInsideArrayLiteralBrackets:
+  Enabled: false
+ 
+Layout/SpaceInsideRangeLiteral:
+  Enabled: false
+
+Layout/SpaceInsideReferenceBrackets:
+  Enabled: false
+
+Layout/SpaceInsideStringInterpolation:
+  Enabled: false
+
+Lint/AmbiguousBlockAssociation:
+  Enabled: false
+
+Lint/EmptyWhen:
+  Enabled: false
+
+Lint/ReturnInVoidContext:
+  Enabled: false
+
+Lint/UselessAssignment:
+  Enabled: false
+
+Metrics/BlockLength:
+  Enabled: false
+
+Metrics/LineLength:
+  Enabled: false
+  Max: 120
+
+Metrics/MethodLength:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: true
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/NumericPredicate:
+  Enabled: false
+
+Style/StringLiterals:
+  Enabled: false
+

data/README.adoc

@@ -7,7 +7,6 @@ Httpd and WebSocket sloth framework based on Celluloid, Reel, Rack and Sinatra.
 * Handle Sinatra asynchronously.
 * Coordinate Sinatra and WebSocket.
 * The implementation is a monkey patch to Reel, Sinatra and WebSocket.
-* It is not a stable version because it depends on the celluloid development version.
 
 == Installation
 

data/README.ja.adoc

@@ -7,7 +7,6 @@ Httpd と WebSocket のナマケモノフレームワーク. Celluloid, Reel, Ra
 * 非同期で Sinatra を扱う.
 * Sinatra と WebSocket を協調させる.
 * 実装は Reel、Sinatra、および WebSocket へのモンキーパッチ.
-* Celluloid 開発版に依存するため、安定版ではない。
 
 == 導入
 

data/lib/reel/rack/server.rb

@@ -26,7 +26,7 @@ module Reel
           if request.websocket?
             connection.detach
             route_websocket request
-            return
+            return  nil
           else
             route_request request
           end
@@ -73,7 +73,7 @@ module Reel
             request.finish_response
           end
         else
-          Logger.error("don't know how to render: #{body.inspect}")
+          Logger.error("don't know how to render: #{request.url}")
           request.respond :internal_server_error, "An error occurred processing your request"
         end
 
@@ -97,8 +97,8 @@ module Reel
 
       # Copied from lib/puma/server.rb
       def normalize_env(env)
-        if host = env["HTTP_HOST"]
-          if colon = host.index(":")
+        if ( host = env["HTTP_HOST"] )
+          if ( colon = host.index(":") )
             env["SERVER_NAME"] = host[0, colon]
             env["SERVER_PORT"] = host[colon+1, host.bytesize]
           else

data/lib/reel/server.rb

@@ -42,7 +42,7 @@ module Reel
       (1..@max_connection).each do
         Thread.start do
           Thread.current.report_on_exception = false    rescue  nil
-          while  sock  =  queue.pop
+          while ( sock = queue.pop )
             handle_connection  sock
           end
         end

data/lib/reel/websocket.rb

@@ -47,7 +47,7 @@ module Reel
       @@thread  ||=  Thread.start do
         loop do
           readables,  =  ::IO.select( @@sockets, nil, nil, 1 )
-          while  sock  =  readables&.shift
+          while ( sock = readables&.shift )
             if sock.eof?
               @@conns[sock]&.close
               break
@@ -64,7 +64,7 @@ module Reel
     def parse( payload )
       @frame  <<  payload
       messages  =  []
-      while  frame = @frame.next
+      while ( frame = @frame.next )
         if (frame.type == :close)
           close
           break

data/lib/sloth/reel.rb

@@ -1,5 +1,5 @@
 require "sloth/reel/version"
-require "celluloid/current"
+#require "celluloid/current"
 require "celluloid/autostart"
 require "celluloid/fsm"
 require "reel/rack"

data/lib/sloth/reel/sinatra.rb

@@ -14,5 +14,5 @@ module Sloth
   end
 end
 
-defined?( ::Sinatra ) && Sinatra::Request.send( :include, ::Sloth::Reel::Sinatra )
+defined?( ::Sinatra ) && ::Sinatra::Request.include( ::Sloth::Reel::Sinatra )
 

data/lib/sloth/reel/version.rb

@@ -1,5 +1,5 @@
 module Sloth
   module Reel
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/sample/rack_server_hello_1.rb

@@ -2,7 +2,6 @@ require 'sloth/reel'
 
 class WebApp
   def call( env )
-    r  =  nil
     case env['REQUEST_METHOD']
     when 'GET'
       case  env['PATH_INFO']

data/sample/server_http_hello_1.rb

@@ -14,7 +14,7 @@ class WebServer < Reel::Server::HTTP
   end
 
   def on_connection( connection )
-    while request = connection.request
+    while ( request = connection.request )
       route_request  connection, request
     end
   end

data/sample/server_http_ws_chat_1.rb

@@ -14,7 +14,7 @@ class WebServer < Reel::Server::HTTP
   end
 
   def on_connection(connection)
-    while request = connection.request
+    while ( request = connection.request )
       if request.websocket?
         connection.detach
         route_websocket( request )
@@ -35,7 +35,7 @@ class WebServer < Reel::Server::HTTP
     if request.websocket?
       ws  =  request.websocket
       ws  <<  Time.now.to_s
-      ws.on_message do |mesg, sender, conns|
+      ws.on_message do |mesg, _sender, conns|
         conns.each do |conn|
           conn  <<  mesg
         end

data/sample/server_http_ws_time_1.rb

@@ -14,7 +14,7 @@ class WebServer < Reel::Server::HTTP
   end
 
   def on_connection(connection)
-    while request = connection.request
+    while ( request = connection.request )
       if request.websocket?
         connection.detach
         route_websocket( request )
@@ -41,7 +41,8 @@ class WebServer < Reel::Server::HTTP
             websocket.write  str
             sleep  1
           end
-        rescue  Reel::SocketError
+        rescue  Reel::SocketError => e
+          error  e.message
         end
       end
     end

data/sample/server_sinatra_ws_chat_1.rb

@@ -6,7 +6,7 @@ class WebApp < Sinatra::Base
     if request.websocket?
       ws  =  request.websocket
       ws  <<  Time.now.to_s
-      ws.on_message do |mesg, sender, conns|
+      ws.on_message do |mesg, _sender, conns|
         conns.each do |conn|
           conn  <<  mesg
         end

data/sample/server_sinatra_ws_time_1.rb

@@ -11,7 +11,8 @@ class WebApp < Sinatra::Base
             ws.write( mesg )
             sleep  1
           end
-        rescue  Reel::SocketError
+        rescue  Reel::SocketError => e
+          STDERR.puts  e.message
         end
       end
     end

data/sloth-reel.gemspec

@@ -17,17 +17,17 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "celluloid", "0.18.0.pre2"
+  spec.add_runtime_dependency "celluloid", "0.18.0"
   spec.add_runtime_dependency "celluloid-io", "0.17.3"
   spec.add_runtime_dependency "celluloid-fsm", "0.20.5"
   spec.add_runtime_dependency "reel", "0.6.1"
   spec.add_runtime_dependency "reel-rack", "0.2.3"
 
   spec.add_runtime_dependency "rack"
-  spec.add_runtime_dependency "sinatra", "~> 2.0.8"
+  spec.add_runtime_dependency "sinatra"
   spec.add_runtime_dependency "sinatra-contrib"
   spec.add_runtime_dependency "websocket"
 
-  spec.add_development_dependency "rake", "~> 12.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sloth-reel
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - arimay
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-09 00:00:00.000000000 Z
+date: 2021-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0.pre2
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0.pre2
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +98,16 @@ dependencies:
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
@@ -140,30 +140,30 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 description: " Httpd and WebSocket sloth framwwork based on Celluloid, Reel, Rack
   and Sinatra. "
 email:
@@ -174,7 +174,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- ".rubocop.yml"
 - Gemfile
 - README.adoc
 - README.ja.adoc
@@ -202,7 +202,7 @@ files:
 homepage: https://github.com/arimay/sloth-reel
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -217,8 +217,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Httpd and WebSocket sloth framework.
 test_files: []

data/.travis.yml

@@ -1,6 +0,0 @@
----
-language: ruby
-cache: bundler
-rvm:
-  - 2.7.2
-before_install: gem install bundler -v 2.1.4