seapig-rails 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25b28f9d7975a6bfd32062f20bc310c01d79735e
-  data.tar.gz: 186a43d3f1e36b1b8b1244d6524b344388d34e74
+  metadata.gz: 02ffc579c05bd9348fb6951b13c49e2dd59fd9de
+  data.tar.gz: 4085bb327476405fdc3f9d219fffa8c5fbece221
 SHA512:
-  metadata.gz: 31bd90e20f73825d39bcafd121eaf070a0f35229bfd2d574ca63ae96ed1b00d7b5e33343622acae53dd5c28c9ed02cad3e7d6895ac720cdc660f5dab254d9d7d
-  data.tar.gz: ce55ecb9cfe3acfcb52b8d24992b2ed4b037f15700d6da06590e602b1352754a12ffaf94f9d249b6747c60b14b93de8d8734cffeada736ad30e5abf58363ac57
+  metadata.gz: 891935bfbb159d2c385790a4bcb04720c3e0d71ac644c09620619a0dcdef82254c6b0fbf68ca5c42590b3a326e4fd7e44c98dfbf3c28444be1afe6a1c3fa7375
+  data.tar.gz: 3df6423bed314b75e7c549a095955ffe511dfbee16d5f7da781c74b219849ee83088dc2e5a5790cafca44c8172392524d99a7b978afb2f11fc5256e30a353664

data/app/assets/javascripts/seapig/{seapig.js.coffee → seapig-client.js.coffee}

@@ -30,6 +30,9 @@ class @SeapigServer
                         @socket.send(JSON.stringify(action: 'client-options-set', options: @options))
                         for object_id, object of @slave_objects
                                 @socket.send(JSON.stringify(action: 'object-consumer-register', id: object_id, latest_known_version: object.version))
+                        for object_id, object of @master_objects
+                                @socket.send(JSON.stringify(action: 'object-producer-register', pattern: object_id))
+                                object.upload(0,{})
 
                 @socket.onmessage = (event) =>
                         #console.log('Seapig message received', event)
@@ -37,45 +40,71 @@ class @SeapigServer
                         switch data.action
                                 when 'object-update'
                                         @slave_objects[data.id].patch(data) if @slave_objects[data.id]
+                                when 'object-produce'
+                                        @master_objects[data.id].upload(0,{}) if @master_objects[data.id]
                                 else
                                         console.log('Seapig received a stupid message', data)
 
 
         slave: (object_id) ->
-                @socket.send(JSON.stringify(action: 'object-consumer-register', id: object_id, latest_known_version: null)) if @connected
-                @slave_objects[object_id] = new SeapigObject(object_id)
+                @socket.send(JSON.stringify(action: 'object-consumer-register', id: object_id, latest_known_version: 0)) if @connected
+                @slave_objects[object_id] = new SeapigObject(@,object_id)
 
 
-        unlink: (object_id) ->
-                delete @slave_objects[object_id]
-                @socket.send(JSON.stringify(action: 'unlink', id: object_id)) if @connected
+        master: (object_id) ->
+                @socket.send(JSON.stringify(action: 'object-producer-register', pattern: object_id)) if @connected
+                @master_objects[object_id] = new SeapigObject(@,object_id)
 
 
+        unlink: (object_id)->
+                if @slave_objects[object_id]?
+                        delete @slave_objects[object_id]
+                        @socket.send(JSON.stringify(action: 'object-consumer-unregister', id: object_id)) if @connected
+                if @master_objects[object_id]?
+                        delete @master_objects[object_id]
+                        @socket.send(JSON.stringify(action: 'object-producer-unregister', id: object_id)) if @connected
+
 
 class SeapigObject
 
 
-        constructor: (id) ->
+        constructor: (server,id) ->
+                @server = server
                 @id = id
                 @valid = false
-                @version = null
+                @version = 0
                 @object = {}
                 @shadow = {}
                 @onchange = null
 
 
         patch: (data) ->
-                if not data.old_version?
+                if data.old_version == 0
                         delete @object[key] for key, value of @object
                 else if not _.isEqual(@version, data.old_version)
-                        console.log("Seapig lost some updates, this shouldn't ever happen", @version, data.old_version)
+                        console.log("Seapig lost some updates, this shouldn't ever happen. object:",@id," version:", @version, " old_version:", data.old_version)
                 jsonpatch.apply(@object, data.patch)
                 @version = data.new_version
                 @valid = true
                 @onchange() if @onchange?
 
         changed: () ->
+                old_version = @version
                 @version += 1
-                patch = jsonpatch.compare(@shadow, @object)
-                console.log(patch)
+                @upload(old_version, @shadow)
                 @shadow = JSON.parse(JSON.stringify(@object))
+
+
+        upload: (old_version, old_object)->
+                message = {
+                        id: @id
+                        action: 'object-patch'
+                        old_version: old_version
+                        new_version: @version
+                        patch: jsonpatch.compare(old_object, @object)
+                        }
+                @server.socket.send(JSON.stringify(message)) if @server.connected
+
+
+        unlink: () ->
+                @server.unlink(@id)

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

@@ -0,0 +1,104 @@
+class @SeapigRouter
+
+
+        constructor: (seapig_server, session_id, initial_state, debug = false)->
+                @seapig_server = seapig_server
+                @session_id = session_id
+                @debug = debug
+
+                @state = _.extend({session_id: @session_id, id: 0}, initial_state)
+
+                @session_data = @seapig_server.master('web-session-data-'+@session_id)
+                @session_data.object.states = [ @state ]
+                @session_data.sequence = 1
+                @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()
+                        @replacing_state = true
+                        window.history.replaceState(@state,null,@current_url())
+                        @replacing_state = false
+
+
+                @replacing_state = false
+                @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] == '?'
+                        window.history.pushState(null,null,event.target.href)
+                        @location_changed()
+                        false
+                        )
+
+                window.onpopstate = (data) =>
+                        @state = data.state
+                        @state_changed()
+
+
+
+        location_changed: () ->
+                return if @replacing_state
+                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]
+                else
+                        path_session_id = @session_id
+                        path_state_id = 0
+
+                overlay = {}
+                if window.location.search.length > 0
+                        for pair in window.location.search.split('?')[1].split('&')
+                                spl = pair.split('=',2)
+                                overlay[spl[0]] = spl[1]
+
+                if path_session_id == @session_id
+                        @state_change(overlay)
+                else
+                        if @remote_state?
+                                @state_change_to_remote(overlay)
+                        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)
+
+
+        state_change_to_remote: (overlay) ->
+                @state = _.clone(@remote_state.object)
+                if _.size(overlay) > 0
+                        @state_change(overlay)
+                else
+                        @state_valid = true
+                        @state_changed()
+
+
+        state_change: (overlay) ->
+                @state = _.extend(_.clone(@state), overlay)
+                @statefilter(@state) if @statefilter?
+                @state.session_id = @session_id
+                @state.id = @session_data.sequence++
+                @session_data.object.states.push(@state)
+                @session_data.changed()
+                if @remote_state?
+                        @remote_state.unlink()
+                        @remote_state = null
+                @state_valid = true
+                @state_changed()
+
+
+        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')
+
+        state_changed: () ->
+
+                console.log("ROUTER: State changed to:    state:", @state, '    url:', @current_url()) if @debug
+                @replacing_state = true
+                window.history.replaceState(@state,null,@current_url())
+                @replacing_state = false
+
+                @onstatechange(@state) if @onstatechange?

data/app/models/seapig_router_session.rb

@@ -0,0 +1,19 @@
+class SeapigRouterSession < ActiveRecord::Base
+
+	has_many :seapig_router_session_states
+
+	acts_as_seapig_dependency
+
+
+	def self.generate
+		session = SeapigRouterSession.new
+		begin
+			session.key = (('a'..'z').to_a + ('A'..'Z').to_a + (0..9).to_a).shuffle[0..10].join('')
+			session.save!
+		rescue ActiveRecord::RecordNotUnique
+			retry
+		end
+		session
+	end
+
+end

data/app/models/seapig_router_session_state.rb

@@ -0,0 +1,7 @@
+class SeapigRouterSessionState < ActiveRecord::Base
+
+	belongs_to :seapig_router_session
+
+	acts_as_seapig_dependency
+
+end

data/bin/seapig-session-saver

@@ -0,0 +1,30 @@
+#!/bin/env ruby
+
+require './config/environment.rb'
+
+require 'seapig-client'
+
+
+
+EM.run {
+	
+	SeapigServer.new(ARGV[0],name: 'session-saver').slave('web-session-data-*').onchange { |sessions|
+		sessions.each_pair { |session_key, session_data|
+			p session_key
+			session = SeapigRouterSession.find_by(key: session_key.split('-',4)[3])
+			max_state = session.seapig_router_session_states.order("state_id DESC").first
+			max_state_id = (max_state and max_state.state_id or -1)
+			session_data['states'].each { |state|
+				if state['id'] > max_state_id		
+					puts Time.new.to_s + " " + state.inspect
+					SeapigRouterSessionState.create!(seapig_router_session_id: session.id, state_id: state['id'], state: state)
+				end
+			}
+		}
+		SeapigRouterSession.seapig_dependency_changed("SeapigRouterSessionState")
+	}
+
+}
+
+
+

data/db/migrate/20151221110834_create_seapig_router_sessions.rb

@@ -0,0 +1,9 @@
+class CreateSeapigRouterSessions < ActiveRecord::Migration
+  def change
+    create_table :seapig_router_sessions do |t|
+      t.text :key
+      t.timestamps null: false
+    end
+    add_index :seapig_router_sessions, :key, unique: true
+  end
+end

data/db/migrate/20151221111628_create_seapig_router_session_states.rb

@@ -0,0 +1,13 @@
+class CreateSeapigRouterSessionStates < ActiveRecord::Migration
+  def change
+    create_table :seapig_router_session_states do |t|
+      t.integer :seapig_router_session_id
+      t.integer :state_id
+      t.jsonb :state
+
+      t.timestamps null: false
+    end
+    add_index :seapig_router_session_states, [:seapig_router_session_id,:state_id], unique: true, name: "seapig_router_session_states_index_1"
+
+  end
+end

data/lib/seapig/version.rb

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

data/lib/seapigs/seapig_router_saved_session.rb

@@ -0,0 +1,22 @@
+require './config/environment.rb'
+
+class SeapigRouterSessionSaved < Producer
+
+	@patterns = [ 'web-session-saved-*' ]
+
+
+	def self.produce(object_id)
+		object_id =~ /web-session-saved-([^-]+)/
+		session_key = $1
+		version = {
+			SeapigRouterSessionState: SeapigRouterSessionState.seapig_dependency_version
+		}
+		session = SeapigRouterSession.find_by(key: session_key)
+		max_state = session.seapig_router_session_states.order("state_id DESC").first
+		data = {
+			max_state_id: (max_state and max_state.state_id or -1)
+		}
+		[data, version]
+	end
+
+end

data/lib/seapigs/seapig_router_session_state.rb

@@ -0,0 +1,20 @@
+require './config/environment.rb'
+
+class SeapigRouterSessionStateProducer < Producer
+
+	@patterns = [ 'web-session-state-*' ]
+
+
+	def self.produce(object_id)
+		object_id =~ /web-session-state-([^-]+)\:(\d+)/
+		session_key = $1
+		state_id = $2.to_i
+		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
+		[data, version]
+	end
+
+end

data/test/dummy/config/application.rb

@@ -3,7 +3,7 @@ require File.expand_path('../boot', __FILE__)
 require 'rails/all'
 
 Bundler.require(*Rails.groups)
-require "seapig-rails"
+require "seapig"
 
 module Dummy
   class Application < Rails::Application

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seapig-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - yunta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-21 00:00:00.000000000 Z
+date: 2016-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -71,19 +71,28 @@ email:
 - maciej.blomberg@mikoton.com
 executables:
 - seapig-notifier
+- seapig-session-saver
 extensions: []
 extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- app/assets/javascripts/seapig/seapig.js.coffee
+- app/assets/javascripts/seapig/seapig-client.js.coffee
+- app/assets/javascripts/seapig/seapig-router.js.coffee
+- app/models/seapig_router_session.rb
+- app/models/seapig_router_session_state.rb
 - bin/seapig-notifier
+- bin/seapig-session-saver
 - config/routes.rb
+- db/migrate/20151221110834_create_seapig_router_sessions.rb
+- db/migrate/20151221111628_create_seapig_router_session_states.rb
 - lib/seapig-rails.rb
 - lib/seapig/acts_as_seapig_dependency.rb
 - lib/seapig/engine.rb
 - lib/seapig/version.rb
+- lib/seapigs/seapig_router_saved_session.rb
+- lib/seapigs/seapig_router_session_state.rb
 - lib/tasks/seapig_tasks.rake
 - test/dummy/README.rdoc
 - test/dummy/Rakefile