sombrero 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad94e5faf6c228675ee3238d7d799858f5763144
-  data.tar.gz: 41c984735515aa614753fe6528d4518238c6b7ad
+  metadata.gz: ef0fd1444aebb7291dd470b2c3e35db00513223c
+  data.tar.gz: af0edc1f6a1b5475e04335b694e2b2827a3918f9
 SHA512:
-  metadata.gz: 7389a0bc78ade222e175f141626944acfda62e89c5864862447392a7e1455a6867920faaa4fa5408aeef02d7acb89cde027f34b8770b49e64ee060671b16493c
-  data.tar.gz: 869c7efb37d89a409db41ce93820bcb676c7f44ae3ff378244b8de8d6cab4fa4c2c1e3e8a99735a384548321874f22c0e1c75fe2bce70ab76f08ee2b51fbe5c4
+  metadata.gz: 49969a561c69d8b4fce496b0c5672717212248ee88cb6412d5911499f1e7624875dcf21f85dcb488ad4701a10c523f79b55889437ceff62349b77302aad058f9
+  data.tar.gz: de203e8f601fd26b183e919162b3e9e64395a81f61fc81aab4e9298413d296775943ebada454afe9d3003f770af11340920a6b1fbccd271854679ec6ddfbe805

data/app/core/Gemfile

@@ -1,3 +1,4 @@
+# DO NOT EDIT THIS FILE
 gem 'sombrero'
 gem 'rocketio'
 gem 'tubesock'

data/lib/sombrero/rtcp_controller.rb

@@ -33,7 +33,11 @@ module Sombrero
 
       msg = indifferent_params(JSON.parse(msg))
       if controller = resolve_controller(msg[:controller])
-        status, _, body = call_controller(controller, msg[:method], msg[:arguments])
+        status, _, body = call_controller(controller, msg[:method], msg[:arguments], msg[:serial])
+        if body.is_a?(Proc)
+          body.call
+          return
+        end
         if status == 200
           write(serial: msg[:serial], data: body) if msg[:reply]
           return
@@ -49,7 +53,7 @@ module Sombrero
       end
 
       if msg && msg[:serial]
-        write(serial: msg[:serial], data: {__rtcp_error__: error})
+        write(serial: msg[:serial], error: error)
       else
         write(error: error)
       end
@@ -70,8 +74,8 @@ module Sombrero
       @router.resolve_path(url)[0]
     end
 
-    def call_controller controller, method, arguments
-      controller.initialize_controller(method, arguments).call(env.merge(rtcp_env))
+    def call_controller controller, method, arguments, serial
+      controller.initialize_controller(method, arguments).call(env.merge(rtcp_serial: serial).update(rtcp_env))
     end
 
     def write data

data/sombrero.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |spec|
   spec.name, spec.version = %w[
     sombrero
-    0.0.7
+    0.0.8
   ]
   spec.authors     = ['Slee Woo']
   spec.email       = ['mail@sleewoo.com']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sombrero
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Slee Woo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rocketio
@@ -123,5 +123,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: '["sombrero-0.0.7", "Opinionated stack for building opinionated web applications"]'
+summary: '["sombrero-0.0.8", "Opinionated stack for building opinionated web applications"]'
 test_files: []