material_raingular-websocket 0.0.2.2.alpha → 0.0.2.3.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69ba54fe8a1a6dc711f2f3e578b5e7b7031ebf38
-  data.tar.gz: fa54620b45359a06a3addc0405e2c7734a1576ee
+  metadata.gz: fe3b37c3ec7ec79b862ed7ea55359cd43819f40c
+  data.tar.gz: f293868c2032655174f4d334dcad10adeba21c60
 SHA512:
-  metadata.gz: 46cc861b4dcef33703393c1ffdd3db9376066cf823efebc8f5b63f856d5505b51777422756a1a96350443b06fcc38c80a56272aed80264243799fb0653768ae4
-  data.tar.gz: 8a93d92321041ee62703ae0ac3a3412ead856c34f11e796e5d86f32c347e903b32eb269783f89833f20e1625c37f5c60f95f67864697d077d46b21a869984b4d
+  metadata.gz: 8388ffbeff178be3a167774c3083a94be831db81db563c0ff98f5867d89863a19a87d72fe214d2dd139a5a908b52424b7aba33fba4dcfb091936c6f502453e87
+  data.tar.gz: 66e791d46018e67cd6c91ba3df446addbfc25250d02b50c474422ddb432940fd3ce92a23898ff5250897e1527d50a67d2b76f4ba9774a76c8f822b1e406c1161

data/lib/assets/javascripts/material_raingular-websockets.coffee

@@ -17,21 +17,22 @@ angular.module('WebSocket', [])
       equiv = (left,right) ->
         return true if left == right
         return !left && !right
-      singleton_process = (data) ->
+      singleton_process = (data,modelName) ->
         for key,value of data
           parent[key] = value unless equiv(parent[key],value) || key == modelName
         modelCtrl.$setViewValue(data[modelName])
         modelCtrl.$render()
-      array_process = (data) ->
-        ids = $filter('pluck')(parent[modelName], 'id')
-        for item in (data[modelName] || [])
-          parent[modelName].push(item) unless ids.includes(item.id)
-        ids = $filter('pluck')(data[modelName], 'id')
-        for item in (parent[modelName] || [])
-          parent[modelName].drop(instance) unless ids.includes(item.id)
-        window.dispatchEvent(new Event('resize'))
-        parent.adjustHeight() if parent.adjustHeight
-        scope.$parent.creating = false
+      array_process = (data,parent,modelName) ->
+        scope.$apply ->
+          ids = $filter('pluck')(parent[modelName], 'id')
+          for item in (data[modelName] || [])
+            parent[modelName].push(item) unless ids.includes(item.id)
+          ids = $filter('pluck')(data[modelName], 'id')
+          for item in (parent[modelName] || [])
+            parent[modelName].drop(instance) unless ids.includes(item.id)
+          window.dispatchEvent(new Event('resize'))
+          parent.adjustHeight() if parent.adjustHeight
+          scope.$parent.creating = false
       contentLoaded = scope.$watch parent_name, (newVal) ->
         if newVal
           contentLoaded()
@@ -39,8 +40,8 @@ angular.module('WebSocket', [])
           angular.channels = {} unless angular.channels
           angular.channels[parent_name] = angular.dispatcher.subscribe parent_name
           angular.channels[parent_name].bind 'change', (data) ->
+            data = JSON.parse(data) if typeof data == 'string'
             if data.id == parent.id
-              scope.$apply ->
-                new DateParser(data).to_s()
-                array_process(data)         if attributes.webSocket == 'array'
-                singleton_process(data) unless attributes.webSocket == 'array'
+              new DateParser(data).to_s()
+              singleton_process(data,modelName) unless attributes.webSocket == 'array'
+              array_process(data,parent,modelName)  if attributes.webSocket == 'array'

data/lib/material_raingular/websocket/active_record_extension.rb

@@ -8,7 +8,7 @@ module EmittableExtension
       @emittable = true
       after_save :emit_changes
       define_method(:emit_changes)        {WebsocketRails[websocket_namespace].trigger(:change, websocket_message) if WebsocketRails[websocket_namespace].subscribers.present?}
-      define_method(:websocket_message)   {self.as_json}
+      define_method(:websocket_message)   {self.to_json}
       define_method(:websocket_namespace) {self.class.name.underscore.to_sym}
     end
     def emittable?() @emittable || false end

data/lib/material_raingular/websocket/version.rb

@@ -1,5 +1,5 @@
 module MaterialRaingular
   module Websocket
-    VERSION = "0.0.2.2.alpha"
+    VERSION = "0.0.2.3.alpha"
   end
 end

data/material_raingular-websocket.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "rails"
   spec.add_dependency "material_raingular"
-  spec.add_dependency "websocket-rails"
+  # spec.add_dependency "websocket-rails"
   spec.add_development_dependency "flying_table"
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: material_raingular-websocket
 version: !ruby/object:Gem::Version
-  version: 0.0.2.2.alpha
+  version: 0.0.2.3.alpha
 platform: ruby
 authors:
 - Chris Moody
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2015-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: websocket-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: flying_table
   requirement: !ruby/object:Gem::Requirement
@@ -191,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Integration of MaterialRaingular and Websocket-Rails.