seapig-rails 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02ffc579c05bd9348fb6951b13c49e2dd59fd9de
-  data.tar.gz: 4085bb327476405fdc3f9d219fffa8c5fbece221
+  metadata.gz: 23f1145dd4d6fb56d90fa41f44e2d652440f0d16
+  data.tar.gz: aefcf64b92b67673f4720c88078ef71f146cc27e
 SHA512:
-  metadata.gz: 891935bfbb159d2c385790a4bcb04720c3e0d71ac644c09620619a0dcdef82254c6b0fbf68ca5c42590b3a326e4fd7e44c98dfbf3c28444be1afe6a1c3fa7375
-  data.tar.gz: 3df6423bed314b75e7c549a095955ffe511dfbee16d5f7da781c74b219849ee83088dc2e5a5790cafca44c8172392524d99a7b978afb2f11fc5256e30a353664
+  metadata.gz: af39161ee44bff9348c655e384c6f01facd81a596efdbd5a0f5863a2fd22423a9cf265ef2316657a08fd4521755550b128137fd27213187eb000628e4bdc38f2
+  data.tar.gz: 07f2aeba1327c29252b019ec3919c2afb1cce8031803dfa87d93a78279f748643266380b68ecebfee7dc325efc503b854e567a0b53124a4585e703776dea7ec5

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

@@ -91,8 +91,9 @@ class SeapigObject
         changed: () ->
                 old_version = @version
                 @version += 1
-                @upload(old_version, @shadow)
+                old_object = @shadow
                 @shadow = JSON.parse(JSON.stringify(@object))
+                @upload(old_version, old_object)
 
 
         upload: (old_version, old_object)->
@@ -101,7 +102,7 @@ class SeapigObject
                         action: 'object-patch'
                         old_version: old_version
                         new_version: @version
-                        patch: jsonpatch.compare(old_object, @object)
+                        patch: jsonpatch.compare(old_object, @shadow)
                         }
                 @server.socket.send(JSON.stringify(message)) if @server.connected
 

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

@@ -11,14 +11,16 @@ class @SeapigRouter
                 @session_data = @seapig_server.master('web-session-data-'+@session_id)
                 @session_data.object.states = [ @state ]
                 @session_data.sequence = 1
+                @session_data.bases = {}
                 @session_data.changed()
 
                 @session_data_saved = @seapig_server.slave('web-session-saved-'+@session_id)
                 @session_data_saved.onchange = ()=>
                         while @session_data.object.states[0]? and @session_data.object.states[0].id < @session_data_saved.object.max_state_id
                                 @session_data.object.states.shift()
+                        console.log('Session saved, updating url:',@current_url()) if @debug
                         @replacing_state = true
-                        window.history.replaceState(@state,null,@current_url())
+                        window.history.replaceState(@state,null,@current_url()) if @state_valid
                         @replacing_state = false
 
 
@@ -26,8 +28,8 @@ class @SeapigRouter
                 @state_valid = false
 
                 $(document).on('click','a', (event) =>
-                        console.log('ROUTER: A-element clicked, changing location to:', event.target.href) if @debug
-                        return true if not event.target.href[0] == '?'
+                        console.log('ROUTER: A-element clicked, changing location to:', $(event.target).attr('href')) if @debug
+                        return true if not ($(event.target).attr('href')[0] == '?')
                         window.history.pushState(null,null,event.target.href)
                         @location_changed()
                         false
@@ -44,44 +46,52 @@ class @SeapigRouter
                 console.log('ROUTER: Location changed to:    pathname:', window.location.pathname, '    search:', window.location.search) if @debug
 
                 spl = window.location.pathname.split('/')
-                if spl[1] == 'a'
-                        path_session_id = spl[2]
-                        path_state_id = spl[3]
+                spl.shift()
+                if spl.shift() == 'a'
+                        path_session_id = spl.shift()
+                        path_state_id = spl.shift()
                 else
                         path_session_id = @session_id
                         path_state_id = 0
+                        spl = []
 
-                overlay = {}
+                diff = []
+                while spl.length > 0
+                        diff.push([spl.shift(),spl.shift()])
                 if window.location.search.length > 0
                         for pair in window.location.search.split('?')[1].split('&')
-                                spl = pair.split('=',2)
-                                overlay[spl[0]] = spl[1]
+                                diff.push(pair.split('=',2))
+                console.log('Parsed location: session_id:',path_session_id,' diff:', diff) if @debug
 
                 if path_session_id == @session_id
-                        @state_change(overlay)
+                        @state_change(diff)
                 else
                         if @remote_state?
-                                @state_change_to_remote(overlay)
+                                @state_change_to_remote(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(overlay)
+                                @remote_state.onchange = ()=> @state_change_to_remote(diff)
 
 
-        state_change_to_remote: (overlay) ->
+        state_change_to_remote: (diff) ->
                 @state = _.clone(@remote_state.object)
-                if _.size(overlay) > 0
-                        @state_change(overlay)
+                if diff.length > 0
+                        @state_change(diff)
                 else
+                        #@session_data.object.states.push(@state)
                         @state_valid = true
                         @state_changed()
 
 
-        state_change: (overlay) ->
-                @state = _.extend(_.clone(@state), overlay)
+        state_change: (diff) ->
+                base_state = @state
+                @state = @state_diff_apply(_.clone(@state), diff)
+                @state.diff = diff
                 @statefilter(@state) if @statefilter?
                 @state.session_id = @session_id
                 @state.id = @session_data.sequence++
+                @session_data.bases[@state.id] = base_state
                 @session_data.object.states.push(@state)
                 @session_data.changed()
                 if @remote_state?
@@ -91,8 +101,34 @@ class @SeapigRouter
                 @state_changed()
 
 
+        state_diff_apply: (state, diff)->
+                for entry in diff
+                        if entry[0][0] == '-'
+                                delete state[entry[0][1..-1]]
+                        else
+                                state[entry[0]] = entry[1]
+                state
+
+
+        state_diff_to_path: (diff)->
+                ('/'+entry[0]+'/'+entry[1] for entry in diff).join("") or ""
+
+
         current_url: ()->
-                '/a/'+@state.session_id+'/'+@state.id+(if (@session_data_saved.object.max_state_id >= @state.id or @state.session_id != @session_id) then '' else '#NOT-SHAREABLE')
+                base_state = @state
+                chain = []
+                while @session_data.bases[base_state.id] and (@session_id == base_state.session_id) and ((@session_data_saved.object.max_state_id or 0 ) < base_state.id)
+                        chain.unshift(base_state)
+                        base_state = @session_data.bases[base_state.id]
+                console.log('Last shareable url:', base_state, chain) if @debug
+                path_overlay = ""
+                for state in chain
+                        console.log('-',state) if @debug
+                        path_overlay += @state_diff_to_path(state.diff)
+
+                console.log('Calculated url:','/a/'+base_state.session_id+'/'+base_state.id+path_overlay) if @debug
+                '/a/'+base_state.session_id+'/'+base_state.id+path_overlay
+
 
         state_changed: () ->
 

data/lib/seapig/version.rb

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

metadata

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