@@ -8,19 +8,27 @@ module Merb end module ClassMethods - # Get fixture: # Post.fixture(:botanicus) - # Create fixture: - # Post.fixture.create(:botanicus, Author.new) - def fixture(name = nil) - @fixture ||= Merb::Fixtures::Fixture.new + def fixture(name) + self.init name ? @fixture.load(name) : @fixture end + + # Post.get_fixture.create(:botanicus, Author.new) + def get_fixture + self.init + return @fixture + end - # Post.fixtures => [#<Post...>, ...] + # Post.fixtures => {:name => object} def fixtures + self.init + return @fixture + end + + protected + def init @fixture ||= Merb::Fixtures::Fixture.new - return @fixture.objects end end end lib/merb-fixtures/shared/extensions.rb @@ -1,10 +1,8 @@ -# Better will be creating one instance per object (one for Post, one for Author ... ) require "merb-fixtures/shared/orm" module Merb module Fixtures class Fixture - # FIXME: isn't better to have it as hash? def initialize @fixtures = Hash.new end @@ -20,10 +18,6 @@ module Merb end def objects - @fixtures.values - end - - def keys_with_objects @fixtures end end lib/merb-fixtures/shared/fixture.rb @@ -7,7 +7,6 @@ module Merb directory = Merb::Plugins.config[:fixtures][:directory] if File.exist?(directory) Dir[directory/"*.rb"].each do |file| - # It's important to not use just load, remember the namespace Kernel.load(file) end else @@ -19,11 +18,13 @@ module Merb alias :reload :load def all - ORM.models.map { |model| model.fixtures unless model.fixtures.empty? }.compact.flatten + output = Hash.new + ORM.models.each { |model| output.merge!(model.fixtures.objects) unless model.fixtures.objects.values.empty? } + return output end - + def save - Merb::Fixtures.all.each { |fixture| fixture.save } + Merb::Fixtures.all.each { |name, fixture| fixture.save rescue raise "Fixture #{name} (model #{fixture.class}) couldn't be saved!"} end end end lib/merb-fixtures/shared/fixtures.rb @@ -19,11 +19,11 @@ module Kernel # end # - # @public - def fixture_for(klass, name, &block) + def fixture_for(klass, name = nil, &block) include Merb::Fixtures::Helpers if Merb::Plugins.config[:fixtures] instance = klass.new # Post.new instance.instance_eval(&block) if block_given? - klass.fixture.create(name, instance) + klass.get_fixture.create(name, instance) return instance end lib/merb-fixtures/shared/kernel.rb @@ -15,7 +15,7 @@ describe "<model>" do before(:each) do @botanicus = Author.new @fixtures = Array(@botanicus) - Author.fixture.create(:botanicus, @botanicus) + Author.get_fixture.create(:botanicus, @botanicus) end describe ".fixture" do spec/merb-fixtures/datamapper/datamapper_spec.rb 41585861fd441b5f703734f114ef001b2806b438 Botanicus knava.bestvinensis@gmail.com http://github.com/botanicus/merb-fixtures/commit/9bf25de4443da74d2ab870acb11491943573ede1 9bf25de4443da74d2ab870acb11491943573ede1 2008-08-13T05:21:25-07:00 2008-08-13T05:21:25-07:00 BIG CHANGES: Fixtures's output is hash, not array! Refactoring and improving. 92bf8889ade03814cee365b5dbfcf46948074b89 Botanicus knava.bestvinensis@gmail.com