rhubarb 0.2.5 → 0.2.6

data/CHANGES

@@ -1,3 +1,15 @@
+version 0.2.6
+
+*  Rhubarb now supports starting arbitrary Ruby objects to fields 
+   of type :object --- these are serialized to yaml and gzipped 
+   before they enter the database.  At the moment, you cannot change
+   such an object in place (accessing a field of type :object will
+   return a frozen object); to change the value of an object field 
+   you must dup and reassign.  This will probably change in a future
+   release.
+
+*  Rhubarb now supports storing gzipped blobs in fields of type :zblob.
+
 version 0.2.5
 
 *  Prepared statements are now optional to eliminate a strange bug

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/lib/rhubarb/classmixins.rb

@@ -15,6 +15,8 @@ require 'rhubarb/mixins/freshness'
 module Rhubarb
   # Methods mixed in to the class object of a persisting class
   module PersistingClassMixins 
+    PCM_INPUT_TRANSFORMERS = {:blob=>Util.blobify_proc, :zblob=>Util.zblobify_proc, :object=>Util.swizzle_object_proc}
+    PCM_OUTPUT_TRANSFORMERS = {:object=>Util.deswizzle_object_proc, :zblob=>Util.dezblobify_proc, }
     # Returns the name of the database table modeled by this class.
     # Defaults to the name of the class (sans module names)
     def table_name
@@ -147,19 +149,18 @@ module Rhubarb
       self.colkinds[cname] = kind
       self.columns << Column.new(cname, kind, quals)
 
+      out_xform = PCM_OUTPUT_TRANSFORMERS[kind]
       # add accessors
       define_method get_method_name do
         freshen
-        return @tuple["#{cname}"] if @tuple
-        nil
+        return nil unless @tuple
+        out_xform ? out_xform.call(@tuple[cname.to_s]) : @tuple[cname.to_s]
       end
 
       if not rf
         xform = nil
         
-        if kind == :blob
-          xform = Util::blobify_proc
-        end
+        xform = PCM_INPUT_TRANSFORMERS[kind]
         
         define_method set_method_name do |arg|
           @tuple["#{cname}"] = xform ? xform.call(arg) : arg
@@ -225,7 +226,8 @@ module Rhubarb
 
       # resolve any references in the args
       new_row.each do |column,value|
-        new_row[column] = colkinds[column] == :blob ? Util::blobify(value) : Util::rhubarb_fk_identity(value)
+        xform = PCM_INPUT_TRANSFORMERS[colkinds[column]]
+        new_row[column] = xform ? xform.call(value) : Util::rhubarb_fk_identity(value)
       end
 
       create_text = "insert into #{table_name} (#{colspec}) values (#{valspec})"

data/lib/rhubarb/util.rb

@@ -11,6 +11,8 @@
 #     http://www.apache.org/licenses/LICENSE-2.0
 
 require 'time'
+require 'yaml'
+require 'zlib'
 
 module Rhubarb
   module Util
@@ -32,5 +34,36 @@ module Rhubarb
     def self.blobify_proc
       @blobify_proc ||= Proc.new {|x| x.is_a?(SQLite3::Blob) ? x : SQLite3::Blob.new(x)}
     end
+    
+    def self.zblobify_proc
+      @zblobify_proc ||= Proc.new {|x| x.is_a?(SQLite3::Blob) ? x : SQLite3::Blob.new(Zlib::Deflate.deflate(x))}
+    end
+    
+    def self.dezblobify_proc
+      @dezblobify_proc ||= Proc.new do |x| 
+        return nil if x.nil? || x == ""
+        Zlib::Inflate.inflate(x)
+      end
+    end
+    
+    def self.swizzle_object_proc
+      @swizzle_object_proc ||= Proc.new do |x| 
+        yamlrepr = x.to_yaml
+        SQLite3::Blob.new(Zlib::Deflate.deflate(yamlrepr, Zlib::BEST_COMPRESSION))
+      end
+    end
+
+    def self.deswizzle_object_proc
+      @deswizzle_object_proc ||= Proc.new do |x|
+        return nil if x.nil? || x == ""
+        
+        z = YAML.load(Zlib::Inflate.inflate(x))
+        z.freeze
+      end
+    end
+
+    def self.identity_proc
+      @identity ||= Proc.new {|x| x}
+    end
   end
 end

data/ruby-rhubarb.spec.in

@@ -48,6 +48,9 @@ rm -rf %{buildroot}
 %{ruby_sitelib}/rhubarb/persistence.rb
 
 %changelog
+* Wed Apr 28 2010 willb <willb@redhat> - 0.2.6-1.0
+- Updated to version 0.2.6
+
 * Wed Apr 14 2010 willb <willb@redhat> - 0.2.5-1.0
 - Updated to version 0.2.5
 

data/test/helper.rb

@@ -4,6 +4,8 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'rhubarb/rhubarb'
 require 'test/unit'
 require 'zlib'
+require 'set'
+require 'ostruct'
 
 class Test::Unit::TestCase
 end

data/test/test_rhubarb.rb

@@ -14,6 +14,9 @@
 require 'helper'
 require 'fileutils'
 
+Customer = Struct.new(:name, :address)
+
+
 class TestClass 
   include Rhubarb::Persisting  
   declare_column :foo, :integer
@@ -93,6 +96,17 @@ class BlobTestTable
   declare_column :info, :blob
 end
 
+class ZBlobTestTable 
+  include Rhubarb::Persisting
+  declare_column :info, :zblob
+end
+
+class ObjectTestTable 
+  include Rhubarb::Persisting
+  declare_column :otype, :string
+  declare_column :obj, :object
+end
+
 class PreparedStmtBackendTests < Test::Unit::TestCase  
   def dbfile
     ENV['RHUBARB_TEST_DB'] || ":memory:"
@@ -119,6 +133,8 @@ class PreparedStmtBackendTests < Test::Unit::TestCase
     klasses << FromRef
     klasses << FreshTestTable
     klasses << BlobTestTable
+    klasses << ZBlobTestTable
+    klasses << ObjectTestTable
     klasses << RhubarbNamespace::NMTC
     klasses << RhubarbNamespace::NMTC2
 
@@ -730,6 +746,59 @@ class PreparedStmtBackendTests < Test::Unit::TestCase
     assert_equal(text, Zlib::Inflate.inflate(cbtrow.info))
   end
 
+  def test_zblob_data
+    words = %w{the quick brown fox jumps over a lazy dog now is time for all good men to come aid party jackdaws love my big sphinx of quartz}
+    text = ""
+    (0..300).each do 
+      text << words[rand(words.length)] << " "
+    end
+    
+    compressed_text = Zlib::Deflate.deflate(text)
+    
+    row = ZBlobTestTable.create(:info => text)
+    crow = ZBlobTestTable.create(:info => compressed_text)
+    
+    btrow = ZBlobTestTable.find(row.row_id)
+    cbtrow = ZBlobTestTable.find(crow.row_id)
+    
+    assert_equal(text, btrow.info)
+    assert_equal(text, Zlib::Inflate.inflate(cbtrow.info))
+  end
+
+
+  def test_object_data
+    things = []
+    things << "foo"
+    things << {"foo"=>"bar"}
+    things << ["a", "b", "c", "d"]
+    things << [1]
+    things << {"augh"=>1, "blaugh"=>"quux"}
+    things << [] # empty list
+    things << {} # empty hash
+    things << 49 # int
+    things << {"blah"=>{"foo"=>"bar"}, "argh"=>123, "yuck"=>[1,1,2,3,5,[8]]} # heterogeneous and nested hash
+    things << 0.618  # float
+    things << 99**99  # bignum
+    things << [1,[2,[3,4,[5,6,[7,[8,9,10,[11,12,[13]]]]]]]] # ludicrous list nesting
+    things << {"a"=>{"b"=>{"c"=>{"d"=>{"e"=>["f","g","h","i",{"j"=>["k","l",{"m"=>"n"}]}]}}}}} # ludicrous hash nesting
+    things << Time.now.utc # time
+    things << %w{foo bar blah}.to_set
+    things << Customer.new("Barney Rubble", "303 Cobblestone Way")
+    things << /[1-3]+[A-Z]/
+    
+    things.each_with_index do |thing, idx|
+      ObjectTestTable.create(:otype=>thing.class.name.to_s, :obj=>thing)
+    end
+    
+    otts = ObjectTestTable.find_all
+    
+    assert_equal otts.size, things.size
+    
+    things.zip(otts) do |thing, ott|
+      assert_equal thing.class.name.to_s, ott.otype
+      assert_equal thing, ott.obj      
+    end
+  end
 end
 
 class NoPreparedStmtBackendTests < PreparedStmtBackendTests  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rhubarb
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - William Benton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-20 00:00:00 -05:00
+date: 2010-04-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency