ribs 0.0.1 → 0.0.2

data/test/test_helper.rb

@@ -20,21 +20,68 @@ Ribs::DB.define do |db|
   db.dialect = 'Derby'
   db.uri = 'jdbc:derby:test_database;create=true'
   db.driver = 'org.apache.derby.jdbc.EmbeddedDriver'
+  db.default = true
 #   db.properties['hibernate.show_sql'] = 'true'
 end
 
+Ribs::DB.define(:flarg) do |db|
+  db.dialect = 'Derby'
+  db.uri = 'jdbc:derby:test_database_flarg;create=true'
+  db.driver = 'org.apache.derby.jdbc.EmbeddedDriver'
+end
+
+Ribs::DB.define(:flurg) do |db|
+  db.dialect = 'Derby'
+  db.uri = 'jdbc:derby:test_database_flurg;create=true'
+  db.driver = 'org.apache.derby.jdbc.EmbeddedDriver'
+end
+
 def reset_database!
-  Ribs.with_session do |s|
-    s.ddl "DROP TABLE DB_TRACK" rescue nil
-    s.ddl "DROP TABLE ARTIST" rescue nil
+  Ribs.with_handle(:flarg) do |h|
+    h.ddl "DROP TABLE FAKEMODEL" rescue nil
+    h.ddl "DROP TABLE FAKEMODEL_FAKESECONDMODEL" rescue nil
+    h.ddl <<SQL
+CREATE TABLE FAKEMODEL (
+  ID INT NOT NULL
+)
+SQL
+    h.ddl <<SQL
+CREATE TABLE FAKEMODEL_FAKESECONDMODEL (
+  ID INT NOT NULL
+)
+SQL
+  end
+
+  Ribs.with_handle(:flurg) do |h|
+    h.ddl "DROP TABLE FAKEMODEL" rescue nil
+    h.ddl "DROP TABLE FAKEMODEL_FAKESECONDMODEL" rescue nil
+    h.ddl <<SQL
+CREATE TABLE FAKEMODEL (
+  ID INT NOT NULL
+)
+SQL
+    h.ddl <<SQL
+CREATE TABLE FAKEMODEL_FAKESECONDMODEL (
+  ID INT NOT NULL
+)
+SQL
+  end
+
+  Ribs.with_handle do |h|
+    h.ddl "DROP TABLE DB_TRACK" rescue nil
+    h.ddl "DROP TABLE ARTIST" rescue nil
+    h.ddl "DROP TABLE person" rescue nil
+    h.ddl "DROP TABLE address" rescue nil
+    h.ddl "DROP TABLE FAKEMODEL" rescue nil
+    h.ddl "DROP TABLE FAKEMODEL_FAKESECONDMODEL" rescue nil
 
     # GENERATED ALWAYS AS IDENTITY
     # Add new columns for TIMESTAMP, BINARY, DECIMAL, FLOAT, BOOLEAN
-    s.ddl <<SQL
+    h.ddl <<SQL
 CREATE TABLE DB_TRACK (
   TRACK_ID INT NOT NULL,
   title VARCHAR(255) NOT NULL,
-  filePath VARCHAR(255),
+  filePath VARCHAR(255) NOT NULL,
   playTime TIME,
   added DATE,
   volume INT NOT NULL,
@@ -49,25 +96,57 @@ CREATE TABLE DB_TRACK (
 )
 SQL
 
-    s.ddl <<SQL
+    h.ddl <<SQL
 CREATE TABLE ARTIST (
   ID INT NOT NULL,
   name VARCHAR(255) NOT NULL,
   PRIMARY KEY (ID)
 )
+SQL
+
+    h.ddl <<SQL
+CREATE TABLE person (
+  ID INT NOT NULL,
+  given_name VARCHAR(255),
+  sur_name VARCHAR(255) NOT NULL,
+  age INT NOT NULL,
+  PRIMARY KEY (ID)
+)
+SQL
+
+    h.ddl <<SQL
+CREATE TABLE address (
+  ID INT NOT NULL,
+  street VARCHAR(255),
+  postal VARCHAR(255),
+  zip VARCHAR(255),
+  country VARCHAR(255),
+  PRIMARY KEY (ID)
+)
+SQL
+    
+    h.ddl <<SQL
+CREATE TABLE FAKEMODEL (
+  ID INT NOT NULL
+)
+SQL
+    h.ddl <<SQL
+CREATE TABLE FAKEMODEL_FAKESECONDMODEL (
+  ID INT NOT NULL
+)
 SQL
     
     template = <<SQL
 INSERT INTO DB_TRACK(TRACK_ID, title, filePath, playTime, added, volume, lastPlayed, data, description, fraction, otherFraction, good, price) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
 SQL
     
-    s.insert(template, 
+    h.insert(template, 
              [1, "foobar", "c:/abc/cde/foo.mp3", [Time.time_at(14,50,0), :time], [Time.local(1984, 12, 13, 0,0,0), :date], 13, 
               [Time.local(1984, 12, 14, 12,3,11), :timestamp], ["abc", :binary], ["foobar", :text], 3.4, 5.7, true, BigDecimal.new("13134.11")], 
              [2, "flux", "d:/abc/cde/flax.mp3", [Time.time_at(16,23,0), :time], [Time.local(1983, 12, 13, 0,0,0), :date], 13,
               [Time.local(1982, 5, 3, 13,3,7), :timestamp], ["mumsi", :binary], ["maxi", :text], 3.5, 35435.4522234, false, BigDecimal.new("55454.33")])
 
-    s.insert("INSERT INTO ARTIST(ID, name) VALUES(?, ?)", 
+    h.insert("INSERT INTO ARTIST(ID, name) VALUES(?, ?)", 
              [1, "Public Image Ltd"],
              [2, "New Model Army"],
              [3, "David Bowie"])
@@ -79,5 +158,7 @@ reset_database!
 at_exit do 
   require 'fileutils'
   FileUtils.rm_rf('test_database')
+  FileUtils.rm_rf('test_database_flarg')
+  FileUtils.rm_rf('test_database_flurg')
   FileUtils.rm_rf('derby.log')
 end

data/test/track_spec.rb

@@ -1,28 +1,40 @@
 require File.join(File.dirname(__FILE__), 'test_helper')
 
 class Track
-  Ribs! do |rib|
-    rib.table :DB_TRACK
-    
-    rib.primary_key :TRACK_ID
-
-    rib.col :title, :track_title
-    rib.col :playTime, :time
-    rib.col :added, :date_added
-    rib.col :lastPlayed, :last_played_at
-    rib.col :data, :file_data
-    rib.col :description, :desc
-    rib.col :fraction, :some_fraction
-    rib.col :good, :is_good
-    rib.col :price, :full_price
-    
-    rib.avoid :filePath
+  attr_accessor :track_id
+  attr_accessor :track_title
+  attr_accessor :time
+  attr_accessor :date_added
+  attr_accessor :last_played_at
+  attr_accessor :file_data
+  attr_accessor :desc
+  attr_accessor :some_fraction
+  attr_accessor :is_good
+  attr_accessor :full_price
+  attr_accessor :volume
+
+  Ribs! :table => :DB_TRACK, :identity_map => false do |rib|
+    rib.TRACK_ID.primary_key!
+
+    rib.track_title    :column => :title
+    rib.time           :column => :playTime
+    rib.date_added     :column => :added
+    rib.last_played_at :column => :lastPlayed
+    rib.file_data      :column => :data
+    rib.desc           :column => :description
+    rib.some_fraction  :column => :fraction
+    rib.is_good        :column => :good
+    rib.full_price     :column => :price
+
+    rib.filePath :avoid, :default => "fluxie"
   end
 end
 
+# R(Track).define_accessors
+
 describe Track do 
   it "should be able to find things based on mapped primary key" do
-    track = Track.find(2)
+    track = R(Track).get(2)
     track.track_id.should == 2
     track.track_title.should == "flux"
     track.time.should == Time.time_at(16,23,0)
@@ -31,7 +43,7 @@ describe Track do
   end
     
   it "should have property that wasn't named" do 
-    prop = Track.ribs_metadata['VOLUME']
+    prop = R(Track).metadata['VOLUME']
     prop.name.should == 'VOLUME'
     colarr = prop.column_iterator.to_a
     colarr.length.should == 1
@@ -39,63 +51,63 @@ describe Track do
   end
 
   it "shouldn't have property that's avoided" do 
-    Track.ribs_metadata['filePath'].should be_nil
+    R(Track).metadata['filePath'].should be_nil
   end
 
   it "should have correct names for defined properties" do 
-    props = Track.ribs_metadata.properties
+    props = R(Track).metadata.properties
     # the primary keys aren't actually part of the properties
     props.keys.sort.should == ['OTHERFRACTION', 'VOLUME', 'track_title', 'time', 'date_added', 'file_data', 'desc', 'some_fraction', 'is_good', 'full_price', 'last_played_at'].sort
     props.values.map { |p| p.column_iterator.to_a[0].name }.sort.should == 
       ['VOLUME', 'TITLE', 'PLAYTIME', 'ADDED', 'OTHERFRACTION', 'LASTPLAYED', 'DATA', 'DESCRIPTION', 'FRACTION', 'GOOD', 'PRICE'].sort
   end
   
-  it "should have correct value and type for OTHERFRACTION property" do 
-    res = Track.find(:all).map { |a| a.otherfraction }.sort
+  it "should have correct value and type for OTHERFRACTION property from instance variable" do 
+    res = R(Track).all.map { |a| a.instance_variable_get :@otherfraction }.sort
     res[0].should be_close(5.7, 0.00001)
     res[1].should be_close(35435.4522234, 0.01)
   end
 
   it "should have correct value and type for VOLUME property" do 
-    Track.find(:all).map { |a| a.volume }.sort.should == [13, 13]
+    R(Track).all.map { |a| a.volume }.sort.should == [13, 13]
   end
   
   it "should have correct value and type for track_title property" do 
-    Track.find(:all).map { |a| a.track_title }.sort.should == ["flux", "foobar"]
+    R(Track).all.map { |a| a.track_title }.sort.should == ["flux", "foobar"]
   end
 
   it "should have correct value and type for time property" do 
-    Track.find(:all).map { |a| a.time }.sort.should == [Time.time_at(14,50,0), Time.time_at(16,23,0)]
+    R(Track).all.map { |a| a.time }.sort.should == [Time.time_at(14,50,0), Time.time_at(16,23,0)]
   end
 
   it "should have correct value and type for date_added property" do 
-    Track.find(:all).map { |a| a.date_added }.sort.should == [Time.local(1983, 12, 13, 0, 0, 0),Time.local(1984, 12, 13, 0, 0, 0)]
+    R(Track).all.map { |a| a.date_added }.sort.should == [Time.local(1983, 12, 13, 0, 0, 0),Time.local(1984, 12, 13, 0, 0, 0)]
   end
   
   it "should have correct value and type for file_data property" do 
-    Track.find(:all).map { |a| a.file_data }.sort.should == ["abc", "mumsi"]
+    R(Track).all.map { |a| a.file_data }.sort.should == ["abc", "mumsi"]
   end
 
   it "should have correct value and type for desc property" do 
-    Track.find(:all).map { |a| a.desc }.sort.should == ["foobar", "maxi"]
+    R(Track).all.map { |a| a.desc }.sort.should == ["foobar", "maxi"]
   end
   
   it "should have correct value and type for some_fraction property" do 
-    res = Track.find(:all).map { |a| a.some_fraction }.sort
+    res = R(Track).all.map { |a| a.some_fraction }.sort
     res[0].should be_close(3.4, 0.00001)
     res[1].should be_close(3.5, 0.00001)
   end
   
   it "should have correct value and type for is_good property" do 
-    Track.find(:all).map { |a| a.is_good }.sort_by{|v| v ? 0 : 1}.should == [true, false]
+    R(Track).all.map { |a| a.is_good }.sort_by{|v| v ? 0 : 1}.should == [true, false]
   end
   
   it "should have correct value and type for full_price property" do 
-    Track.find(:all).map { |a| a.full_price }.sort.should == [BigDecimal.new("13134.11"), BigDecimal.new("55454.33")]
+    R(Track).all.map { |a| a.full_price }.sort.should == [BigDecimal.new("13134.11"), BigDecimal.new("55454.33")]
   end
 
   it "should have correct value and type for last_played_at property" do 
-    Track.find(:all).map { |a| a.last_played_at }.sort.should == [Time.local(1982, 5, 3, 13,3,7), Time.local(1984, 12, 14, 12,3,11)]
+    R(Track).all.map { |a| a.last_played_at }.sort.should == [Time.local(1982, 5, 3, 13,3,7), Time.local(1984, 12, 14, 12,3,11)]
   end
   
   it "should be possible to create a new instance by setting properties" do 
@@ -113,11 +125,11 @@ describe Track do
       track.full_price = BigDecimal.new("14.49")
       track.volume = 5
 
-      Track.find(3).should be_nil
+      R(Track).get(3).should be_nil
       
-      track.save
+      R(track).save
 
-      Track.find(3).should_not be_nil
+      R(Track).get(3).should_not be_nil
     ensure
       reset_database!
     end
@@ -125,7 +137,7 @@ describe Track do
 
   it "should be possible to create a new instance by giving properties to new" do 
     begin 
-      track = Track.new(
+      track = R(Track).new(
                         :track_id => 3,
                         :track_title => "Born to raise hell",
                         :time => Time.time_at(0,3,25),
@@ -138,11 +150,11 @@ describe Track do
                         :full_price => BigDecimal.new("14.49"),
                         :volume => 5)
 
-      Track.find(3).should be_nil
+      R(Track).get(3).should be_nil
 
-      track.save
+      R(track).save
 
-      Track.find(3).should_not be_nil
+      R(Track).get(3).should_not be_nil
     ensure
       reset_database!
     end
@@ -150,8 +162,8 @@ describe Track do
 
   it "should be possible to create a new instance by using create" do 
     begin 
-      Track.find(3).should be_nil
-      track = Track.create(
+      R(Track).get(3).should be_nil
+      track = R(Track).create(
                         :track_id => 3,
                         :track_title => "Born to raise hell",
                         :time => Time.time_at(0,3,25),
@@ -164,14 +176,14 @@ describe Track do
                         :full_price => BigDecimal.new("14.49"),
                         :volume => 5)
 
-      Track.find(3).should_not be_nil
+      R(Track).get(3).should_not be_nil
     ensure
       reset_database!
     end
   end
 
   def create_simple
-    Track.create(
+    R(Track).create(
                  :track_id => 3,
                  :track_title => "Born to raise hell",
                  :time => Time.time_at(0,3,25),
@@ -184,7 +196,7 @@ describe Track do
                  :full_price => BigDecimal.new("14.49"),
                  :volume => 5)
     
-    Track.find(3)
+    R(Track).get(3)
   end
   
   it "should have correct value and type for TRACK_ID property on newly created bean" do 
@@ -277,11 +289,11 @@ describe Track do
 
   it "should be possible to update track_title property on existing bean" do 
     begin
-      v = Track.find(1)
+      v = R(Track).get(1)
       v.track_title = "new value here"
-      v.save
+      R(v).save
       
-      Track.find(1).track_title.should == "new value here"
+      R(Track).get(1).track_title.should == "new value here"
     ensure
       reset_database!
     end
@@ -289,11 +301,11 @@ describe Track do
 
   it "should be possible to update time property on existing bean" do 
     begin
-      v = Track.find(1)
+      v = R(Track).get(1)
       v.time = Time.time_at(23,32,33)
-      v.save
+      R(v).save
       
-      Track.find(1).time.should == Time.time_at(23,32,33)
+      R(Track).get(1).time.should == Time.time_at(23,32,33)
     ensure
       reset_database!
     end
@@ -301,11 +313,11 @@ describe Track do
 
   it "should be possible to update date_added property on existing bean" do 
     begin
-      v = Track.find(1)
+      v = R(Track).get(1)
       v.date_added = Time.local(2004,10,9,0,0,0)
-      v.save
+      R(v).save
       
-      Track.find(1).date_added.should == Time.local(2004,10,9,0,0,0)
+      R(Track).get(1).date_added.should == Time.local(2004,10,9,0,0,0)
     ensure
       reset_database!
     end
@@ -313,11 +325,11 @@ describe Track do
 
   it "should be possible to update last_played_at property on existing bean" do 
     begin
-      v = Track.find(1)
+      v = R(Track).get(1)
       v.last_played_at = Time.local(2005,8,8,10,24,12)
-      v.save
+      R(v).save
       
-      Track.find(1).last_played_at.should == Time.local(2005,8,8,10,24,12)
+      R(Track).get(1).last_played_at.should == Time.local(2005,8,8,10,24,12)
     ensure
       reset_database!
     end
@@ -325,11 +337,11 @@ describe Track do
 
   it "should be possible to update file_data property on existing bean" do 
     begin
-      v = Track.find(1)
+      v = R(Track).get(1)
       v.file_data = "Some data"
-      v.save
+      R(v).save
       
-      Track.find(1).file_data.should == "Some data"
+      R(Track).get(1).file_data.should == "Some data"
     ensure
       reset_database!
     end
@@ -337,11 +349,11 @@ describe Track do
 
   it "should be possible to update desc property on existing bean" do 
     begin
-      v = Track.find(1)
+      v = R(Track).get(1)
       v.desc = "Some description"
-      v.save
+      R(v).save
       
-      Track.find(1).desc.should == "Some description"
+      R(Track).get(1).desc.should == "Some description"
     ensure
       reset_database!
     end
@@ -349,11 +361,11 @@ describe Track do
 
   it "should be possible to update some_fraction property on existing bean" do 
     begin
-      v = Track.find(1)
+      v = R(Track).get(1)
       v.some_fraction = 3.1416 #Anal test
-      v.save
+      R(v).save
       
-      Track.find(1).some_fraction.should be_close(3.1416, 0.00001)
+      R(Track).get(1).some_fraction.should be_close(3.1416, 0.00001)
     ensure
       reset_database!
     end
@@ -361,11 +373,11 @@ describe Track do
 
   it "should be possible to update is_good property on existing bean" do 
     begin
-      v = Track.find(1)
+      v = R(Track).get(1)
       v.is_good = false
-      v.save
+      R(v).save
       
-      Track.find(1).is_good.should be_false
+      R(Track).get(1).is_good.should be_false
     ensure
       reset_database!
     end
@@ -373,11 +385,11 @@ describe Track do
 
   it "should be possible to update full_price property on existing bean" do 
     begin
-      v = Track.find(1)
+      v = R(Track).get(1)
       v.full_price = BigDecimal.new("142.12")
-      v.save
+      R(v).save
       
-      Track.find(1).full_price.should == BigDecimal.new("142.12")
+      R(Track).get(1).full_price.should == BigDecimal.new("142.12")
     ensure
       reset_database!
     end
@@ -385,11 +397,11 @@ describe Track do
 
   it "should be possible to update volume property on existing bean" do 
     begin
-      v = Track.find(1)
+      v = R(Track).get(1)
       v.volume = 42
-      v.save
+      R(v).save
       
-      Track.find(1).volume.should == 42
+      R(Track).get(1).volume.should == 42
     ensure
       reset_database!
     end
@@ -397,8 +409,8 @@ describe Track do
   
   it "should be possible to delete existing bean" do 
     begin
-      Track.find(1).destroy!
-      Track.find(1).should be_nil
+      R(R(Track).get(1)).destroy!
+      R(Track).get(1).should be_nil
     ensure
       reset_database!
     end
@@ -406,8 +418,8 @@ describe Track do
   
   it "should be possible to delete existing bean by id" do 
     begin
-      Track.destroy(2)
-      Track.find(2).should be_nil
+      R(Track).destroy(2)
+      R(Track).get(2).should be_nil
     ensure
       reset_database!
     end