webmate 0.1.5 → 0.1.6

data/lib/webmate.rb

@@ -37,6 +37,7 @@ require 'webmate/routes/handler'
 
 Bundler.require(:default, Webmate.env.to_sym)
 
+require 'webmate/socket.io/request'
 require 'webmate/socket.io/actions/handshake'
 require 'webmate/socket.io/actions/connection'
 require 'webmate/socket.io/packets/base'

data/lib/webmate/responders/response.rb

@@ -14,5 +14,19 @@ module Webmate::Responders
     def to_rack
       [@status, {}, @data]
     end
+
+    def to_packet
+      Webmate::SocketIO::Packets::Message.build_response_packet(self).to_packet
+    end
+
+    class << self
+      def build_not_found(message, options = {})
+        self.new(message, {status: 404}.merge(options))
+      end
+
+      def build_error(message, options = {})
+        self.new(message, {status: 500}.merge(options))
+      end
+    end
   end
 end

data/lib/webmate/routes/handler.rb

@@ -14,12 +14,10 @@ module Webmate::Routes
         end
 
         session_id = route_info[:params][:session_id]
-        Webmate::Websockets.subscribe(session_id, request) do |message|
-          if route_info = application.routes.match(message['method'], 'WS', message.path)
-            request_info = params_from_websoket(route_info, message)
-            # here we should create subscriber who can live
-            # between messages.. but not between requests.
-            route_info[:responder].new(request_info).respond
+        Webmate::Websockets.subscribe(session_id, request) do |request|
+          if route_info = application.routes.match(request[:method], 'WS', request.path)
+            request_info = prepare_response_params(route_info, request)
+            response = route_info[:responder].new(request_info).respond
           end
         end
 
@@ -28,18 +26,17 @@ module Webmate::Routes
         [-1, {}, []]
 
       else # HTTP
-        # this should return correct Rack response..
-        request_info = params_from_http(route_info)
+        request_info = prepare_response_params(route_info, request)
         response = route_info[:responder].new(request_info).respond
         response.to_rack
       end
     end
 
-    # this method prepare data for responder from http request
+    # this method prepare data for responder from request
     # @param Hash request_info = { path: '/', metadata: {}, action: 'index', params: { test: true } }
-    def params_from_http(route_info)
+    def prepare_response_params(route_info, request)
       # create unified request info
-      request_params = http_body_request_params
+      request_params = request_params_all(request)
       metadata = request_params.delete(:metadata)
       {
         path: request.path,
@@ -50,25 +47,15 @@ module Webmate::Routes
       }
     end
 
-    # this method prepare data for responder from http request
-    def params_from_websoket(route_info, message)
-      {
-        path: message.path,
-        metadata: message.metadata || {},
-        action: route_info[:action],
-        params: message.params.merge(route_info[:params])
-      }
-    end
-
     # Get and parse all request params
-    def http_body_request_params
+    def request_params_all(request)
       request_params = HashWithIndifferentAccess.new
-      request_params.merge!(@request.params || {})
+      request_params.merge!(request.params || {})
 
       # read post or put params. this will erase  params
       # {code: 123, mode: 123}
       # "code=123&mode=123"
-      request_body = @request.body.read
+      request_body = request.body.read
       if request_body.present?
         body_params = begin
           JSON.parse(request_body) # {code: 123, mode: 123}

data/lib/webmate/socket.io/packets/base.rb

@@ -23,39 +23,30 @@ module Webmate
           @packet_data  = packet_data.with_indifferent_access
         end
 
-        # packet should be created by socket.io spec
-        # [message type] ':' [message id ('+')] ':' [message endpoint] (':' [message data])
-        # and webmate spec
-        # message_data = {
+        # Parse packet created by socket.io spec
+        # Packet format
+        #   [packet type] ':' [packet id ('+')] ':' [packet endpoint] (':' [packet data])
+        #
+        # packet_data = {
         #   method: GET/POST/...
         #   path: '/projects'
-        #   params: {}
-        #   metadata: { data should be returned back with answer }
+        #   params: {
+        #     metadata: { data should be returned back with response },
+        #     foor: 'bar'
+        #     // and any other paranms
+        #   }
+        #   headers: [ {"SomeHeader": "SomeHeaderValue"} ]
         # }
         def self.parse(packet)
           # last element is encoded json array, so there can be many ':'
           packet_type_id, packet_id, packet_endpoint, json_data = packet.split(':', 4)
 
-          packet_data = (Yajl::Parser.parse(json_data) || {}).with_indifferent_access
-
-          if packet_data[:params].is_a?(String)
-            packet_data[:params] = Yajl::Parser.parse(packet_data[:params])
-          end
-
-          if packet_data[:metadata].is_a?(String)
-            packet_data[:metadata] = Yajl::Parser.parse(packet_data[:metadata])
-          end
-
-          packet = OpenStruct.new(
+          packet_data = (JSON.parse(json_data) rescue {}).with_indifferent_access
+          Webmate::SocketIO::Request.new(
             path: packet_data[:path],
-            method: packet_data[:method],
-            params: packet_data[:params] || {},
-            metadata: packet_data[:metadata] || {},
-            packet_id: packet_id,
-            packet_endpoint: packet_endpoint
+            method: packet_data[:method].upcase,
+            params: packet_data[:params] || {}
           )
-
-          packet
         end
 
         # convert response from Responders::Base to socket io message
@@ -69,7 +60,8 @@ module Webmate
             body:     response.data,
             path:     response.path,
             params:   response.params,
-            metadata: response.metadata
+            metadata: response.metadata,
+            status:   response.status
           }
         end
 

data/lib/webmate/socket.io/request.rb

@@ -0,0 +1,17 @@
+# this class emulates Sinatra::Requst class for SocketIO.
+module Webmate::SocketIO
+  class Request
+    attr_accessor :params, :path, :method, :body
+
+    def initialize(options = {})
+      @params = options[:params]
+      @path = options[:path]
+      @method = options[:method]
+      @body = options[:body] || ''
+    end
+
+    def body
+      @body.is_a?(String) ? StringIO.new(@body) : @body
+    end
+  end
+end

data/lib/webmate/version.rb

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

data/lib/webmate/websockets.rb

@@ -15,14 +15,12 @@ module Webmate
 
           websocket.onmessage do |message|
             request = Webmate::SocketIO::Packets::Base.parse(message)
-            response = block.call(request)
-            if response
-              packet = Webmate::SocketIO::Packets::Message.build_response_packet(response)
-              websocket.send(packet.to_packet)
-            else
-              packet = Webmate::SocketIO::Packets::Error.build_response_packet("{error: 'empty response for #{message.inspect}'}")
-              websocket.send(packet.to_packet)
+            response = begin
+              block.call(request) || Responders::Response.build_not_found("Action not found: #{request.path}")
+            rescue Exception => e
+              Responders::Response.build_error("Error while processing request: #{request.path}, #{e.message}")
             end
+            websocket.send(response.to_packet)
           end
 
           websocket.onclose do

data/spec/lib/socket.io/base_packet_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+def build_packet(data)
+  data = {
+    params: {
+      foo: 'bar',
+      metadata: {request_id: 'test'}
+    },
+    path: '/some/url',
+    method: 'GET'
+  }.merge(data)
+  "3:::#{Webmate::JSON.dump(data)}"
+end
+
+describe Webmate::SocketIO::Packets::Base do
+  let(:subject) { Webmate::SocketIO::Packets::Base }
+
+  describe "#parse" do
+    it "should parse packet data and return object compatible with Sinatra::Request" do
+      packet_data = build_packet(path: '/projects')
+      request = subject.parse(packet_data)
+      request.params[:metadata][:request_id].should == 'test'
+      request.method.should == 'GET'
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webmate
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -232,6 +232,7 @@ files:
 - lib/webmate/socket.io/packets/json.rb
 - lib/webmate/socket.io/packets/message.rb
 - lib/webmate/socket.io/packets/noop.rb
+- lib/webmate/socket.io/request.rb
 - lib/webmate/support/json.rb
 - lib/webmate/version.rb
 - lib/webmate/views/scope.rb
@@ -239,6 +240,7 @@ files:
 - spec/lib/application_spec.rb
 - spec/lib/routes/base_spec.rb
 - spec/lib/routes/collection_spec.rb
+- spec/lib/socket.io/base_packet_spec.rb
 - spec/spec_helper.rb
 - webmate.gemspec
 homepage: https://github.com/webmate/webmate
@@ -256,7 +258,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1691783446799875159
+      hash: -242899012726086530
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -265,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1691783446799875159
+      hash: -242899012726086530
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25