datamapper-dm-core 0.9.11 → 0.10.0

data/spec/semipublic/resource_spec.rb

@@ -0,0 +1,47 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+
+describe DataMapper::Resource do
+  before :all do
+    class ::User
+      include DataMapper::Resource
+
+      property :name,        String, :key => true
+      property :age,         Integer
+      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
+
+  supported_by :all do
+    before :all do
+      @user = @user_model.create(:name => 'dbussink', :age => 25, :description => "Test")
+    end
+
+    it_should_behave_like 'A semipublic Resource'
+  end
+end

data/spec/semipublic/shared/resource_shared_spec.rb

@@ -0,0 +1,126 @@
+share_examples_for 'A semipublic Resource' do
+  before :all do
+    %w[ @user_model @user ].each do |ivar|
+      raise "+#{ivar}+ should be defined in before block" unless instance_variable_get(ivar)
+    end
+  end
+
+  it { @user.should respond_to(:dirty?) }
+
+  describe '#dirty?' do
+
+    describe 'on a non-dirty record' do
+
+      it { @user.should_not be_dirty }
+
+    end
+
+    describe 'on a dirty record' do
+
+      before { @user.age = 100 }
+
+      it { @user.should be_dirty }
+
+    end
+
+    describe 'on a new record, with no attributes, no default attributes, and no identity field' do
+
+      before { @user = @user_model.new }
+
+      it { @user.should_not be_dirty }
+
+    end
+
+    describe 'on a new record, with no attributes, no default attributes, and an identity field' do
+
+      before { @comment = Comment.new }
+
+      it { @comment.should be_dirty }
+
+    end
+
+    describe 'on a new record, with no attributes, default attributes, and no identity field' do
+
+      before { @default = Default.new }
+
+      it { @default.should be_dirty }
+
+    end
+
+
+  end
+
+  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
+
+    describe 'on a dirty record' do
+
+      before { @user.age = 100 }
+
+      it { @user.attribute_dirty?(:age).should be_true }
+
+    end
+
+    describe 'on a new record' do
+
+      before { @user = @user_model.new }
+
+      it { @user.attribute_dirty?(:age).should be_false }
+
+    end
+
+  end
+
+  it { @user.should respond_to(:repository) }
+
+  describe "#repository" do
+
+    before :all do
+      class ::Statistic
+        include DataMapper::Resource
+
+        def self.default_repository_name
+          :alternate
+        end
+
+        property :id,    Serial
+        property :name,  String
+        property :value, Integer
+      end
+    end
+
+    with_alternate_adapter do
+      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
+      end
+
+      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
+        @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
+        end
+
+        @alternate_repository.scope { @user_model.get("carl") }.repository.should == @alternate_repository
+      end
+    end
+
+  end
+
+end

data/spec/spec.opts

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

data/spec/spec_helper.rb

@@ -1,23 +1,52 @@
 require 'pathname'
 require 'rubygems'
 
-gem 'rspec', '~>1.2'
+gem 'addressable', '~>2.0'
+gem 'rspec',       '>1.1.2'
+
+require 'addressable/uri'
 require 'spec'
 
 SPEC_ROOT = Pathname(__FILE__).dirname.expand_path
-require SPEC_ROOT.parent + 'lib/dm-core'
+$LOAD_PATH.unshift(SPEC_ROOT.parent + 'lib')
+
+require 'dm-core'
 
-# Load the various helpers for the spec suite
-Dir[(DataMapper.root / 'spec' / 'lib' / '*.rb').to_s].each do |file|
-  require file
+ENV['PLUGINS'].to_s.strip.split(/\s+/).each do |plugin|
+  require plugin
 end
 
-# setup mock adapters
-DataMapper.setup(:default2, "sqlite3::memory:")
+Pathname.glob((SPEC_ROOT + '{lib,*/shared}/**/*.rb').to_s).each { |file| require file }
 
-[ :mock, :legacy, :west_coast, :east_coast ].each do |repository_name|
-  DataMapper.setup(repository_name, "mock://localhost/#{repository_name}")
-end
+# create sqlite3_fs directory if it doesn't exist
+temp_db_dir = SPEC_ROOT.join('db')
+temp_db_dir.mkpath
+
+ENV['ADAPTERS'] ||= 'all'
+
+HAS_DO = DataMapper::Adapters.const_defined?('DataObjectsAdapter')
+
+ADAPTERS = []
+
+PRIMARY = {
+  'in_memory'  => { :adapter => :in_memory },
+  'yaml'       => "yaml://#{temp_db_dir}/primary_yaml",
+  'sqlite3'    => 'sqlite3::memory:',
+#  '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'
+}
+
+ALTERNATE = {
+  'in_memory'  => { :adapter => :in_memory },
+  'yaml'       => "yaml://#{temp_db_dir}/secondary_yaml",
+  'sqlite3'    => "sqlite3://#{temp_db_dir}/alternate.db",  # use a FS for the alternate because there can only be one memory db at a time in SQLite3
+#  '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'
+}
 
 # These environment variables will override the default connection string:
 #   MYSQL_SPEC_URI
@@ -26,66 +55,60 @@ end
 #
 # For example, in the bash shell, you might use:
 #   export MYSQL_SPEC_URI="mysql://localhost/dm_core_test?socket=/opt/local/var/run/mysql5/mysqld.sock"
-#
-def setup_adapter(name, default_uri)
+
+adapters = ENV['ADAPTERS'].split(' ').map { |adapter_name| adapter_name.strip.downcase }.uniq
+adapters = PRIMARY.keys if adapters.include?('all')
+
+PRIMARY.only(*adapters).each do |name, default|
+  connection_string = ENV["#{name.upcase}_SPEC_URI"] || default
   begin
-    adapter = DataMapper.setup(name, ENV["#{name.to_s.upcase}_SPEC_URI"] || default_uri)
+    adapter = DataMapper.setup(name.to_sym, connection_string)
 
-    if name.to_s == ENV['ADAPTER']
-      Object.const_set('ADAPTER', ENV['ADAPTER'].to_sym)
-      DataMapper::Repository.adapters[:default] = adapter
+    # test the connection if possible
+    if adapter.respond_to?(:query)
+      name == 'oracle' ? adapter.query('SELECT 1 FROM dual') : adapter.query('SELECT 1')
     end
 
-    true
-  rescue Exception => e
-    if name.to_s == ENV['ADAPTER']
-      Object.const_set('ADAPTER', nil)
-      warn "Could not load #{name} adapter: #{e}"
-    end
-    false
+    ADAPTERS << name
+    PRIMARY[name] = connection_string  # ensure *_SPEC_URI is saved
+   rescue Exception => exception
+     puts "Could not connect to the database using #{connection_string.inspect} because: #{exception.inspect}"
   end
 end
 
-ENV['ADAPTER'] ||= 'sqlite3'
-
-HAS_SQLITE3  = setup_adapter(:sqlite3,  'sqlite3::memory:')
-HAS_MYSQL    = setup_adapter(:mysql,    'mysql://localhost/dm_core_test')
-HAS_POSTGRES = setup_adapter(:postgres, 'postgres://postgres@localhost/dm_core_test')
-
-DataMapper::Logger.new(nil, :debug)
-
-# ----------------------------------------------------------------------
-# --- Do not declare new models unless absolutely necessary. Instead ---
-# --- pick a metaphor and use those models. If you do need new       ---
-# --- models, define them according to the metaphor being used.      ---
-# ----------------------------------------------------------------------
-
-Spec::Runner.configure do |config|
-  config.before(:each) do
-    # load_models_for_metaphor :vehicles
+# speed up test execution on Oracle
+if defined?(DataMapper::Adapters::OracleAdapter)
+  DataMapper::Adapters::OracleAdapter.instance_eval do
+    auto_migrate_with :delete           # table data will be deleted instead of dropping and creating table
+    auto_migrate_reset_sequences false  # primary key sequences will not be reset
   end
 end
 
-# ----------------------------------------------------------------------
-# --- All these models are going to be removed. Don't use them!!!    ---
-# ----------------------------------------------------------------------
+ADAPTERS.freeze
+PRIMARY.freeze
 
-class Article
-  include DataMapper::Resource
+logger = DataMapper::Logger.new(DataMapper.root / 'log' / 'dm.log', :debug)
+logger.auto_flush = true
 
-  property :id,         Serial
-  property :blog_id,    Integer
-  property :created_at, DateTime
-  property :author,     String
-  property :title,      String
-end
+Spec::Runner.configure do |config|
+  config.extend(DataMapper::Spec::AdapterHelpers)
+  config.include(DataMapper::Spec::PendingHelpers)
 
-class Comment
-  include DataMapper::Resource
+  config.after :all do
+    # global model cleanup
+    descendants = DataMapper::Model.descendants.to_a
+    while model = descendants.shift
+      descendants.concat(model.descendants.to_a - [ model ])
 
-  property :id,         Serial # blah
-end
+      parts         = model.name.split('::')
+      constant_name = parts.pop.to_sym
+      base          = parts.empty? ? Object : Object.full_const_get(parts.join('::'))
+
+      if base.const_defined?(constant_name)
+        base.send(:remove_const, constant_name)
+      end
 
-class NormalClass
-  # should not include DataMapper::Resource
+      DataMapper::Model.descendants.delete(model)
+    end
+  end
 end

data/tasks/ci.rb

@@ -1,36 +1,24 @@
-task 'ci:doc' => :doc
+desc 'Run metric_fu'
+task :ci do
+  # sudo gem install jscruggs-metric_fu -s http://gems.github.com
+  require 'metric_fu'
 
-namespace :ci do
+  MetricFu::Configuration.run do |config|
+    specs = Pathname.glob(ENV['FILES'] || (ROOT + 'spec/**/*_spec.rb').to_s).sort.map { |file| file.to_s }
 
-  task :prepare do
-    rm_rf ROOT + "ci"
-    mkdir_p ROOT + "ci"
-    mkdir_p ROOT + "ci/doc"
-    mkdir_p ROOT + "ci/cyclomatic"
-    mkdir_p ROOT + "ci/token"
-  end
-
-  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"
-      t.rcov_opts << '--text-summary'
-      t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
-      t.rcov_opts << '--only-uncovered'
-    end
-  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'
-
-    system "saikuro -t -i lib -y 0 -w 20 -e 30 -o ci/token"
-    mv 'ci/token/index_token.html', 'ci/token/index.html'
+    config.rcov = {
+      :test_files => specs,
+      :rcov_opts  => [
+        '--sort coverage',
+        '--no-html',
+        '--text-coverage',
+        '--no-color',
+        '--profile',
+        '--exclude spec',
+        "`which spec` -- #{specs.join(' ')}",
+      ],
+    }
   end
 
+  Rake::Task['metrics:all'].invoke
 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 ]

data/tasks/dm.rb

@@ -1,63 +1,58 @@
-task :default => 'dm:spec'
-task :spec    => 'dm:spec'
-task :rcov    => 'dm:rcov'
+require 'spec/rake/spectask'
+require 'spec/rake/verify_rcov'
 
-namespace :spec do
-  task :unit        => 'dm:spec:unit'
-  task :integration => 'dm:spec:integration'
-end
+task :default => 'spec'
 
-namespace :rcov do
-  task :unit        => 'dm:rcov:unit'
-  task :integration => 'dm:rcov:integration'
+RCov::VerifyTask.new(:verify_rcov => :rcov) do |config|
+  config.threshold = 88.1  # Make sure you have rcov 0.7 or higher!
 end
 
-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.to_s).map { |f| f.to_s }
-      t.rcov = rcov
-      t.rcov_opts << '--exclude' << 'spec,environment.rb'
-      t.rcov_opts << '--text-summary'
-      t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
-      t.rcov_opts << '--only-uncovered'
-    end
+def run_spec(name, files, rcov)
+  Spec::Rake::SpecTask.new(name) do |config|
+    config.spec_opts << '--options' << ROOT + 'spec/spec.opts'
+    config.spec_files = Pathname.glob(ENV['FILES'] || files.to_s).map { |file| file.to_s }
+    config.rcov = rcov
+    config.rcov_opts << '--exclude' << 'spec'
+    config.rcov_opts << '--text-summary'
+    config.rcov_opts << '--sort' << 'coverage'
+    config.rcov_opts << '--only-uncovered'
+    config.rcov_opts << '--profile'
+    #config.rcov_opts << '-w'  # TODO: make sure it runs with warnings enabled
   end
+end
 
-  unit_specs        = ROOT + 'spec/unit/**/*_spec.rb'
-  integration_specs = ROOT + 'spec/integration/**/*_spec.rb'
-  all_specs         = ROOT + 'spec/**/*_spec.rb'
+public_specs     = ROOT + 'spec/public/**/*_spec.rb'
+semipublic_specs = ROOT + 'spec/semipublic/**/*_spec.rb'
+all_specs        = ROOT + 'spec/**/*_spec.rb'
 
-  desc "Run all specifications"
-  run_spec('spec', all_specs, false)
+desc 'Run all specifications'
+run_spec('spec', all_specs, false)
 
-  desc "Run all specifications with rcov"
-  run_spec('rcov', all_specs, true)
+desc 'Run all specifications with rcov'
+run_spec('rcov', all_specs, true)
 
-  namespace :spec do
-    desc "Run unit specifications"
-    run_spec('unit', unit_specs, false)
+namespace :spec do
+  desc 'Run public specifications'
+  run_spec('public', public_specs, false)
 
-    desc "Run integration specifications"
-    run_spec('integration', integration_specs, false)
-  end
+  desc 'Run semipublic specifications'
+  run_spec('semipublic', semipublic_specs, false)
+end
 
-  namespace :rcov do
-    desc "Run unit specifications with rcov"
-    run_spec('unit', unit_specs, true)
+namespace :rcov do
+  desc 'Run public specifications with rcov'
+  run_spec('public', public_specs, true)
 
-    desc "Run integration specifications with rcov"
-    run_spec('integration', integration_specs, true)
-  end
+  desc 'Run semipublic specifications with rcov'
+  run_spec('semipublic', semipublic_specs, true)
+end
 
-  desc "Run all comparisons with ActiveRecord"
-  task :perf do
-    sh ROOT + 'script/performance.rb'
-  end
+desc 'Run all comparisons with ActiveRecord'
+task :perf do
+  sh ROOT + 'script/performance.rb'
+end
 
-  desc "Profile DataMapper"
-  task :profile do
-    sh ROOT + 'script/profile.rb'
-  end
+desc 'Profile DataMapper'
+task :profile do
+  sh ROOT + 'script/profile.rb'
 end

data/tasks/doc.rb

@@ -1,20 +1,17 @@
 # when yard's ready, it'll have to come back, but for now...
-Rake::RDocTask.new("doc") do |t|
-  t.rdoc_dir = 'doc'
-  t.title    = "DataMapper - Ruby Object Relational Mapper"
-  t.options  = ['--line-numbers', '--inline-source', '--all']
-  t.rdoc_files.include("README.txt", "QUICKLINKS", "FAQ", "lib/**/**/*.rb")
+Rake::RDocTask.new('doc') do |config|
+  config.rdoc_dir = 'doc'
+  config.title    = 'DataMapper - Ruby Object Relational Mapper'
+  config.options  = %w[ --line-numbers --inline-source --all ]
+  config.rdoc_files.include('README.txt', 'QUICKLINKS', 'FAQ', 'lib/**/**/*.rb')
 end
 
 begin
-  gem 'yard', '>=0.2.1'
   require 'yard'
 
-  YARD::Rake::YardocTask.new("yardoc") do |t|
-    t.options << '--protected'
-    # t.options << '-q'
-    # t.files << '...anyglobshere...'
+  YARD::Rake::YardocTask.new('yardoc') do |config|
+    config.files << 'lib/**/*.rb'
   end
-rescue Exception
+rescue LoadError
   # yard not installed
 end

data/tasks/gemspec.rb

@@ -1,20 +1,20 @@
-desc "Generate gemspec"
-task :gemspec do |x|
+desc 'Generate gemspec'
+task :gemspec do
   # Clean up extraneous files before checking manifest
   %x[rake clean]
 
   # Check the manifest before generating the gemspec
   manifest = %x[rake check_manifest]
-  manifest.gsub!("(in /usr/local/projects/dm/dm-core)\n", "")
+  manifest.gsub!("(in /usr/local/projects/dm/dm-core)\n", '')
 
   unless manifest.empty?
-    print "\n", "#"*68, "\n"
+    print "\n", '#' * 68, "\n"
     print <<-EOS
   Manifest.txt is not up-to-date. Please review the changes below.
   If the changes are correct, run 'rake check_manifest | patch'
   and then run this command again.
 EOS
-    print "#"*68, "\n\n"
+    print '#' * 68, "\n\n"
     puts manifest
   else
     %x[rake debug_gem > #{GEM_NAME}.gemspec]

data/tasks/hoe.rb

@@ -1,8 +1,8 @@
 require 'hoe'
 
-@config_file = "~/.rubyforge/user-config.yml"
+@config_file = '~/.rubyforge/user-config.yml'
 @config = nil
-RUBYFORGE_USERNAME = "unknown"
+RUBYFORGE_USERNAME = 'unknown'
 def rubyforge_username
   unless @config
     begin
@@ -16,31 +16,30 @@ Run 'rubyforge setup' to prepare your env for access to Rubyforge
       exit
     end
   end
-  RUBYFORGE_USERNAME.replace @config["username"]
+  RUBYFORGE_USERNAME.replace @config['username']
 end
 
 # Remove hoe dependency
 class Hoe
   def extra_dev_deps
-    @extra_dev_deps.reject! { |dep| dep[0] == "hoe" }
+    @extra_dev_deps.reject! { |dep| dep[0] == 'hoe' }
     @extra_dev_deps
   end
 end
 
-hoe = Hoe.new(GEM_NAME, GEM_VERSION) do |p|
+# Don't use Hoe's test task
+Hoe.plugins.delete(:test)
 
-  p.developer(AUTHOR, EMAIL)
+hoe = Hoe.spec(GEM_NAME) do
+  developer(AUTHOR, EMAIL)
 
-  p.description = PROJECT_DESCRIPTION
-  p.summary = PROJECT_SUMMARY
-  p.url = PROJECT_URL
+  self.version     = GEM_VERSION
+  self.description = PROJECT_DESCRIPTION
+  self.summary     = PROJECT_SUMMARY
+  self.url         = PROJECT_URL
 
-  p.rubyforge_name = PROJECT_NAME if PROJECT_NAME
-
-  p.clean_globs |= ["{coverage,doc,log,tmp}", "**/*.{log,db}", "profile_results.*", "**/.DS_Store"]
-
-  GEM_DEPENDENCIES.each do |dep|
-    p.extra_deps << dep
-  end
+  self.rubyforge_name = PROJECT_NAME
 
+  clean_globs |= %w[ {coverage,doc,log,tmp} **/*.{log,db} profile_results.* **/.DS_Store spec/db ]
+  extra_deps  |= GEM_DEPENDENCIES
 end

data/tasks/install.rb

@@ -1,20 +1,18 @@
 WIN32 = (RUBY_PLATFORM =~ /win32|mingw|bccwin|cygwin/) rescue nil
 SUDO = WIN32 ? '' : ('sudo' unless ENV['SUDOLESS'])
 
-desc "Install #{GEM_NAME}"
+def sudo_gem(cmd)
+  sh "#{SUDO} #{RUBY} -S gem #{cmd}", :verbose => false
+end
+
 if WIN32
+  desc "Install #{GEM_NAME}"
   task :install => :gem do
-    system %{gem install --no-rdoc --no-ri -l pkg/#{GEM_NAME}-#{GEM_VERSION}.gem}
-  end
-  namespace :dev do
-    desc 'Install for development (for windows)'
-    task :winstall => :gem do
-      warn "You can now call 'rake install' instead of 'rake dev:winstall'."
-      system %{gem install --no-rdoc --no-ri -l pkg/#{GEM_NAME}-#{GEM_VERSION}.gem}
-    end
+    sudo_gem "install --no-rdoc --no-ri pkg/#{GEM_NAME}-#{GEM_VERSION}.gem"
   end
 else
+  desc "Install #{GEM_NAME}"
   task :install => :package do
-    sh %{#{SUDO} gem install --local pkg/#{GEM_NAME}-#{GEM_VERSION}.gem}
+    sudo_gem "install --no-rdoc --no-ri pkg/#{GEM_NAME}-#{GEM_VERSION}.gem"
   end
 end