@@ -6,8 +6,8 @@ module MongoMapper self end - def many(association_id, options = {}) - create_association(:many, association_id, options) + def many(association_id, options = {}, &block) + create_association(:many, association_id, options, &block) self end @@ -18,13 +18,20 @@ module MongoMapper end private - def create_association(type, name, options) + def create_association(type, name, options, &extension) + options[:extend] = modulized_extensions(extension, options[:extend]) association = Associations::Base.new(type, name, options) associations[association.name] = association define_association_methods(association) define_dependent_callback(association) association end + + def modulized_extensions(*extensions) + extensions.flatten.compact.map do |extension| + Proc === extension ? Module.new(&extension) : extension + end + end def define_association_methods(association) define_method(association.name) do lib/mongo_mapper/associations.rb @@ -6,6 +6,7 @@ module MongoMapper def initialize(owner, association) @owner = owner @association = association + @association.options[:extend].each {|ext| proxy_extend(ext) } reset end lib/mongo_mapper/associations/proxy.rb @@ -1,4 +1,5 @@ class BasicObject #:nodoc: + alias_method :proxy_extend, :extend instance_methods.each { |m| undef_method m unless m =~ /(^__|^nil\?$|^send$|^methods$|instance_eval|proxy_|^object_id$)/ } end unless defined?(BasicObject) lib/mongo_mapper/support.rb @@ -129,4 +129,28 @@ class ManyEmbeddedPolymorphicProxyTest < Test::Unit::TestCase from_db.transports[2].icu.should == true end end -end \ No newline at end of file + + context "extending the association" do + should "work using a block passed to many" do + catalog = Catalog.new + medias = catalog.medias = [ + Video.new("file" => "video.mpg", "length" => 3600, :visible => true), + Music.new("file" => "music.mp3", "bitrate" => "128kbps", :visible => true), + Image.new("file" => "image.png", "width" => 800, "height" => 600, :visible => false) + ] + catalog.save + catalog.medias.visible.should == [medias[0], medias[1]] + end + + should "work using many's :extend option" do + fleet = TrModels::Fleet.new + transports = fleet.transports = [ + TrModels::Car.new("license_plate" => "ABC1223", "model" => "Honda Civic", "year" => 2003, :purchased_on => 2.years.ago.to_date), + TrModels::Bus.new("license_plate" => "XYZ9090", "max_passengers" => 51, :purchased_on => 3.years.ago.to_date), + TrModels::Ambulance.new("license_plate" => "HDD3030", "icu" => true, :purchased_on => 1.year.ago.to_date) + ] + fleet.save + fleet.transports.to_be_replaced.should == [transports[1]] + end + end +end test/functional/associations/test_many_embedded_polymorphic_proxy.rb @@ -171,4 +171,29 @@ class ManyEmbeddedProxyTest < Test::Unit::TestCase meg.pets.find(sparky.id).should == sparky end + + context "extending the association" do + should "work using a block passed to many" do + project = Project.new(:name => "Some Project") + addr1 = Address.new(:address => "Gate-3 Lankershim Blvd.", :city => "Universal City", :state => "CA", :zip => "91608") + addr2 = Address.new(:address => "3000 W. Alameda Ave.", :city => "Burbank", :state => "CA", :zip => "91523") + addr3 = Address.new(:address => "111 Some Ln", :city => "Nashville", :state => "TN", :zip => "37211") + project.addresses = [addr1, addr2, addr3] + project.save + project.addresses.find_all_by_state("CA").should == [addr1, addr2] + end + + should "work using many's :extend option" do + project = Project.new(:name => "Some Project") + person1 = Person.new(:name => "Steve") + person2 = Person.new(:name => "Betty") + person3 = Person.new(:name => "Cynthia") + + project.people << person1 + project.people << person2 + project.people << person3 + project.save + project.people.find_by_name("Steve").should == person1 + end + end end \ No newline at end of file test/functional/associations/test_many_embedded_proxy.rb @@ -294,4 +294,31 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase end end end + + context "extending the association" do + should "work using a block passed to many" do + room = Room.new(:name => "Amazing Room") + messages = room.messages = [ + Enter.new(:body => 'John entered room', :position => 3), + Chat.new(:body => 'Heyyyoooo!', :position => 4), + Exit.new(:body => 'John exited room', :position => 5), + Enter.new(:body => 'Steve entered room', :position => 6), + Chat.new(:body => 'Anyone there?', :position => 7), + Exit.new(:body => 'Steve exited room', :position => 8) + ] + room.save + room.messages.older.should == messages[3..5] + end + + should "work using many's :extend option" do + room = Room.new(:name => "Amazing Room") + accounts = room.accounts = [ + Bot.new(:last_logged_in => 3.weeks.ago), + User.new(:last_logged_in => nil), + Bot.new(:last_logged_in => 1.week.ago) + ] + room.save + room.accounts.inactive.should == [accounts[1]] + end + end end test/functional/associations/test_many_polymorphic_proxy.rb @@ -328,4 +328,25 @@ class ManyProxyTest < Test::Unit::TestCase end end end + + context "extending the association" do + should "work using a block passed to many" do + project = Project.new(:name => "Some Project") + status1 = Status.new(:name => "New") + status2 = Status.new(:name => "Assigned") + status3 = Status.new(:name => "Closed") + project.statuses = [status1, status2, status3] + project.save + project.statuses.open.should == [status1, status2] + end + + should "work using many's :extend option" do + project = Project.new(:name => "Some Project") + collaborator1 = Collaborator.new(:name => "zing") + collaborator2 = Collaborator.new(:name => "zang") + project.collaborators = [collaborator1, collaborator2] + project.save + project.collaborators.top.should == collaborator1 + end + end end test/functional/associations/test_many_proxy.rb @@ -78,19 +78,77 @@ class Enter < Message; end class Exit < Message; end class Chat < Message; end +module AccountsExtensions + def inactive + find(:all, :conditions => { :last_logged_in => nil }) + end +end + +class Account + include MongoMapper::Document + + key :_type, String + key :room_id, String + key :last_logged_in, Time + + belongs_to :room +end +class User < Account; end +class Bot < Account; end + + class Room include MongoMapper::Document key :name, String - many :messages, :polymorphic => true + many :messages, :polymorphic => true do + def older + find(:all, :conditions => { :position => {"$gt" => 5} }) + end + end + + many :accounts, :polymorphic => true, :extend => AccountsExtensions end class Project include MongoMapper::Document key :name, String - many :statuses - many :addresses + + module PeopleExtensions + def find_by_name(name) + detect {|p| p.name == name } + end + end + many :people, :extend => PeopleExtensions + + module CollaboratorsExtensions + def top + find(:first) + end + end + many :collaborators, :extend => CollaboratorsExtensions + + many :statuses do + def open + find(:all, :conditions => { :name => %w(New Assigned) }) + end + end + + many :addresses do + def find_all_by_state(state) + # can't use select here for some reason + find_all {|a| a.state == state } + end + end + +end + +class Collaborator + include MongoMapper::Document + key :project_id, String + key :name, String + belongs_to :project end class Status @@ -109,9 +167,13 @@ end class RealPerson include MongoMapper::Document - many :pets + key :room_id, String key :name, String - + + belongs_to :room + + many :pets + def realname=(n) self.name = n end @@ -138,6 +200,8 @@ class Media key :_type, String key :file, String + + key :visible, Boolean end class Video < Media @@ -155,8 +219,13 @@ end class Catalog include MongoMapper::Document - - many :medias, :polymorphic => true + + many :medias, :polymorphic => true do + def visible + # for some reason we can't use select here + find_all {|m| m.visible? } + end + end end module TrModels @@ -165,6 +234,7 @@ module TrModels key :_type, String key :license_plate, String + key :purchased_on, Date end class Car < TrModels::Transport @@ -189,7 +259,14 @@ module TrModels class Fleet include MongoMapper::Document - many :transports, :polymorphic => true, :class_name => "TrModels::Transport" + module TransportsExtension + def to_be_replaced + # for some reason we can't use select + find_all {|t| t.purchased_on < 2.years.ago.to_date } + end + end + + many :transports, :polymorphic => true, :class_name => "TrModels::Transport", :extend => TransportsExtension key :name, String end end test/models.rb 66424ec633bcc81076c40788828529ef44212192 Rune Botten rbotten@gmail.com http://github.com/collectiveidea/mongomapper/commit/78a20494e0c6bea89638b1348afca732a647007e 78a20494e0c6bea89638b1348afca732a647007e 2009-10-16T17:50:54-07:00 2009-10-16T16:49:59-07:00 Add a way to extend a has_many association using either a block or the :extend option Rebased to jnunemakers master from mcmires fork All code by mcmire 47169ab01bdcc9d87d46cbc7435e9cf391be54a0 Rune Botten rbotten@gmail.com