deja-vu 0.4 → 0.5

data/Change.log

@@ -1,4 +1,8 @@
--- Dec. 7th
+-- Dec. 8th, 2009
+- modified the storage model
+- fixed xampl transaction
+
+-- Dec. 7th, 2009
 - added analysis class to do basic stats on recordings
 - refactored the player to be better
 - fixed a bug in the recorder

data/Rakefile

@@ -9,7 +9,7 @@ begin
     s.homepage = "http://github.com/kuccello/deja-vu"
     s.authors = ['Kristan "Krispy" Uccello']
     s.files = FileList["[A-Z]*", "{lib,test,example,example-playback}/**/*"]
-    s.version = "0.4"
+    s.version = "0.5"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/lib/deja-vu.rb

@@ -1,3 +1,4 @@
+require 'dirge'
 require ~'deja-vu/init'
 #require ~'rack-session-listener'
 require 'digest/sha1'
@@ -25,30 +26,30 @@ module SoldierOfCode
       end
 
       def call(env)
-
         if @opt[:enable_record] then
           user_identifier_before = get_user_identifier(env)
           env_before = env
           t_start = Time.new
+#          puts "#{__FILE__}:#{__LINE__} #{Thread.current} HERE BEFORE APP CALL"
           resp = @app.call(env) # would be nice to capture all log output from the downstream as well.... TODO add log object as logger
+#          puts "#{__FILE__}:#{__LINE__} #{Thread.current} HERE AFTER APP CALL"
           t_stop = Time.new
           user_identifier_after = get_user_identifier(env)
 
           current_request = Rack::Request.new(env)
 
-          dejavu_recorder = nil
+          dejavu_recorder = Recorder.new(@opt)
           if user_identifier_before != user_identifier_after then
-            # something changed the identifier
-            dejavu_recorder = Recorder.new(@opt)
+#            puts "#{__FILE__}:#{__LINE__} #{Thread.current} HERE SOMETHING CHANGED"
             dejavu_recorder.identifier_change(user_identifier_after)
           end
 
-          dejavu_recorder = Recorder.new(@opt) unless dejavu_recorder
-
+#          puts "#{__FILE__}:#{__LINE__} #{Thread.current} ABOUT TO DO THE RECORD"
           dejavu_recorder.record(env, resp, current_request, t_start, t_stop, user_identifier_after)
-
+#          puts "#{__FILE__}:#{__LINE__} #{Thread.current} FINISHED THE RECORD OPERATION"
           resp
         else
+#          puts "#{__FILE__}:#{__LINE__} #{Thread.current} HERE SKIPPED COMPLETLEY"
           @app.call(env)
         end
       end
@@ -59,7 +60,7 @@ module SoldierOfCode
       # otherwise will create a hash based on the env data available
       #
       def get_user_identifier(env) # => a string representing a specific browser client user
-        
+#        puts "#{__FILE__}:#{__LINE__} #{Thread.current} HERE DOING IDENTIFIER WORK"
         http_accept = env['HTTP_ACCEPT']
         http_agent = env['HTTP_USER_AGENT']
         user_ip = env['REMOTE_ADDR']

data/lib/deja-vu/model/generated_model/DejaVuNS.rb

@@ -184,7 +184,7 @@ module DejaVuNS
       accessed
       index = record.get_the_index
       if(nil == index) then
-        raise Xampl::XamplException.new("no value for the index 'id' of record defined in : " << record.pp_xml)
+        raise Xampl::XamplException.new("no value for the index 'pid' of record defined in : " << record.pp_xml)
       end
 
       existing = @record_child[index]
@@ -206,6 +206,7 @@ module DejaVuNS
       accessed
 
       record = nil
+      record = Record.lookup(index) if Xampl.persister and Xampl.persister.automatic
       record = Record.new(index) unless record
 
       yield(record) if block_given?
@@ -218,6 +219,7 @@ module DejaVuNS
       record = @record_child[index]
 		  return record if record 
 
+      record = Record.lookup(index) if Xampl.persister and Xampl.persister.automatic
       record = Record.new(index) unless record
 
       yield(record) if block_given?
@@ -834,7 +836,28 @@ module DejaVuNS
   end
 
   class Record
-    include Xampl::XamplObject
+    include Xampl::XamplPersistedObject
+
+    @@default_persister_format = nil
+
+    def default_persister_format
+      @@default_persister_format
+    end
+    def Record.default_persister_format
+      @@default_persister_format
+    end
+    def Record.set_default_persister_format(format)
+      @@default_persister_format = format
+    end
+
+    def Record.find_by_query
+      things = Xampl.find_xampl do | q |
+         q.add_condition('class', :equals, self.name)
+         yield(q)
+       end
+    end
+
+
     include Xampl::XamplWithDataContent
 
     @@tag = "record"
@@ -843,12 +866,13 @@ module DejaVuNS
     @@module_name = "DejaVuNS"
     @@safe_name = "DejaVuNS_record"
     @@attributes = [
-                     [ :@id, "id" ],
+                     [ :@pid, "pid" ],
                      [ :@stamp, "stamp" ],
                      [ :@status, "status" ],
                      [ :@httpmethod, "httpmethod" ],
                      [ :@url, "url" ],
                      [ :@request_time, "request-time" ],
+                     [ :@scheduled_for_deletion_at, "scheduled-for-deletion-at" ],
                    ]
     include DejaVuNS::HeaderAsChild
     include DejaVuNS::BodyAsChild
@@ -856,15 +880,25 @@ module DejaVuNS
     include DejaVuNS::MultipartReferenceAsChild
 
 
-    def id
-      accessed
-      @id
+    def Record.lookup(pid)
+      Xampl.lookup(Record, pid)
     end
 
-    def id=(v)
-     accessed
-     changed
-     @id = v
+    def Record.[](pid)
+      Xampl.lookup(Record, pid)
+    end
+
+    def pid
+      @pid
+    end
+
+    def pid=(v)
+      accessed
+			# This is kind of optimistic, I think you are in trouble if you do this
+      Xampl.auto_uncache(self) if @pid
+      @pid = v
+      changed
+      Xampl.auto_cache(self) if v
     end
 
     def stamp
@@ -922,16 +956,28 @@ module DejaVuNS
      @request_time = v
     end
 
+    def scheduled_for_deletion_at
+      accessed
+      @scheduled_for_deletion_at
+    end
+
+    def scheduled_for_deletion_at=(v)
+     accessed
+     changed
+     @scheduled_for_deletion_at = v
+    end
+
     def initialize(index=nil)
-      @id = index if index
+      @pid = index if index
       super()
 
-      @id = nil if not defined? @id
+      @pid = nil if not defined? @pid
       @stamp = nil if not defined? @stamp
       @status = nil if not defined? @status
       @httpmethod = nil if not defined? @httpmethod
       @url = nil if not defined? @url
       @request_time = nil if not defined? @request_time
+      @scheduled_for_deletion_at = nil if not defined? @scheduled_for_deletion_at
 
       init_xampl_object
       init_data_content
@@ -947,12 +993,12 @@ module DejaVuNS
     end
 
     def clear_non_persistent_index_attributes
-      @id = nil
       @stamp = nil
       @status = nil
       @httpmethod = nil
       @url = nil
       @request_time = nil
+      @scheduled_for_deletion_at = nil
     end
 
     def append_to(other)
@@ -960,11 +1006,11 @@ module DejaVuNS
     end
 
     def Record.persisted?
-      return nil
+      return :pid
     end
 
     def persisted?
-      return nil
+      return :pid
     end
 
     def Record.tag
@@ -1012,15 +1058,15 @@ module DejaVuNS
     end
 
     def indexed_by
-      :id
+      :pid
     end
 
     def get_the_index
-      @id
+      @pid
     end
 
     def set_the_index(index)
-      @id = index
+      @pid = index
     end
 
     def substitute_in_visit(visitor)

data/lib/deja-vu/model/xml/dejavu.xml

@@ -6,7 +6,7 @@
              agent=""
              ip="">
 
-    <record id=""
+    <record pid=""
             stamp=""
             status=""
             httpmethod=""

data/lib/deja-vu/recorder.rb

@@ -14,6 +14,8 @@ module SoldierOfCode
       def initialize(opt)
         @identifier = opt['cookie_name']
         @opt = opt
+
+        @foo = Time.new.to_i
       end
 
       def export(to_file_named)
@@ -30,27 +32,43 @@ module SoldierOfCode
 
         # 1. try to locate the recording
         recording = nil
+
+#        puts "#{__FILE__}:#{__LINE__} #{Thread.current} >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
+#        puts "#{__FILE__}:#{__LINE__} #{Thread.current} INSIDE RECORD - STARTING TXN"
+#        puts "#{__FILE__}:#{__LINE__} #{Thread.current} >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
+
         DejaVuNS.transaction do
+#puts "#{__FILE__}:#{__LINE__} #{Thread.current} JUST INSIDE"
           recording = DejaVuNS::Recording.find_by_identifier(@identifier)
-
-#          puts "#{__FILE__}:#{__LINE__} #{__method__}  #{recording.class.name}"
+#puts "#{__FILE__}:#{__LINE__} #{Thread.current} RECORDING FOUND: #{recording.pid}"
+#          puts "#{__FILE__}:#{__LINE__} #{Thread.current}  #{recording.class.name}"
           # 1.b if not found then create a new one
           unless recording
+#puts "#{__FILE__}:#{__LINE__} #{Thread.current} "
             recording = DejaVuNS.root.new_recording(DejaVuNS.pid_from_string(@identifier||identifier))
             recording.cookie = req.cookies[@identifier||identifier]
             recording.stamp = Time.new.to_i
             recording.agent = env['HTTP_USER_AGENT']
             recording.ip = env['REMOTE_ADDR']
+#puts "#{__FILE__}:#{__LINE__} #{Thread.current} "
           end
 
           # 2. create a new record
-#          puts "#{__FILE__}:#{__LINE__} #{__method__}  #{recording.class.name}"
+#          puts "#{__FILE__}:#{__LINE__} #{Thread.current}  #{recording.class.name}"
+#puts "#{__FILE__}:#{__LINE__} #{Thread.current} "
           record = recording.new_record("#{Time.new.to_i}")
+#puts "#{__FILE__}:#{__LINE__} #{Thread.current} "
           record.stamp = "#{Time.new.to_i}"
+#          puts "#{__FILE__}:#{__LINE__} #{Thread.current} "
+
           record.status = "#{resp[0]}"
+#          puts "#{__FILE__}:#{__LINE__} #{Thread.current} "
           record.httpmethod = env['REQUEST_METHOD']
+#          puts "#{__FILE__}:#{__LINE__} #{Thread.current} "
           record.url = "#{env['rack.url_scheme']}://#{env['HTTP_HOST']}#{env['REQUEST_URI']}"
+#          puts "#{__FILE__}:#{__LINE__} #{Thread.current} "
           record.request_time = ("#{end_time.to_i}.#{end_time.usec}".to_f - "#{start_time.to_i}.#{start_time.usec}".to_f).to_s
+#          puts "#{__FILE__}:#{__LINE__} #{Thread.current} "
 
           # 3. add the body etc elements
           resp[1].each do |k, v|
@@ -58,33 +76,56 @@ module SoldierOfCode
             h.name = k
             h.value = v
           end
+#          puts "#{__FILE__}:#{__LINE__} #{Thread.current} "
 
           record.new_body().content = "<![CDATA[#{resp[2]}]]>"
+#          puts "#{__FILE__}:#{__LINE__} #{Thread.current} "
 
           if req.post? && env['CONTENT_TYPE'] =~ %r|\Amultipart/form-data.*boundary=\"?([^\";,]+)\"?|n
             # its multipart
             # <multipart-reference name="" file-path=""/>
             # can I grab it off the env object?
-            puts "#{__FILE__}:#{__LINE__} #{__method__} NOT IMPLEMENTED - MULTIPART"
+            puts "#{__FILE__}:#{__LINE__} #{Thread.current} NOT IMPLEMENTED - MULTIPART"
           else
+#            puts "#{__FILE__}:#{__LINE__} #{Thread.current} "
             # safe param recording
             req.params.each do |k,v|
               p = record.new_param()
               p.name = k
               p.value = v
             end
+#            puts "#{__FILE__}:#{__LINE__} #{Thread.current} "
 
           end
+#          puts "#{__FILE__}:#{__LINE__} #{Thread.current} ABOUT TO PRINT XML"
+          STDOUT.flush
+#          puts "#{__FILE__}:#{__LINE__} #{Thread.current} #{recording.pp_xml}"
         end
 
+#        puts "#{__FILE__}:#{__LINE__} #{Thread.current} >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
+#        puts "#{__FILE__}:#{__LINE__} #{Thread.current} >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
+#        puts "#{__FILE__}:#{__LINE__} #{Thread.current} >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
+#        puts "#{__FILE__}:#{__LINE__} #{Thread.current} >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
+#        puts "#{__FILE__}:#{__LINE__} #{Thread.current} >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
+#        puts "#{__FILE__}:#{__LINE__} #{Thread.current} DONE TXN"
+#        puts "#{__FILE__}:#{__LINE__} #{Thread.current} >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
+#        puts "#{__FILE__}:#{__LINE__} #{Thread.current} >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
+#        puts "#{__FILE__}:#{__LINE__} #{Thread.current} >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
+#        puts "#{__FILE__}:#{__LINE__} #{Thread.current} >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
+#        puts "#{__FILE__}:#{__LINE__} #{Thread.current} >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
+#        puts "#{__FILE__}:#{__LINE__} #{Thread.current} >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
+
       end
 
       def identifier_change(new_identifier)
         DejaVuNS.transaction do
+#          puts "#{__FILE__}:#{__LINE__} #{Thread.current} IDENTIFIER CHANGE"
           recording = DejaVuNS::Recording.find_by_identifier(@identifier)
           if recording
+#            puts "#{__FILE__}:#{__LINE__} #{Thread.current} IDENTIFIER CHANGE HERE"
             @identifier = new_identifier
             recording.cookie = new_identifier
+#            puts "#{__FILE__}:#{__LINE__} #{Thread.currentta} IDENTIFIER CHANGE HERE #{recording.cookie}"
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: deja-vu
 version: !ruby/object:Gem::Version 
-  version: "0.4"
+  version: "0.5"
 platform: ruby
 authors: 
 - Kristan "Krispy" Uccello