test/belongs_to_spec.rb test/has_n_spec.rb test/has_one_spec.rb @@ -82,6 +82,7 @@ module Ribs Column = org.hibernate.mapping.Column Property = org.hibernate.mapping.Property SimpleValue = org.hibernate.mapping.SimpleValue + ManyToOne = org.hibernate.mapping.ManyToOne # A simple helper class that allows the Java parts of the system to # get the Ruby class from the PersistentClass instance. @@ -133,6 +134,10 @@ module Ribs end class << self + def ensure_valid_entity_name(db, name) + R(eval(name), db || :default) + end + # Define a rib for the class +on+. If a block is given, will first # yield an instance of Rib to it and then base the mapping # definition on that. @@ -161,7 +166,6 @@ module Ribs rm.rib = rib rib_data = rib.__column_data__ - db = nil with_handle(options[:db] || :default) do |h| db = h.db @@ -206,18 +210,21 @@ module Ribs table.column_iterator.each do |c| unless rib_data.to_avoid.include?(c.name.downcase) - prop = Property.new - prop.persistent_class = pc - prop.name = ((v=rib_data.columns.find{ |key, val| val[0].to_s.downcase == c.name.downcase}) && v[0]) || c.name - val = SimpleValue.new(table) - val.add_column(c) - val.type_name = get_type_for_sql(c.sql_type, c.sql_type_code) - prop.value = val - if (!rib_data.primary_keys.empty? && rib_data.primary_keys.include?(prop.name)) || c.name.downcase == 'id' - pc.identifier_property = prop - pc.identifier = val - else - pc.add_property(prop) + col_data = rib_data.columns.find{ |key, val| val[0].to_s.downcase == c.name.downcase} || [c.name, {}] + unless col_data[1].length == 3 # It's an association + prop = Property.new + prop.persistent_class = pc + prop.name = col_data[0] + val = SimpleValue.new(table) + val.add_column(c) + val.type_name = get_type_for_sql(c.sql_type, c.sql_type_code) + prop.value = val + if (!rib_data.primary_keys.empty? && rib_data.primary_keys.include?(prop.name)) || c.name.downcase == 'id' + pc.identifier_property = prop + pc.identifier = val + else + pc.add_property(prop) + end end else if !c.nullable @@ -233,6 +240,19 @@ module Ribs end end end + + rib_data.associations[:belongs_to].each do |col_name, definition| + prop = Property.new + prop.persistent_class = pc + prop.name = definition[0] + val = ManyToOne.new(table) + val.add_column(table.get_column(Column.new(col_name))) + ensure_valid_entity_name(options[:db], definition[1]) + val.referenced_entity_name = definition[1] + prop.value = val + pc.add_property(prop) + end + pc.create_primary_key db.mappings.add_class(pc) else lib/ribs/definition.rb @@ -38,9 +38,12 @@ module Ribs # List of default values for columns attr_reader :default_values + attr_reader :associations + # Sets all values - def initialize(columns, primary_keys, to_avoid, default_values) - @columns, @primary_keys, @to_avoid, @default_values = columns, primary_keys, to_avoid, default_values + def initialize(columns, primary_keys, to_avoid, default_values, associations) + @columns, @primary_keys, @to_avoid, @default_values, @associations = + columns, primary_keys, to_avoid, default_values, associations end end @@ -55,14 +58,35 @@ module Ribs @primary_keys = [] @to_avoid = [] @default_values = { } + @associations = + { + :belongs_to => { }, + :has_one => { }, + :has_n => { } + } end # Returns a reference object that allow access to the resulting # data objects def __column_data__ - ColumnData.new(@columns, @primary_keys, @to_avoid, @default_values) + ColumnData.new(@columns, @primary_keys, @to_avoid, @default_values, @associations) end + def belongs_to(*args) + if args==[] || args.first.is_a?(Hash) || [:primary_key, :avoid, :default].include?(args.first) + method_missing(:belongs_to, *args) + else + opts = args.grep(Hash).first || {} + simple_name = args.first.to_s + name = simple_name.gsub(/([[:lower:]][0-9]*)([[:upper:]]+)/, '\1_\2').downcase + + opts = {:column => "#{name}_id"}.merge(opts) + + @columns[name] = [opts[:column].to_s, opts, :belongs_to] + @associations[:belongs_to][opts[:column]] = [name, simple_name, opts[:column], opts] + end + end + # Handles property names. The only ones that aren't possibly to # use is "initialize", "__column_data__", "__id__", # "method_missing" and "__send__". Everything else is lib/ribs/rib.rb @@ -1,7 +1,7 @@ require File.join(File.dirname(__FILE__), 'test_helper') -Ribs::define_model :Address do |rib| - rib.zip_code :column => :zip +Ribs::define_model :Address do |address| + address.zip_code :column => :zip end describe "define_model" do test/define_model_spec.rb @@ -4,7 +4,7 @@ describe Ribs::Rib do it "should not have any methods defined except for method_missing" do Ribs::Rib.instance_methods.sort.should == %w(Ribs! __send__ __id__ rspec_reset - rspec_verify should_receive + rspec_verify should_receive belongs_to should_not_receive R received_message? stub! __column_data__ method_missing).sort end test/rib_spec.rb @@ -112,6 +112,20 @@ SQL PRIMARY KEY (ID) SQL + delete_or_create(h, "blog",<<SQL) + ID INT NOT NULL, + name VARCHAR(255), + owner_id INT NOT NULL, + PRIMARY KEY (ID) +SQL + + delete_or_create(h, "owner",<<SQL) + ID INT NOT NULL, + name VARCHAR(255), + blog_id INT NOT NULL, + PRIMARY KEY (ID) +SQL + template = <<SQL INSERT INTO DB_TRACK(TRACK_ID, title, filePath, playTime, added, volume, lastPlayed, data, description, fraction, otherFraction, good, price) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) SQL @@ -126,6 +140,14 @@ SQL [1, "Public Image Ltd"], [2, "New Model Army"], [3, "David Bowie"]) + + h.insert("INSERT INTO blog(ID, name, owner_id) VALUES(?, ?, ?)", + [1, "One", 1], + [2, "Two", 2]) + + h.insert("INSERT INTO owner(ID, name, blog_id) VALUES(?, ?, ?)", + [1, "Foo", 2], + [2, "Bar", 1]) end end test/test_helper.rb @@ -13,20 +13,20 @@ class Track 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" + Ribs! :table => :DB_TRACK, :identity_map => false do |track| + track.TRACK_ID.primary_key! + + track.track_title :column => :title + track.time :column => :playTime + track.date_added :column => :added + track.last_played_at :column => :lastPlayed + track.file_data :column => :data + track.desc :column => :description + track.some_fraction :column => :fraction + track.is_good :column => :good + track.full_price :column => :price + + track.filePath :avoid, :default => "fluxie" end end test/track_spec.rb df01c4776dfef0ff057abcdd5bfbdefc25a9f629 Ola Bini ola.bini@gmail.com http://github.com/olabini/ribs/commit/c50b441acf55e7ad3a9f25f2a2ca01bca093c9ca c50b441acf55e7ad3a9f25f2a2ca01bca093c9ca 2008-10-09T06:42:15-07:00 2008-10-09T06:42:15-07:00 Add support for simple belongs_to association 6738bfbf98566a34de51ca94c23cdbfe567095ee Ola Bini ola.bini@gmail.com