xrefresh-server 0.1.7 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.2.1

data/lib/xrefresh-server.rb

@@ -19,6 +19,7 @@ module XRefreshServer
     VERSION = File.read(File.join(File.expand_path(File.dirname(__FILE__)), '..', 'VERSION'))
     AGENT = "OSX xrefresh-server"
     CONFIG_FILE = ".xrefresh-server.yml"
+    XREFRESH_MESSAGE_SEPARATOR = "---XREFRESH-MESSAGE---"
 
     def self.die(s)
         $stderr.puts s

data/lib/xrefresh-server/client.rb

@@ -21,7 +21,7 @@ module XRefreshServer
         def send(data)
             return if @dead
             begin
-                @socket << data.to_json
+                @socket << data.to_json + XREFRESH_MESSAGE_SEPARATOR
             rescue
                 OUT.puts "Client #{name} #{red("is dead")}"
                 @dead = true
@@ -37,6 +37,15 @@ module XRefreshServer
         end
 
         def send_do_refresh(root, name, type, date, time, files)
+            # read all CSS files and add them into response
+            contents = {}
+            files.each do |item|
+                next unless item["path1"] =~ /\.css$/
+                path = File.join(root, item["path1"]) 
+                content = File.open(path).read
+                contents[item["path1"]] = content
+            end
+            
             send({
               "command" => "DoRefresh", 
               "root" => root, 
@@ -44,7 +53,8 @@ module XRefreshServer
               "date" => date, 
               "time" => time, 
               "type" => type, 
-              "files" => files
+              "files" => files,
+              "contents" => contents
             })
         end
     end

data/lib/xrefresh-server/server.rb

@@ -19,25 +19,17 @@ module XRefreshServer
             @last_client_id += 1
             client = Client.new(@last_client_id, socket)
             @clients.add(client)
-            buffer = ""
             loop do
-                # accumulate incomming input in @buffer
                 begin
-                    buffer += socket.gets
+                    buffer = socket.gets(XREFRESH_MESSAGE_SEPARATOR)
                 rescue
+                    # socket breaks on client disconnection
                     break
                 end
-
-                begin
-                    # try to parse buffer
-                    msg = JSON.parse buffer
-                rescue
-                    # buffer may be incomplete due to packet fragmentation ...
-                else
-                    # got whole message => process it
-                    buffer = ""
-                    process(client, msg)
-                end
+                break unless buffer
+                message = buffer[0...-XREFRESH_MESSAGE_SEPARATOR.size]
+                json = JSON.parse(message)
+                process(client, json)
             end
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: xrefresh-server
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.2.1
 platform: ruby
 authors: 
 - Antonin Hildebrand
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-26 00:00:00 +02:00
+date: 2009-06-20 00:00:00 +02:00
 default_executable: xrefresh-server
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: xrefresh-server
-rubygems_version: 1.3.3
+rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
 summary: XRefresh filesystem monitor for OSX