dm-core 0.9.5 → 0.9.6

data/spec/unit/query_spec.rb

@@ -482,6 +482,47 @@ describe DataMapper::Query do
       @query.reverse!.object_id.should == @query.object_id
     end
   end
+
+  describe 'inheritance properties' do
+    before(:each) do
+      class Parent
+        include DataMapper::Resource
+        property :id, Serial
+        property :type, Discriminator
+      end
+      @query = DataMapper::Query.new(@repository, Parent)
+      @other_query = DataMapper::Query.new(@repository, Article)
+    end
+
+    it 'should provide #inheritance_property' do
+      @query.should respond_to(:inheritance_property)
+    end
+
+    describe '#inheritance_property' do
+      it 'should return a Property object if there is a Discriminator field' do
+        @query.inheritance_property.should be_kind_of(DataMapper::Property)
+        @query.inheritance_property.name.should == :type
+        @query.inheritance_property.type.should == DM::Discriminator
+      end
+
+      it 'should return nil if there is no Discriminator field' do
+        @other_query.inheritance_property.should be_nil
+      end
+    end
+
+    it 'should provide #inheritance_property_index' do
+      @query.should respond_to(:inheritance_property_index)
+    end
+
+    describe '#inheritance_property_index' do
+      it 'should return integer index if there is a Discriminator field' do
+        @query.inheritance_property_index.should be_kind_of(Integer)
+        @query.inheritance_property_index.should == 1
+      end
+
+      it 'should return nil if there is no Discriminator field'
+    end
+  end
 end
 
 describe DataMapper::Query::Operator do

data/spec/unit/resource_spec.rb

@@ -41,80 +41,91 @@ describe DataMapper::Resource do
   end
 end
 
-
 # ---------- Old specs... BOOOOOOOOOO ---------------
 
-class Planet
-  include DataMapper::Resource
-
-  storage_names[:legacy] = "dying_planets"
-
-  property :id, Integer, :key => true
-  property :name, String
-  property :age, Integer
-  property :core, String, :accessor => :private
-  property :type, Discriminator
-  property :data, Object
-
-  repository(:legacy) do
-    property :cowabunga, String
-  end
+describe DataMapper::Resource do
+  before(:each) do
+    Object.send(:remove_const, :Planet) if defined?(Planet)
+    class Planet
+      include DataMapper::Resource
+
+      storage_names[:legacy] = "dying_planets"
+
+      property :id, Integer, :key => true
+      property :name, String
+      property :age, Integer
+      property :core, String, :accessor => :private
+      property :type, Discriminator
+      property :data, Object, :track => :get
+
+      repository(:legacy) do
+        property :cowabunga, String
+      end
 
-  def age
-    attribute_get(:age)
-  end
+      def age
+        attribute_get(:age)
+      end
 
-  def to_s
-    name
-  end
-end
+      def to_s
+        name
+      end
+    end
 
-class Phone
-  include DataMapper::Resource
+    Object.send(:remove_const, :Phone) if defined?(Phone)
+    class Phone
+      include DataMapper::Resource
 
-  property :name, String, :key => true
-  property :awesomeness, Integer
-end
+      property :name, String, :key => true
+      property :awesomeness, Integer
+    end
 
-class Fruit
-  include DataMapper::Resource
+    Object.send(:remove_const, :Fruit) if defined?(Fruit)
+    class Fruit
+      include DataMapper::Resource
 
-  property :id, Integer, :key => true
-  property :name, String
-end
+      property :id, Integer, :key => true
+      property :name, String
+    end
 
-class Grain
-  include DataMapper::Resource
+    Object.send(:remove_const, :Grain) if defined?(Grain)
+    class Grain
+      include DataMapper::Resource
 
-  property :id, Serial
-  property :name, String, :default => 'wheat'
-end
+      property :id, Serial
+      property :name, String, :default => 'wheat'
+    end
 
-class Vegetable
-  include DataMapper::Resource
+    Object.send(:remove_const, :Vegetable) if defined?(Vegetable)
+    class Vegetable
+      include DataMapper::Resource
 
-  property :id, Serial
-  property :name, String
-end
+      property :id, Serial
+      property :name, String
+    end
 
-class Banana < Fruit
-  property :type, Discriminator
-end
+    Object.send(:remove_const, :Banana) if defined?(Banana)
+    class Banana < Fruit
+      property :type, Discriminator
+    end
 
-class Cyclist
-  include DataMapper::Resource
-  property :id,         Integer, :serial => true
-  property :victories,  Integer
-end
+    Object.send(:remove_const, :Cyclist) if defined?(Cyclist)
+    class Cyclist
+      include DataMapper::Resource
+      property :id,         Serial
+      property :victories,  Integer
+    end
 
-describe DataMapper::Resource do
+    Fruit.auto_migrate!
+    Planet.auto_migrate!
+    Cyclist.auto_migrate!
+  end
 
   it 'should provide #save' do
     Planet.new.should respond_to(:save)
   end
 
   describe '#save' do
-    before do
+    before(:each) do
       @adapter = repository(:default).adapter
     end
 
@@ -163,11 +174,19 @@ describe DataMapper::Resource do
         resource.should be_new_record
         resource.model.key.any? { |p| p.serial? }.should be_false
 
-        @adapter.should_not_receive(:create)
-
         resource.save.should be_false
       end
 
+      it 'should return true even if the object is not dirty' do
+        resource = Cyclist.new
+        resource.victories = "0 victories"
+        resource.save.should be_true
+
+        resource.should_not be_dirty
+        resource.should_not be_new_record
+        resource.save.should be_true
+      end
+
       describe 'for integer fields' do
 
         it "should save strings without digits as nil" do
@@ -350,7 +369,7 @@ describe DataMapper::Resource do
   end
 
   it "should not mark attributes dirty if they are similar after typecasting" do
-    jupiter = Planet.new(:name => 'Jupiter', :age => 1_000_000, :id => 42, :type => nil)
+    jupiter = Planet.new(:name => 'Jupiter', :age => 1_000_000, :id => 42, :type => Planet)
     jupiter.save.should be_true
     jupiter.dirty?.should be_false
 

data/tasks/ci.rb

@@ -10,9 +10,9 @@ namespace :ci do
     mkdir_p ROOT + "ci/token"
   end
 
-  Spec::Rake::SpecTask.new("spec:unit" => :prepare) do |t|
-    t.spec_opts = ["--format", "specdoc", "--format", "html:#{ROOT}/ci/unit_rspec_report.html", "--diff"]
-    t.spec_files = Pathname.glob(ROOT + "spec/unit/**/*_spec.rb")
+  Spec::Rake::SpecTask.new(:spec => :prepare) do |t|
+    t.spec_opts = ["--colour", "--format", "specdoc", "--format", "html:#{ROOT}/ci/rspec_report.html", "--diff"]
+    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
     unless ENV['NO_RCOV']
       t.rcov = true
       t.rcov_opts << '--exclude' << "spec,gems"
@@ -22,26 +22,6 @@ namespace :ci do
     end
   end
 
-  Spec::Rake::SpecTask.new("spec:integration" => :prepare) do |t|
-    t.spec_opts = ["--format", "specdoc", "--format", "html:#{ROOT}/ci/integration_rspec_report.html", "--diff"]
-    t.spec_files = Pathname.glob(ROOT + "spec/integration/**/*_spec.rb")
-    unless ENV['NO_RCOV']
-      t.rcov = true
-      t.rcov_opts << '--exclude' << "spec,gems"
-      t.rcov_opts << '--text-summary'
-      t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
-      t.rcov_opts << '--only-uncovered'
-    end
-  end
-
-  task :spec do
-    Rake::Task["ci:spec:unit"].invoke
-    mv ROOT + "coverage", ROOT + "ci/unit_coverage"
-
-    Rake::Task["ci:spec:integration"].invoke
-    mv ROOT + "coverage", ROOT + "ci/integration_coverage"
-  end
-
   task :saikuro => :prepare do
     system "saikuro -c -i lib -y 0 -w 10 -e 15 -o ci/cyclomatic"
     mv 'ci/cyclomatic/index_cyclo.html', 'ci/cyclomatic/index.html'
@@ -50,19 +30,7 @@ namespace :ci do
     mv 'ci/token/index_token.html', 'ci/token/index.html'
   end
 
-  task :publish do
-    out = ENV['CC_BUILD_ARTIFACTS'] || "out"
-    mkdir_p out unless File.directory? out
-
-    mv "ci/unit_rspec_report.html", "#{out}/unit_rspec_report.html"
-    mv "ci/unit_coverage", "#{out}/unit_coverage"
-    mv "ci/integration_rspec_report.html", "#{out}/integration_rspec_report.html"
-    mv "ci/integration_coverage", "#{out}/integration_coverage"
-    mv "ci/doc", "#{out}/doc"
-    mv "ci/cyclomatic", "#{out}/cyclomatic_complexity"
-    mv "ci/token", "#{out}/token_complexity"
-  end
 end
 
 #task :ci => %w[ ci:spec ci:doc ci:saikuro install ci:publish ]  # yard-related tasks do not work yet
-task :ci => %w[ ci:spec ci:saikuro install ]
+task :ci => %w[ ci:spec ]

data/tasks/dm.rb

@@ -16,7 +16,7 @@ namespace :dm do
   def run_spec(name, files, rcov)
     Spec::Rake::SpecTask.new(name) do |t|
       t.spec_opts << '--colour' << '--loadby' << 'random'
-      t.spec_files = Pathname.glob(ENV['FILES'] || files)
+      t.spec_files = Pathname.glob(ENV['FILES'] || files.to_s)
       t.rcov = rcov
       t.rcov_opts << '--exclude' << 'spec,environment.rb'
       t.rcov_opts << '--text-summary'
@@ -25,9 +25,9 @@ namespace :dm do
     end
   end
 
-  unit_specs = ROOT + 'spec/unit/**/*_spec.rb'
+  unit_specs        = ROOT + 'spec/unit/**/*_spec.rb'
   integration_specs = ROOT + 'spec/integration/**/*_spec.rb'
-  all_specs = ROOT + 'spec/**/*_spec.rb'
+  all_specs         = ROOT + 'spec/**/*_spec.rb'
 
   desc "Run all specifications"
   run_spec('spec', all_specs, false)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-core
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Sam Smoot
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-26 00:00:00 -05:00
+date: 2008-10-12 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,6 +79,7 @@ files:
 - lib/dm-core/adapters.rb
 - lib/dm-core/adapters/abstract_adapter.rb
 - lib/dm-core/adapters/data_objects_adapter.rb
+- lib/dm-core/adapters/in_memory_adapter.rb
 - lib/dm-core/adapters/mysql_adapter.rb
 - lib/dm-core/adapters/postgres_adapter.rb
 - lib/dm-core/adapters/sqlite3_adapter.rb
@@ -152,6 +153,7 @@ files:
 - spec/lib/mock_adapter.rb
 - spec/lib/model_loader.rb
 - spec/lib/publicize_methods.rb
+- spec/models/content.rb
 - spec/models/vehicles.rb
 - spec/models/zoo.rb
 - spec/spec.opts
@@ -159,6 +161,7 @@ files:
 - spec/unit/adapters/abstract_adapter_spec.rb
 - spec/unit/adapters/adapter_shared_spec.rb
 - spec/unit/adapters/data_objects_adapter_spec.rb
+- spec/unit/adapters/in_memory_adapter_spec.rb
 - spec/unit/adapters/postgres_adapter_spec.rb
 - spec/unit/associations/many_to_many_spec.rb
 - spec/unit/associations/many_to_one_spec.rb