six-updater-web 0.14.8 → 0.14.9

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'six-updater-web'
-  s.version = '0.14.8'
+  s.version = '0.14.9'
   s.has_rdoc = false
   #s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'

data/lib/six-updater-web/app/controllers/logviews_controller.rb

@@ -10,8 +10,8 @@ class LogviewsController < ApplicationController
   end
 
   def upd
-    s = Log.find(:last, :select => "id")
-    s = s.id if s
+    s = Log.find(:last, :select => "id,updated_at")
+    s = Log.new unless s
     logger.debug "Latest entry: #{s}"
 
     #session[:logentry] = 0 unless session[:logentry]
@@ -25,16 +25,18 @@ class LogviewsController < ApplicationController
 #    end
 
     a = false
-    if session[:logentry]
-      logger.debug "Session entry #{session[:logentry]}"
-      if s != session[:logentry]            
-        session[:logentry] = s
-        logger.debug "New session entry #{session[:logentry]}"
+    if session[:logentry] && session[:logupdated]
+      logger.debug "Session entry #{session[:logentry]} - #{session[:logupdated]}"
+      if s.id != session[:logentry] || s.updated_at != session[:logupdated]            
+        session[:logentry] = s.id
+        session[:logupdated] = s.updated_at
+        logger.debug "New session entry #{session[:logentry]} - #{session[:logupdated]}"
         a = true
       end
     else
-      session[:logentry] = s
-      logger.debug "New session entry #{session[:logentry]}"
+      session[:logentry] = s.id
+      session[:logupdated] = s.updated_at
+      logger.debug "New session entry #{session[:logentry]} - #{session[:logupdated]}"
       a = true
     end
 

data/lib/six-updater-web/app/models/sixconfig.rb

@@ -136,25 +136,15 @@ class Sixconfig < ActiveRecord::Base
   end
 
   def self.process_msg(msg, messages, ses, previous_r = nil)
-    entry = nil
-    if msg[/\n$/] #&& ! msg[/.+\r\n$/]
-      # Create new log entry
-      entry = Log.new :logsession_id => ses, :content => msg
-      previous_r = nil
-    else
-      if previous_r
-        # Overwrite previous log entry
-        entry = previous_r
-      else
-        # Create new log entry
-        entry = Log.new :logsession_id => ses
-        previous_r = entry
-      end
-      entry.content = msg
-    end
-    # Add back into messages even when used before, as the content might be changed anyway, but dont add it if still in queue for nect cycle
-    messages << entry unless messages.include?(entry)
+    # Create new logentry when no previous_r is found
+    entry = previous_r ? previous_r : Log.new(:logsession_id => ses)
+    entry.content = msg
     #p [msg, entry]
+
+    # Set new previous_r unless last message had return
+    previous_r = msg[/\n$/] ? nil : entry #&& ! msg[/.+\r\n$/]
+
+    messages << entry unless messages.include?(entry)
     previous_r
   end
 

data/lib/six-updater-web/app/views/layouts/application.haml

@@ -11,9 +11,10 @@
     = javascript_include_tag :defaults
     = record_select_includes
     = active_scaffold_includes
-    %script
-      stop_polling_logo = false;
-    = periodically_call_remote(:url => '/main/test', :frequency => '1', :condition => 'stop_polling_logo == false')
+    - if Goldberg.user
+      %script
+        stop_polling_logo = false;
+      = periodically_call_remote(:url => '/main/test', :frequency => '1', :condition => 'stop_polling_logo == false')
   %body
     #mainContainerBg
       #mainContainer

data/lib/six-updater-web/config/six-updater-web.rb

@@ -22,7 +22,7 @@ case RUBY_VERSION
 end
 
 module SixUpdaterWeb
-  VERSION = "0.14.8"
+  VERSION = "0.14.9"
   COMPONENT = "six-updater-web"
 
   DEFAULT_IP = "127.0.0.1" unless defined?(DEFAULT_IP)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 14
-  - 8
-  version: 0.14.8
+  - 9
+  version: 0.14.9
 platform: ruby
 authors: 
 - Sickboy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-02 00:00:00 +02:00
+date: 2010-05-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency