hutch-xamplr 1.3.13 → 1.3.14

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
 :minor: 3
-:patch: 13
+:patch: 14

data/lib/xamplr/persisters/tokyo-cabinet.rb

@@ -27,7 +27,8 @@ module Xampl
     end
 
     $lexical_indexes = Set.new(%w{ class pid time-stamp xampl-from xampl-to xampl-place }) unless defined?($lexical_indexes)
-    $numeric_indexes = Set.new unless defined?($numeric_indexes)
+
+    $numeric_indexes = Set.new(%w{ scheduled-delete-at }) unless defined?($numeric_indexes)
 
     def TokyoCabinetPersister.add_lexical_indexs(indexes)
       $lexical_indexes.merge(indexes)
@@ -397,12 +398,22 @@ module Xampl
         @tc_db.put(place, xampl_hash)
       end
 
+      #TODO -- smarter regarding when to delete (e.g. mentions)
+      if xampl.should_schedule_delete? and xampl.scheduled_for_deletion_at then
+        secondary_descriptions = [] unless secondary_descriptions
+        secondary_descriptions << { 'scheduled-delete-at' => xampl.scheduled_for_deletion_at }
+      elsif xampl.scheduled_for_deletion_at then
+        puts "#{ __FILE__ }:#{ __LINE__ } HOW TO DO THIS without violating xampl's change rules????? "
+        #xampl.scheduled_for_deletion_at = nil
+      end
+
       if secondary_descriptions then
         xampl_hash = {
                 'class' => xampl.class.name,
                 'pid' => xampl.get_the_index,
                 'xampl-place' => place
         }
+
         secondary_descriptions.each do | secondary_description |
           description = secondary_description.merge(xampl_hash)
 

data/lib/xamplr/xampl-object.rb

@@ -187,15 +187,16 @@ module Xampl
     ################################################################################################
     ################################################################################################
 
-    def Xampl.find_things_to_delete
+    def Xampl.find_things_to_delete(scheduled_before=Time.now.to_i)
       #TODO -- one of these for XamplObject to limit search???
-      Xampl.query do | q |
-        q.add_condition('scheduled-delete', :streq, 'true')
+      things = Xampl.query do | q |
+        q.add_condition('scheduled-delete-at', :lte, scheduled_before)
       end
+      things
     end
 
     def should_schedule_delete?
-      puts "Xampl#should_schedule_delete? is NOT IMPLEMENTED FOR: #{ self.class.name }"
+      #puts "Xampl#should_schedule_delete? is NOT IMPLEMENTED FOR: #{ self.class.name }"
       false
     end
 
@@ -203,18 +204,6 @@ module Xampl
       @scheduled_for_deletion_at = should_schedule_delete? ? at.to_s : nil #TODO -- necessary??
     end
 
-    def schedule_delete_at
-      #TODO -- smarter regarding when to delete
-      if should_schedule_delete? and @scheduled_for_deletion_at then
-        [{ 'scheduled-delete' => 'true',
-           'scheduled-delete-at' => @scheduled_for_deletion_at }]
-      elsif @scheduled_for_deletion_at then
-        @scheduled_for_deletion_at = nil
-      else
-        nil
-      end
-    end
-
     ################################################################################################
     ################################################################################################
     ################################################################################################

data/xamplr.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xamplr}
-  s.version = "1.3.13"
+  s.version = "1.3.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bob Hutchison"]
-  s.date = %q{2009-06-25}
+  s.date = %q{2009-06-26}
   s.email = %q{hutch@recursive.ca}
   s.extra_rdoc_files = [
     "LICENSE",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hutch-xamplr
 version: !ruby/object:Gem::Version 
-  version: 1.3.13
+  version: 1.3.14
 platform: ruby
 authors: 
 - Bob Hutchison
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-25 00:00:00 -07:00
+date: 2009-06-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency