content_data 0.0.2 → 0.0.8

data/lib/content_data.rb

@@ -1,9 +1,9 @@
-require_relative 'content_data/content_data'
+require 'content_data/content_data'
+require 'content_data/dynamic_content_data'
 
 # Data structure for an abstract layer over files.
 # Each binary sequence is a content, each file is content instance.
 module BBFS
   module ContentData
-    VERSION = "0.0.1"
   end
 end

data/lib/content_data/content_data.rb

@@ -1,3 +1,5 @@
+require 'log'
+require 'params'
 require 'time'
 
 module BBFS
@@ -31,8 +33,6 @@ module BBFS
         end
       end
 
-
-
       def to_s
         "%s,%d,%s" % [@checksum, @size, ContentData.format_time(@first_appearance_time)]
       end
@@ -42,16 +42,6 @@ module BBFS
             self.size.eql? other.size and
             self.first_appearance_time.to_i.eql? other.first_appearance_time.to_i)
       end
-
-      # Support for protocol buffers
-      #def serialize
-      #  serializer = ContentMessage.new
-      #  serializer.checksum = checksum
-      #  serializer.size = size
-      #  serializer.first_appearance_time = ContentData.format_time(first_appearance_time)
-      #
-      #  serializer
-      #end
     end
 
     class ContentInstance
@@ -100,7 +90,11 @@ module BBFS
       end
 
       def global_path
-        "%s:%s:%s" % [@server_name, @device, @full_path]
+        ContentInstance.instance_global_path(@server_name, @full_path)
+      end
+
+      def ContentInstance.instance_global_path(server_name, full_path)
+        "%s:%s" % [server_name, full_path]
       end
 
       def to_s
@@ -116,96 +110,40 @@ module BBFS
             self.full_path.eql? other.full_path and
             self.modification_time.to_i.eql? other.modification_time.to_i)
       end
-
-      # Support for protocol buffers
-      #      #def serialize
-      #  serializer = ContentInstanceMessage.new
-      #  serializer.checksum = checksum
-      #  serializer.size = size
-      #  serializer.modification_time = ContentData.format_time(modification_time)
-      #  serializer.server_name = server_name
-      #  serializer.device = device.to_s
-      #  serializer.full_path = full_path
-      #
-      #  serializer
-      #end
-
-      #@checksum
-      #@size
-      #@server_name
-      #@device
-      #@full_path
-      #@modification_time
     end
 
+    # Unfortunately this class is used as mutable for now. So need to be carefull.
+    # TODO(kolman): Make this class imutable, but add indexing structure to it.
+    # TODO(kolman): Add wrapper to the class to enable dynamic content data
+    # (with easy access indexes)
     class ContentData
       attr_reader :contents, :instances
 
       # @param content_data_serializer_str [String]
-      def initialize(content_data_serializer = nil)
-        @contents = Hash.new # key is a checksum , value is a refernce to the Content object
-        @instances = Hash.new  # key is an instance global path , value is a reference to the ContentInstance object
-        if (content_data_serializer != nil)
-          content_data_serializer.contents.each do |entry|
-            key = entry.key
-            value = entry.value
-            content_serializer = value.content
-            raise ArgumentError.new("content have to be defined") if content_serializer.nil?
-            content = Content.new(nil, nil, nil, content_serializer)
-            @contents[key] = content
-          end
-          content_data_serializer.instances.each do |entry|
-            key = entry.key
-            value = entry.value
-            content_instance_serializer = value.instance
-            raise ArgumentError.new("instance have to be defined") if content_instance_serializer.nil?
-            content_instance = ContentInstance.new(nil, nil, nil, nil, nil, nil, content_instance_serializer)
-            @instances[key] = content_instance
-          end
+      def initialize(copy = nil)
+        if copy.nil?
+          @contents = Hash.new # key is a checksum , value is a refernce to the Content object
+          @instances = Hash.new  # key is an instance global path , value is a reference to the ContentInstance object
+        else
+          # Regenerate only the hashes, the values are immutable.
+          @contents = copy.contents.clone
+          @instances = copy.instances.clone
         end
       end
 
-      # Support for protocol buffers
-      #def serialize (serializer = nil)
-      #  serializer = ContentDataMessage.new if (serializer == nil)
-      #  contents.each do |key, value|
-      #    hash_value = ContentDataMessage::HashEntry::HashValue.new
-      #    content_serializer = value.serialize
-      #    #content_serializer = ContentMessage.new
-      #    #content_serializer.parse_from_string(content_serializer_str)
-      #    hash_value.content = content_serializer
-      #    hash_entry = ContentDataMessage::HashEntry.new
-      #    hash_entry.key = key
-      #    hash_entry.value = hash_value
-      #    serializer.contents << hash_entry
-      #  end
-      #  instances.each do |key, value|
-      #    hash_value = ContentDataMessage::HashEntry::HashValue.new
-      #    instance_serializer = value.serialize
-      #    #instance_serializer = ContentInstanceMessage.new
-      #    #instance_serializer.parse_from_string(instance_serializer_str)
-      #    hash_value.instance = instance_serializer
-      #    hash_entry = ContentDataMessage::HashEntry.new
-      #    hash_entry.key = key
-      #    hash_entry.value = hash_value
-      #    serializer.instances << hash_entry
-      #  end
-      #  serializer
-      #end
-
       def add_content(content)
         @contents[content.checksum] = content
       end
 
       def add_instance(instance)
         if (not @contents.key?(instance.checksum))
-          printf("Warning: Adding instance while it's" +
+          Log.warning sprintf("Adding instance while it's" +
                      " checksum %s does not exists.\n", instance.checksum)
-          printf("%s\n", instance.to_s)
+          Log.warning sprintf("%s\n", instance.to_s)
           return false
         elsif (@contents[instance.checksum].size != instance.size)
-          print("Warning: File size different from content size while same checksum.\n")
-          printf("%s\n", instance.to_s)
+          Log.warning 'File size different from content size while same checksum'
+          Log.warning instance.to_s
           return false
         end
 
@@ -234,33 +172,22 @@ module BBFS
       end
 
       def ==(other)
-
-        #print "size:%s\n" % @contents.size
-        #print "other size:%s\n" % other.contents.size
         return false if other == nil
         return false unless @contents.size == other.contents.size
         return false unless @instances.size == other.instances.size
 
         @contents.keys.each { |key|
           if (@contents[key] != other.contents[key])
-            #print "%s-" % @contents[key].to_s
-            #print other.contents[key].to_s
-            #puts " compare - false"
-            puts @contents[key].first_appearance_time.to_i
-            puts other.contents[key].first_appearance_time.to_i
+            Log.info @contents[key].first_appearance_time.to_i
+            Log.info other.contents[key].first_appearance_time.to_i
             return false
           end
         }
-
         @instances.keys.each { |key|
           if (@instances[key] != other.instances[key])
-            #print "%s-" % @instances[key].to_s
-            #print other.instances[key].to_s
-            #puts " compare - false"
             return false
           end
         }
-        #puts "compare - true"
         return true
       end
 
@@ -278,6 +205,8 @@ module BBFS
       end
 
       def to_file(filename)
+        content_data_dir = File.dirname(filename)
+        FileUtils.makedirs(content_data_dir) unless File.exists?(content_data_dir)
         File.open(filename, 'w') {|f| f.write(to_s) }
       end
 
@@ -297,7 +226,7 @@ module BBFS
         number_of_instances = lines[i].to_i
         i += 1
         number_of_instances.times {
-          parameters = lines[i].split(",")
+          parameters = lines[i].split(',')
           # bugfix: if file name consist a comma then parsing based on comma separating fails
           if (parameters.size > 6)
             (5..parameters.size-2).each do |i|
@@ -318,20 +247,15 @@ module BBFS
         }
       end
 
-      def self.parse_time(time_str)
+      def self.parse_time time_str
         return nil unless time_str.instance_of? String
-        time = Time.strptime( time_str, '%Y/%m/%d %H:%M:%S.%L' )
-        # another option to parse a time
-        #require 'scanf.rb'
-        #time_arr = time_str.scanf("%d/%d/%d %d:%d:%d.%d")
-        #time = Time.utc(time_arr[0], time_arr[1],time_arr[2],time_arr[3],time_arr[4],time_arr[5],time_arr[6])
+        seconds_from_epoch = Integer time_str  # Not using to_i here because it does not check string is integer.
+        time = Time.at seconds_from_epoch
       end
 
       def self.format_time(time)
         return nil unless time.instance_of?Time
-        #puts time.class
-        str = time.strftime( '%Y/%m/%d %H:%M:%S.%L' )
-        #puts str
+        str = time.to_i.to_s
         return str
       end
 
@@ -362,7 +286,7 @@ module BBFS
           ret.add_content(content) unless a.content_exists(content.checksum)
         }
 
-        #puts "kaka"
+        #Log.info "kaka"
 
         b.instances.values.each { |instance|
           #print "%s - %s\n" % [instance.checksum, a.content_exists(instance.checksum).to_s]
@@ -374,6 +298,36 @@ module BBFS
         return ret
       end
 
+      def self.remove_instances(a, b)
+        return nil unless a.instance_of?ContentData
+        return nil unless b.instance_of?ContentData
+
+        ret = ContentData.new
+        b.instances.values.each do |instance|
+          if !a.instances.key?(instance.global_path)
+            ret.add_content(b.contents[instance.checksum])
+            ret.add_instance(instance)
+          end
+        end
+        return ret
+      end
+
+      def self.remove_directory(cd, global_dir_path)
+        return nil unless cd.instance_of?ContentData
+
+        ret = ContentData.new
+        cd.instances.values.each do |instance|
+          Log.debug3("global path to check: #{global_dir_path}")
+          Log.debug3("instance global path: #{instance.global_path}")
+          if instance.global_path.scan(global_dir_path).size == 0
+            Log.debug3("Adding instance.")
+            ret.add_content(cd.contents[instance.checksum])
+            ret.add_instance(instance)
+          end
+        end
+        return ret
+      end
+
       # returns the common content in both a and b
       def self.intersect(a, b)
         b_minus_a = ContentData.remove(a, b)
@@ -391,12 +345,12 @@ module BBFS
           checksum = instance.checksum
           time = instance.modification_time
 
-          unless (checksum2instances.has_key?checksum)
+          unless (checksum2instances.has_key? checksum)
             checksum2instances[checksum] = []
           end
           checksum2instances[checksum] << instance
 
-          if (not checksum2time.has_key?checksum)
+          if (not checksum2time.has_key? checksum)
             checksum2time[checksum] = time
           elsif ((checksum2time[checksum] <=> time) > 0)
             checksum2time[checksum] = time
@@ -406,7 +360,7 @@ module BBFS
         # update min time table with time information from contents
         db.contents.each do |checksum, content|
           time = content.first_appearance_time
-          if (not checksum2time.has_key?checksum)
+          if (not checksum2time.has_key? checksum)
             checksum2time[checksum] = time
           elsif ((checksum2time[checksum] <=> time) > 0)
             checksum2time[checksum] = time
@@ -430,7 +384,9 @@ module BBFS
             if ((instance.modification_time <=> time) == 0)
               mod_db.add_instance(instance)
             else # must be bigger then found min time
-              mod_instance = ContentInstance.new(instance.checksum, instance.size, instance.server_name, instance.device, instance.full_path, time)
+              mod_instance = ContentInstance.new(instance.checksum, instance.size,
+                                                 instance.server_name, instance.device,
+                                                 instance.full_path, time)
               mod_db.add_instance(mod_instance)
             end
           end

data/lib/content_data/dynamic_content_data.rb

@@ -0,0 +1,43 @@
+require 'thread'
+
+module BBFS
+  module ContentData
+
+    # TODO(kolman): When content data is immutable, remove the clones (waste).
+    class DynamicContentData
+      def initialize()
+        @last_content_data = nil
+        @last_content_data_available_mutex = Mutex.new
+      end
+
+      def update(content_data)
+        ref = ContentData.new(content_data)
+        @last_content_data_available_mutex.synchronize {
+          @last_content_data = ref
+        }
+      end
+
+      def exists?(checksum)
+        ref = nil
+        @last_content_data_available_mutex.synchronize {
+          ref = @last_content_data
+        }
+        #Log.debug3("@last_content_data is nil? #{@last_content_data.nil?}")
+        #Log.debug3(@last_content_data.to_s) unless @last_content_data.nil?
+        #Log.debug3("Exists?:#{@last_content_data.content_exists(checksum)}") \
+        #         unless @last_content_data.nil?
+        return ref.content_exists(checksum) if ref != nil
+        false
+      end
+
+      def last_content_data
+        ref = nil
+        @last_content_data_available_mutex.synchronize {
+          ref = @last_content_data
+        }
+        return ContentData.new(ref)
+      end
+    end
+
+  end  # module ContentData
+end  # module BBFS

data/lib/content_data/version.rb

@@ -0,0 +1,5 @@
+module BBFS
+  module ContentData
+    VERSION = "0.0.8"
+  end
+end

data/test/content_data/content_data_test.rb

@@ -9,102 +9,102 @@ module BBFS
     class TestContentData < Test::Unit::TestCase
       def test_content
         content_data = ContentData.new
-        content_data.add_content(Content.new("D12A1C98A3", 765, ContentData.parse_time("2011/02/01 02:23:59.000")))
-        content_data.add_content(Content.new("B12A1C98A3", 123123, ContentData.parse_time("2011/02/01 02:23:59.000")))
-        content_data.add_content(Content.new("D1234C98A3", 12444, ContentData.parse_time("2011/02/01 02:23:59.000")))
-        content_data.add_content(Content.new("DB12A1C233", 2, ContentData.parse_time("2011/02/01 02:23:59.000")))
-        content_data.add_content(Content.new("DB12A4338A", 12412, ContentData.parse_time("2011/02/01 02:23:59.000")))
-        content_data.add_content(Content.new("232A1C98A3", 124424, ContentData.parse_time("2011/02/01 02:23:59.000")))
-        content_data.add_content(Content.new("AC12A1C983", 1242, ContentData.parse_time("2011/02/01 02:23:59.000")))
-        content_data.add_content(Content.new("AAC12A1C983", 1242,ContentData.parse_time("2011/02/01 02:23:59.000")))
+        content_data.add_content(Content.new("D12A1C98A3", 765, ContentData.parse_time("1296527039")))
+        content_data.add_content(Content.new("B12A1C98A3", 123123, ContentData.parse_time("1296527039")))
+        content_data.add_content(Content.new("D1234C98A3", 12444, ContentData.parse_time("1296527039")))
+        content_data.add_content(Content.new("DB12A1C233", 2, ContentData.parse_time("1296527039")))
+        content_data.add_content(Content.new("DB12A4338A", 12412, ContentData.parse_time("1296527039")))
+        content_data.add_content(Content.new("232A1C98A3", 124424, ContentData.parse_time("1296527039")))
+        content_data.add_content(Content.new("AC12A1C983", 1242, ContentData.parse_time("1296527039")))
+        content_data.add_content(Content.new("AAC12A1C983", 1242,ContentData.parse_time("1296527039")))
 
         content_data.add_instance(ContentInstance.new("DB12A1C233", 765, "large_server_1", "dev1",
-                                                      "/home/kuku/dev/lala/k.txt", ContentData.parse_time("2011/02/01 02:23:59.000")))
+                                                      "/home/kuku/dev/lala/k.txt", ContentData.parse_time("1296527039")))
         content_data.add_instance(ContentInstance.new("DB12A4338A", 765, "large_server_1", "dev2",
-                                                      "/home/kuku/dev/lala/k1.txt", ContentData.parse_time("2011/02/01 02:23:59.000")))
+                                                      "/home/kuku/dev/lala/k1.txt", ContentData.parse_time("1296527039")))
         content_data.add_instance(ContentInstance.new("232A1C98A3", 765, "large_server_1", "dev3",
-                                                      "/home/kuku/dev/k.txt", ContentData.parse_time("2011/02/01 02:23:59.000")))
+                                                      "/home/kuku/dev/k.txt", ContentData.parse_time("1296527039")))
         content_data.add_instance(ContentInstance.new("DB12A4338A", 765, "large_server_2", "dev2",
-                                                      "/home/lala/k.txt", ContentData.parse_time("2011/02/01 02:23:59.000")))
+                                                      "/home/lala/k.txt", ContentData.parse_time("1296527039")))
         content_data.add_instance(ContentInstance.new("D1234C98A3", 765, "large_server_2", "dev1",
-                                                      "/home/kuku/lala/k.txt", ContentData.parse_time("2011/02/01 02:23:59.000")))
+                                                      "/home/kuku/lala/k.txt", ContentData.parse_time("1296527039")))
         content_data.add_instance(ContentInstance.new("D12A1C98A3", 765, "large_server_2", "dev1",
-                                                      "/home/kuku/dev/lala/k.txt", ContentData.parse_time("2011/02/01 02:23:59.000")))
+                                                      "/home/kuku/dev/lala/k.txt", ContentData.parse_time("1296527039")))
         content_data.add_instance(ContentInstance.new("AC12A1C983", 765, "large_server_2", "dev2",
-                                                      "/home/kuku/dev/lala/k1.txt", ContentData.parse_time("2011/02/01 02:23:59.000")))
+                                                      "/home/kuku/dev/lala/k1.txt", ContentData.parse_time("1296527039")))
         content_data.add_instance(ContentInstance.new("232A1C98A3", 765, "large_server_2", "dev3",
-                                                      "/home/kuku/dev/k.txt", ContentData.parse_time("2011/02/01 02:23:59.000")))
+                                                      "/home/kuku/dev/k.txt", ContentData.parse_time("1296527039")))
         content_data.add_instance(ContentInstance.new("D12A1C98A3", 765, "large_server_2", "dev2",
-                                                      "/home/lala/k.txt", ContentData.parse_time("2011/02/01 02:23:59.000")))
+                                                      "/home/lala/k.txt", ContentData.parse_time("1296527039")))
         content_data.add_instance(ContentInstance.new("D1234C98A3", 12412, "large_server_2", "dev1",
-                                                      "/home/kuku/lala/k.txt", ContentData.parse_time("2011/02/01 02:23:59.000")))
+                                                      "/home/kuku/lala/k.txt", ContentData.parse_time("1296527039")))
         content_data.add_instance(ContentInstance.new("DB12A4338A", 12412, "large_server_2", "dev1",
-                                                      "/home/kuku/dev/lala/k.txt", ContentData.parse_time("2011/02/01 02:23:59.000")))
+                                                      "/home/kuku/dev/lala/k.txt", ContentData.parse_time("1296527039")))
         content_data.add_instance(ContentInstance.new("AC12A1C983", 12412, "large_server_2", "dev2",
-                                                      "/home/kuku/kuku/dev/lala/k1.txt", ContentData.parse_time("2011/02/01 02:23:59.000")))
+                                                      "/home/kuku/kuku/dev/lala/k1.txt", ContentData.parse_time("1296527039")))
         content_data.add_instance(ContentInstance.new("232A1C98A3", 12412, "large_server_2", "dev3",
-                                                      "/home/kuku/kuku/dev/k.txt", ContentData.parse_time("2011/02/01 02:23:59.000")))
+                                                      "/home/kuku/kuku/dev/k.txt", ContentData.parse_time("1296527039")))
         content_data.add_instance(ContentInstance.new("DB12A4338A", 12412, "large_server_1", "dev2",
-                                                      "/home/kuku/lala/k.txt", ContentData.parse_time("2011/02/01 02:23:59.000")))
+                                                      "/home/kuku/lala/k.txt", ContentData.parse_time("1296527039")))
         content_data.add_instance(ContentInstance.new("D1234C98A3", 12412, "large_server_1", "dev1",
-                                                      "/home/kuku/kuku/lala/k.txt", ContentData.parse_time("2011/02/01 02:23:59.000")))
+                                                      "/home/kuku/kuku/lala/k.txt", ContentData.parse_time("1296527039")))
 
         #print content_data.to_s
 
-        assert_equal("8\nD12A1C98A3,765,2011/02/01 02:23:59.000\nB12A1C98A3,123123,2011/02/01 02:23:59.000\nD1234C98A3,12444,2011/02/01 02:23:59.000\nDB12A1C233,2,2011/02/01 02:23:59.000\nDB12A4338A,12412,2011/02/01 02:23:59.000\n232A1C98A3,124424,2011/02/01 02:23:59.000\nAC12A1C983,1242,2011/02/01 02:23:59.000\nAAC12A1C983,1242,2011/02/01 02:23:59.000\n3\nDB12A4338A,12412,large_server_2,dev1,/home/kuku/dev/lala/k.txt,2011/02/01 02:23:59.000\nD12A1C98A3,765,large_server_2,dev2,/home/lala/k.txt,2011/02/01 02:23:59.000\nDB12A4338A,12412,large_server_1,dev2,/home/kuku/lala/k.txt,2011/02/01 02:23:59.000\n",
+        assert_equal("8\nD12A1C98A3,765,1296527039\nB12A1C98A3,123123,1296527039\nD1234C98A3,12444,1296527039\nDB12A1C233,2,1296527039\nDB12A4338A,12412,1296527039\n232A1C98A3,124424,1296527039\nAC12A1C983,1242,1296527039\nAAC12A1C983,1242,1296527039\n3\nDB12A4338A,12412,large_server_2,dev1,/home/kuku/dev/lala/k.txt,1296527039\nD12A1C98A3,765,large_server_2,dev2,/home/lala/k.txt,1296527039\nDB12A4338A,12412,large_server_1,dev2,/home/kuku/lala/k.txt,1296527039\n",
                      content_data.to_s)
-        content_data.to_file("content_data_test.data")
+        content_data.to_file(File.join File.dirname(__FILE__), "/content_data_test.data")
         new_content_data = ContentData.new()
-        new_content_data.from_file("content_data_test.data")
+        new_content_data.from_file(File.join File.dirname(__FILE__), "/content_data_test.data")
         assert_equal(new_content_data, content_data)
 
         content_data2 = ContentData.new
-        content_data2.add_content(Content.new("AD12A1C98A3", 765, ContentData.parse_time("2011/02/01 02:23:59.000")))
-        content_data2.add_content(Content.new("AB12A1C98A3", 123123, ContentData.parse_time("2011/02/01 02:23:59.000")))
-        content_data2.add_content(Content.new("AD1234C98A3", 12444, ContentData.parse_time("2011/02/01 02:23:59.000")))
-        content_data2.add_content(Content.new("ADB12A1C233", 2, ContentData.parse_time("2011/02/01 02:23:59.000")))
-        content_data2.add_content(Content.new("ADB12A4338A", 12412, ContentData.parse_time("2011/02/01 02:23:59.000")))
-        content_data2.add_content(Content.new("A232A1C98A3", 124424, ContentData.parse_time("2011/02/01 02:23:59.000")))
-        content_data2.add_content(Content.new("AAC12A1C983", 1242, ContentData.parse_time("2011/02/01 02:23:59.000")))
+        content_data2.add_content(Content.new("AD12A1C98A3", 765, ContentData.parse_time("1296527039")))
+        content_data2.add_content(Content.new("AB12A1C98A3", 123123, ContentData.parse_time("1296527039")))
+        content_data2.add_content(Content.new("AD1234C98A3", 12444, ContentData.parse_time("1296527039")))
+        content_data2.add_content(Content.new("ADB12A1C233", 2, ContentData.parse_time("1296527039")))
+        content_data2.add_content(Content.new("ADB12A4338A", 12412, ContentData.parse_time("1296527039")))
+        content_data2.add_content(Content.new("A232A1C98A3", 124424, ContentData.parse_time("1296527039")))
+        content_data2.add_content(Content.new("AAC12A1C983", 1242, ContentData.parse_time("1296527039")))
 
         content_data2.add_instance(ContentInstance.new("ADB12A1C233", 765, "large_server_11", "dev1",
-                                                       "/home/kuku/dev/lala/k.txt", ContentData.parse_time("2011/02/01 02:23:59.000")))
+                                                       "/home/kuku/dev/lala/k.txt", ContentData.parse_time("1296527039")))
         content_data2.add_instance(ContentInstance.new("ADB12A4338A", 765, "large_server_11", "dev2",
-                                                       "/home/kuku/dev/lala/k1.txt", ContentData.parse_time("2011/02/01 02:23:59.000")))
+                                                       "/home/kuku/dev/lala/k1.txt", ContentData.parse_time("1296527039")))
         content_data2.add_instance(ContentInstance.new("A232A1C98A3", 765, "large_server_11", "dev3",
-                                                       "/home/kuku/dev/k.txt", ContentData.parse_time("2011/02/01 02:23:59.000")))
+                                                       "/home/kuku/dev/k.txt", ContentData.parse_time("1296527039")))
         content_data2.add_instance(ContentInstance.new("ADB12A4338A", 765, "large_server_12", "dev2",
-                                                       "/home/lala/k.txt", ContentData.parse_time("2011/02/01 02:23:59.000")))
+                                                       "/home/lala/k.txt", ContentData.parse_time("1296527039")))
         content_data2.add_instance(ContentInstance.new("AD1234C98A3", 765, "large_server_12", "dev1",
-                                                       "/home/kuku/lala/k.txt", ContentData.parse_time("2011/02/01 02:23:59.000")))
+                                                       "/home/kuku/lala/k.txt", ContentData.parse_time("1296527039")))
         content_data2.add_instance(ContentInstance.new("AD12A1C98A3", 765, "large_server_12", "dev1",
-                                                       "/home/kuku/dev/lala/k.txt", ContentData.parse_time("2011/02/01 02:23:59.000")))
+                                                       "/home/kuku/dev/lala/k.txt", ContentData.parse_time("1296527039")))
         content_data2.add_instance(ContentInstance.new("AAC12A1C983", 765, "large_server_12", "dev2",
-                                                       "/home/kuku/dev/lala/k1.txt", ContentData.parse_time("2011/02/01 02:23:59.000")))
+                                                       "/home/kuku/dev/lala/k1.txt", ContentData.parse_time("1296527039")))
         content_data2.add_instance(ContentInstance.new("A232A1C98A3", 765, "large_server_12", "dev3",
-                                                       "/home/kuku/dev/k.txt", ContentData.parse_time("2011/02/01 02:23:59.000")))
+                                                       "/home/kuku/dev/k.txt", ContentData.parse_time("1296527039")))
         content_data2.add_instance(ContentInstance.new("AD12A1C98A3", 765, "large_server_12", "dev2",
-                                                       "/home/lala/k.txt", ContentData.parse_time("2011/02/01 02:23:59.000")))
+                                                       "/home/lala/k.txt", ContentData.parse_time("1296527039")))
         content_data2.add_instance(ContentInstance.new("AD1234C98A3", 12412, "large_server_12", "dev1",
-                                                       "/home/kuku/lala/k.txt", ContentData.parse_time("2011/02/01 02:23:59.000")))
+                                                       "/home/kuku/lala/k.txt", ContentData.parse_time("1296527039")))
         content_data2.add_instance(ContentInstance.new("ADB12A4338A", 12412, "large_server_12", "dev1",
-                                                       "/home/kuku/dev/lala/k.txt", ContentData.parse_time("2011/02/01 02:23:59.000")))
+                                                       "/home/kuku/dev/lala/k.txt", ContentData.parse_time("1296527039")))
         content_data2.add_instance(ContentInstance.new("AAC12A1C983", 12412, "large_server_12", "dev2",
-                                                       "/home/kuku/kuku/dev/lala/k1.txt", ContentData.parse_time("2011/02/01 02:23:59.000")))
+                                                       "/home/kuku/kuku/dev/lala/k1.txt", ContentData.parse_time("1296527039")))
         content_data2.add_instance(ContentInstance.new("A232A1C98A3", 12412, "large_server_12", "dev3",
-                                                       "/home/kuku/kuku/dev/k.txt", ContentData.parse_time("2011/02/01 02:23:59.000")))
+                                                       "/home/kuku/kuku/dev/k.txt", ContentData.parse_time("1296527039")))
         content_data2.add_instance(ContentInstance.new("ADB12A4338A", 12412, "large_server_11", "dev2",
-                                                       "/home/kuku/lala/k.txt", ContentData.parse_time("2011/02/01 02:23:59.000")))
+                                                       "/home/kuku/lala/k.txt", ContentData.parse_time("1296527039")))
         content_data2.add_instance(ContentInstance.new("AD1234C98A3", 12412, "large_server_11", "dev1",
-                                                       "/home/kuku/kuku/lala/k.txt", ContentData.parse_time("2011/02/01 02:23:59.000")))
+                                                       "/home/kuku/kuku/lala/k.txt", ContentData.parse_time("1296527039")))
 
         old_content_data = ContentData.new
         old_content_data.merge(content_data)
         assert_equal(true, old_content_data == content_data)
         content_data.merge(content_data2)
-        content_data.to_file("content_data_test2.data")
+        content_data.to_file(File.join File.dirname(__FILE__), "/content_data_test2.data")
         new_content_data2 = ContentData.new()
-        new_content_data2.from_file("content_data_test2.data")
+        new_content_data2.from_file(File.join File.dirname(__FILE__), "/content_data_test2.data")
         assert_equal(true, new_content_data2 == content_data)
         assert_equal(false, new_content_data2 == old_content_data)
 
@@ -112,8 +112,8 @@ module BBFS
         assert_equal(false, old_content_data == cd3)
         cd4 = ContentData.remove(cd3, content_data)
         #assert_equal(content_data.to_s, "")
-        assert_equal(cd3.to_s, "7\nD12A1C98A3,765,2011/02/01 02:23:59.000\nB12A1C98A3,123123,2011/02/01 02:23:59.000\nD1234C98A3,12444,2011/02/01 02:23:59.000\nDB12A1C233,2,2011/02/01 02:23:59.000\nDB12A4338A,12412,2011/02/01 02:23:59.000\n232A1C98A3,124424,2011/02/01 02:23:59.000\nAC12A1C983,1242,2011/02/01 02:23:59.000\n3\nDB12A4338A,12412,large_server_2,dev1,/home/kuku/dev/lala/k.txt,2011/02/01 02:23:59.000\nD12A1C98A3,765,large_server_2,dev2,/home/lala/k.txt,2011/02/01 02:23:59.000\nDB12A4338A,12412,large_server_1,dev2,/home/kuku/lala/k.txt,2011/02/01 02:23:59.000\n")
-        assert_equal(cd4.to_s, "7\nAAC12A1C983,1242,2011/02/01 02:23:59.000\nAD12A1C98A3,765,2011/02/01 02:23:59.000\nAB12A1C98A3,123123,2011/02/01 02:23:59.000\nAD1234C98A3,12444,2011/02/01 02:23:59.000\nADB12A1C233,2,2011/02/01 02:23:59.000\nADB12A4338A,12412,2011/02/01 02:23:59.000\nA232A1C98A3,124424,2011/02/01 02:23:59.000\n3\nADB12A4338A,12412,large_server_12,dev1,/home/kuku/dev/lala/k.txt,2011/02/01 02:23:59.000\nAD12A1C98A3,765,large_server_12,dev2,/home/lala/k.txt,2011/02/01 02:23:59.000\nADB12A4338A,12412,large_server_11,dev2,/home/kuku/lala/k.txt,2011/02/01 02:23:59.000\n")
+        assert_equal(cd3.to_s, "7\nD12A1C98A3,765,1296527039\nB12A1C98A3,123123,1296527039\nD1234C98A3,12444,1296527039\nDB12A1C233,2,1296527039\nDB12A4338A,12412,1296527039\n232A1C98A3,124424,1296527039\nAC12A1C983,1242,1296527039\n3\nDB12A4338A,12412,large_server_2,dev1,/home/kuku/dev/lala/k.txt,1296527039\nD12A1C98A3,765,large_server_2,dev2,/home/lala/k.txt,1296527039\nDB12A4338A,12412,large_server_1,dev2,/home/kuku/lala/k.txt,1296527039\n")
+        assert_equal(cd4.to_s, "7\nAAC12A1C983,1242,1296527039\nAD12A1C98A3,765,1296527039\nAB12A1C98A3,123123,1296527039\nAD1234C98A3,12444,1296527039\nADB12A1C233,2,1296527039\nADB12A4338A,12412,1296527039\nA232A1C98A3,124424,1296527039\n3\nADB12A4338A,12412,large_server_12,dev1,/home/kuku/dev/lala/k.txt,1296527039\nAD12A1C98A3,765,large_server_12,dev2,/home/lala/k.txt,1296527039\nADB12A4338A,12412,large_server_11,dev2,/home/kuku/lala/k.txt,1296527039\n")
         cd5 = ContentData.merge(cd3, cd4)
         assert_equal(cd5, content_data)
 
@@ -123,14 +123,14 @@ module BBFS
         assert_equal(cd4, intersect)
 
         # Content serialization test
-        #content = Content.new("D12A1C98A3", 765, ContentData.parse_time("2011/02/01 02:23:59.000"))
+        #content = Content.new("D12A1C98A3", 765, ContentData.parse_time("1296527039"))
         #content_serializer = content.serialize()
         #content_copy = Content.new(nil, nil, nil, content_serializer)
         #assert_equal(content, content_copy)
 
         # ContentInstance serialization test
         #instance = ContentInstance.new("DB12A1C233", 765, "large_server_1", "dev1",
-        #                               "/home/kuku/dev/lala/k.txt", ContentData.parse_time("2011/02/01 02:23:59.000"))
+        #                               "/home/kuku/dev/lala/k.txt", ContentData.parse_time("1296527039"))
         #instance_serializer = instance.serialize()
         #instance_copy = ContentInstance.new(nil, nil, nil, nil, nil, nil, instance_serializer)
         #assert_equal(instance, instance_copy)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: content_data
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,42 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000Z
-dependencies: []
+date: 2012-09-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: log
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: params
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! 'Data structure for an abstract layer over files. Each binary sequence
-  is a content, '
+  is a '
 email: kolmanv@gmail.com
 executables: []
 extensions: []
@@ -20,6 +52,8 @@ extra_rdoc_files: []
 files:
 - lib/content_data.rb
 - lib/content_data/content_data.rb
+- lib/content_data/dynamic_content_data.rb
+- lib/content_data/version.rb
 - test/content_data/content_data_test.rb
 homepage: http://github.com/kolmanv/bbfs
 licenses: []
@@ -41,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Data structure for an abstract layer over files.