@@ -28,13 +28,16 @@ module ActionORM module Core module ClassMethods - def supports?(obj) - !find_key(obj).nil? - end def for(obj) + return nil if obj.nil? + unless supports?(obj) + ActionORM.use :driver => ActionORM::Drivers::AbstractDriver, :for => obj.class + end driver = driver_registry[find_key(obj)] case driver + when :compliant + obj when NilClass obj else @@ -52,7 +55,20 @@ module ActionORM ActionORM.register(options[:for], options[:driver]) end + def find_key(obj) + return nil if obj.nil? + unless driver_key_cache.key?(obj.class) + driver_key_cache[obj.class] = driver_registry.keys.find {|k, v| obj.is_a? k } + end + driver_key_cache[obj.class] + end + protected + + def supports?(obj) + !find_key(obj).nil? + end + def driver_registry @_driver_registry ||= {} end @@ -65,12 +81,6 @@ module ActionORM driver_registry[obj_class] = obj_driver_class end - def find_key(obj) - unless driver_key_cache.key?(obj.class) - driver_key_cache[obj.class] = driver_registry.keys.find {|k, v| obj.is_a? k } - end - driver_key_cache[obj.class] - end end end end \ No newline at end of file merb-actionorm/lib/merb-actionorm/action_orm/core.rb @@ -30,15 +30,27 @@ module ActionORM end def new_record? - model.new_record? + if !@model.respond_to?(:new_record?) + raise AbstractDriverMethod, "#{@model.class} doesn't define a way to check if a new record is new or not!" + else + @model.new_record? + end end def errors - raise AbstractDriverMethod + if !@model.respond_to?(:errors) + raise AbstractDriverMethod, "#{@model.class} doesn't define a way to look up errors!" + else + @model.errors + end end def valid? - model.valid? + if !@model.respond_to?(:valid?) + raise AbstractDriverMethod, "#{@model.class} doesn't define a way to check if an instance is valid!" + else + @model.valid? + end end end end merb-actionorm/lib/merb-actionorm/action_orm/drivers/abstract_driver.rb @@ -3,9 +3,6 @@ require File.dirname(__FILE__) + '/spec_helper' describe "merb-actionorm" do shared_examples_for "a supported ORM" do - it "should support the orm" do - ActionORM.supports?(@model_instance).should be_true - end it "should know if a record is a new record or not" do ActionORM.for(@model_instance).new_record?.should be_true @@ -44,6 +41,12 @@ describe "merb-actionorm" do @model_instance.name = nil ActionORM.for(@model_instance).valid?.should be_false end + + it "should have a list of errors on failed validation" do + @model_instance.name = nil + ActionORM.for(@model_instance).valid?.should be_false + @model_instance.errors.class.should_not be_nil + end end # describe "ActiveRecord ORM" do @@ -93,7 +96,7 @@ describe "merb-actionorm" do end end - describe "FakeModel" do + describe "Compliant model" do before(:all) do class FakeModel def valid? @@ -103,23 +106,27 @@ describe "merb-actionorm" do true end def errors - FakeErrors.new(self) + {:name => "can't be empty"} end def to_s 'fake_model' end end - ActionORM.use :driver => ActionORM::Drivers::AbstractDriver, :for => FakeModel + ActionORM.use :driver => :compliant, :for => FakeModel @model_instance = FakeModel.new end - - it "should support the orm" do - ActionORM.supports?(@model_instance).should be_true - end it "should know if a record is a new record or not" do ActionORM.for(@model_instance).new_record?.should be_true end + + it "should know if a record is valid" do + ActionORM.for(@model_instance).new_record?.should be_true + end + + it "should know if a record is valid" do + ActionORM.for(@model_instance).errors.should be_true + end end end \ No newline at end of file merb-actionorm/spec/merb-actionorm_spec.rb @@ -131,7 +131,8 @@ module Merb::Helpers::Form::Builder attrs[:method] = :post unless attrs[:method] == :get # Use a fake PUT if the object is not new, otherwise use the method # passed in. Defaults to :post if no method is set. - method ||= (ActionORM.supports?(@obj) && !ActionORM.for(@obj).new_record?) || (@obj.respond_to?(:new?) && !@obj.new?) ? :put : :post + standardized_object = ActionORM.for(@obj) + method ||= (!standardized_object.nil? && standardized_object.new_record?) || (@obj.respond_to?(:new?) && @obj.new?) ? :post : :put attrs[:enctype] = "multipart/form-data" if attrs.delete(:multipart) || @multipart merb-helpers/lib/merb-helpers/form/builder.rb @@ -23,3 +23,5 @@ class FakeDMModel end alias bat bat? end + +ActionORM.use :driver => :compliant, :for => FakeDMModel \ No newline at end of file merb-helpers/spec/fixture/app/models/fake_dm_model.rb @@ -56,4 +56,4 @@ class FakeModel end end -ActionORM.use :driver => ActionORM::Drivers::AbstractDriver, :for => FakeModel \ No newline at end of file +ActionORM.use :driver => :compliant, :for => FakeModel \ No newline at end of file merb-helpers/spec/fixture/app/models/first_generic_fake_model.rb @@ -1,3 +1,8 @@ class FakeModel3 attr_accessor :foo, :bar + + def new_record? + false + end + end merb-helpers/spec/fixture/app/models/third_generic_fake_model.rb @@ -41,6 +41,7 @@ require File.dirname(__FILE__) + '/spec_helper' Merb::Plugins.config[:helpers] = { :default_builder => Merb::Helpers::Form::Builder::FormWithErrors } +class MyClass; end describe "error_messages_for" do @@ -297,7 +298,7 @@ describe "bound_text_field" do it "should errorify a field for a model with errors" do model = mock("model") model.stub!(:new_record?).and_return(true) - model.stub!(:class).and_return("MyClass") + model.stub!(:class).and_return(MyClass) model.stub!(:foo).and_return("FOO") errors = mock("errors") errors.should_receive(:on).with(:foo).and_return(true) @@ -345,7 +346,7 @@ describe "bound_radio_button" do it "should errorify a field for a model with errors" do model = mock("model") model.stub!(:new_record?).and_return(true) - model.stub!(:class).and_return("MyClass") + model.stub!(:class).and_return(MyClass) model.stub!(:foo).and_return("FOO") errors = mock("errors") errors.should_receive(:on).with(:foo).and_return(true) @@ -416,7 +417,7 @@ describe "bound_password_field" do it "should errorify a field for a model with errors" do model = mock("model") model.stub!(:new_record?).and_return(true) - model.stub!(:class).and_return("MyClass") + model.stub!(:class).and_return(MyClass) model.stub!(:foo).and_return("FOO") errors = mock("errors") errors.should_receive(:on).with(:foo).and_return(true) @@ -579,7 +580,7 @@ describe "bound_check_box" do it "should errorify a field for a model with errors" do model = mock("model") model.stub!(:new_record?).and_return(true) - model.stub!(:class).and_return("MyClass") + model.stub!(:class).and_return(MyClass) model.stub!(:baz).and_return("BAZ") model.stub!(:bat).and_return("BAT") errors = mock("errors") @@ -667,7 +668,7 @@ describe "bound_hidden_field" do it "should not errorify a field for a model with errors" do model = mock("model") model.stub!(:new_record?).and_return(true) - model.stub!(:class).and_return("MyClass") + model.stub!(:class).and_return(MyClass) model.stub!(:foo).and_return("FOO") errors = mock("errors") errors.should_receive(:on).with(:foo).and_return(true) merb-helpers/spec/merb_helpers_form_spec.rb @@ -5,6 +5,7 @@ if defined?(Merb::Plugins) require File.dirname(__FILE__) / "merb" / "orms" / "data_mapper" / "connection" require File.dirname(__FILE__) / "merb" / "session" / "data_mapper_session" Merb::Plugins.add_rakefiles "merb_datamapper" / "merbtasks" + ActionORM.use :driver => :compliant, :for => DataMapper::Resource # conditionally assign things, so as not to override previously set options. # This is most relevent for :use_repository_block, which is used later in this file. merb_datamapper/lib/merb_datamapper.rb 784ac7d71780d1a7cfb9152ba4cb0e18a990ab7a Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb/commit/ffff732093da6d300b4652616a8fa150ec758331 ffff732093da6d300b4652616a8fa150ec758331 2009-04-27T15:34:41-07:00 2009-04-27T15:34:41-07:00 switched merb_datamapper to ActionORM and made sure all the specs were compliant 490ced56aa02d133ef5e573318ddfcaff0952e90 Matt Aimonetti mattaimonetti@gmail.com