seapig-rails 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23f1145dd4d6fb56d90fa41f44e2d652440f0d16
-  data.tar.gz: aefcf64b92b67673f4720c88078ef71f146cc27e
+  metadata.gz: bb62d1753a2bd5140ae246bf3684fcb9ea0faccf
+  data.tar.gz: 90cd3b4c61da4f098dc4ec1b0fa84ee439d5e60f
 SHA512:
-  metadata.gz: af39161ee44bff9348c655e384c6f01facd81a596efdbd5a0f5863a2fd22423a9cf265ef2316657a08fd4521755550b128137fd27213187eb000628e4bdc38f2
-  data.tar.gz: 07f2aeba1327c29252b019ec3919c2afb1cce8031803dfa87d93a78279f748643266380b68ecebfee7dc325efc503b854e567a0b53124a4585e703776dea7ec5
+  metadata.gz: 3a8d72ef25ff1af569147db2734310934c66250962ef5b7c5ca57b3292a0282cd86289aa45cb4e8185a61f1f78fd9240fd0638d83caa535cd8fa2d5b89feeceb
+  data.tar.gz: 27473c18d6476877676269fe3ccfe852bfad81021c38d0e9d5e9246bd305441b00d60ddbc84a4ac3ec5398b5973b95941481c46525e9feb474e11c1fc6bf861f

data/app/assets/javascripts/seapig/seapig-client.js.coffee

@@ -12,20 +12,20 @@ class @SeapigServer
         connect: () ->
                 @connected = false
 
-                @socket = new WebSocket(@url,'SeaPig-0.0')
+                @socket = new WebSocket(@url)
 
                 @socket.onerror = (error) =>
                         console.log('Seapig socket error', error)
                         @socket.close()
 
                 @socket.onclose = () =>
-                        console.log('Seapig connection closed')
+                        console.log('Seapig connection closed') if @options.debug
                         for object_id, object of @slave_objects
                                 object.valid = false
                         setTimeout((=>@connect()), 2000)
 
                 @socket.onopen = () =>
-                        console.log('Seapig connection opened')
+                        console.log('Seapig connection opened') if @options.debug
                         @connected = true
                         @socket.send(JSON.stringify(action: 'client-options-set', options: @options))
                         for object_id, object of @slave_objects

data/app/assets/javascripts/seapig/seapig-router.js.coffee

@@ -1,12 +1,13 @@
 class @SeapigRouter
 
 
-        constructor: (seapig_server, session_id, initial_state, debug = false)->
+        constructor: (seapig_server, session_id, initial_search, debug = false)->
                 @seapig_server = seapig_server
                 @session_id = session_id
                 @debug = debug
+                @initial_search = initial_search
 
-                @state = _.extend({session_id: @session_id, id: 0}, initial_state)
+                @state = {session_id: @session_id, id: 0}
 
                 @session_data = @seapig_server.master('web-session-data-'+@session_id)
                 @session_data.object.states = [ @state ]
@@ -51,27 +52,32 @@ class @SeapigRouter
                         path_session_id = spl.shift()
                         path_state_id = spl.shift()
                 else
-                        path_session_id = @session_id
-                        path_state_id = 0
-                        spl = []
+                        window.history.replaceState(@state,null,'/a/'+@session_id+'/0'+@initial_search)
+                        return @location_changed()
 
-                diff = []
+                total_diff = []
+                partial_diff = []
                 while spl.length > 0
-                        diff.push([spl.shift(),spl.shift()])
+                       total_diff.push([spl.shift(),spl.shift()])
                 if window.location.search.length > 0
                         for pair in window.location.search.split('?')[1].split('&')
-                                diff.push(pair.split('=',2))
-                console.log('Parsed location: session_id:',path_session_id,' diff:', diff) if @debug
+                                total_diff.push(pair.split('=',2))
+                                partial_diff.push(pair.split('=',2))
+                console.log('Parsed location: session_id:',path_session_id,' partial_diff:', partial_diff) if @debug
 
                 if path_session_id == @session_id
-                        @state_change(diff)
+                        @state_change(partial_diff)
                 else
                         if @remote_state?
-                                @state_change_to_remote(diff)
+                                @state_change_to_remote(total_diff)
                         else
                                 @state_valid = false
-                                @remote_state = @seapig_server.slave('web-session-state-'+path_session_id+':'+path_state_id)
-                                @remote_state.onchange = ()=> @state_change_to_remote(diff)
+                                if path_state_id == '0'
+                                        @remote_state = {object: {session_id: path_session_id, id: 0}}
+                                        @state_change_to_remote(total_diff)
+                                else
+                                        @remote_state = @seapig_server.slave('web-session-state-'+path_session_id+':'+path_state_id)
+                                        @remote_state.onchange = ()=> @state_change_to_remote(total_diff)
 
 
         state_change_to_remote: (diff) ->
@@ -95,7 +101,7 @@ class @SeapigRouter
                 @session_data.object.states.push(@state)
                 @session_data.changed()
                 if @remote_state?
-                        @remote_state.unlink()
+                        @remote_state.unlink() if @remote_state.object.id > 0
                         @remote_state = null
                 @state_valid = true
                 @state_changed()
@@ -103,10 +109,28 @@ class @SeapigRouter
 
         state_diff_apply: (state, diff)->
                 for entry in diff
-                        if entry[0][0] == '-'
-                                delete state[entry[0][1..-1]]
+                        address = entry[0]
+                        value = entry[1]
+                        add = (address[0] != '-')
+                        hash = (address[address.length-1] != '~')
+                        address = address[1..-1] if address[0] == '-'
+                        address = address[0..-2] if address[address.length-1] == '~'
+                        obj = state
+                        spl = address.split('~')
+                        for subobj,i in spl
+                                if i < (spl.length-1)
+                                        obj[subobj] = {} if not obj[subobj]?
+                                        obj = obj[subobj]
+                        if add
+                                if hash
+                                        obj[spl[spl.length-1]] = value
+                                else
+                                        obj[spl[spl.length-1]].push(value)
                         else
-                                state[entry[0]] = entry[1]
+                                if hash
+                                        delete obj[spl[spl.length-1]]
+                                else
+                                        state[entry[0]].splice(_.indexOf(state[entry[0]], value),1)
                 state
 
 

data/bin/seapig-notifier

@@ -1,14 +1,17 @@
 #!/bin/env ruby
 
+ENV['RAILS_ENV'] = 'production'
 require './config/environment.rb'
 
 require 'websocket-eventmachine-client'
 require 'json'
 
-
-Rails.application.eager_load!
 notifiers = Hash[*ActiveRecord::Base.descendants.select { |cls| cls.respond_to?('seapig_dependency_version') }.map { |notifier| [notifier.name,notifier] }.flatten ]
 
+puts "Known notifiers:"
+notifiers.keys.each { |notifier| puts "        "+notifier }
+puts
+
 $last_versions = {}
 $payloads = Queue.new
 

data/lib/seapig/version.rb

@@ -1,3 +1,3 @@
 module Seapig
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/seapigs/seapig_router_session_state.rb

@@ -12,8 +12,9 @@ class SeapigRouterSessionStateProducer < Producer
 		version = Time.new.to_f
 		p session_key, object_id
 		session = SeapigRouterSession.find_by(key: session_key)
-		data = SeapigRouterSessionState.find_by(seapig_router_session_id: session.id, state_id: state_id).state
-		p data
+		state = SeapigRouterSessionState.find_by(seapig_router_session_id: session.id, state_id: state_id)
+		return [false, {SeapigRouterSessionState: SeapigRouterSessionState.seapig_dependency_version}] if not state
+		data = state.state
 		[data, version]
 	end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seapig-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - yunta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-06 00:00:00.000000000 Z
+date: 2016-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails