angelo 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eace5c23e9adee9dcfd79505ca157123efe2a8d5
-  data.tar.gz: f53fe954693847bb50a5ea88c08904d3313e092b
+  metadata.gz: d3ee383cbc5d2f838c1a46aa1d5e18e7e22bb900
+  data.tar.gz: fbf02365249c4c948c81148906247bb357e0c887
 SHA512:
-  metadata.gz: 1970b01b008eabd222cb8b5219ae6783707d5d801ac3b26971fd59f31b0d8683bb0810e48b900199227cfbbbdc95fbbf205b0804d8bb483e0c0491844fcd53b8
-  data.tar.gz: 10d4cec420a5d0e5a441189d996616b2753ee80d69c434aaba780e9bec1c823f8bba8f66b62d30a6df9c97764ab66b3a329a8054166cf275b8ac01f625ca98ce
+  metadata.gz: 3bc808f0d1104da6f11f7d7b9e8e97ed7a6613f516e91f7734eac2d9a614babb6bbd727c947a72647791b1606dc5cbad025f972909ef4ccf3ffbc0033e3f0d78
+  data.tar.gz: 5daa0814e6825926be13f01b5a42b40b20b3ffaba6ddd88ad9ee4e0001b398ce13286c3f1407e0c0af58c7ceda6875b263979be416114a16637e153b8b2be731

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 changelog
 =========
 
+### 0.1.6 2 apr 2014
+
+* better testing of Responder#headers
+* better handling of Responder#redirect
+* add Base#request_headers helper
+* rename Base.async -> Base.task, add Base#future
+
 ### 0.1.5 31 mar 2014
 
 * add WebsocketsArray#all

data/README.md

@@ -20,8 +20,10 @@ Lots of work left to do!
 
 ```ruby
 require 'angelo'
+require 'angelo/mustermann'
 
 class Foo < Angelo::Base
+  include Angelo::Mustermann
 
   TEST = {foo: "bar", baz: 123, bat: false}.to_json
 
@@ -74,14 +76,28 @@ class Foo < Angelo::Base
     websockets[:hearts] << ws
   end
 
-  # this is a call to Base.async, defining the task
+  # this is a call to Base.task, defining the task
   # to perform on the reactor
   #
-  async :hearts do
+  task :hearts do
     @@hearting = true
     every(10){ websockets[:hearts].each {|ws| ws.write HEART } }
   end
 
+  post '/in/:sec/sec/:msg' do
+
+    # this is a call to Base#future, telling the reactor
+    # do this thing and we'' want the value eventually
+    #
+    f = future :in_sec params[:sec], params[:msg]
+    f.value
+  end
+
+  task :in_sec do |sec, msg|
+    sleep sec.to_i
+    msg
+  end
+
 end
 
 Foo.run

data/lib/angelo/base.rb

@@ -82,8 +82,8 @@ module Angelo
         WebsocketResponder.on_pong = block
       end
 
-      def async name, &block
-        Angelo::Server.define_action name, &block
+      def task name, &block
+        Angelo::Server.define_task name, &block
       end
 
       def websockets
@@ -112,6 +112,10 @@ module Angelo
       self.class.server.async.__send__ meth, *args
     end
 
+    def future meth, *args
+      self.class.server.future.__send__ meth, *args
+    end
+
     def params
       @params ||= case request.method
                   when GET;  parse_query_string
@@ -122,7 +126,18 @@ module Angelo
 
     def websockets; self.class.websockets; end
 
-    async :handle_websocket do |ws|
+    def request_headers
+      @request_headers ||= Hash.new do |hash, key|
+        if Symbol === key
+          k = key.to_s.upcase
+          k.gsub! UNDERSCORE, DASH
+          rhv = request.headers.select {|header_key,v| header_key.upcase == k}
+          hash[key] = rhv.values.first
+        end
+      end
+    end
+
+    task :handle_websocket do |ws|
       begin
         while !ws.closed? do
           ws.read
@@ -132,7 +147,7 @@ module Angelo
       end
     end
 
-    async :ping_websockets do
+    task :ping_websockets do
       every(@@ping_time) do
         websockets.all.each do |ws|
           ws.socket << ::WebSocket::Message.ping.to_data

data/lib/angelo/responder.rb

@@ -46,6 +46,7 @@ module Angelo
 
     def request= request
       @params = nil
+      @redirect = nil
       @request = request
       handle_request
       respond
@@ -121,18 +122,21 @@ module Angelo
               when Hash
                 raise 'html response requires String' if respond_with? :html
                 @body.to_json if respond_with? :json
+              when NilClass
+                EMPTY_STRING
               end
-      Angelo.log @connection, @request, nil, :ok, @body.size
-      @connection.respond :ok, headers, @body
+
+      status = @redirect.nil? ? :ok : :moved_permanently
+      headers LOCATION_HEADER_KEY => @redirect if @redirect
+
+      Angelo.log @connection, @request, nil, status, @body.size
+      @connection.respond status, headers, @body
     rescue => e
       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
+      @redirect = url
     end
 
   end

data/lib/angelo/server.rb

@@ -25,11 +25,11 @@ module Angelo
       # RubyProf.pause
     end
 
-    def self.define_action name, &action
+    def self.define_task name, &action
       define_method name, &action
     end
 
-    def self.remove_action name
+    def self.remove_task name
       remove_method name
     end
 

data/lib/angelo/version.rb

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

data/lib/angelo.rb

@@ -47,6 +47,10 @@ module Angelo
 
   DEFAULT_PING_TIME = 30
 
+  UNDERSCORE = '_'
+  DASH = '-'
+  EMPTY_STRING = ''
+
   def self.log connection, request, socket, status, body_size = '-'
 
     remote_ip = ->{

data/spec/angelo_spec.rb

@@ -122,6 +122,36 @@ describe Angelo::Base do
 
   end
 
+  describe 'headers helper' do
+
+    headers_count = 0
+
+    define_app do
+
+      put '/incr' do
+        headers 'X-Http-Angelo-Server' => 'catbutt' if headers_count % 2 == 0
+        headers_count += 1
+        ''
+      end
+
+    end
+
+    it 'sets headers for a response' do
+      put '/incr'
+      expect(last_response.headers['X-Http-Angelo-Server']).to eq('catbutt')
+    end
+
+    it 'does not carry headers over responses' do
+      headers_count = 0
+      put '/incr'
+      expect(last_response.headers['X-Http-Angelo-Server']).to eq('catbutt')
+
+      put '/incr'
+      expect(last_response.headers['X-Http-Angelo-Server']).to be_nil
+    end
+
+  end
+
   describe 'content_type helper' do
 
     describe 'when in route block' do
@@ -315,4 +345,39 @@ describe Angelo::Base do
 
   end
 
+  describe 'request_headers helper' do
+
+    define_app do
+
+      get '/rh' do
+        content_type :json
+        { values: [
+            request_headers[params[:hk_1].to_sym],
+            request_headers[params[:hk_2].to_sym],
+            request_headers[params[:hk_3].to_sym]
+          ]
+        }
+      end
+
+    end
+
+    it 'matches snakecased symbols against case insensitive header keys' do
+      ps = {
+        hk_1: 'foo_bar',
+        hk_2: 'x_http_mozilla_ie_safari_puke',
+        hk_3: 'authorization'
+      }
+
+      hs = {
+        'Foo-BAR' => 'abcdef',
+        'X-HTTP-Mozilla-IE-Safari-PuKe' => 'ghijkl',
+        'Authorization' => 'Bearer oauth_token_hi'
+      }
+
+      get '/rh', ps, hs
+      last_response_should_be_json 'values' => hs.values
+    end
+
+  end
+
 end

metadata

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