caboose-cms 0.4.74 → 0.4.75

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzAyZTljYjY2NzA2MmMzYTkxMzZhZGZhYjhmMmFhMzM2MTc0YWI1ZA==
+    NjUwNjcxN2I2ZDIzY2JiZDc2NGFmMGNmYjdkOTUzZmNjZGZhNTE2Yg==
   data.tar.gz: !binary |-
-    MjgzYWQ0ZTViN2VhMzk5YWQ1ZTA5YWQwYTVhNzI2NGRhOTA2MzNmOA==
+    YjBlY2ZiNWIzNjYxZmY0Zjc1ZTc4MTc5ZGMzOWZmMjUyODYyZjc4Nw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MDQwYTg3MDY2MTI0ZTk2NmZlZDZmZTAzOWYwNmVlNDZkMmEzMDBhMmViNGFm
-    NzMwODljM2YyNTZhNTU2YzM1MTU4MjAyNDJmZGY2MzFjNzI1NmM0YzUyYTY1
-    YzM4ZThmYTUyYzg4YjllMmQ3OTE2NWRkNjlmMzMxYWJkN2FkYjY=
+    ZDQyNjQ3YWIyNDQ2NDQzNzI5NDE1Y2E4OTc5OTBkMTRlNWQ5MDQwZDQ2NTg3
+    ZDRkNDAzMmJiNDNjZDA3NzY0MjkxNWFjNDVlM2I1ZDA0OGE3NWExM2FiZTUz
+    MmU4YjRlZTAxZTA5YWUwNTU0Zjg0NjNiZjEzYTJkODAwMmE0Zjk=
   data.tar.gz: !binary |-
-    Y2Y5OTIzNDc5NjUwYTkzYzQxOTA2MmQzZGVmODgwZTA4OThiNDkxM2I0MzZk
-    MWJlZjRlZGU3M2M1YzNlZDQzMWNkZDE4MTZhZjE1MGU1Mzc4MDYyOTY1ZTBk
-    OTg5N2JiYjE1MGVhYzQ4YWU4YWEyZDk4OTIzZDBjYjRhZjY3OGI=
+    MzBlOWIzYjE5ODZjYmYzNzc2NmM4N2E3MzJlNmEwMDgyM2UwN2U2NGZkOTNm
+    OTBkYWI5MjFjZGVhZDMxMTE5OGNhNjI1NjY1ZTY5MWUzYTk0ODEyOTFmMjVj
+    MjU4ODBiNWI5ZGU1ZWU0Yzc0ZTRiZWUwYWZjYzU2Y2U5ZDNhNTk=

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.74'
+  VERSION = '0.4.75'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.74
+  version: 0.4.75
 platform: ruby
 authors:
 - William Barry
@@ -319,7 +319,6 @@ files:
 - app/models/caboose/media_category.rb
 - app/models/caboose/media_file.rb
 - app/models/caboose/media_image.rb
-- app/models/caboose/media_image_socket.rb
 - app/models/caboose/menu_block.rb
 - app/models/caboose/page.rb
 - app/models/caboose/page_bar_generator.rb

data/app/models/caboose/media_image_socket.rb

@@ -1,73 +0,0 @@
-require 'faye/websocket'
-
-module Caboose
-  class MediaImageSocket
-    
-    KEEPALIVE_TIME = 15 # in seconds
-
-    def initialize(app)
-      @app = app
-      @clients = {}
-      @image_ids = {}
-    end
-
-    def call(env)             
-      if Faye::WebSocket.websocket?(env)
-                        
-        uri = env['REQUEST_URI']
-        #Caboose.log(uri)
-        
-        # GET /admin/images/:id/wait
-        if uri =~ /\/admin\/images\/\d*\/wait/                    
-          image_id = uri.gsub('/admin/images/', '').gsub('/wait', '').to_i
-          #Caboose.log("Waiting on image_id #{image_id}...")          
-          ws = Faye::WebSocket.new(env, nil, { :ping =>  KEEPALIVE_TIME })
-          ws.on :open do |event|
-            Caboose.log("Opening browser web socket for image #{image_id}...")
-            @clients[image_id] = [] if @clients[image_id].nil?            
-            @clients[image_id] << ws
-          end
-          ws.on :message do |event|            
-            Caboose.log("Received browser message for image #{image_id}")
-            @clients[image_id].each { |client| client.send(event.data) }
-          end
-          ws.on :close do |event|
-            Caboose.log("Closing browser web socket for image #{image_id}...")
-            #p [:close, ws.object_id, event.code, event.reason]
-            @clients.delete(ws)
-            ws = nil
-          end                    
-          ws.rack_response
-          
-        # GET /admin/images/:id/finished
-        elsif uri =~ /\/admin\/images\/\d*\/finished/          
-          image_id = uri.gsub('/admin/images/', '').gsub('/finished', '').to_i                    
-          ws = Faye::WebSocket.new(env, nil, { :ping =>  KEEPALIVE_TIME })
-          ws.on :open do |event|
-            #p [:open, ws.object_id]
-            Caboose.log("Opening server web socket for image #{image_id}...")
-            @image_ids[ws.object_id] = image_id
-          end
-          ws.on :message do |event|
-            #p [:message, event.data]
-            Caboose.log("Receieved server message for image #{image_id}")
-            image_id = @image_ids[ws.object_id]            
-            @clients[image_id].each { |client| client.send(event.data) }
-          end
-          ws.on :close do |event|
-            #p [:close, ws.object_id, event.code, event.reason]
-            Caboose.log("Closing server web socket for image #{image_id}...")
-            @image_ids.delete(ws.object_id)
-            ws = nil
-          end                    
-          ws.rack_response
-        end
-        
-      else
-        @app.call(env)
-      end
-      
-    end
-  end
-end
-