dm-core 0.9.2 → 0.9.3

data/spec/unit/scope_spec.rb

@@ -75,6 +75,17 @@ 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
+        Article.with_exclusive_scope(:author => 'dkubb') do
+          Article.query.should == DataMapper::Query.new(repository(:mock), Article, :author => 'dkubb')
+        end
+      end
+      Article.default_scope.delete(:blog_id)
+    end
+
   end
 
   describe '.scope_stack' do

data/tasks/ci.rb

@@ -0,0 +1,68 @@
+task 'ci:doc' => :doc
+
+namespace :ci do
+
+  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: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")
+    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
+
+  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'
+
+    system "saikuro -t -i lib -y 0 -w 20 -e 30 -o ci/token"
+    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 ]

data/tasks/dm.rb

@@ -0,0 +1,63 @@
+task :default => 'dm:spec'
+task :spec    => 'dm:spec'
+task :rcov    => 'dm:rcov'
+
+namespace :spec do
+  task :unit        => 'dm:spec:unit'
+  task :integration => 'dm:spec:integration'
+end
+
+namespace :rcov do
+  task :unit        => 'dm:rcov:unit'
+  task :integration => 'dm:rcov:integration'
+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)
+      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
+  end
+
+  unit_specs = ROOT + 'spec/unit/**/*_spec.rb'
+  integration_specs = ROOT + 'spec/integration/**/*_spec.rb'
+  all_specs = ROOT + 'spec/**/*_spec.rb'
+
+  desc "Run all specifications"
+  run_spec('spec', all_specs, false)
+
+  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)
+
+    desc "Run integration specifications"
+    run_spec('integration', integration_specs, false)
+  end
+
+  namespace :rcov do
+    desc "Run unit specifications with rcov"
+    run_spec('unit', unit_specs, true)
+
+    desc "Run integration specifications with rcov"
+    run_spec('integration', integration_specs, true)
+  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
+end

data/tasks/doc.rb

@@ -0,0 +1,20 @@
+# 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")
+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...'
+  end
+rescue Exception
+  # yard not installed
+end

data/tasks/hoe.rb

@@ -0,0 +1,38 @@
+require 'hoe'
+
+@config_file = "~/.rubyforge/user-config.yml"
+@config = nil
+RUBYFORGE_USERNAME = "unknown"
+def rubyforge_username
+  unless @config
+    begin
+      @config = YAML.load(File.read(File.expand_path(@config_file)))
+    rescue
+      puts <<-EOS
+ERROR: No rubyforge config file found: #{@config_file}
+Run 'rubyforge setup' to prepare your env for access to Rubyforge
+ - See http://newgem.rubyforge.org/rubyforge.html for more details
+      EOS
+      exit
+    end
+  end
+  RUBYFORGE_USERNAME.replace @config["username"]
+end
+
+hoe = Hoe.new(GEM_NAME, GEM_VERSION) do |p|
+
+  p.developer(AUTHOR, EMAIL)
+
+  p.description = PROJECT_DESCRIPTION
+  p.summary = PROJECT_SUMMARY
+  p.url = PROJECT_URL
+
+  p.rubyforge_name = PROJECT_NAME if PROJECT_NAME
+
+  p.clean_globs |= ["{coverage,doc,log}/", "**/*.db", "profile_results.*", "**/.*.sw?", "*.gem", ".config", "**/.DS_Store"]
+
+  GEM_DEPENDENCIES.each do |dep|
+    p.extra_deps << dep
+  end
+
+end

data/tasks/install.rb

@@ -0,0 +1,20 @@
+WIN32 = (RUBY_PLATFORM =~ /win32|mingw|bccwin|cygwin/) rescue nil
+SUDO = WIN32 ? '' : ('sudo' unless ENV['SUDOLESS'])
+
+desc "Install #{GEM_NAME}"
+if WIN32
+  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
+  end
+else
+  task :install => :package do
+    sh %{#{SUDO} gem install --local pkg/#{GEM_NAME}-#{GEM_VERSION}.gem}
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-core
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Sam Smoot
@@ -9,29 +9,32 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-25 00:00:00 -05:00
+date: 2008-07-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: data_objects
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.2
+        version: 0.9.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: extlib
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.2
+        version: 0.9.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -41,6 +44,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: addressable
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -48,35 +52,55 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.0.4
     version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.7.0
+    version: 
 description: Faster, Better, Simpler.
-email: ssmoot@gmail.com
+email: 
+- ssmoot@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- History.txt
+- Manifest.txt
+- README.txt
 files: 
-- README
+- .autotest
 - FAQ
-- QUICKLINKS
-- CHANGELOG
+- History.txt
 - MIT-LICENSE
+- Manifest.txt
+- QUICKLINKS
+- README.txt
+- Rakefile
+- SPECS
+- TODO
+- lib/dm-core.rb
+- lib/dm-core/adapters.rb
 - lib/dm-core/adapters/abstract_adapter.rb
 - lib/dm-core/adapters/data_objects_adapter.rb
 - lib/dm-core/adapters/mysql_adapter.rb
 - lib/dm-core/adapters/postgres_adapter.rb
 - lib/dm-core/adapters/sqlite3_adapter.rb
-- lib/dm-core/adapters.rb
+- lib/dm-core/associations.rb
 - lib/dm-core/associations/many_to_many.rb
 - lib/dm-core/associations/many_to_one.rb
 - lib/dm-core/associations/one_to_many.rb
 - lib/dm-core/associations/one_to_one.rb
 - lib/dm-core/associations/relationship.rb
 - lib/dm-core/associations/relationship_chain.rb
-- lib/dm-core/associations.rb
 - lib/dm-core/auto_migrations.rb
 - lib/dm-core/collection.rb
+- lib/dm-core/dependency_queue.rb
 - lib/dm-core/hook.rb
 - lib/dm-core/identity_map.rb
 - lib/dm-core/is.rb
@@ -91,15 +115,16 @@ files:
 - lib/dm-core/repository.rb
 - lib/dm-core/resource.rb
 - lib/dm-core/scope.rb
+- lib/dm-core/support.rb
 - lib/dm-core/support/array.rb
 - lib/dm-core/support/assertions.rb
 - lib/dm-core/support/errors.rb
 - lib/dm-core/support/kernel.rb
 - lib/dm-core/support/symbol.rb
-- lib/dm-core/support.rb
 - lib/dm-core/transaction.rb
 - lib/dm-core/type.rb
 - lib/dm-core/type_map.rb
+- lib/dm-core/types.rb
 - lib/dm-core/types/boolean.rb
 - lib/dm-core/types/discriminator.rb
 - lib/dm-core/types/object.rb
@@ -107,8 +132,10 @@ files:
 - lib/dm-core/types/paranoid_datetime.rb
 - lib/dm-core/types/serial.rb
 - lib/dm-core/types/text.rb
-- lib/dm-core/types.rb
-- lib/dm-core.rb
+- lib/dm-core/version.rb
+- script/all
+- script/performance.rb
+- script/profile.rb
 - spec/integration/association_spec.rb
 - spec/integration/association_through_spec.rb
 - spec/integration/associations/many_to_many_spec.rb
@@ -117,6 +144,7 @@ files:
 - spec/integration/auto_migrations_spec.rb
 - spec/integration/collection_spec.rb
 - spec/integration/data_objects_adapter_spec.rb
+- spec/integration/dependency_queue_spec.rb
 - spec/integration/model_spec.rb
 - spec/integration/mysql_adapter_spec.rb
 - spec/integration/postgres_adapter_spec.rb
@@ -126,9 +154,16 @@ files:
 - spec/integration/resource_spec.rb
 - spec/integration/sqlite3_adapter_spec.rb
 - spec/integration/sti_spec.rb
+- spec/integration/strategic_eager_loading_spec.rb
 - spec/integration/transaction_spec.rb
 - spec/integration/type_spec.rb
+- spec/lib/logging_helper.rb
 - spec/lib/mock_adapter.rb
+- spec/lib/model_loader.rb
+- spec/lib/publicize_methods.rb
+- spec/models/vehicles.rb
+- spec/models/zoo.rb
+- spec/spec.opts
 - spec/spec_helper.rb
 - spec/unit/adapters/abstract_adapter_spec.rb
 - spec/unit/adapters/adapter_shared_spec.rb
@@ -157,11 +192,17 @@ files:
 - spec/unit/transaction_spec.rb
 - spec/unit/type_map_spec.rb
 - spec/unit/type_spec.rb
-has_rdoc: false
+- tasks/ci.rb
+- tasks/dm.rb
+- tasks/doc.rb
+- tasks/hoe.rb
+- tasks/install.rb
+has_rdoc: true
 homepage: http://datamapper.org
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --main
+- README.txt
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -176,10 +217,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version 
       version: "0"
   version: 
-requirements: 
-- none
-rubyforge_project: dm-core
-rubygems_version: 1.0.1
+requirements: []
+
+rubyforge_project: datamapper
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: An Object/Relational Mapper for Ruby