rhubarb 0.2.1 → 0.2.2

data/CHANGES

@@ -1,4 +1,12 @@
-version 0.2.1
+version 0.2.2
+
+*  explicit support for :blob-typed columns (blob values will be
+   appropriately stored in create statements and attribute assignments).
+   Note that it is still not possible to search for rows based on the
+   value in a blob-valued column.
+*  equality and hash methods (both based on class and row identity).
+
+version 0.2.1 (97339238fbca0116b686f64343d479d15af8a03f)
 
 *  Code cleanups
 

data/Rakefile

@@ -41,13 +41,12 @@ def pkg_version
   return version.chomp
 end
 
-def pkg_version
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-  return version.chomp
+def name
+  return 'rhubarb'
 end
 
 def pkg_name
-  return 'ruby-rhubarb'
+  return "ruby-" + name()
 end
 
 def pkg_spec
@@ -71,15 +70,18 @@ def rpm_dirs
 end
 
 desc "create RPMs"
-task :rpms => [:build, :tarball] do
-  require 'fileutils'
+task :rpms => [:build, :tarball, :gen_spec] do
   FileUtils.cp pkg_spec(), 'SPECS'
   sh "rpmbuild --define=\"_topdir \${PWD}\" -ba SPECS/#{pkg_spec}"
 end
 
+desc "Generate the specfile"
+task :gen_spec do
+  sh "cat #{pkg_spec}" + ".in" + "| sed 's/RHUBARB_VERSION/#{pkg_version}/' > #{pkg_spec}"
+end
+
 desc "Create a tarball"
-task :tarball => :make_rpmdirs do
-  require 'fileutils'
+task :tarball => [:make_rpmdirs, :gen_spec] do
   FileUtils.cp_r 'lib', pkg_dir()
   FileUtils.cp ['LICENSE', 'README.rdoc', 'CHANGES', 'TODO', 'VERSION'], pkg_dir()
   sh "tar -cf #{pkg_source} #{pkg_dir}"
@@ -87,17 +89,15 @@ task :tarball => :make_rpmdirs do
 end
 
 desc "Make dirs for building RPM"
-task :make_rpmdirs => :rpm_clean do
-  require 'fileutils'
+task :make_rpmdirs => :clean do
   FileUtils.mkdir pkg_dir()
   FileUtils.mkdir rpm_dirs()
 end
 
 desc "Cleanup after an RPM build"
-task :rpm_clean do
+task :clean do
   require 'fileutils'
-  FileUtils.rm_r pkg_dir(), :force => true
-  FileUtils.rm_r rpm_dirs(), :force => true
+  FileUtils.rm_r [pkg_dir(), rpm_dirs(), pkg_spec(), 'pkg', name() + ".gemspec"], :force => true
 end
 
 require 'spec/rake/spectask'

data/TODO

@@ -5,6 +5,10 @@
 * Documentation
 * Standalone examples (i.e. not just "please see the test suite")
 * Resolve issues related to using prepared statements
+* Find rows by value of blob-valued field
+* Automatic zlib compression of blobs (:zblob type)
+* Automatic yaml serialization of arbitrary Ruby objects (:rubyobj type)
+* Refactor column value transformations (e.g. for foreign-key rows, blobs, [future] zblob/rubyobj, etc.) to be more regular and uniform
 
 Legend:
 

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/rhubarb/classmixins.rb

@@ -128,6 +128,7 @@ module Rhubarb
       end
 
       self.colnames.merge([cname])
+      self.colkinds[cname] = kind
       self.columns << Column.new(cname, kind, quals)
 
       # add accessors
@@ -138,8 +139,14 @@ module Rhubarb
       end
 
       if not rf
+        xform = nil
+        
+        if kind == :blob
+          xform = Util::blobify_proc
+        end
+        
         define_method set_method_name do |arg|
-          @tuple["#{cname}"] = arg
+          @tuple["#{cname}"] = xform ? xform.call(arg) : arg
           update cname, arg
         end      
       else
@@ -202,7 +209,7 @@ module Rhubarb
 
       # resolve any references in the args
       new_row.each do |column,value|
-        new_row[column] = Util::rhubarb_fk_identity(value)
+        new_row[column] = colkinds[column] == :blob ? Util::blobify(value) : Util::rhubarb_fk_identity(value)
       end
 
       stmt = "insert into #{table_name} (#{colspec}) values (#{valspec})"
@@ -246,7 +253,7 @@ module Rhubarb
           # The API purposefully does not expose the ability to create a
           # row with a given id, and created and updated values are
           # maintained automatically by the API.
-          attr_accessor :columns, :colnames, :constraints, :dirtied, :refs, :creation_callbacks
+          attr_accessor :columns, :colnames, :colkinds, :constraints, :dirtied, :refs, :creation_callbacks
         end
       end
 
@@ -254,6 +261,7 @@ module Rhubarb
       self.columns ||= [Column.new(:row_id, :integer, [:primary_key]), Column.new(:created, :integer, []), Column.new(:updated, :integer, [])]
       self.colnames ||= Set.new [:created, :updated]
       self.constraints ||= []
+      self.colkinds ||= {}
       self.dirtied ||= {}
       self.refs ||= {}
       self.creation_callbacks ||= []

data/lib/rhubarb/persisting.rb

@@ -34,7 +34,17 @@ module Rhubarb
       freshen
       not @tuple
     end
-
+    
+    def hash
+      freshen
+      @row_id ^ self.table_name.hash
+    end
+    
+    def ==(other)
+      freshen
+      self.class == other.class && other.row_id == self.row_id
+    end
+      
     # Initializes a new instance backed by a tuple of values.  Do not call this directly. 
     # Create new instances with the create or find methods.
     def initialize(tup)

data/lib/rhubarb/util.rb

@@ -24,5 +24,13 @@ module Rhubarb
     def self.rhubarb_fk_identity(object)
       (object.row_id if object.class.ancestors.include? Persisting) || object
     end
+    
+    def self.blobify(obj)
+      blobify_proc.call(obj)
+    end
+    
+    def self.blobify_proc
+      @blobify_proc ||= Proc.new {|x| x.is_a?(SQLite3::Blob) ? x : SQLite3::Blob.new(x)}
+    end
   end
 end

data/{ruby-rhubarb.spec → ruby-rhubarb.spec.in}

@@ -1,9 +1,9 @@
 %{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')}
-%define rel 0.3
+%define rel 0.1
 
 Summary: Simple versioned object-graph persistence layer
 Name: ruby-rhubarb
-Version: 0.2.0
+Version: RHUBARB_VERSION
 Release: %{rel}%{?dist}
 Group: Applications/System
 License: ASL 2.0

data/test/helper.rb

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

data/test/test_rhubarb.rb

@@ -11,8 +11,7 @@
 # 
 #     http://www.apache.org/licenses/LICENSE-2.0
 
-require 'rhubarb/rhubarb'
-require 'test/unit'
+require 'helper'
 
 class TestClass 
   include Rhubarb::Persisting  
@@ -88,6 +87,11 @@ class FreshTestTable
   declare_column :fum, :integer
 end
 
+class BlobTestTable 
+  include Rhubarb::Persisting
+  declare_column :info, :blob
+end
+
 class BackendBasicTests < Test::Unit::TestCase
   def setup
     Rhubarb::Persistence::open(":memory:")
@@ -101,6 +105,7 @@ class BackendBasicTests < Test::Unit::TestCase
     klasses << ToRef
     klasses << FromRef
     klasses << FreshTestTable
+    klasses << BlobTestTable
     klasses << RhubarbNamespace::NMTC
     klasses << RhubarbNamespace::NMTC2
 
@@ -554,6 +559,26 @@ class BackendBasicTests < Test::Unit::TestCase
     end
     
   end
+  
+  def test_equality
+    tc1 = TestClass.create(:foo=>1, :bar=>"hello")
+    tc2 = TestClass.create(:foo=>1, :bar=>"hello")
+    tc3 = TestClass.create(:foo=>2, :bar=>"goodbye")
+    
+    tc1p = TestClass.find(tc1.row_id)
+    
+    assert_equal(tc1, tc1)         # equality is reflexive
+    assert_equal(tc1p, tc1)        # even after find operations
+    assert_equal(tc1, tc1p)        # ... and it should be symmetric
+    assert_not_equal(tc1, tc2)     # these are not identical
+    assert_not_equal(tc1p, tc2)    # even after find operations
+    assert_not_equal(tc2, tc1p)    # ... and it should be symmetric
+    assert_not_same(tc1, tc2)      # but these are not identical
+    assert_not_equal(tc1, tc3)     # these aren't even equal!
+    assert_not_equal(tc2, tc3)     # neither are these
+    assert_not_equal(tc3, tc1)     # and inequality should hold
+    assert_not_equal(tc3, tc2)     #   under symmetry
+  end
 
   def freshness_query_fixture
     @flist = []
@@ -629,4 +654,25 @@ class BackendBasicTests < Test::Unit::TestCase
       end
     end
   end
+  
+  def test_blob_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 = BlobTestTable.create(:info => text)
+    
+    crow = BlobTestTable.create(:info => compressed_text)
+    
+    btrow = BlobTestTable.find(row.row_id)
+    cbtrow = BlobTestTable.find(crow.row_id)
+    
+    assert_equal(text, btrow.info)
+    assert_equal(text, Zlib::Inflate.inflate(cbtrow.info))
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rhubarb
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - William Benton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-15 00:00:00 -06:00
+date: 2010-02-22 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,7 +59,7 @@ files:
 - lib/rhubarb/reference.rb
 - lib/rhubarb/rhubarb.rb
 - lib/rhubarb/util.rb
-- ruby-rhubarb.spec
+- ruby-rhubarb.spec.in
 - test/helper.rb
 - test/test_rhubarb.rb
 has_rdoc: true