livedata 0.2.1 → 0.2.2

data/CHANGELOG

@@ -0,0 +1,6 @@
+* v0.2.2
+	1. New method set_read_time in User class.
+	2. handle read & write locking in User class.
+	3. write_json and read_json methods are removed from the User class.
+	4. Default ReadTime is set to 30 seconds.
+	5. handle the user list in group

data/lib/live_data/group.rb

@@ -50,8 +50,10 @@ module LiveData
 
       # Add user to the group
       def add_user( user )
-         @users.push( user )
-         user.groups.push( self )
+         if( !@users.include?(user))
+            @users.push( user )
+            user.groups.push( self )
+         end
       end
 
       # Delete user from the group

data/lib/live_data/user.rb

@@ -3,18 +3,24 @@ module LiveData
    class User
 
       IntegerPackCode = "I"
+      ReadTime        = 30
 
       attr :groups, :name
 
       # Create a user object
       def initialize( name = nil, channel = nil )
-         @name    = name || self
-	 @channel = channel
-         @lock                     = Mutex.new
+         @name      = name || self
+    @channel   = channel
+    @read_time = ReadTime
+         @lock      = Mutex.new
          @read_pipe, @write_pipe = IO.pipe
          @groups       = []
       end
 
+      def set_read_time( time )
+         @read_time = time
+      end
+
       # Reset the write pipe and read pipe
       def reset
          begin
@@ -28,33 +34,43 @@ module LiveData
       # Clean the Contain in the pipe
       def clean
          begin
-            while( @read_pipe.read_nonblock( 10000 ) )
-            end
+       @lock.synchronize {
+          while( @read_pipe.read_nonblock( 10000 ) )
+          end
+       }
          rescue => err
          end
       end
 
-      # Read json contain
-      def read_json
-         @read_pipe.gets()
-      end
-
       # Read yaml contain
       def read_yaml
-         len, etc = @read_pipe.read(4).unpack( IntegerPackCode )
-         @read_pipe.read( len )
+         if( ioarrays = IO.select( [@read_pipe], [], [], @read_time ) )
+            if( ioarrays[0].include? @read_pipe )
+               @lock.synchronize {
+                  tcont = @read_pipe.read_nonblock(4)
+                  if( tcont and tcont.size == 4 )
+                     len, etc = tcont.unpack( IntegerPackCode )
+                     return @read_pipe.read_nonblock( len )
+                  else
+                     return nil
+                  end
+               }
+            else
+               return nil
+            end
+         else
+            return nil
+         end
       end
 
       # read a Object
       def read
-          YAML.load( read_yaml )
-      end
-
-      # Write a string, which contain json format
-      # ==== Parameters
-      # * +json_data+ - json string
-      def write_json( json_data )
-         @write_pipe.write( json_data + "\n" )         
+         cont = read_yaml
+         if( cont )
+            return YAML.load( cont )
+         else
+            return nil
+         end
       end
 
       # Write a string, which contain yam format
@@ -62,9 +78,11 @@ module LiveData
       # * +yaml_data+ - yaml string
       def write_yaml( yaml_data )
          return unless yaml_data and yaml_data.class == String
-         len = [ yaml_data.length ].pack( IntegerPackCode )
-         @write_pipe.write( len )
-         @write_pipe.write( yaml_data )
+    len = [ yaml_data.length ].pack( IntegerPackCode )
+    @lock.synchronize {
+       @write_pipe.write( len )
+       @write_pipe.write( yaml_data )
+    }
       end
 
       # Write a Object
@@ -79,10 +97,10 @@ module LiveData
          @groups.dup.each{|grp|
             grp.remove_user( self )
          }
-	 if( @channel )
-		 @channel.users.delete( @name )
-		 @channel.user_in_groups.delete( @name )
-	 end
+    if( @channel )
+       @channel.users.delete( @name )
+       @channel.user_in_groups.delete( @name )
+    end
          begin
             @read_pipe.close
             @write_pipe.close

data/lib/live_data/version.rb

@@ -1,4 +1,4 @@
 
 module LiveData
-   VERSION      = '0.2.1'
+   VERSION      = '0.2.2'
 end

data/lib/live_data.rb

@@ -2,7 +2,6 @@
 
 require 'thread'
 require 'yaml'
-require 'json'
 
 require 'live_data/version'
 require 'live_data/channel'

data/test/live_data_test.rb

@@ -60,8 +60,14 @@ class LiveDataTest < Test::Unit::TestCase
 		data    = { :title => "Greating", :message => "Welcome you all" }
 		data1   = { :title => "Greating1", :message => "Welcome you all" }
 		data2   = { :title => "Greating2", :message => "Welcome you all" }
+
 		grp.add_user( guest1 )
+		assert grp.users.size == 1
+		grp.add_user( guest1 )	# Duplicate user 
+		assert grp.users.size == 1
+
 		grp.add_user( guest2 )
+		assert grp.users.size == 2
 
 		guest1.write( data )
 		assert data == guest1.read
@@ -77,4 +83,14 @@ class LiveDataTest < Test::Unit::TestCase
 		assert data2 == guest2.read
 
 	end
+
+	def test_read_time
+		chat 	= LiveData.create_channel( 'chat' )
+		guest1 	= chat.create_user( 'guest1' )
+		guest1.set_read_time( 2 )
+		assert guest1.read == nil
+
+		guest1.write( "hai" )
+		assert guest1.read == "hai"
+	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: livedata
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Mohammed Siddick. E
@@ -9,7 +9,7 @@ autorequire: live_data
 bindir: bin
 cert_chain: []
 
-date: 2010-02-13 00:00:00 +05:30
+date: 2010-02-15 00:00:00 +05:30
 default_executable: 
 dependencies: []