sam-dm-core 0.9.6 → 0.9.7

data/spec/unit/model_spec.rb

@@ -1,15 +1,18 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
 describe 'DataMapper::Model' do
-  module ModelSpec
-    class Resource
-      include DataMapper::Resource
+  before do
+    Object.send(:remove_const, :ModelSpec) if defined?(ModelSpec)
+    module ModelSpec
+      class Resource
+        include DataMapper::Resource
 
-      storage_names[:legacy] = 'legacy_resource'
+        storage_names[:legacy] = 'legacy_resource'
 
-      property :id,   Serial
-      property :name, String
-      property :type, Discriminator
+        property :id,   Serial
+        property :name, String
+        property :type, Discriminator
+      end
     end
   end
 
@@ -87,7 +90,7 @@ describe 'DataMapper::Model' do
   describe '#storage_names' do
     it 'should return a Hash mapping each repository to a storage location' do
       ModelSpec::Resource.storage_names.should be_kind_of(Hash)
-      ModelSpec::Resource.storage_names.should == { :default => 'model_spec_resources', :legacy => 'legacy_resource' }
+      ModelSpec::Resource.storage_names.should == { :legacy => 'legacy_resource' }
     end
   end
 
@@ -147,22 +150,6 @@ describe 'DataMapper::Model' do
     end
   end
 
-  it 'should provide #inheritance_property' do
-    ModelSpec::Resource.should respond_to(:inheritance_property)
-  end
-
-  describe '#inheritance_property' do
-    it 'should return a Property object' do
-      ModelSpec::Resource.inheritance_property(:legacy).should be_kind_of(DataMapper::Property)
-      ModelSpec::Resource.inheritance_property(:legacy).name.should == :type
-      ModelSpec::Resource.inheritance_property(:legacy).type.should == DM::Discriminator
-    end
-
-    it 'should use default repository when not passed any arguments' do
-      ModelSpec::Resource.inheritance_property.object_id.should == ModelSpec::Resource.inheritance_property(:default).object_id
-    end
-  end
-
   it 'should provide #get' do
     ModelSpec::Resource.should respond_to(:get)
   end
@@ -181,12 +168,7 @@ describe 'DataMapper::Model' do
 
   describe '#storage_exists?' do
     it 'should return whether or not the storage exists' do
-      ModelSpec::Resource.should_receive(:repository).with(:default) do
-        repository = mock('repository')
-        repository.should_receive(:storage_exists?).with('model_spec_resources').and_return(true)
-        repository
-      end
-      ModelSpec::Resource.storage_exists?.should == true
+      ModelSpec::Resource.storage_exists?.should == false
     end
   end
 

data/spec/unit/property_set_spec.rb

@@ -24,7 +24,7 @@ end
 
 describe DataMapper::PropertySet do
   before :each do
-    @properties = Icon.properties(:default)
+    @properties = Icon.properties(:default).dup
   end
 
   it "#slice should find properties" do
@@ -35,6 +35,13 @@ describe DataMapper::PropertySet do
     @properties.select { |property| property.primitive == Integer }.should have(3).entries
   end
 
+  it "#clear should clear out set" do
+    @properties.clear
+    @properties.key.should == []
+    @properties.defaults.should == []
+    @properties.length.should == 0
+  end
+
   it "#[] should find properties by name (Symbol or String)" do
     default_properties = [ :id, 'name', :width, 'height' ]
     @properties.each_with_index do |property,i|

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

@@ -11,7 +11,7 @@ describe DataMapper::Resource do
       zoo.description = "This is a pretty awesome zoo"
       zoo.attributes.should == {
         :name => "San Francisco", :description => "This is a pretty awesome zoo",
-        :id => nil, :inception => nil, :open => false, :size => nil
+        :id => nil, :inception => nil, :open => false, :size => nil, :mission => nil
       }
     end
 
@@ -24,6 +24,20 @@ describe DataMapper::Resource do
     end
   end
 
+  describe "#attributes=" do
+    before(:each) do
+      @zoo = Zoo.new(:name => "San Francisco", :size => 10)
+      @zoo.attributes = {:size => 12 }
+    end
+    it "should change a public property" do
+      @zoo.size.should == 12
+    end
+    it "should raise when attempting to change a property with a non-public writer" do
+      lambda { @zoo.attributes = {:mission => "Just keep some odd
+        critters, y'know?" } }.should raise_error
+    end
+  end
+
 # ---------- REPOSITORY WRITE METHODS ---------------
 
   describe '#save' do
@@ -115,6 +129,7 @@ describe DataMapper::Resource do
       property :victories,  Integer
     end
 
+    Fruit.auto_migrate!
     Planet.auto_migrate!
     Cyclist.auto_migrate!
   end
@@ -173,11 +188,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
@@ -339,7 +362,7 @@ describe DataMapper::Resource do
   it "should not be able to set private attributes" do
     lambda {
       jupiter = Planet.new({ :core => "Molten Metal" })
-    }.should raise_error(NameError)
+    }.should raise_error(ArgumentError)
   end
 
   it "should not mark attributes dirty if they are similar after update" do

data/spec/unit/transaction_spec.rb

@@ -240,9 +240,9 @@ describe DataMapper::Transaction do
         @transaction_primitive.should_receive(:begin)
         @transaction_primitive.should_receive(:rollback)
         @transaction_primitive.should_receive(:close)
-        p = Proc.new do raise "test exception, never mind me" end
-        @transaction.should_receive(:within).with(&p)
-        lambda do @transaction.commit(&p) end.should raise_error(Exception, /test exception, never mind me/)
+        p = Proc.new do end
+        @transaction.should_receive(:within).with(&p).and_raise(Exception.new('test exception, never mind me'))
+        lambda { @transaction.commit(&p) }.should raise_error(Exception, /test exception, never mind me/)
       end
     end
   end
@@ -280,8 +280,8 @@ describe DataMapper::Transaction do
   describe "#method_missing" do
     before :each do
       @transaction = DataMapper::Transaction.new(@adapter, @repository)
-      @adapter.should_receive(:is_a?).any_number_of_times.with(Spec::Mocks::AnyArgsConstraint).and_return(false)
-      @adapter.should_receive(:is_a?).any_number_of_times.with(Spec::Mocks::NoArgsConstraint).and_return(false)
+      @adapter.should_receive(:is_a?).any_number_of_times.with(any_args).and_return(false)
+      @adapter.should_receive(:is_a?).any_number_of_times.with(no_args).and_return(false)
       @adapter.should_receive(:is_a?).any_number_of_times.with(Regexp).and_return(false)
     end
     it "should delegate calls to [a method we have]_if_[state](adapter) to [a method we have](adapter) if state of adapter is [state]" do
@@ -326,11 +326,11 @@ describe DataMapper::Transaction do
   describe "#each_adapter" do
     before :each do
       @transaction = DataMapper::Transaction.new(@adapter, @repository)
-      @adapter.should_receive(:is_a?).any_number_of_times.with(Spec::Mocks::AnyArgsConstraint).and_return(false)
-      @adapter.should_receive(:is_a?).any_number_of_times.with(Spec::Mocks::NoArgsConstraint).and_return(false)
+      @adapter.should_receive(:is_a?).any_number_of_times.with(any_args).and_return(false)
+      @adapter.should_receive(:is_a?).any_number_of_times.with(no_args).and_return(false)
       @adapter.should_receive(:is_a?).any_number_of_times.with(Regexp).and_return(false)
-      @repository_adapter.should_receive(:is_a?).any_number_of_times.with(Spec::Mocks::AnyArgsConstraint).and_return(false)
-      @repository_adapter.should_receive(:is_a?).any_number_of_times.with(Spec::Mocks::NoArgsConstraint).and_return(false)
+      @repository_adapter.should_receive(:is_a?).any_number_of_times.with(any_args).and_return(false)
+      @repository_adapter.should_receive(:is_a?).any_number_of_times.with(no_args).and_return(false)
       @repository_adapter.should_receive(:is_a?).any_number_of_times.with(Regexp).and_return(false)
     end
     it "should send the first argument to itself once for each adapter" do
@@ -386,8 +386,8 @@ describe DataMapper::Transaction do
   describe "#do_adapter" do
     before :each do
       @transaction = DataMapper::Transaction.new(@adapter, @repository)
-      @adapter.should_receive(:is_a?).any_number_of_times.with(Spec::Mocks::AnyArgsConstraint).and_return(false)
-      @adapter.should_receive(:is_a?).any_number_of_times.with(Spec::Mocks::NoArgsConstraint).and_return(false)
+      @adapter.should_receive(:is_a?).any_number_of_times.with(any_args).and_return(false)
+      @adapter.should_receive(:is_a?).any_number_of_times.with(no_args).and_return(false)
       @adapter.should_receive(:is_a?).any_number_of_times.with(Regexp).and_return(false)
     end
     it "should raise if there is no connection for the adapter" do
@@ -447,8 +447,8 @@ describe DataMapper::Transaction do
       @other_adapter = mock("adapter")
       @other_adapter.should_receive(:is_a?).any_number_of_times.with(Array).and_return(false)
       @other_adapter.should_receive(:is_a?).any_number_of_times.with(DataMapper::Adapters::AbstractAdapter).and_return(true)
-      @other_adapter.should_receive(:is_a?).any_number_of_times.with(Spec::Mocks::AnyArgsConstraint).and_return(false)
-      @other_adapter.should_receive(:is_a?).any_number_of_times.with(Spec::Mocks::NoArgsConstraint).and_return(false)
+      @other_adapter.should_receive(:is_a?).any_number_of_times.with(any_args).and_return(false)
+      @other_adapter.should_receive(:is_a?).any_number_of_times.with(no_args).and_return(false)
       @other_adapter.should_receive(:is_a?).any_number_of_times.with(Regexp).and_return(false)
       @transaction = DataMapper::Transaction.new(@other_adapter)
     end

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: sam-dm-core
 version: !ruby/object:Gem::Version 
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors: 
 - Sam Smoot
@@ -17,36 +17,27 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.5
+        version: 0.9.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: extlib
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.5
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.1.3
+        version: 0.9.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: addressable
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.4
+        version: 2.0.1
     version: 
 description: Faster, Better, Simpler!
 email: