dm-core 0.10.1 → 0.10.2

data/spec/semipublic/resource_spec.rb

@@ -10,30 +10,6 @@ describe DataMapper::Resource do
       property :description, Text
     end
 
-    # This is a special class that needs to be an exact copy of User
-    class ::Clone
-      include DataMapper::Resource
-
-      property :name,        String, :key => true
-      property :age,         Integer
-      property :description, Text
-    end
-
-    class ::Comment
-      include DataMapper::Resource
-
-      property :id,   Serial
-      property :body, Text
-
-      belongs_to :user
-    end
-
-    class ::Default
-      include DataMapper::Resource
-
-      property :name, String, :key => true, :default => 'a default value'
-    end
-
     @user_model = User
   end
 

data/spec/semipublic/shared/resource_shared_spec.rb

@@ -5,83 +5,149 @@ share_examples_for 'A semipublic Resource' do
     end
   end
 
-  it { @user.should respond_to(:dirty?) }
-
-  describe '#dirty?' do
+  it { @user.should respond_to(:attribute_dirty?) }
 
+  describe '#attribute_dirty?' do
     describe 'on a non-dirty record' do
+      it { @user.attribute_dirty?(:age).should be_false }
+    end
 
-      it { @user.should_not be_dirty }
+    describe 'on a dirty record' do
+      before { @user.age = 100 }
 
+      it { @user.attribute_dirty?(:age).should be_true }
     end
 
-    describe 'on a dirty record' do
+    describe 'on a new record' do
+      before { @user = @user_model.new }
 
-      before { @user.age = 100 }
+      it { @user.attribute_dirty?(:age).should be_false }
+    end
+  end
 
-      it { @user.should be_dirty }
+  it { @user.should respond_to(:dirty_attributes) }
 
+  describe '#dirty_attributes' do
+    describe 'on a saved/clean record' do
+      it { @user.dirty_attributes.should be_empty }
     end
 
-    describe 'on a new record, with no attributes, no default attributes, and no identity field' do
+    describe 'on a saved/dirty record' do
+      before { @user.age = 100 }
 
-      before { @user = @user_model.new }
+      it { @user.dirty_attributes.should == { @user_model.properties[:age] => 100 } }
+    end
 
-      it { @user.should_not be_dirty }
+    describe 'on an saved/set/unset record' do
+      before do
+        @user.age = 100
+        @user.age = 25
+      end
 
+      it { @user.dirty_attributes.should be_empty }
     end
 
-    describe 'on a new record, with no attributes, no default attributes, and an identity field' do
+    describe 'on an saved/unchanged record' do
+      before do
+        @user.age = 25
+      end
 
-      before { @comment = Comment.new }
+      it { @user.dirty_attributes.should be_empty }
+    end
 
-      it { @comment.should be_dirty }
+    describe 'on a new/clean record' do
+      before { @user = @user_model.new }
 
+      it { @user.dirty_attributes.should be_empty }
     end
 
-    describe 'on a new record, with no attributes, default attributes, and no identity field' do
+    describe 'on a new/dirty record' do
+      before { @user = @user_model.new(:age => 100) }
 
-      before { @default = Default.new }
+      it { @user.original_attributes.should == { @user_model.properties[:age] => nil } }
+    end
 
-      it { @default.should be_dirty }
+    describe 'on an new/set/unset record' do
+      before do
+        @user = @user_model.new(:age => 100)
+        @user.age = nil
+      end
 
+      it { @user.dirty_attributes.should == { @user_model.properties[:age] => nil } }
     end
 
+    describe 'on an new/unchanged record' do
+      before do
+        @user = @user_model.new(:age => nil)
+      end
 
+      it { @user.dirty_attributes.should == { @user_model.properties[:age] => nil } }
+    end
   end
 
-  it { @user.should respond_to(:attribute_dirty?) }
+  it { @user.should respond_to(:original_attributes) }
 
-  describe '#attribute_dirty?' do
+  describe '#original_attributes' do
+    describe 'on a saved/clean record' do
+      it { @user.original_attributes.should be_empty }
+    end
 
-    describe 'on a non-dirty record' do
+    describe 'on a saved/dirty record' do
+      before { @user.age = 100 }
 
-      it { @user.attribute_dirty?(:age).should be_false }
+      it { @user.original_attributes.should == { @user_model.properties[:age] => 25 } }
+    end
 
+    describe 'on an saved/set/unset record' do
+      before do
+        @user.age = 100
+        @user.age = 25
+      end
+
+      it { @user.original_attributes.should be_empty }
     end
 
-    describe 'on a dirty record' do
+    describe 'on an saved/unchanged record' do
+      before do
+        @user.age = 25
+      end
 
-      before { @user.age = 100 }
+      it { @user.original_attributes.should be_empty }
+    end
 
-      it { @user.attribute_dirty?(:age).should be_true }
+    describe 'on a new/clean record' do
+      before { @user = @user_model.new }
 
+      it { @user.original_attributes.should be_empty }
     end
 
-    describe 'on a new record' do
+    describe 'on a new/dirty record' do
+      before { @user = @user_model.new(:age => 100) }
 
-      before { @user = @user_model.new }
+      it { @user.original_attributes.should == { @user_model.properties[:age] => nil } }
+    end
 
-      it { @user.attribute_dirty?(:age).should be_false }
+    describe 'on an new/set/unset record' do
+      before do
+        @user = @user_model.new(:age => 100)
+        @user.age = nil
+      end
 
+      it { @user.original_attributes.should == { @user_model.properties[:age] => nil } }
     end
 
+    describe 'on an new/unchanged record' do
+      before do
+        @user = @user_model.new(:age => nil)
+      end
+
+      it { @user.original_attributes.should == { @user_model.properties[:age] => nil } }
+    end
   end
 
   it { @user.should respond_to(:repository) }
 
-  describe "#repository" do
-
+  describe '#repository' do
     before :all do
       class ::Statistic
         include DataMapper::Resource
@@ -97,30 +163,29 @@ share_examples_for 'A semipublic Resource' do
     end
 
     with_alternate_adapter do
-      it "should return the default adapter when nothing is specified" do
-        @user_model.create(:name => "carl").repository.should == @repository
+      it 'should return the default adapter when nothing is specified' do
+        @user_model.create(:name => 'carl').repository.should == @repository
         @user_model.new.repository.should                     == @repository
-        @user_model.get("carl").repository.should             == @repository
+        @user_model.get('carl').repository.should             == @repository
       end
 
-      it "should return the default repository for the model" do
-        statistic = Statistic.create(:name => "visits", :value => 2)
+      it 'should return the default repository for the model' do
+        statistic = Statistic.create(:name => 'visits', :value => 2)
         statistic.repository.should        == @alternate_repository
         Statistic.new.repository.should    == @alternate_repository
         Statistic.get(statistic.id).repository.should == @alternate_repository
       end
 
-      it "should return the repository defined by the current context" do
+      it 'should return the repository defined by the current context' do
         @alternate_repository.scope do
           @user_model.new.repository.should                     == @alternate_repository
-          @user_model.create(:name => "carl").repository.should == @alternate_repository
-          @user_model.get("carl").repository.should             == @alternate_repository
+          @user_model.create(:name => 'carl').repository.should == @alternate_repository
+          @user_model.get('carl').repository.should             == @alternate_repository
         end
 
-        @alternate_repository.scope { @user_model.get("carl") }.repository.should == @alternate_repository
+        @alternate_repository.scope { @user_model.get('carl') }.repository.should == @alternate_repository
       end
     end
 
   end
-
 end

data/spec/spec.opts

@@ -1,5 +1,5 @@
 --colour
 --loadby random
---require spec/lib/rspec_immediate_feedback_formatter.rb
+--require ./spec/lib/rspec_immediate_feedback_formatter.rb
 --format Spec::Runner::Formatter::ImmediateFeedbackFormatter
 --backtrace

data/spec/spec_helper.rb

@@ -1,9 +1,6 @@
 require 'pathname'
 require 'rubygems'
 
-gem 'addressable', '~>2.0'
-gem 'rspec',       '>1.1.2'
-
 require 'addressable/uri'
 require 'spec'
 
@@ -35,7 +32,8 @@ PRIMARY = {
 #  'sqlite3_fs' => "sqlite3://#{temp_db_dir}/primary.db",
   'mysql'      => 'mysql://localhost/dm_core_test',
   'postgres'   => 'postgres://localhost/dm_core_test',
-  'oracle'     => 'oracle://dm_core_test:dm_core_test@localhost/orcl'
+  'oracle'     => 'oracle://dm_core_test:dm_core_test@localhost/orcl',
+  'sqlserver'  => 'sqlserver://dm_core_test:dm_core_test@localhost/dm_core_test;instance=SQLEXPRESS'
 }
 
 ALTERNATE = {
@@ -45,7 +43,8 @@ ALTERNATE = {
 #  'sqlite3_fs' => "sqlite3://#{temp_db_dir}/alternate.db",
   'mysql'      => 'mysql://localhost/dm_core_test2',
   'postgres'   => 'postgres://localhost/dm_core_test2',
-  'oracle'     => 'oracle://dm_core_test2:dm_core_test2@localhost/orcl'
+  'oracle'     => 'oracle://dm_core_test2:dm_core_test2@localhost/orcl',
+  'sqlserver'  => 'sqlserver://dm_core_test:dm_core_test@localhost/dm_core_test2;instance=SQLEXPRESS'
 }
 
 # These environment variables will override the default connection string:
@@ -66,7 +65,7 @@ PRIMARY.only(*adapters).each do |name, default|
 
     # test the connection if possible
     if adapter.respond_to?(:query)
-      name == 'oracle' ? adapter.query('SELECT 1 FROM dual') : adapter.query('SELECT 1')
+      name == 'oracle' ? adapter.select('SELECT 1 FROM dual') : adapter.select('SELECT 1')
     end
 
     ADAPTERS << name
@@ -112,3 +111,13 @@ Spec::Runner.configure do |config|
     end
   end
 end
+
+# remove the Resource#send method to ensure specs/internals do no rely on it
+module RemoveSend
+  def self.included(model)
+    model.send(:undef_method, :send)
+    model.send(:undef_method, :freeze)
+  end
+
+  DataMapper::Model.append_inclusions self
+end

data/tasks/ci.rake

@@ -0,0 +1 @@
+task :ci => [ :verify_measurements, 'metrics:all' ]

data/tasks/metrics.rake

@@ -0,0 +1,37 @@
+begin
+  require 'metric_fu'
+rescue LoadError
+  namespace :metrics do
+    task :all do
+      abort 'metric_fu is not available. In order to run metrics:all, you must: gem install metric_fu'
+    end
+  end
+end
+
+begin
+  require 'reek/adapters/rake_task'
+
+  Reek::RakeTask.new do |t|
+    t.fail_on_error = true
+    t.verbose       = false
+    t.source_files  = 'lib/**/*.rb'
+  end
+rescue LoadError
+  task :reek do
+    abort 'Reek is not available. In order to run reek, you must: gem install reek'
+  end
+end
+
+begin
+  require 'roodi'
+  require 'rake/tasklib'
+  require 'roodi_task'
+
+  RoodiTask.new do |t|
+    t.verbose = false
+  end
+rescue LoadError
+  task :roodi do
+    abort 'Roodi is not available. In order to run roodi, you must: gem install roodi'
+  end
+end

data/tasks/spec.rake

@@ -0,0 +1,41 @@
+spec_defaults = lambda do |spec|
+  spec.pattern    = 'spec/**/*_spec.rb'
+  spec.libs      << 'lib' << 'spec'
+  spec.spec_opts << '--options' << 'spec/spec.opts'
+end
+
+begin
+  require 'spec/rake/spectask'
+
+  Spec::Rake::SpecTask.new(:spec, &spec_defaults)
+rescue LoadError
+  task :spec do
+    abort 'rspec is not available. In order to run spec, you must: gem install rspec'
+  end
+end
+
+begin
+  require 'rcov'
+  require 'spec/rake/verify_rcov'
+
+  Spec::Rake::SpecTask.new(:rcov) do |rcov|
+    spec_defaults.call(rcov)
+    rcov.rcov      = true
+    rcov.rcov_opts = File.read('spec/rcov.opts').split(/\s+/)
+  end
+
+  RCov::VerifyTask.new(:verify_rcov => :rcov) do |rcov|
+    rcov.threshold = 100
+  end
+rescue LoadError
+  %w[ rcov verify_rcov ].each do |name|
+    task name do
+      abort "rcov is not available. In order to run #{name}, you must: gem install rcov"
+    end
+  end
+end
+
+task :spec => :check_dependencies
+task :rcov => :check_dependencies
+
+task :default => :spec

data/tasks/yard.rake

@@ -0,0 +1,9 @@
+begin
+  require 'yard'
+
+  YARD::Rake::YardocTask.new
+rescue LoadError
+  task :yard do
+    abort 'YARD is not available. In order to run yard, you must: gem install yard'
+  end
+end

data/tasks/yardstick.rake

@@ -0,0 +1,19 @@
+begin
+  require 'pathname'
+  require 'yardstick/rake/measurement'
+  require 'yardstick/rake/verify'
+
+  # yardstick_measure task
+  Yardstick::Rake::Measurement.new
+
+  # verify_measurements task
+  Yardstick::Rake::Verify.new do |verify|
+    verify.threshold = 100
+  end
+rescue LoadError
+  %w[ yardstick_measure verify_measurements ].each do |name|
+    task name.to_s do
+      abort "Yardstick is not available. In order to run #{name}, you must: gem install yardstick"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-core
 version: !ruby/object:Gem::Version 
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors: 
 - Dan Kubb
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-30 00:00:00 -07:00
+date: 2009-12-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.13
+        version: 0.9.14
     version: 
 - !ruby/object:Gem::Dependency 
   name: addressable
@@ -32,30 +32,43 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "2.1"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.2.9
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: yard
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.4.0
+    version: 
 description: Faster, Better, Simpler.
-email: 
-- dan.kubb@gmail.com
+email: dan.kubb@gmail.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- README.txt
+- LICENSE
+- README.rdoc
 files: 
 - .autotest
+- .document
 - .gitignore
-- CONTRIBUTING
-- FAQ
-- History.txt
-- MIT-LICENSE
-- Manifest.txt
-- QUICKLINKS
-- README.txt
+- LICENSE
+- README.rdoc
 - Rakefile
-- SPECS
-- TODO
+- VERSION
 - deps.rip
 - dm-core.gemspec
 - lib/dm-core.rb
@@ -67,6 +80,7 @@ files:
 - lib/dm-core/adapters/oracle_adapter.rb
 - lib/dm-core/adapters/postgres_adapter.rb
 - lib/dm-core/adapters/sqlite3_adapter.rb
+- lib/dm-core/adapters/sqlserver_adapter.rb
 - lib/dm-core/adapters/yaml_adapter.rb
 - lib/dm-core/associations/many_to_many.rb
 - lib/dm-core/associations/many_to_one.rb
@@ -74,6 +88,7 @@ files:
 - lib/dm-core/associations/one_to_one.rb
 - lib/dm-core/associations/relationship.rb
 - lib/dm-core/collection.rb
+- lib/dm-core/core_ext/enumerable.rb
 - lib/dm-core/core_ext/kernel.rb
 - lib/dm-core/core_ext/symbol.rb
 - lib/dm-core/identity_map.rb
@@ -122,36 +137,44 @@ files:
 - spec/lib/rspec_immediate_feedback_formatter.rb
 - spec/public/associations/many_to_many_spec.rb
 - spec/public/associations/many_to_one_spec.rb
+- spec/public/associations/many_to_one_with_boolean_cpk_spec.rb
 - spec/public/associations/one_to_many_spec.rb
 - spec/public/associations/one_to_one_spec.rb
+- spec/public/associations/one_to_one_with_boolean_cpk_spec.rb
 - spec/public/collection_spec.rb
 - spec/public/migrations_spec.rb
 - spec/public/model/relationship_spec.rb
 - spec/public/model_spec.rb
+- spec/public/property/object_spec.rb
 - spec/public/property_spec.rb
 - spec/public/resource_spec.rb
 - spec/public/sel_spec.rb
 - spec/public/setup_spec.rb
 - spec/public/shared/association_collection_shared_spec.rb
+- spec/public/shared/collection_finder_shared_spec.rb
 - spec/public/shared/collection_shared_spec.rb
 - spec/public/shared/finder_shared_spec.rb
 - spec/public/shared/resource_shared_spec.rb
 - spec/public/shared/sel_shared_spec.rb
 - spec/public/transaction_spec.rb
 - spec/public/types/discriminator_spec.rb
+- spec/rcov.opts
 - spec/semipublic/adapters/abstract_adapter_spec.rb
 - spec/semipublic/adapters/in_memory_adapter_spec.rb
 - spec/semipublic/adapters/mysql_adapter_spec.rb
 - spec/semipublic/adapters/oracle_adapter_spec.rb
 - spec/semipublic/adapters/postgres_adapter_spec.rb
 - spec/semipublic/adapters/sqlite3_adapter_spec.rb
+- spec/semipublic/adapters/sqlserver_adapter_spec.rb
 - spec/semipublic/adapters/yaml_adapter_spec.rb
 - spec/semipublic/associations/many_to_one_spec.rb
 - spec/semipublic/associations/relationship_spec.rb
 - spec/semipublic/associations_spec.rb
 - spec/semipublic/collection_spec.rb
+- spec/semipublic/model_spec.rb
 - spec/semipublic/property_spec.rb
-- spec/semipublic/query/conditions_spec.rb
+- spec/semipublic/query/conditions/comparison_spec.rb
+- spec/semipublic/query/conditions/operation_spec.rb
 - spec/semipublic/query/path_spec.rb
 - spec/semipublic/query_spec.rb
 - spec/semipublic/resource_spec.rb
@@ -159,20 +182,18 @@ files:
 - spec/semipublic/shared/resource_shared_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- tasks/ci.rb
-- tasks/dm.rb
-- tasks/doc.rb
-- tasks/gemspec.rb
-- tasks/hoe.rb
-- tasks/install.rb
+- tasks/ci.rake
+- tasks/metrics.rake
+- tasks/spec.rake
+- tasks/yard.rake
+- tasks/yardstick.rake
 has_rdoc: true
-homepage: http://datamapper.org
+homepage: http://github.com/datamapper/dm-core
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.txt
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -194,5 +215,54 @@ rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: An Object/Relational Mapper for Ruby
-test_files: []
-
+test_files: 
+- spec/lib/adapter_helpers.rb
+- spec/lib/collection_helpers.rb
+- spec/lib/counter_adapter.rb
+- spec/lib/pending_helpers.rb
+- spec/lib/rspec_immediate_feedback_formatter.rb
+- spec/public/associations/many_to_many_spec.rb
+- spec/public/associations/many_to_one_spec.rb
+- spec/public/associations/many_to_one_with_boolean_cpk_spec.rb
+- spec/public/associations/one_to_many_spec.rb
+- spec/public/associations/one_to_one_spec.rb
+- spec/public/associations/one_to_one_with_boolean_cpk_spec.rb
+- spec/public/collection_spec.rb
+- spec/public/migrations_spec.rb
+- spec/public/model/relationship_spec.rb
+- spec/public/model_spec.rb
+- spec/public/property/object_spec.rb
+- spec/public/property_spec.rb
+- spec/public/resource_spec.rb
+- spec/public/sel_spec.rb
+- spec/public/setup_spec.rb
+- spec/public/shared/association_collection_shared_spec.rb
+- spec/public/shared/collection_finder_shared_spec.rb
+- spec/public/shared/collection_shared_spec.rb
+- spec/public/shared/finder_shared_spec.rb
+- spec/public/shared/resource_shared_spec.rb
+- spec/public/shared/sel_shared_spec.rb
+- spec/public/transaction_spec.rb
+- spec/public/types/discriminator_spec.rb
+- spec/semipublic/adapters/abstract_adapter_spec.rb
+- spec/semipublic/adapters/in_memory_adapter_spec.rb
+- spec/semipublic/adapters/mysql_adapter_spec.rb
+- spec/semipublic/adapters/oracle_adapter_spec.rb
+- spec/semipublic/adapters/postgres_adapter_spec.rb
+- spec/semipublic/adapters/sqlite3_adapter_spec.rb
+- spec/semipublic/adapters/sqlserver_adapter_spec.rb
+- spec/semipublic/adapters/yaml_adapter_spec.rb
+- spec/semipublic/associations/many_to_one_spec.rb
+- spec/semipublic/associations/relationship_spec.rb
+- spec/semipublic/associations_spec.rb
+- spec/semipublic/collection_spec.rb
+- spec/semipublic/model_spec.rb
+- spec/semipublic/property_spec.rb
+- spec/semipublic/query/conditions/comparison_spec.rb
+- spec/semipublic/query/conditions/operation_spec.rb
+- spec/semipublic/query/path_spec.rb
+- spec/semipublic/query_spec.rb
+- spec/semipublic/resource_spec.rb
+- spec/semipublic/shared/condition_shared_spec.rb
+- spec/semipublic/shared/resource_shared_spec.rb
+- spec/spec_helper.rb