angelo 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b034c03ba6c0b50e1d31e5ee1c0bd043b70d8d2e
-  data.tar.gz: b4e9ba5af2b009a7fa292f97d6a8b2a3831ec709
+  metadata.gz: eace5c23e9adee9dcfd79505ca157123efe2a8d5
+  data.tar.gz: f53fe954693847bb50a5ea88c08904d3313e092b
 SHA512:
-  metadata.gz: 64b482cc286556b98b03f211134bed314d2c3b3564640aca4b9d2882d4b31d157760d7ef476d7fcb257d3065152f38c4573a24226d3de19f1309136c9a3f8730
-  data.tar.gz: 000d06333538e664c71d40e6f0371d6d946c586efe2f1cb3dd42c08d510cb459faa772cacef57c3135315609f85387c70bc147cd0a26f16e8cb0eb8c62e1c632
+  metadata.gz: 1970b01b008eabd222cb8b5219ae6783707d5d801ac3b26971fd59f31b0d8683bb0810e48b900199227cfbbbdc95fbbf205b0804d8bb483e0c0491844fcd53b8
+  data.tar.gz: 10d4cec420a5d0e5a441189d996616b2753ee80d69c434aaba780e9bec1c823f8bba8f66b62d30a6df9c97764ab66b3a329a8054166cf275b8ac01f625ca98ce

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 changelog
 =========
 
+### 0.1.5 31 mar 2014
+
+* add WebsocketsArray#all
+* fix websockets pinging to ping all connected sockets
+* add Responder#redirect
+
 ### 0.1.4 26 mar 2014
 
 * add Base.async, Base.on_pong, and Base#async

data/lib/angelo.rb

@@ -24,6 +24,7 @@ module Angelo
   DEFAULT_CONTENT_DISPOSITION = 'attachment'
   ETAG_HEADER_KEY = 'ETag'
   IF_NONE_MATCH_HEADER_KEY = 'If-None-Match'
+  LOCATION_HEADER_KEY = 'Location'
 
   HTML_TYPE = 'text/html'
   JSON_TYPE = 'application/json'

data/lib/angelo/base.rb

@@ -5,7 +5,7 @@ module Angelo
     include Celluloid::Logger
 
     extend Forwardable
-    def_delegators :@responder, :content_type, :headers, :request
+    def_delegators :@responder, :content_type, :headers, :redirect, :request
 
     @@addr = DEFAULT_ADDR
     @@port = DEFAULT_PORT
@@ -134,7 +134,7 @@ module Angelo
 
     async :ping_websockets do
       every(@@ping_time) do
-        websockets.each do |ws|
+        websockets.all.each do |ws|
           ws.socket << ::WebSocket::Message.ping.to_data
         end
       end
@@ -145,6 +145,7 @@ module Angelo
 
       @@peeraddrs = {}
       @@socket_context = {}
+      @@websockets = {}
 
       def initialize server, context = nil
         @context, @server = context, server
@@ -181,10 +182,13 @@ module Angelo
 
       def [] context
         raise ArgumentError.new "symbol required" unless Symbol === context
-        @@websockets ||= {}
         @@websockets[context] ||= self.class.new @server, context
       end
 
+      def all
+        a = self + @@websockets.values.flatten
+      end
+
     end
 
   end

data/lib/angelo/responder.rb

@@ -128,6 +128,13 @@ module Angelo
       handle_error e, :internal_server_error, false
     end
 
+    def redirect url
+      Angelo.log @connection, @request, nil, :moved_permanently, 0
+      @connection.respond :moved_permanently, headers(LOCATION_HEADER_KEY => url), ''
+    rescue => e
+      handle_error e, :internal_server_error, false
+    end
+
   end
 
 end

data/lib/angelo/version.rb

@@ -1,3 +1,3 @@
 module Angelo
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/spec/angelo_spec.rb

@@ -26,6 +26,10 @@ describe Angelo::Base do
         end
       end
 
+      get '/redirect' do
+        redirect '/'
+      end
+
     end
 
     it 'responds to http requests properly' do
@@ -45,6 +49,12 @@ describe Angelo::Base do
       last_response_should_be_json obj
     end
 
+    it 'redirects' do
+      get '/redirect'
+      expect(last_response.status).to eq(301)
+      expect(last_response.headers['Location']).to eq('/')
+    end
+
   end
 
   describe 'before filter' do
@@ -305,7 +315,4 @@ describe Angelo::Base do
 
   end
 
-  describe 'websockets helper' do
-  end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: angelo
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Kenichi Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reel