webmate-client 0.1.1 → 0.1.3

data/lib/webmate-client/version.rb

@@ -1,3 +1,3 @@
 module WebmateClient
-  VERSION = '0.1.1'
+  VERSION = '0.1.3'
 end

data/vendor/assets/javascripts/webmate/backbone_ext/resources.coffee

@@ -33,25 +33,6 @@ Backbone.Collection::bindSocketEvents = () ->
     if collection.remove(collection.parse(response))
       collection.trigger('change', collection, response, {})
 
-  ###
-  # bind
-  client.on "#{path}/update", (response, params) =>
-    return unless response._id
-    @get(response._id).set(response)
-
-  client.on "#{@collectionName()}/read", (response, params)->
-    model.reset(response)
-    model.trigger "sync", model, response
-
-  client.on "#{@collectionName()}/create", (response, params)->
-    model.add(response)
-    #model.get(response._id).trigger 'sync', response
-    #if clientId is params._client_id
-    #  model.add(response)
-    #else
-    #  model.get(params._cid).set(response)
-  ###
-
 # update existing functions
 
 Backbone.Collection::_prepareModelWithoutAssociations = Backbone.Collection::_prepareModel

data/vendor/assets/javascripts/webmate/client.coffee

@@ -1,43 +1,39 @@
 class Webmate.Client
   constructor: (channel_name) ->
-    self = @
     @bindings = {}
-    @channel_name = channel_name
+    @channel_name = channel_name || 'http_over_websocket'
 
     if @useWebsockets()
       @websocket = @createConnection( (message) ->
+        console.log(message)
         metadata = message.request.metadata
         eventBindings = @bindings["#{metadata.collection_url}/#{metadata.method}"]
-        
+
         _.each eventBindings, (eventBinding) ->
           eventBinding(message.response.body, message.request.metadata)
       )
-  
+
   useWebsockets: ->
     window.Webmate.websocketsEnabled isnt false && io && io.Socket
 
   createConnection: (onMessageHandler) ->
-    self = @
-    @clientId or= Math.random().toString(36).substr(2)
-
     # pass callback func, if needed be sure what callback exists
-    token = Webmate.Auth.getToken()
-    return false unless token?
-
+    # token = Webmate.Auth.getToken()
+    # return false unless token?
+    token = false
     socket = new io.Socket
       resource: @channel_name
       host: location.hostname
       port: Webmate.websocketsPort or location.port
-      query: $.param(token: token)
+      query: if token then $.param(token: token) else ''
 
     socket.on "connect", () ->
       console.log("connection established")
 
-    socket.onPacket = (packet) ->
-      console.log(packet)
+    socket.onPacket = (packet) =>
       return unless packet.type is 'message'
-      parsed_packet = Webmate.Client::parsePacketData(packet.data)
-      onMessageHandler.call(self, parsed_packet)
+      response = JSON.parse(packet.data)
+      onMessageHandler.call(@, response)
 
     socket.connect()
     socket
@@ -47,87 +43,21 @@ class Webmate.Client
     @bindings[action].push(callback)
     @
 
-  send: (path, data, method) ->
+  send: (path, params, method) ->
+    data = {}
     data.path = path
     data.method = method
+    data.params = params
+    data.params.metadata = {
+      request_id: Math.random().toString(36).substr(2);
+    }
     packet = {
       type: 'message',
       data: JSON.stringify(data)
     }
     @websocket.packet(packet)
 
-Webmate.Client::parsePacketData = (packet_data) ->
-  data = JSON.parse(packet_data)
-  data.response.body = JSON.parse(data.response.body)
-  data
-
-Webmate.connect = (channel, callback)->
-  client = new Webmate.Client(channel, callback)
-  Webmate.channels[channel] = client
-  client
-
-  ###
-class Webmate.Client
-  getFullPath: ->
-    "#{location.hostname}:#{Webmate.websocketsPort or location.port}/#{@channel}"
-
-  getClientId: ->
-    @clientId or= Math.random().toString(36).substr(2)
-
-  buildSocket: (onMessageHandler) ->
-
-  constructor: (channel, callback) ->
-    self = @
-    @bindings = {}
-    @channel = channel
-
-    if window.Webmate.websocketsEnabled isnt false && window.WebSocket
-      @websocket = buildSocket( (message) ->
-      )
-
-      @websocket = new WebSocket("ws://#{@fullPath}")
-      # prepare queue to store requests if socket not ready
-      @callsQueue = new Array()
-      @websocket.onmessage = (e) ->
-        data = JSON.parse(e.data)
-        eventBinding = self.bindings[data.action]
-        _.each eventBinding, (binding)->
-          binding(data.response, data.params)
-      @websocket.onopen = (e) ->
-        # process pending queues
-        while data = self.callsQueue.pop()
-          self.websocket.send(JSON.stringify(data))
-        callback() if callback
-    else
-      if window.Webmate.websocketsEnabled is false
-        console.log("Websockets is disabled. Using http.")
-      else
-        console.log("Websocket not supported. Using http.")
-      callback() if callback
-    @
-  on: (action, callback)->
-    @bindings[action] = [] if !@bindings[action]
-    @bindings[action].push(callback)
-    @
-  send: (action, data, method)->
-    data = {} if !data
-    method = 'get' if !method
-    data.action = action
-    data.channel = @channel
-    data._client_id = @clientId
-
-    if @websocket
-      if @websocket.readyState == @websocket.OPEN
-        @websocket.send(JSON.stringify(data))
-      else
-        @callsQueue.push(data)
-    else
-      $.ajax("http://#{@fullPath}/#{action}", type: method).success (data) ->
-        console.log(data)
-    @
-
 Webmate.connect = (channel, callback)->
   client = new Webmate.Client(channel, callback)
   Webmate.channels[channel] = client
   client
-  ###

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webmate-client
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2013-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script