@@ -11,17 +11,14 @@ module Machinist named_blueprint = object.class.blueprint(args.shift) if args.first.is_a?(Symbol) attributes = args.pop || {} - blueprint_chain = [named_blueprint] - klass = object.class - while klass.respond_to? :blueprint - blueprint_chain << klass.blueprint - klass = klass.superclass - end + raise "No blueprint for class #{object.class}" if blueprint.nil? - raise "No blueprint for class #{object.class}" if blueprint_chain.compact.empty? returning self.new(adapter, object, attributes) do |lathe| - blueprint_chain.each do |blueprint| - lathe.instance_eval(&blueprint) if blueprint + lathe.instance_eval(&named_blueprint) if named_blueprint + klass = object.class + while klass + lathe.instance_eval(&klass.blueprint) if klass.blueprint + klass = klass.superclass end end end lib/machinist.rb @@ -2,18 +2,18 @@ require 'machinist' require 'machinist/blueprints' module Machinist - + class ActiveRecordAdapter - + def self.has_association?(object, attribute) object.class.reflect_on_association(attribute) end - + def self.class_for_association(object, attribute) association = object.class.reflect_on_association(attribute) association && association.klass end - + # This method takes care of converting any associated objects, # in the hash returned by Lathe#assigned_attributes, into their # object ids. @@ -39,14 +39,14 @@ module Machinist end attributes end - + end - + module ActiveRecordExtensions def self.included(base) base.extend(ClassMethods) end - + module ClassMethods def make(*args, &block) lathe = Lathe.run(Machinist::ActiveRecordAdapter, self.new, *args) @@ -62,18 +62,14 @@ module Machinist yield object if block_given? end end - + def plan(*args) lathe = Lathe.run(Machinist::ActiveRecordAdapter, self.new, *args) Machinist::ActiveRecordAdapter.assigned_attributes_without_associations(lathe) end - - def find_or_make(attrs) - find(:first, :conditions => attrs) || make(attrs) - end end end - + module ActiveRecordHasManyExtensions def make(*args, &block) lathe = Lathe.run(Machinist::ActiveRecordAdapter, self.build, *args) lib/machinist/active_record.rb @@ -15,11 +15,7 @@ module Machinist def named_blueprints @blueprints.reject{|name,_| name == :master }.keys end - - def has_blueprint?(named = :master) - (@blueprints || {}).has_key?(named) - end - + def clear_blueprints! @blueprints = {} end lib/machinist/blueprints.rb @@ -27,46 +27,18 @@ module MachinistActiveRecordSpecs end before(:each) do - Person.clear_blueprints! - Post.clear_blueprints! - Comment.clear_blueprints! + [Person, Admin, Post, Comment].each(&:clear_blueprints!) end describe "make method" do it "should support single-table inheritance" do Person.blueprint { } + Admin.blueprint { } admin = Admin.make admin.should_not be_new_record admin.type.should == "Admin" end - it "should support anonymous and named blueprints for both superclasses and subclasses" do - Person.blueprint { name "John" } - Person.blueprint(:special) { name "Paul" } - Admin.blueprint { name "George" } - Admin.blueprint(:special) { name "Ringo" } - - person = Person.make - person.should_not be_new_record - person.type.should == nil - person.name.should == "John" - - person = Person.make(:special) - person.should_not be_new_record - person.type.should == nil - person.name.should == "Paul" - - admin = Admin.make - admin.should_not be_new_record - admin.type.should == "Admin" - admin.name.should == "George" - - admin = Admin.make(:special) - admin.should_not be_new_record - admin.type.should == "Admin" - admin.name.should == "Ringo" - end - it "should save the constructed object" do Person.blueprint { } person = Person.make @@ -109,17 +81,6 @@ module MachinistActiveRecordSpecs Person.make.type.should == "Person" end - describe "subclass blueprint" do - it "should augment superclass blueprint, not replace it" do - Person.blueprint { name "Bob" } - Admin.blueprint { admin true } - - admin = Admin.make - admin.name.should == "Bob" - admin.should be_admin - end - end - describe "on a has_many association" do before do Post.blueprint { } spec/active_record_spec.rb @@ -42,47 +42,19 @@ module MachinistDataMapperSpecs end before(:each) do - Person.clear_blueprints! - Post.clear_blueprints! - Comment.clear_blueprints! + [Person, Admin, Post, Comment].each(&:clear_blueprints!) end describe "make method" do it "should support inheritance" do Person.blueprint {} + Admin.blueprint {} admin = Admin.make admin.should_not be_new_record admin.type.should_not be_nil end - it "should support anonymous and named blueprints for both superclasses and subclasses" do - Person.blueprint { name "John" } - Person.blueprint(:special) { name "Paul" } - Admin.blueprint { name "George" } - Admin.blueprint(:special) { name "Ringo" } - - person = Person.make - person.should_not be_new_record - person.type.should == MachinistDataMapperSpecs::Person - person.name.should == "John" - - person = Person.make(:special) - person.should_not be_new_record - person.type.should == MachinistDataMapperSpecs::Person - person.name.should == "Paul" - - admin = Admin.make - admin.should_not be_new_record - admin.type.should == MachinistDataMapperSpecs::Admin - admin.name.should == "George" - - admin = Admin.make(:special) - admin.should_not be_new_record - admin.type.should == MachinistDataMapperSpecs::Admin - admin.name.should == "Ringo" - end - it "should save the constructed object" do Person.blueprint { } person = Person.make @@ -108,17 +80,6 @@ module MachinistDataMapperSpecs end end - describe "subclass blueprint" do - it "should augment superclass blueprint, not replace it" do - Person.blueprint { name "Bob" } - Admin.blueprint { admin true } - - admin = Admin.make - admin.name.should == "Bob" - admin.should be_admin - end - end - describe "plan method" do it "should not save the constructed object" do person_count = Person.all.length spec/data_mapper_spec.rb @@ -11,10 +11,21 @@ module MachinistSpecs attr_accessor :title, :body, :published end + class Grandpa + attr_accessor :name + end + + class Dad < Grandpa + attr_accessor :name + end + + class Son < Dad + attr_accessor :name + end + describe Machinist do before(:each) do - Person.clear_blueprints! - Post.clear_blueprints! + [Person, Post, Grandpa, Dad, Son].each(&:clear_blueprints!) end it "should raise for make on a class with no blueprint" do @@ -127,7 +138,38 @@ module MachinistSpecs Person.blueprint(:bar) { } Person.named_blueprints.to_set.should == [:admin, :foo, :bar].to_set end - end + end + + describe "blueprint inheritance" do + it "should inherit blueprinted attributes from the parent class" do + Dad.blueprint { name "Fred" } + Son.blueprint { } + Son.make.name.should == "Fred" + end + + it "should override blueprinted attributes in the child class" do + Dad.blueprint { name "Fred" } + Son.blueprint { name "George" } + Dad.make.name.should == "Fred" + Son.make.name.should == "George" + end + + it "should inherit from blueprinted attributes in ancestor class" do + Grandpa.blueprint { name "Fred" } + Son.blueprint { } + Grandpa.make.name.should == "Fred" + lambda { Dad.make }.should raise_error(RuntimeError) + Son.make.name.should == "Fred" + end + + it "should follow inheritance for named blueprints correctly" do + Dad.blueprint { name "John" } + Dad.blueprint(:special) { name "Paul" } + Son.blueprint { } + Son.blueprint(:special) { } + Son.make(:special).name.should == "John" + end + end describe "clear_blueprints! method" do it "should clear the list of blueprints" do spec/machinist_spec.rb 65ebd711003c24e053c8ac6433cd2736d552f82e Pete Yandell pete@notahat.com http://github.com/notahat/machinist/commit/9b8b5d2c94499168e23dfe9d2f7bafec765157c7 9b8b5d2c94499168e23dfe9d2f7bafec765157c7 2009-08-22T00:02:12-07:00 2009-08-22T00:02:12-07:00 Cleaned up inheritance support. This is my improvements on Rubysolo's patches to make Machinist look at superclasses when evaluating blueprints. The order of blueprint evaluation is now: name blueprint, this class's blueprint, parent class's blueprint, etc. 3e3104dc347c6b3fd346502bcfc2b196fe643990 Pete Yandell pete@notahat.com