src/java/org/jruby/ribs/RubyInterceptor.java test/identity_map_spec.rb @@ -146,7 +146,7 @@ module Ribs properties.set_property(key, value) end @configuration = Configuration.new.add_properties(properties) - @configuration.set_interceptor org.jruby.ribs.EntityNameInterceptor.new + @configuration.set_interceptor org.jruby.ribs.RubyInterceptor.new(self, (self.default? ? :default : self.name).to_s) @mappings = @configuration.create_mappings reset_session_factory! end lib/ribs/db.rb @@ -34,7 +34,13 @@ module Ribs attr_accessor :persistent_class # The Rib that defines all the mapping data attr_accessor :rib + # Should this object be saved in an identity map? + attr_accessor :identity_map + def identity_map? + self.identity_map + end + # Return the property instance for the given +name+. def [](name) self.persistent_class.get_property(name.to_s) rescue nil @@ -49,6 +55,16 @@ module Ribs h end end + + # Return all the properties for this model. + def properties_and_identity + (self.persistent_class.property_iterator.to_a + [self.persistent_class.identifier_property]).inject({}) do |h, value| + if !value.respond_to?(:getRubyValue) + h[value.name] = value + end + h + end + end end # Contains the mapping data that gets created when calling the @@ -62,7 +78,7 @@ module Ribs attr_reader :to_avoid # List of default values for columns attr_reader :default_values - + # Initializes object def initialize @columns = { } @@ -174,6 +190,7 @@ module Ribs rm = options[:metadata] Ribs::add_metadata_for(options[:db], on, rm) + rm.identity_map = options.key?(:identity_map) ? options[:identity_map] : true unless options[:from] options[:from] = R(on, options[:db] || :default) @@ -185,7 +202,8 @@ module Ribs with_handle(options[:db] || :default) do |h| db = h.db m = h.meta_data - name = rib.table || table_name_for(on.name, m) + + name = table_name_for((rib.table || on.name), m) tables = m.get_tables nil, nil, name.to_s, %w(TABLE VIEW ALIAS SYNONYM).to_java(:String) if tables.next @@ -299,11 +317,11 @@ module Ribs # Tries to figure out if a table name should be in lower case or # upper case, and returns the table name based on that. def table_name_for(str, metadata) - str = str.gsub(/::/, '_') + str = str.to_s.gsub(/::/, '_') if metadata.stores_lower_case_identifiers str.downcase elsif metadata.stores_upper_case_identifiers - str.upcase! + str.upcase else str end lib/ribs/definition.rb @@ -51,8 +51,8 @@ module Ribs end def define_accessors - self.metadata.properties.each do |name, _| - self.model.send :attr_accessor, name + self.metadata.properties_and_identity.each do |name, _| + self.model.send :attr_accessor, name.downcase end end lib/ribs/repository.rb @@ -1,6 +1,7 @@ require File.join(File.dirname(__FILE__), 'test_helper') class Artist + Ribs! :identity_map => false attr_accessor :id attr_accessor :name end test/artist_spec.rb @@ -5,7 +5,23 @@ class Person;end R(Person).define_accessors describe "define_accessors" do - it "should define id accessors" - it "should define given name accessors" - it "should define sur name accessors" + it "should define id accessors" do + Person.instance_methods.should include("id") + Person.instance_methods.should include("id=") + end + + it "should define given_name accessors" do + Person.instance_methods.should include("given_name") + Person.instance_methods.should include("given_name=") + end + + it "should define sur_name accessors" do + Person.instance_methods.should include("sur_name") + Person.instance_methods.should include("sur_name=") + end + + it "should define age accessors" do + Person.instance_methods.should include("age") + Person.instance_methods.should include("age=") + end end test/define_accessors_spec.rb @@ -5,7 +5,37 @@ Ribs::define_model :Address do |rib| end describe "define_model" do - it "should create a class" - it "should create a mapping" - it "should create all the needed properties" + it "should create a class" do + Address.class.should == Class + end + + it "should create all the needed properties" do + Address.instance_methods.should include("id") + Address.instance_methods.should include("id=") + Address.instance_methods.should include("street") + Address.instance_methods.should include("street=") + Address.instance_methods.should include("postal") + Address.instance_methods.should include("postal=") + Address.instance_methods.should include("zip_code") + Address.instance_methods.should include("zip_code=") + Address.instance_methods.should_not include("zip") + Address.instance_methods.should_not include("zip=") + Address.instance_methods.should include("country") + Address.instance_methods.should include("country=") + end + + it "should be a working Ribs class" do + R(Address).create :id => 1, :street => "foobar 42" + all = R(Address).all + all.length.should == 1 + all[0].id.should == 1 + all[0].street.should == "foobar 42" + all[0].zip_code.should be_nil + R(Address).get(1).street.should == all[0].street + all[0].street = "foobar 43" + R(all[0]).save + R(Address).get(1).street.should == "foobar 43" + R(Address).destroy(1) + R(Address).all.should be_empty + end end test/define_model_spec.rb src/java/org/jruby/ribs/EntityNameInterceptor.java 4b04e930467ba585c2a78d789426556a50c40703 Ola Bini ola.bini@gmail.com http://github.com/olabini/ribs/commit/0b8ddb8aec64b54bb5c8f1380dd13da35919eded 0b8ddb8aec64b54bb5c8f1380dd13da35919eded 2008-09-10T06:22:53-07:00 2008-09-10T06:22:53-07:00 Add support for identity-map functionality. 65dc2ec90b10fbd7e94caafdb589cdffa8813158 Ola Bini ola.bini@gmail.com