angelo 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 646a618bdb4cb30cd3ec05c4dd4e372380c830e5
-  data.tar.gz: 16eaadba88f497055b6dc1114f5c2accf6317ab3
+  metadata.gz: ebbf63326421673b1352e779ea177d5f7b43c610
+  data.tar.gz: c1e169dd0f1d88a64bdc70df502edd24533a187d
 SHA512:
-  metadata.gz: 310b0831c924fd91bac9ddf2815c2b4cb3697d037b362b1b7efbd37cee529fe44ce99d78af0d4e77b5fc6caa9d75f47a3470307b1d027def5e2260a5456c23d1
-  data.tar.gz: d62dee4947455350ed4234b503718b83e32bdc773cb3be122bfd98943591dc30f174757478244dca57c8f7937b6b9259ea0bd489ce132bdc1493b17ad38eb2e4
+  metadata.gz: 823587abc0ddec2fd5ffd496feb3c0295f5aa331882bad9314895a329d487ab7c823aa106b617fe447e135bf73ba50e9a0eb2ccebaa4c958590e441af60bba2f
+  data.tar.gz: e6972e20b9b724331d0873b809e8ebb7f5dbbb571ddd59e1694c56083ef7fcd5d49a4d755a4c4b90986af819bbddbb58648ecfeb714f80752055b1070b10c66a

data/CHANGELOG.md

@@ -1,6 +1,18 @@
 changelog
 =========
 
+### 0.3.0 10 nov 2014
+
+thanks: @mighe
+
+* refactor bind address, port, log level and error reporting setting into top level DSLish methods
+    * set bind address with `addr '0.0.0.0'`
+    * set bind port with `port 4567`
+    * set log level with `log_level ::Logger::DEBUG`
+    * set error reporting with `report_errors!`
+    * bind address and port can still be specified on `.run` or `.run!` calls
+* remove command line option parsing completely
+
 ### 0.2.4 4 nov 2014 totally voted
 
 thanks: @mighe

data/lib/angelo/base.rb

@@ -6,23 +6,7 @@ module Angelo
 
     extend Forwardable
     def_delegators :@responder, :content_type, :headers, :redirect, :request, :transfer_encoding
-    def_delegators :@klass, :websockets, :sses, :sse_event, :sse_message
-
-    @@addr = DEFAULT_ADDR
-    @@port = DEFAULT_PORT
-
-    @@ping_time = DEFAULT_PING_TIME
-    @@log_level = DEFAULT_LOG_LEVEL
-
-    @@report_errors = false
-
-    if ARGV.any? and not Kernel.const_defined?('Minitest')
-      require 'optparse'
-      OptionParser.new { |op|
-        op.on('-p port',   'set the port (default is 4567)')      { |val| @@port = Integer(val) }
-        op.on('-o addr',   "set the host (default is #{@@addr})") { |val| @@addr = val }
-      }.parse!(ARGV.dup)
-    end
+    def_delegators :@klass, :report_errors?, :sse_event, :sse_message, :sses, :websockets
 
     attr_accessor :responder
 
@@ -40,6 +24,12 @@ module Angelo
         #
         subclass.class_eval 'class RequestError < Angelo::RequestError; end'
 
+        subclass.addr DEFAULT_ADDR
+        subclass.port DEFAULT_PORT
+
+        subclass.ping_time DEFAULT_PING_TIME
+        subclass.log_level DEFAULT_LOG_LEVEL
+
         class << subclass
 
           def root
@@ -60,6 +50,34 @@ module Angelo
 
       end
 
+      def addr a = nil
+        @addr = a if a
+        @addr
+      end
+
+      def log_level ll = nil
+        @log_level = ll if ll
+        @log_level
+      end
+
+      def ping_time pt = nil
+        @ping_time = pt if pt
+        @ping_time
+      end
+
+      def port p = nil
+        @port = p if p
+        @port
+      end
+
+      def report_errors!
+        @report_errors = true
+      end
+
+      def report_errors?
+        !!@report_errors
+      end
+
       def compile! name, &block
         define_method name, &block
         method = instance_method name
@@ -144,13 +162,13 @@ module Angelo
         Responder.content_type type
       end
 
-      def run! addr = @@addr, port = @@port
-        run addr, port, true
+      def run! _addr = addr, _port = port
+        run _addr, _port, true
       end
 
-      def run addr = @@addr, port = @@port, blocking = false
-        Celluloid.logger.level = @@log_level
-        @server = Angelo::Server.new self, addr, port
+      def run _addr = addr, _port = port, blocking = false
+        Celluloid.logger.level = log_level
+        @server = Angelo::Server.new self, _addr, _port
         @server.async.ping_websockets
         if blocking
           trap "INT" do
@@ -226,7 +244,7 @@ module Angelo
     end
 
     task :ping_websockets do
-      every(@@ping_time) do
+      every(@base.ping_time) do
         websockets.all_each do |ws|
           ws.socket << ::WebSocket::Message.ping.to_data
         end
@@ -238,7 +256,7 @@ module Angelo
         block[socket]
       rescue Reel::SocketError, IOError, SystemCallError => e
         # probably closed on client
-        warn e.message if @@report_errors
+        warn e.message if report_errors
         socket.close unless socket.closed?
       rescue => e
         error e.inspect
@@ -298,10 +316,6 @@ module Angelo
       halt 200, :sse
     end
 
-    def report_errors?
-      @@report_errors
-    end
-
     def sleep time
       Celluloid.sleep time
     end

data/lib/angelo/minitest/helpers.rb

@@ -13,7 +13,10 @@ module Angelo
 
         before do
           app = Class.new Angelo::Base
-          app.class_eval { content_type :html } # reset
+
+          app.class_eval { content_type :html }    # reset
+          Celluloid.logger.level = ::Logger::ERROR # see spec_helper.rb:9
+
           app.class_eval &block
           @server = Angelo::Server.new app
           app.server = @server

data/lib/angelo/server.rb

@@ -9,11 +9,15 @@ module Angelo
 
     def_delegators :@base, :websockets, :sses
 
-    def initialize base, host = '127.0.0.1', port = 4567
+    attr_reader :base
+
+    def initialize base, addr = nil, port = nil
       @base = base
+      addr ||= @base.addr
+      port ||= @base.port
       info "Angelo #{VERSION}"
-      info "listening on #{host}:#{port}"
-      super host, port, &method(:on_connection)
+      info "listening on #{addr}:#{port}"
+      super addr, port, &method(:on_connection)
     end
 
     def on_connection connection

data/lib/angelo/version.rb

@@ -1,3 +1,3 @@
 module Angelo
-  VERSION = '0.2.4'
+  VERSION = '0.3.0'
 end

data/test/angelo_spec.rb

@@ -442,4 +442,73 @@ describe Angelo::Base do
 
   end
 
+  describe 'dsl configs' do
+
+    describe 'addr' do
+
+      define_app do
+        addr '0.0.0.0'
+        get('/'){ 'hi' }
+      end
+
+      it 'binds to the specified addr' do
+        ->{ TCPServer.new '0.0.0.0', 4567 }.must_raise Errno::EADDRINUSE
+      end
+
+    end
+
+    describe 'port' do
+
+      define_app do
+        port 3000
+        get('/'){ 'hi' }
+      end
+
+      it 'binds to the specified port' do
+        ->{ TCPServer.new Angelo::DEFAULT_ADDR, 3000 }.must_raise Errno::EADDRINUSE
+      end
+
+    end
+
+    describe 'log_level' do
+
+      define_app do
+        log_level Logger::FATAL
+        get('/'){ 'hi' }
+      end
+
+      it 'sets the logging level' do
+        @server.base.log_level.must_equal Logger::FATAL
+      end
+
+    end
+
+    describe 'ping_time' do
+
+      define_app do
+        ping_time 3
+        get('/'){ 'hi' }
+      end
+
+      it 'sets the websocket ping time' do
+        @server.base.ping_time.must_equal 3
+      end
+
+    end
+
+    describe 'report_errors!' do
+
+      define_app do
+        report_errors!
+        get('/'){ 'hi' }
+      end
+
+      it 'sets flag for reporting error traces in the log' do
+        assert @server.base.report_errors?
+      end
+
+    end
+
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: angelo
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Kenichi Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-04 00:00:00.000000000 Z
+date: 2014-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reel