angelo 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd2cb610a7377a13e931101270360afe324e1abd
-  data.tar.gz: 079ed6a36ff484e41ca11fdd7a1791a874923904
+  metadata.gz: 8b18b8a96ef58b0f38df32ae070d22da0564b2f1
+  data.tar.gz: c1abdf8b2494da8b8fc0b3efcce12bc5fe2ea06e
 SHA512:
-  metadata.gz: c6e24a7a88a9b44361c0efebb43ee3fb58130c19280cf3c73b013748ab87b76d104d85b0bd93416b7577c6504680550cfb5f77c8d2be9a38d3c7865eec9f250d
-  data.tar.gz: 543e9def3af8a7d149a8ce17bd1a15702a88a807949a1584f1e58f34815921fd5c2446c1b0ea536d3743156ea62e3ceb493b2235263438e3b5447fc109f1043e
+  metadata.gz: a561e6343ed0ac67eac30d741b8c65421b684936d1761f2aeb08202eb7d4eecf3db78cf497823ba4ebaaa37f45e1fc742fccecc2bcf8f9c1163e309f5480173b
+  data.tar.gz: aa9e7a498eb39a86b0e95c0df5607fcf5b825b61159a3490ce7e2eb18ad90dde2e11058e10840c083b0b6f2b4db4ba333e8df59abac8754c840d7e2344719747

data/CHANGELOG.md

@@ -1,6 +1,21 @@
 changelog
 =========
 
+### 0.2.3 28 oct 2014
+
+thanks: @mighe, @chewi
+
+* add flag (default: false) to `Base.run` to trap INT and sleep or not
+* add `Base.run!` which calls `.run` with flag set true
+* fix for form params keys with no values
+
+### 0.2.2 22 oct 2014
+
+thanks: @chewi
+
+* add on_close setter to EventSource
+* fix peeraddr forward on EventSource
+
 ### 0.2.1 7 oct 2014
 
 thanks: @chewi

data/README.md

@@ -63,7 +63,8 @@ from inside a websocket handler block. These can "later" be iterated over so one
 emit a message on every connected websocket when the service receives a POST request.
 
 The `websockets` helper also includes a context ability, so you can stash connected websocket clients
-into different "sections".
+into different "sections". Also, by default, the helper will `reject!` any closed sockets before
+returning; you may optionally pass `false` to the helper to skip this step.
 
 ##### Example!
 
@@ -178,10 +179,12 @@ Angelo also includes a "stash" helper for SSE connections. One can `<<` a socket
 inside an `eventsource` handler block. These can also be "later" be iterated over so one can do things
 like emit a message on every SSE connection when the service receives a POST request.
 
-The `sses` helper includes the same a context ability as the `websockets` helper. In addition, the
-`sses` stash includes methods for easily sending events or messages to all stashed connections. **Note
-that the `Stash::SSE#event` method only works on non-default contexts and uses the context name as
-the event name.**
+The `sses` helper includes the same a context ability as the `websockets` helper. Also, by default,
+the helper will `reject!` any closed sockets before returning, just like `websockets`. You may
+optionally pass `false` to the helper to skip this step.In addition, the `sses` stash includes
+methods for easily sending events or messages to all stashed connections. **Note that the
+`Stash::SSE#event` method only works on non-default contexts and uses the context name as the event
+name.**
 
 ```ruby
 eventsource '/sse' do |s|
@@ -222,6 +225,37 @@ Handling this on the client may require conditionals for [browsers](http://caniu
 do not support EventSource yet, since this will respond with a non-"text/event-stream" Content-Type if
 'sse' is not present in the params.
 
+##### `EventSource#on_close` helper
+
+When inside an eventsource block, you can use may want to do something specific when a client closes the
+connection. For this case, there are `on_close` and `on_close=` methods on the object passed to the block
+that will get called if the client closes the socket. The assignment method takes a proc object and the
+other one takes a block:
+
+```ruby
+get '/' do
+  eventsource do |es|
+
+    # assignment!
+    es.on_close = ->{sses(false).remove_socket es}
+
+    sses << es
+  end
+end
+
+eventsource '/sse' do |es|
+
+  # just passing a block here
+  es.on_close {sses(false).remove_socket es}
+
+  sses << es
+end
+```
+
+Note the use of the optional parameter the stashes here; by default, stash accessors (`websockets` and
+`sses`) will `reject!` any closed sockets before letting you in. If you pass `false` to the stash
+accessors, they will skip the `reject!` step.
+
 ### Tasks + Async / Future
 
 Angelo is built on Reel and Celluloid::IO, giving your web application class the ability to define
@@ -555,7 +589,7 @@ class Foo < Angelo::Base
   get '/chunky_json' do
     content_type :json
 
-    # this helper requires a block that takes one arg, the response 
+    # this helper requires a block that takes one arg, the response
     # proc to call with each chunk (i.e. the block that is passed to
     # `#each`)
     #

data/lib/angelo/base.rb

@@ -144,15 +144,22 @@ module Angelo
         Responder.content_type type
       end
 
-      def run addr = @@addr, port = @@port
+      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
         @server.async.ping_websockets
-        trap "INT" do
-          @server.terminate if @server and @server.alive?
-          exit
+        if blocking
+          trap "INT" do
+            @server.terminate if @server and @server.alive?
+            exit
+          end
+          sleep
         end
-        sleep
+        @server
       end
 
       def local_path path

data/lib/angelo/params_parser.rb

@@ -12,7 +12,6 @@ module Angelo
     AMPERSAND = '&'
 
     def parse_formencoded str
-      raise FormEncodingError unless str.empty? or str.index EQUALS
       str.split(AMPERSAND).reduce(Responder.symhash) do |p, kv|
         key, value = kv.split(EQUALS).map {|s| CGI.unescape s}
         p[key] = value

data/lib/angelo/version.rb

@@ -1,3 +1,3 @@
 module Angelo
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/test/angelo_spec.rb

@@ -327,7 +327,7 @@ describe Angelo::Base do
 
     it 'does not parse JSON body when content-type is formencoded' do
       post '/json', obj.to_json, {'Content-Type' => Angelo::FORM_TYPE}
-      last_response.status.must_equal 400
+      last_response_must_be_json(obj.to_json => nil)
     end
 
     it 'does not parse body when request content-type not set' do
@@ -342,6 +342,13 @@ describe Angelo::Base do
       end
     end
 
+    Angelo::HTTPABLE.each do |m|
+      it "does not choke on #{m.to_s.upcase} requests with without param values" do
+        send m, '/json?foo'
+        last_response_must_be_json('foo' => nil)
+      end
+    end
+
   end
 
   describe 'request_headers helper' do

metadata

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