dm-ambition 1.0.0 → 1.1.0.rc1

data/Gemfile

@@ -0,0 +1,77 @@
+source 'http://rubygems.org'
+
+DATAMAPPER = 'git://github.com/datamapper'
+DM_VERSION = '~> 1.0.2'
+
+group :runtime do
+
+  if ENV['EXTLIB']
+    gem 'extlib', '~> 0.9.15', SOURCE => "#{DATAMAPPER}/extlib#{REPO_POSTFIX}", :require => nil
+  else
+    gem 'activesupport', '~> 3.0.4', :require => nil
+    gem 'i18n',          '~> 0.5.0'
+  end
+
+  gem 'dm-core',   DM_VERSION, :git => "#{DATAMAPPER}/dm-core.git"
+  gem 'ParseTree', '~> 3.0.7', :platforms => :mri_18
+  gem 'ruby2ruby', '~> 1.2.5'
+  gem 'sourcify',  '~> 0.4.2'
+
+end
+
+group :development do
+
+  gem 'dm-migrations', DM_VERSION, :git => "#{DATAMAPPER}/dm-migrations.git"
+  gem 'jeweler',       '~> 1.5.2'
+  gem 'rake',          '~> 0.8.7'
+  gem 'rspec',         '~> 1.3.1'
+
+end
+
+platforms :mri_18 do
+  group :quality do
+
+    gem 'metric_fu', '~> 1.3'
+    gem 'rcov',      '~> 0.9.9'
+    gem 'reek',      '~> 1.2.8'
+    gem 'roodi',     '~> 2.1'
+    gem 'yard',      '~> 0.6'
+    gem 'yardstick', '~> 0.2'
+
+  end
+end
+
+group :datamapper do
+
+  adapters = ENV['ADAPTER'] || ENV['ADAPTERS']
+  adapters = adapters.to_s.tr(',', ' ').split.uniq - %w[ in_memory ]
+
+  DO_VERSION     = '~> 0.10.2'
+  DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
+
+  if (do_adapters = DM_DO_ADAPTERS & adapters).any?
+    options = {}
+    options[:git] = "#{DATAMAPPER}/do.git" if ENV['DO_GIT'] == 'true'
+
+    gem 'data_objects', DO_VERSION, options.dup
+
+    do_adapters.each do |adapter|
+      adapter = 'sqlite3' if adapter == 'sqlite'
+      gem "do_#{adapter}", DO_VERSION, options.dup
+    end
+
+    gem 'dm-do-adapter', DM_VERSION, :git => "#{DATAMAPPER}/dm-do-adapter.git"
+  end
+
+  adapters.each do |adapter|
+    gem "dm-#{adapter}-adapter", DM_VERSION, :git => "#{DATAMAPPER}/dm-#{adapter}-adapter.git"
+  end
+
+  plugins = ENV['PLUGINS'] || ENV['PLUGIN']
+  plugins = plugins.to_s.tr(',', ' ').split.push('dm-migrations').uniq
+
+  plugins.each do |plugin|
+    gem plugin, DM_VERSION, :git => "#{DATAMAPPER}/#{plugin}.git"
+  end
+
+end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Dan Kubb
+Copyright (c) 2011 Dan Kubb
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -7,9 +7,8 @@ accessing DataMapper models.
 
 With Rubygems:
 
-  $ sudo gem install dm-ambition
+  $ gem install dm-ambition
   $ irb -rubygems
-  >> require 'dm-core'
   >> require 'dm-ambition'
   => true
 
@@ -17,12 +16,19 @@ With git and local working copy:
 
   $ git clone git://github.com/dkubb/dm-ambition.git
   $ cd dm-ambition
-  $ rake build && sudo rake install
+  $ rake install
   $ irb -rubygems
-  >> require 'dm-core'
   >> require 'dm-ambition'
   => true
 
+== Testing
+
+The simplest way to test is with Bundler since it handles all dependencies:
+
+  $ rake local_gemfile
+  $ BUNDLE_GEMFILE="Gemfile.local" ADAPTER="in_memory" bundle install --without=quality --relock
+  $ BUNDLE_GEMFILE="Gemfile.local" ADAPTER="in_memory" bundle exec rake spec
+
 == Examples
 
     # with == operator
@@ -67,9 +73,12 @@ With git and local working copy:
     # with double-negated conditions
     User.select { |u| !(!(u.id == 1)) }
 
-    # with receiver matching
+    # with matching from receiver
     User.select { |u| u == user }
 
+    # with matching to receiver
+    User.select { |u| user == u }
+
     # using send on receiver
     User.select { |u| u.send(:name) == 'Dan Kubb' }
 
@@ -96,7 +105,7 @@ With git and local working copy:
 
 == License
 
-Copyright (c) 2010 Dan Kubb
+Copyright (c) 2011 Dan Kubb
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake'
 require File.expand_path('../lib/dm-ambition/version', __FILE__)
 
 begin
-  gem 'jeweler', '~> 1.4'
+  gem 'jeweler', '~> 1.5.2'
   require 'jeweler'
 
   Jeweler::Tasks.new do |gem|
@@ -14,19 +14,13 @@ begin
     gem.email       = 'dan.kubb@gmail.com'
     gem.homepage    = 'http://github.com/dkubb/%s' % gem.name
     gem.authors     = [ 'Dan Kubb' ]
+    gem.has_rdoc    = 'yard'
 
     gem.version = DataMapper::Ambition::VERSION
 
-    gem.required_ruby_version = '~> 1.8.6'
+    gem.required_ruby_version = '~> 1.8.7'
 
     gem.rubyforge_project = 'dm-ambition'
-
-    gem.add_dependency 'dm-core',   '~> 1.0.0'
-    gem.add_dependency 'ParseTree', '~> 3.0.5'
-    gem.add_dependency 'ruby2ruby', '~> 1.2.4'
-
-    gem.add_development_dependency 'dm-migrations', '~> 1.0.0'
-    gem.add_development_dependency 'rspec',         '~> 1.3'
   end
 
   Jeweler::GemcutterTasks.new

data/TODO

@@ -0,0 +1,13 @@
+* Heckle the methods to make sure that the specs cover all branches
+  within the code.
+  * The purpose of this is to make sure we have good test cases
+    to use with a Veritas port in the future.
+
+* Refactor specs to use one spec file per public method
+
+* Add to Model and Collection:
+  * Add #empty?
+  * Add #any?  (handle with and without block)
+  * Add #all?  (handle with and without block)
+  * Add #none? (handle with and without block) (add to LazyArray for < 1.9)
+  * Add #one?  (handle with and without block) (add to LazyArray for < 1.9)

data/dm-ambition.gemspec

@@ -1,90 +1,104 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{dm-ambition}
-  s.version = "1.0.0"
+  s.version = "1.1.0.rc1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Kubb"]
-  s.date = %q{2010-06-08}
+  s.date = %q{2011-02-28}
   s.description = %q{DataMapper plugin providing an Ambition-like API}
   s.email = %q{dan.kubb@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc",
-     "TODO"
+    "README.rdoc",
+    "TODO"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "Manifest.txt",
-     "README.rdoc",
-     "Rakefile",
-     "TODO",
-     "dm-ambition.gemspec",
-     "lib/dm-ambition.rb",
-     "lib/dm-ambition/collection.rb",
-     "lib/dm-ambition/model.rb",
-     "lib/dm-ambition/query.rb",
-     "lib/dm-ambition/query/filter_processor.rb",
-     "lib/dm-ambition/version.rb",
-     "spec/public/collection_spec.rb",
-     "spec/public/model_spec.rb",
-     "spec/public/shared/filter_shared_spec.rb",
-     "spec/rcov.opts",
-     "spec/semipublic/query_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "tasks/ci.rake",
-     "tasks/clean.rake",
-     "tasks/heckle.rake",
-     "tasks/metrics.rake",
-     "tasks/spec.rake",
-     "tasks/yard.rake",
-     "tasks/yardstick.rake"
+    "Gemfile",
+    "LICENSE",
+    "Manifest.txt",
+    "README.rdoc",
+    "Rakefile",
+    "TODO",
+    "dm-ambition.gemspec",
+    "lib/dm-ambition.rb",
+    "lib/dm-ambition/collection.rb",
+    "lib/dm-ambition/model.rb",
+    "lib/dm-ambition/query.rb",
+    "lib/dm-ambition/query/filter_processor.rb",
+    "lib/dm-ambition/version.rb",
+    "spec/public/collection_spec.rb",
+    "spec/public/model_spec.rb",
+    "spec/public/shared/filter_shared_spec.rb",
+    "spec/rcov.opts",
+    "spec/semipublic/query_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb",
+    "tasks/ci.rake",
+    "tasks/clean.rake",
+    "tasks/heckle.rake",
+    "tasks/local_gemfile.rake",
+    "tasks/metrics.rake",
+    "tasks/spec.rake",
+    "tasks/yard.rake",
+    "tasks/yardstick.rake"
   ]
   s.homepage = %q{http://github.com/dkubb/dm-ambition}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.required_ruby_version = Gem::Requirement.new("~> 1.8.6")
+  s.required_ruby_version = Gem::Requirement.new("~> 1.8.7")
   s.rubyforge_project = %q{dm-ambition}
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{DataMapper plugin providing an Ambition-like API}
   s.test_files = [
     "spec/public/collection_spec.rb",
-     "spec/public/model_spec.rb",
-     "spec/public/shared/filter_shared_spec.rb",
-     "spec/semipublic/query_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/public/model_spec.rb",
+    "spec/public/shared/filter_shared_spec.rb",
+    "spec/semipublic/query_spec.rb",
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0"])
-      s.add_runtime_dependency(%q<ParseTree>, ["~> 3.0.5"])
-      s.add_runtime_dependency(%q<ruby2ruby>, ["~> 1.2.4"])
-      s.add_development_dependency(%q<dm-migrations>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.4"])
+      s.add_runtime_dependency(%q<i18n>, ["~> 0.5.0"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.2"])
+      s.add_runtime_dependency(%q<ParseTree>, ["~> 3.0.7"])
+      s.add_runtime_dependency(%q<ruby2ruby>, ["~> 1.2.5"])
+      s.add_runtime_dependency(%q<sourcify>, ["~> 0.4.2"])
+      s.add_development_dependency(%q<dm-migrations>, ["~> 1.0.2"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.3.1"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 1.0.0"])
-      s.add_dependency(%q<ParseTree>, ["~> 3.0.5"])
-      s.add_dependency(%q<ruby2ruby>, ["~> 1.2.4"])
-      s.add_dependency(%q<dm-migrations>, ["~> 1.0.0"])
-      s.add_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_dependency(%q<activesupport>, ["~> 3.0.4"])
+      s.add_dependency(%q<i18n>, ["~> 0.5.0"])
+      s.add_dependency(%q<dm-core>, ["~> 1.0.2"])
+      s.add_dependency(%q<ParseTree>, ["~> 3.0.7"])
+      s.add_dependency(%q<ruby2ruby>, ["~> 1.2.5"])
+      s.add_dependency(%q<sourcify>, ["~> 0.4.2"])
+      s.add_dependency(%q<dm-migrations>, ["~> 1.0.2"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<rake>, ["~> 0.8.7"])
+      s.add_dependency(%q<rspec>, ["~> 1.3.1"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 1.0.0"])
-    s.add_dependency(%q<ParseTree>, ["~> 3.0.5"])
-    s.add_dependency(%q<ruby2ruby>, ["~> 1.2.4"])
-    s.add_dependency(%q<dm-migrations>, ["~> 1.0.0"])
-    s.add_dependency(%q<rspec>, ["~> 1.3"])
+    s.add_dependency(%q<activesupport>, ["~> 3.0.4"])
+    s.add_dependency(%q<i18n>, ["~> 0.5.0"])
+    s.add_dependency(%q<dm-core>, ["~> 1.0.2"])
+    s.add_dependency(%q<ParseTree>, ["~> 3.0.7"])
+    s.add_dependency(%q<ruby2ruby>, ["~> 1.2.5"])
+    s.add_dependency(%q<sourcify>, ["~> 0.4.2"])
+    s.add_dependency(%q<dm-migrations>, ["~> 1.0.2"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<rake>, ["~> 0.8.7"])
+    s.add_dependency(%q<rspec>, ["~> 1.3.1"])
   end
 end
 

data/lib/dm-ambition/collection.rb

@@ -1,73 +1,43 @@
-# TODO: update Collection#select in dm-core to return a Collection
-# TODO: update Collection#reject in dm-core to return a Collection
-
 module DataMapper
   module Ambition
     module Collection
       def self.included(base)
-        base.send(:alias_method, :find_all, :select)
         base.send(:alias_method, :find,     :detect)
+        base.send(:alias_method, :find_all, :select)
       end
 
-      # TODO: add empty?
-      # TODO: add any?  (handle with and without block)
-      # TODO: add all?  (handle with and without block)
-      # TODO: add none? (handle with and without block) (add to LazyArray for < 1.9)
-      # TODO: add one?  (handle with and without block) (add to LazyArray for < 1.9)
-
       # TODO: document this
       # @api public
-      def select(&block)
-        query = self.query.filter(&block)
-
-        if loaded?
-          new_collection(query, super)
-        else
-          collection = all(query)
-
-          if head.any?
-            collection.unshift(*head.select(&block))
-          end
-
-          if tail.any?
-            collection.concat(tail.select(&block))
-          end
-
-          collection
-        end
+      def detect(&block)
+        return super if loaded?
+        head.detect(&block) || first(query.filter(&block))
       end
 
       # TODO: document this
       # @api public
-      def detect(&block)
-        if loaded?
-          super
-        else
-          head.detect(&block) || first(query.filter(&block))
-        end
+      def select(&block)
+        filter_collection(:&, block) { super }
       end
 
       # TODO: document this
       # @api public
       def reject(&block)
-        query = self.query.filter(true, &block)
-
-        if loaded?
-          new_collection(query, super)
-        else
-          collection = all(query)
+        filter_collection(:-, block) { super }
+      end
 
-          if head.any?
-            collection.unshift(*head.reject(&block))
-          end
+    private
 
-          if tail.any?
-            collection.concat(tail.reject(&block))
-          end
+      # @api private
+      def filter_collection(operation, block)
+        new_query = query.filter(&block)
+        return new_collection(new_query, yield) if loaded?
 
-          collection
-        end
+        collection = send(operation, all(new_query))
+        collection.unshift(*head.send(operation, head.select(&block)))
+        collection.concat(tail.send(operation, tail.select(&block)))
+        collection
       end
+
     end # module Collection
   end # module Ambition
 end # module DataMapper

data/lib/dm-ambition/model.rb

@@ -23,6 +23,7 @@ module DataMapper
       def reject(&block)
         all.reject(&block)
       end
+
     end # module Model
   end # module Ambition
 end # module DataMapper