@@ -142,4 +142,4 @@ * Added benchmarks comparing ActiveRecord::Base::find_by_sql with Session#query == 0.1.0 -* Initial Public Release \ No newline at end of file +* Initial Public Release History.txt @@ -26,4 +26,4 @@ require ROOT + 'tasks/hoe' require ROOT + 'tasks/install' require ROOT + 'tasks/dm' require ROOT + 'tasks/doc' -require ROOT + 'tasks/ci' \ No newline at end of file +require ROOT + 'tasks/ci' Rakefile @@ -338,7 +338,7 @@ module DataMapper def default_repository_name Repository.default_name end - + def paranoid_properties @paranoid_properties ||= {} @paranoid_properties @@ -367,7 +367,7 @@ module DataMapper merge_with_default_scope(query) end end - + def set_paranoid_property(name, &block) self.paranoid_properties[name] = block end lib/dm-core/model.rb @@ -47,10 +47,10 @@ module DataMapper scope_stack_for = Thread.current[:dm_scope_stack] ||= Hash.new { |h,model| h[model] = [] } scope_stack_for[self] end - + # @api private def default_scope_for_query(query) - repository_name = query.repository.name + repository_name = query.repository.name default_repository_name = query.model.default_repository_name self.default_scope(default_repository_name).merge(self.default_scope(repository_name)) end lib/dm-core/scope.rb @@ -12,13 +12,13 @@ module DataMapper model.send(:set_paranoid_property, property.name){true} model.class_eval <<-EOS, __FILE__, __LINE__ - + def self.with_deleted with_exclusive_scope(#{property.name.inspect} => true) do yield end end - + def destroy self.class.paranoid_properties.each do |name, blk| attribute_set(name, blk.call(self)) lib/dm-core/types/paranoid_boolean.rb @@ -7,17 +7,17 @@ module DataMapper def self.bind(property) model = property.model repository = property.repository - + model.send(:set_paranoid_property, property.name){DateTime.now} model.class_eval <<-EOS, __FILE__, __LINE__ - + def self.with_deleted with_exclusive_scope(#{property.name.inspect}.not => nil) do yield end end - + def destroy self.class.paranoid_properties.each do |name, blk| attribute_set(name, blk.call(self)) @@ -30,4 +30,4 @@ module DataMapper end end # class ParanoidDateTime end # module Types -end # module DataMapper \ No newline at end of file +end # module DataMapper lib/dm-core/types/paranoid_datetime.rb @@ -8,7 +8,7 @@ if ADAPTER class Impostor < DataMapper::Type primitive String end - + class Coconut include DataMapper::Resource @@ -118,13 +118,13 @@ if ADAPTER lemon.deleted_at.should be_kind_of(DateTime) end - + repository(ADAPTER) do |repository| Lemon.all.should be_empty Lemon.get(lemon.id).should be_nil end end - + it "should provide access to paranoid items with DateTime" do Lemon.auto_migrate!(ADAPTER) @@ -134,26 +134,26 @@ if ADAPTER %w(red green yellow blue).each do |color| Lemon.create(:color => color) end - + Lemon.all.size.should == 4 Lemon.first.destroy Lemon.all.size.should == 3 Lemon.with_deleted{Lemon.all.size.should == 1} end end - + it "should set paranoid datetime to a date time" do tmp = (DateTime.now - 0.5) dt = DateTime.now DateTime.stub!(:now).and_return(tmp) - + repository(ADAPTER) do |repository| lemon = Lemon.new lemon.color = 'green' lemon.save lemon.destroy lemon.deleted_at.should == tmp - end + end end it "should respect paranoia with a boolean" do @@ -176,7 +176,7 @@ if ADAPTER Lime.get(lime.id).should be_nil end end - + it "should provide access to paranoid items with Boolean" do Lime.auto_migrate!(ADAPTER) @@ -186,18 +186,18 @@ if ADAPTER %w(red green yellow blue).each do |color| Lime.create(:color => color) end - + Lime.all.size.should == 4 Lime.first.destroy Lime.all.size.should == 3 Lime.with_deleted{Lime.all.size.should == 1} end end - + describe "paranoid types across repositories" do before(:all) do DataMapper::Repository.adapters[:alternate_paranoid] = repository(ADAPTER).adapter.dup - + class Orange include DataMapper::Resource @@ -213,26 +213,26 @@ if ADAPTER property :deleted_at, DataMapper::Types::ParanoidDateTime end end - + repository(:alternate_paranoid){Orange.auto_migrate!} end - + before(:each) do %w(red orange blue green).each{|color| o = Orange.create(:color => color)} end - + after(:each) do Orange.repository.adapter.execute("DELETE FROM oranges") end - + it "should setup the correct objects for the spec" do repository(:alternate_paranoid){Orange.all.should have(4).items} end - + it "should allow access the the default repository" do Orange.all.should have(4).items end - + it "should mark the objects as deleted in the alternate_paranoid repository" do repository(:alternate_paranoid) do Orange.first.destroy @@ -240,31 +240,31 @@ if ADAPTER Orange.find_by_sql("SELECT * FROM oranges").should have(4).items end end - + it "should mark the objects as deleted in the alternate_paranoid repository but ignore it in the #{ADAPTER} repository" do repository(:alternate_paranoid) do Orange.first.destroy end Orange.all.should have(4).items end - + it "should raise an error when trying to destroy from a repository that is not paranoid" do lambda do Orange.first.destroy end.should raise_error(ArgumentError) end - + it "should set all paranoid attributes on delete" do repository(:alternate_paranoid) do orange = Orange.first orange.deleted.should be_false orange.deleted_at.should be_nil orange.destroy - + orange.deleted.should be_true orange.deleted_at.should be_a_kind_of(DateTime) end - end + end end end end spec/integration/type_spec.rb @@ -15,4 +15,4 @@ module LoggingHelper File.delete(log_path) end end -end \ No newline at end of file +end spec/lib/logging_helper.rb @@ -35,42 +35,42 @@ # end # end module ModelLoader - + def self.included(base) base.extend(ClassMethods) base.class_eval { include InstanceMethods } # base.before(:each) { load_models(:global) } base.after(:each) { unload_models } end - + module ClassMethods - + def load_models_for_metaphor(*metaphors) before(:each) { load_models_for_metaphor(*metaphors) } end - + end - + module InstanceMethods - + def load_models_for_metaphor(*metaphors) files = metaphors.map { |m| DataMapper.root / "spec" / "models" / "#{m}.rb" } - + klasses = object_space_classes.dup files.each { |file| load file } loaded_models.concat(object_space_classes - klasses) end - + def unload_models while model = loaded_models.pop remove_model(model) end end - + def loaded_models @loaded_models ||= [] end - + private def object_space_classes @@ -78,7 +78,7 @@ module ModelLoader ObjectSpace.each_object(Class) {|o| klasses << o} klasses end - + def remove_model(klass) DataMapper::Resource.descendants.delete(klass) Object.module_eval { remove_const klass.to_s } @@ -88,4 +88,4 @@ end Spec::Runner.configure do |config| config.include(ModelLoader) -end \ No newline at end of file +end spec/lib/model_loader.rb @@ -25,4 +25,4 @@ class Class end end end -end \ No newline at end of file +end spec/lib/publicize_methods.rb @@ -70,4 +70,4 @@ end class NormalClass # should not include DataMapper::Resource -end \ No newline at end of file +end spec/spec_helper.rb @@ -1,9 +1,9 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')) describe DataMapper::Associations::ManyToMany do - + load_models_for_metaphor :vehicles - + it 'should allow a declaration' do lambda do class Supplier spec/unit/associations/many_to_many_spec.rb @@ -1,9 +1,9 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')) describe DataMapper::Associations::ManyToOne do - + load_models_for_metaphor :vehicles - + it 'should allow a declaration' do lambda do class Vehicle @@ -14,9 +14,9 @@ describe DataMapper::Associations::ManyToOne do end describe DataMapper::Associations::ManyToOne::Proxy do - + load_models_for_metaphor :vehicles - + before do @child = mock('child', :kind_of? => true) @parent = mock('parent') spec/unit/associations/many_to_one_spec.rb @@ -1,9 +1,9 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')) describe DataMapper::Associations::OneToMany do - + load_models_for_metaphor :vehicles - + before do @class = Class.new do def self.name spec/unit/associations/one_to_many_spec.rb @@ -1,9 +1,9 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')) describe DataMapper::Associations::Relationship do - + load_models_for_metaphor :vehicles - + it "should describe an association" do belongs_to = DataMapper::Associations::Relationship.new( :manufacturer, @@ -53,7 +53,7 @@ describe DataMapper::Associations::Relationship do has_many.with_repository do |r| r.name.should == :mock end - + has_many.child_key.should be_a_kind_of(DataMapper::PropertySet) has_many.parent_key.should be_a_kind_of(DataMapper::PropertySet) # Vehicle.has n, :models, :class_name => 'Manufacturer', :child_key => "models_id" spec/unit/associations/relationship_spec.rb @@ -1,9 +1,9 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper')) describe "DataMapper::Associations" do - + load_models_for_metaphor :vehicles - + before do @relationship = mock(DataMapper::Associations::Relationship) @n = 1.0/0 spec/unit/associations_spec.rb @@ -75,7 +75,7 @@ describe DataMapper::Scope do Article.query.should be_nil end end - + it "should ignore the default_scope when using an exclusive scope" do Article.default_scope.update(:blog_id => 1) Article.publicize_methods do @@ -85,7 +85,7 @@ describe DataMapper::Scope do end Article.default_scope.delete(:blog_id) end - + end describe '.scope_stack' do spec/unit/scope_spec.rb @@ -35,4 +35,4 @@ hoe = Hoe.new(GEM_NAME, GEM_VERSION) do |p| p.extra_deps << dep end -end \ No newline at end of file +end tasks/hoe.rb 71e9871f9dd60eb79656a2c28e97695171cb9be2 Dan Kubb dan.kubb@autopilotmarketing.com http://github.com/sam/dm-core/commit/6dfffdc0692091e54a68472e326261d3b669f873 6dfffdc0692091e54a68472e326261d3b669f873 2008-07-14T21:59:19-07:00 2008-07-14T21:59:19-07:00 Stripped whitespace with "sake strip" bf4f1e407aee7df4e73a31f2ec8ea20aecda299f Dan Kubb dan.kubb@autopilotmarketing.com