angelo 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8b3d7e04d65efc3b63b8e866b1831fe772457c3
-  data.tar.gz: e71d70c1f4685ed93631661d4b19600612c563dd
+  metadata.gz: e5eddbc45b846a99f2c3970949b8bcaea4a8da2a
+  data.tar.gz: b03151aeabb0265da3b371d1dbaa9023de404499
 SHA512:
-  metadata.gz: 89d7d40daa608b501aa3f4a24faa967b62bf6a346adf495c3838e0ed42e1cbaca2e10e50c9ae801d48113001afc69d67d9ee67f8b4b167a0b8363fcf0bb16d84
-  data.tar.gz: 4ab1b3d6e547d703733517f7b17e1d5aa56a3c544b6d28dc0a4619deab9c87468b7413f19bcf1e0150a1094c9e9878519177c5b6cb99801d53837c95420c89cb
+  metadata.gz: b398233f7e0e60a647661ff90c92f78485e23561a64243548f5eacc59b8f7d07918c03d071520ffee784bf921d23d40afc189224ce6b3290e4eacd295622a078
+  data.tar.gz: 33d0251cf93ef34be952eecdfa5969f0e4278b8f22a73e00ee8ec5ee8a68b44d4cd797e51bc8a18425f04714f20246e95d26d67c8ab58f2362d4dd5aa60e4bc3

data/.travis.yml

@@ -2,5 +2,5 @@ language: ruby
 rvm:
   - "1.9.3"
   - "2.0.0"
-  - "2.1.1"
+  - "2.1.2"
 script: rake

data/CHANGELOG.md

@@ -1,6 +1,17 @@
 changelog
 =========
 
+### 0.1.13 19 jun 2014
+
+* add log level settings
+* make response logging default to :info level
+* catch SystemCallError, IOError in Stash#each\* methods
+
+### 0.1.12 17 jun 2014
+
+* before and after blocks now wrap websocket routes
+* add :js content_type
+
 ### 0.1.11 13 jun 2014
 
 * add halt method and handling

data/lib/angelo/base.rb

@@ -11,6 +11,7 @@ module Angelo
     @@port = DEFAULT_PORT
 
     @@ping_time = DEFAULT_PING_TIME
+    @@log_level = DEFAULT_LOG_LEVEL
 
     if ARGV.any? and not Kernel.const_defined?('Minitest')
       require 'optparse'
@@ -108,6 +109,7 @@ module Angelo
       end
 
       def run addr = @@addr, port = @@port
+        Celluloid.logger.level = @@log_level
         @server = Angelo::Server.new self, addr, port
         @server.async.ping_websockets
         trap "INT" do

data/lib/angelo/stash.rb

@@ -44,7 +44,8 @@ module Angelo
       stash.each do |ws|
         begin
           yield ws
-        rescue Reel::SocketError
+        rescue Reel::SocketError, IOError, SystemCallError => e
+          debug e.message
           remove_socket ws
         end
       end
@@ -73,7 +74,8 @@ module Angelo
       @@stashes.values.flatten.each do |ws|
         begin
           yield ws
-        rescue IOError
+        rescue Reel::SocketError, IOError, SystemCallError => e
+          debug e.message
           remove_socket ws
         end
       end

data/lib/angelo/tilt/erb.rb

@@ -32,12 +32,10 @@ module Angelo
 
         def templates
           @templates ||= templatify('**', '*.erb'){|v| v =~ /^layouts\//}
-          @templates
         end
 
         def layout_templates
           @layout_templates ||= templatify 'layouts', '*.erb'
-          @layout_templates
         end
 
         def default_layout

data/lib/angelo/version.rb

@@ -1,3 +1,3 @@
 module Angelo
-  VERSION = '0.1.12'
+  VERSION = '0.1.13'
 end

data/lib/angelo.rb

@@ -38,6 +38,9 @@ module Angelo
   DEFAULT_VIEW_DIR = 'views'
   DEFAULT_PUBLIC_DIR = 'public'
 
+  DEFAULT_LOG_LEVEL = ::Logger::INFO
+  DEFAULT_RESPONSE_LOG_LEVEL = :info
+
   DEFAULT_RESPONSE_HEADERS = {
     CONTENT_TYPE_HEADER_KEY => HTML_TYPE
   }
@@ -54,6 +57,16 @@ module Angelo
 
   HALT_STRUCT = Struct.new :status, :body
 
+  class << self
+
+    attr_writer :response_log_level
+
+    def response_log_level
+      @response_log_level ||= DEFAULT_RESPONSE_LOG_LEVEL
+    end
+
+  end
+
   def self.log connection, request, socket, status, body_size = '-'
 
     remote_ip = ->{
@@ -64,7 +77,7 @@ module Angelo
       end
     }
 
-    Celluloid::Logger.debug LOG_FORMAT % [
+    Celluloid::Logger.__send__ Angelo.response_log_level, LOG_FORMAT % [
       remote_ip[],
       request.method,
       request.path,

data/test/angelo/websocket_spec.rb

@@ -181,6 +181,7 @@ describe Angelo::WebsocketResponder do
         Reactor.remove_action :go
       end
 
+      sleep 1
       invoked.must_equal 8
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: angelo
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Kenichi Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-17 00:00:00.000000000 Z
+date: 2014-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reel