xamplr 1.9.2 → 1.9.3

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 1
 :minor: 9
-:patch: 2
+:patch: 3
 :build: 

data/lib/xamplr/notifications.rb

@@ -44,6 +44,11 @@ module Xampl
       return self
     end
 
+    # this element has been realised
+    def note_realised
+      return self
+    end
+
     # replacing the original
 
     def note_replacing(original)

data/lib/xamplr/persister.rb

@@ -144,11 +144,13 @@ module Xampl
       # Normally we'd expect to see the representation in the @format format, but
       # that isn't necessarily the case. Try to work out what the format might be...
 
+      xampl = nil
       if representation =~ /^</ then
-        return XamplObject.realise_from_xml_string(representation, target)
+        xampl = XamplObject.realise_from_xml_string(representation, target)
       else
-        XamplObject.from_ruby(representation, target)
+        xampl = XamplObject.from_ruby(representation, target)
       end
+      return xampl.note_realised
     end
 
     def write(xampl)
@@ -333,6 +335,7 @@ module Xampl
   end
 
   require "xamplr/persisters/simple"
+  require "xamplr/persisters/dumb"
   require "xamplr/persisters/in-memory"
   require "xamplr/persisters/filesystem"
 

data/lib/xamplr/persisters/caching.rb

@@ -134,6 +134,8 @@ module Xampl
     end
 
     def read(klass, pid, target=nil)
+      #return nil unless pid
+
 #      puts "#{File.basename(__FILE__)} #{__LINE__} READ:: klass: #{klass} pid: #{pid} target: [[#{target}]], PM: #{ self }"
 
       xampl, target = read_from_cache(klass, pid, target)

data/lib/xamplr/persisters/dumb.rb

@@ -0,0 +1,48 @@
+module Xampl
+
+  class DumbPersister < Persister
+
+    def initialize(name=nil, format=nil)
+      super(name, format)
+
+      @module_map = {}
+      @cache = {}
+    end
+
+    def DumbPersister.kind
+      :dumb
+    end
+
+    def kind
+      DumbPersister.kind
+    end
+
+    def sync_done
+    end
+
+    def has_changed(xampl)
+      throw :mixed_persisters unless self == xampl.persister
+    end
+
+    def cache(xampl)
+      xampl
+    end
+
+    def uncache(xampl)
+    end
+
+    def clear_cache
+    end
+
+    def write(xampl)
+      return true
+    end
+
+    def read(klass, pid, target=nil)
+      return nil
+    end
+  end
+
+  Xampl.register_persister_kind(DumbPersister)
+end
+

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

@@ -1,9 +1,13 @@
 module Xampl
 
   require 'fileutils'
+  require 'set'
+  require 'json'
+  require 'yaml'
+
   require 'tokyocabinet'
+
   require 'xamplr/persisters/caching'
-  require 'set'
 
   #  require 'ruby-prof'
 
@@ -472,6 +476,7 @@ module Xampl
     end
 
     def write(xampl)
+
       raise XamplException.new(:no_index_so_no_persist) unless xampl.get_the_index
 
       expunging = self.expunged.include?(xampl)
@@ -541,23 +546,12 @@ module Xampl
           xampl_hash = primary_description.merge(xampl_hash)
         end
 
-        note_errors("TC[[#{ @filename }]]:: write error: %s\n") do
-          if Xampl.raw_persister_options[:write_through] then
-            FileUtils.mkdir_p(place_dir) unless File.exist?(place_dir)
-            file_place = "#{ @files_dir }/#{ place }"
-            File.open(file_place, "w") do |out|
-              out.write xampl_hash['xampl']
-              if :sync == Xampl.raw_persister_options[:write_through] then
-                out.fsync
-                if $is_darwin then
-                  out.fcntl(51, 0) # Attempt an F_FULLFSYNC fcntl to commit data to disk (darwin *ONLY*)
-                end
-              end
-            end
-
-          end
-          @tc_db.put(place, xampl_hash)
+        index_info = {}
+        if primary_description && 0 < primary_description.size then
+          index_info[:primary] = xampl_hash.dup
+          index_info[:primary].delete('xampl')
         end
+        index_info[:secondary] = []
 
         #TODO -- smarter regarding when to delete (e.g. mentions)
         if xampl.should_schedule_delete? and xampl.scheduled_for_deletion_at then
@@ -577,6 +571,7 @@ module Xampl
 
           secondary_descriptions.each do | secondary_description |
             description = secondary_description.merge(xampl_hash)
+            index_info[:secondary] << secondary_description
 
             note_errors("TC[[#{ @filename }]]:: write error: %s\n") do
               pk = @tc_db.genuid
@@ -585,6 +580,30 @@ module Xampl
           end
         end
 
+        note_errors("TC[[#{ @filename }]]:: write error: %s\n") do
+          if Xampl.raw_persister_options[:write_through] then
+            FileUtils.mkdir_p(place_dir) unless File.exist?(place_dir)
+            file_place = "#{ @files_dir }/#{ place }"
+            File.open(file_place, "w") do |out|
+              out.write xampl_hash['xampl']
+              if :sync == Xampl.raw_persister_options[:write_through] then
+                out.fsync
+                if $is_darwin then
+                  out.fcntl(51, 0) # Attempt an F_FULLFSYNC fcntl to commit data to disk (darwin *ONLY*)
+                end
+              end
+            end
+            if index_info[:primary] && 0 < index_info[:secondary].size then
+              file_place += ".idx"
+              File.open(file_place, "w") do |out|
+                out.write index_info.to_yaml
+              end
+            end
+          end
+          
+          @tc_db.put(place, xampl_hash)
+        end
+
         @write_count = @write_count + 1
         xampl.changes_accepted
       end
@@ -607,6 +626,7 @@ module Xampl
 #        puts "#{ __FILE__ }:#{ __LINE__ } [#{__method__}] READ REP"
         open_tc_db
       end
+
       place = File.join(klass.name.split("::"), pid)
 
       meta = @tc_db[place]

data/xamplr.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xamplr}
-  s.version = "1.9.2"
+  s.version = "1.9.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bob Hutchison"]
-  s.date = %q{2010-01-20}
+  s.date = %q{2010-02-01}
   s.description = %q{xamplr is the ruby version of xampl.}
   s.email = %q{hutch@recursive.ca}
   s.extra_rdoc_files = [
@@ -44,6 +44,7 @@ Gem::Specification.new do |s|
      "lib/xamplr/persister.rb",
      "lib/xamplr/persisters/caches.rb",
      "lib/xamplr/persisters/caching.rb",
+     "lib/xamplr/persisters/dumb.rb",
      "lib/xamplr/persisters/filesystem.rb",
      "lib/xamplr/persisters/in-memory.rb",
      "lib/xamplr/persisters/simple.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: xamplr
 version: !ruby/object:Gem::Version 
-  version: 1.9.2
+  version: 1.9.3
 platform: ruby
 authors: 
 - Bob Hutchison
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-20 00:00:00 -05:00
+date: 2010-02-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,6 +69,7 @@ files:
 - lib/xamplr/persister.rb
 - lib/xamplr/persisters/caches.rb
 - lib/xamplr/persisters/caching.rb
+- lib/xamplr/persisters/dumb.rb
 - lib/xamplr/persisters/filesystem.rb
 - lib/xamplr/persisters/in-memory.rb
 - lib/xamplr/persisters/simple.rb