dm-ambition 1.0.0 → 1.1.0.rc1

data/spec/semipublic/query_spec.rb

@@ -11,6 +11,13 @@ describe DataMapper::Ambition::Query do
       property :admin, Boolean
     end
 
+    class ::Person
+      include DataMapper::Resource
+
+      property :first_name, String, :key => true
+      property :last_name,  String, :key => true
+    end
+
     if DataMapper.respond_to?(:auto_migrate!)
       DataMapper.auto_migrate!
     end
@@ -27,8 +34,8 @@ describe DataMapper::Ambition::Query do
   it { @subject.should respond_to(:filter) }
 
   describe '#filter' do
-    describe 'with operator' do
-      describe '==' do
+    context 'with operator' do
+      context '==' do
         before :all do
           @return = @subject.filter { |u| u.name == 'Dan Kubb' }
         end
@@ -48,7 +55,7 @@ describe DataMapper::Ambition::Query do
         end
       end
 
-      describe '=~' do
+      context '=~' do
         before :all do
           @return = @subject.filter { |u| u.name =~ /Dan Kubb/ }
         end
@@ -68,7 +75,7 @@ describe DataMapper::Ambition::Query do
         end
       end
 
-      describe '>' do
+      context '>' do
         before :all do
           @return = @subject.filter { |u| u.id > 1 }
         end
@@ -88,7 +95,7 @@ describe DataMapper::Ambition::Query do
         end
       end
 
-      describe '>=' do
+      context '>=' do
         before :all do
           @return = @subject.filter { |u| u.id >= 1 }
         end
@@ -108,7 +115,7 @@ describe DataMapper::Ambition::Query do
         end
       end
 
-      describe '<' do
+      context '<' do
         before :all do
           @return = @subject.filter { |u| u.id < 1 }
         end
@@ -128,7 +135,7 @@ describe DataMapper::Ambition::Query do
         end
       end
 
-      describe '<=' do
+      context '<=' do
         before :all do
           @return = @subject.filter { |u| u.id <= 1 }
         end
@@ -149,7 +156,7 @@ describe DataMapper::Ambition::Query do
       end
 
       [ :include?, :member? ].each do |method|
-        describe "Array##{method}" do
+        context "Array##{method}" do
           before :all do
             @return = @subject.filter { |u| [ 1, 2 ].send(method, u.id) }
           end
@@ -171,7 +178,7 @@ describe DataMapper::Ambition::Query do
       end
 
       [ :include?, :member?, :=== ].each do |method|
-        describe "Range##{method} (inclusive)" do
+        context "Range##{method} (inclusive)" do
           before :all do
             @return = @subject.filter { |u| (1..2).send(method, u.id) }
           end
@@ -191,7 +198,7 @@ describe DataMapper::Ambition::Query do
           end
         end
 
-        describe "Range##{method} (exclusive)" do
+        context "Range##{method} (exclusive)" do
           before :all do
             @return = @subject.filter { |u| (1...3).send(method, u.id) }
           end
@@ -213,7 +220,7 @@ describe DataMapper::Ambition::Query do
       end
 
       [ :key?, :has_key?, :include?, :member? ].each do |method|
-        describe "Hash##{method}" do
+        context "Hash##{method}" do
           before :all do
             @return = @subject.filter { |u| { 1 => '1', 2 => '2' }.send(method, u.id) }
           end
@@ -235,9 +242,9 @@ describe DataMapper::Ambition::Query do
       end
 
       [ :value?, :has_value? ].each do |method|
-        describe "Hash##{method}" do
+        context "Hash##{method}" do
           before :all do
-            @return = @subject.filter { |u| { '1' => 1, '2' => 2 }.value?(u.id) }
+            @return = @subject.filter { |u| { '1' => 1, '2' => 2 }.send(method, u.id) }
           end
 
           it 'should return a Query' do
@@ -256,7 +263,7 @@ describe DataMapper::Ambition::Query do
         end
       end
 
-      describe 'receiver.method.nil?' do
+      context 'receiver.method.nil?' do
         before :all do
           @return = @subject.filter { |u| u.id.nil? }
         end
@@ -277,8 +284,8 @@ describe DataMapper::Ambition::Query do
       end
     end
 
-    describe 'with bind value' do
-      describe 'nil' do
+    context 'with bind value' do
+      context 'nil' do
         before :all do
           @return = @subject.filter { |u| u.name == nil }
         end
@@ -298,7 +305,7 @@ describe DataMapper::Ambition::Query do
         end
       end
 
-      describe 'true' do
+      context 'true' do
         before :all do
           @return = @subject.filter { |u| u.admin == true }
         end
@@ -318,7 +325,7 @@ describe DataMapper::Ambition::Query do
         end
       end
 
-      describe 'false' do
+      context 'false' do
         before :all do
           @return = @subject.filter { |u| u.admin == false }
         end
@@ -339,8 +346,8 @@ describe DataMapper::Ambition::Query do
       end
     end
 
-    describe 'with conditions' do
-      describe 'ANDed' do
+    context 'with conditions' do
+      context 'ANDed' do
         before :all do
           @return = @subject.filter { |u| u.id == 1 && u.name == 'Dan Kubb' }
         end
@@ -361,7 +368,7 @@ describe DataMapper::Ambition::Query do
         end
       end
 
-      describe 'ORed' do
+      context 'ORed' do
         before :all do
           @return = @subject.filter { |u| u.id == 1 || u.name == 'Dan Kubb' }
         end
@@ -384,7 +391,7 @@ describe DataMapper::Ambition::Query do
         end
       end
 
-      describe 'negated' do
+      context 'negated' do
         before :all do
           @return = @subject.filter { |u| !(u.id == 1) }
         end
@@ -406,7 +413,7 @@ describe DataMapper::Ambition::Query do
         end
       end
 
-      describe 'double-negated' do
+      context 'double-negated' do
         before :all do
           @return = @subject.filter { |u| !(!(u.id == 1)) }
         end
@@ -421,18 +428,14 @@ describe DataMapper::Ambition::Query do
 
         it 'should set conditions' do
           @return.conditions.should == DataMapper::Query::Conditions::Operation.new(:and,
-            DataMapper::Query::Conditions::Operation.new(:not,
-              DataMapper::Query::Conditions::Operation.new(:not,
-                DataMapper::Query::Conditions::Comparison.new(:eql, @model.properties[:id], 1)
-              )
-            )
+            DataMapper::Query::Conditions::Comparison.new(:eql, @model.properties[:id], 1)
           )
         end
       end
 
-      describe 'receiver matching a resource' do
+      context 'receiver matching a resource' do
         before :all do
-          resource = User.create(:id => 1)
+          resource = @model.new(:id => 1)
 
           @return = @subject.filter { |u| u == resource }
         end
@@ -452,12 +455,75 @@ describe DataMapper::Ambition::Query do
         end
       end
 
+      context 'resource matching a receiver' do
+        before :all do
+          resource = @model.new(:id => 1)
+
+          @return = @subject.filter { |u| resource == u }
+        end
+
+        it 'should return a Query' do
+          @return.should be_kind_of(DataMapper::Query)
+        end
+
+        it 'should not return self' do
+          @return.should_not equal(@subject)
+        end
+
+        it 'should set conditions' do
+          @return.conditions.should == DataMapper::Query::Conditions::Operation.new(:and,
+            DataMapper::Query::Conditions::Comparison.new(:eql, @model.properties[:id], 1)
+          )
+        end
+      end
+
+      context 'receiver matching a non-resource' do
+        before :all do
+          @return = @subject.filter { |u| u == nil }
+        end
+
+        it 'should return a Query' do
+          @return.should be_kind_of(DataMapper::Query)
+        end
+
+        it 'should not return self' do
+          @return.should_not equal(@subject)
+        end
+
+        it 'should set conditions' do
+          @return.conditions.should == DataMapper::Query::Conditions::Operation.new(:and,
+            DataMapper::Query::Conditions::Comparison.new(:in, @model.properties[:id], [])
+          )
+        end
+      end
+
+      context 'non-resource matching a receiver' do
+        before :all do
+          @return = @subject.filter { |u| nil == u }
+        end
+
+        it 'should return a Query' do
+          @return.should be_kind_of(DataMapper::Query)
+        end
+
+        it 'should not return self' do
+          @return.should_not equal(@subject)
+        end
+
+        it 'should set conditions' do
+          @return.conditions.should == DataMapper::Query::Conditions::Operation.new(:and,
+            DataMapper::Query::Conditions::Comparison.new(:in, @model.properties[:id], [])
+          )
+        end
+      end
+
       [ :include?, :member? ].each do |method|
-        describe "receiver matching a resource using Array##{method}" do
+        context "receiver matching a resource using Array##{method}" do
           before :all do
-            resource = User.new(:id => 1)
+            one = @model.new(:id => 1)
+            two = @model.new(:id => 2)
 
-            @return = @subject.filter { |u| [ resource ].send(method, u) }
+            @return = @subject.filter { |u| [ one, two ].send(method, u) }
           end
 
           it 'should return a Query' do
@@ -470,17 +536,52 @@ describe DataMapper::Ambition::Query do
 
           it 'should set conditions' do
             @return.conditions.should == DataMapper::Query::Conditions::Operation.new(:and,
-              DataMapper::Query::Conditions::Comparison.new(:in, @model.properties[:id], [ 1 ])
+              DataMapper::Query::Conditions::Comparison.new(:in, @model.properties[:id], [ 1, 2 ])
+            )
+          end
+        end
+
+        context "receiver matching a resource (with a CPK) using Array##{method}" do
+          before :all do
+            @model   = Person
+            @subject = DataMapper::Query.new(@repository, @model)
+
+            @one = @model.new(:first_name => 'Dan',  :last_name => 'Kubb')
+            @two = @model.new(:first_name => 'John', :last_name => 'Doe')
+
+            @return = @subject.filter { |p| [ @one, @two ].send(method, p) }
+          end
+
+          it 'should return a Query' do
+            @return.should be_kind_of(DataMapper::Query)
+          end
+
+          it 'should not return self' do
+            @return.should_not equal(@subject)
+          end
+
+          it 'should set conditions' do
+            @return.conditions.should == DataMapper::Query::Conditions::Operation.new(:and,
+              DataMapper::Query::Conditions::Operation.new(:or,
+                DataMapper::Query::Conditions::Operation.new(:and,
+                  DataMapper::Query::Conditions::Comparison.new(:eql, @model.properties[:first_name], 'Dan'),
+                  DataMapper::Query::Conditions::Comparison.new(:eql, @model.properties[:last_name],  'Kubb')
+                ),
+                DataMapper::Query::Conditions::Operation.new(:and,
+                  DataMapper::Query::Conditions::Comparison.new(:eql, @model.properties[:first_name], 'John'),
+                  DataMapper::Query::Conditions::Comparison.new(:eql, @model.properties[:last_name],  'Doe')
+                )
+              )
             )
           end
         end
       end
 
       [ :key?, :has_key?, :include?, :member? ].each do |method|
-        describe "receiver matching a resource using Hash##{method}" do
+        context "receiver matching a resource using Hash##{method}" do
           before :all do
-            one = User.new(:id => 1)
-            two = User.new(:id => 2)
+            one = @model.new(:id => 1)
+            two = @model.new(:id => 2)
 
             @return = @subject.filter { |u| { one => '1', two => '2' }.send(method, u) }
           end
@@ -502,10 +603,10 @@ describe DataMapper::Ambition::Query do
       end
 
       [ :value?, :has_value? ].each do |method|
-        describe "receiver matching a resource using Hash##{method}" do
+        context "receiver matching a resource using Hash##{method}" do
           before :all do
-            one = User.new(:id => 1)
-            two = User.new(:id => 2)
+            one = @model.new(:id => 1)
+            two = @model.new(:id => 2)
 
             @return = @subject.filter { |u| { '1' => one, '2' => two }.send(method, u) }
           end
@@ -526,29 +627,31 @@ describe DataMapper::Ambition::Query do
         end
       end
 
-      describe 'using send on receiver' do
-        before :all do
-          @return = @subject.filter { |u| u.send(:name) == 'Dan Kubb' }
-        end
+      [ :send, :__send__ ].each do |method|
+        context 'using send on receiver' do
+          before :all do
+            @return = @subject.filter { |u| u.send(method, :name) == 'Dan Kubb' }
+          end
 
-        it 'should return a Query' do
-          @return.should be_kind_of(DataMapper::Query)
-        end
+          it 'should return a Query' do
+            @return.should be_kind_of(DataMapper::Query)
+          end
 
-        it 'should not return self' do
-          @return.should_not equal(@subject)
-        end
+          it 'should not return self' do
+            @return.should_not equal(@subject)
+          end
 
-        it 'should set conditions' do
-          @return.conditions.should == DataMapper::Query::Conditions::Operation.new(:and,
-            DataMapper::Query::Conditions::Comparison.new(:eql, @model.properties[:name], 'Dan Kubb')
-          )
+          it 'should set conditions' do
+            @return.conditions.should == DataMapper::Query::Conditions::Operation.new(:and,
+              DataMapper::Query::Conditions::Comparison.new(:eql, @model.properties[:name], 'Dan Kubb')
+            )
+          end
         end
       end
     end
 
-    describe 'with external value' do
-      describe 'local variable' do
+    context 'with external value' do
+      context 'local variable' do
         before :all do
           name = 'Dan Kubb'
 
@@ -570,7 +673,7 @@ describe DataMapper::Ambition::Query do
         end
       end
 
-      describe 'instance variable' do
+      context 'instance variable' do
         before :all do
           @name = 'Dan Kubb'
 
@@ -592,7 +695,7 @@ describe DataMapper::Ambition::Query do
         end
       end
 
-      describe 'global variable' do
+      context 'global variable' do
         before :all do
           $name = 'Dan Kubb'
 
@@ -614,7 +717,7 @@ describe DataMapper::Ambition::Query do
         end
       end
 
-      describe 'method' do
+      context 'method' do
         def name
           'Dan Kubb'
         end
@@ -632,15 +735,37 @@ describe DataMapper::Ambition::Query do
         end
 
         it 'should set conditions' do
-          pending 'TODO: make methods work inside block' do
-            @return.conditions.should == DataMapper::Query::Conditions::Operation.new(:and,
-              DataMapper::Query::Conditions::Comparison.new(:eql, @model.properties[:name], name)
-            )
-          end
+          @return.conditions.should == DataMapper::Query::Conditions::Operation.new(:and,
+            DataMapper::Query::Conditions::Comparison.new(:eql, @model.properties[:name], 'Dan Kubb')
+          )
         end
       end
 
-      describe 'constant' do
+      context 'method with arguments' do
+        def name(first_name, last_name)
+          "#{first_name} #{last_name}"
+        end
+
+        before :all do
+          @return = @subject.filter { |u| u.name == name('Dan', 'Kubb') }
+        end
+
+        it 'should return a Query' do
+          @return.should be_kind_of(DataMapper::Query)
+        end
+
+        it 'should not return self' do
+          @return.should_not equal(@subject)
+        end
+
+        it 'should set conditions' do
+          @return.conditions.should == DataMapper::Query::Conditions::Operation.new(:and,
+            DataMapper::Query::Conditions::Comparison.new(:eql, @model.properties[:name], 'Dan Kubb')
+          )
+        end
+      end
+
+      context 'constant' do
         NAME = 'Dan Kubb'
 
         before :all do
@@ -662,7 +787,7 @@ describe DataMapper::Ambition::Query do
         end
       end
 
-      describe 'namespaced constant' do
+      context 'namespaced constant' do
         before :all do
           Object.send(:remove_const, :Condition) if defined?(::Condition)
           module ::Condition
@@ -687,7 +812,7 @@ describe DataMapper::Ambition::Query do
         end
       end
 
-      describe 'namespaced method' do
+      context 'namespaced method' do
         before :all do
           Object.send(:remove_const, :Condition) if defined?(::Condition)
           module ::Condition
@@ -714,5 +839,96 @@ describe DataMapper::Ambition::Query do
         end
       end
     end
+
+    context 'with literal' do
+      context 'true' do
+        before :all do
+          @return = @subject.filter { |u| true }
+        end
+
+        it 'should return a Query' do
+          @return.should be_kind_of(DataMapper::Query)
+        end
+
+        it 'should not return self' do
+          @return.should_not equal(@subject)
+        end
+
+        it 'should set conditions' do
+          pending do
+            @return.conditions.should == DataMapper::Query::Conditions::Operation.new(:null)
+          end
+        end
+      end
+
+      [ nil, false ].each do |literal|
+        context literal.inspect do
+          before :all do
+            @return = @subject.filter { |u| literal }
+          end
+
+          it 'should return a Query' do
+            @return.should be_kind_of(DataMapper::Query)
+          end
+
+          it 'should not return self' do
+            @return.should_not equal(@subject)
+          end
+
+          it 'should set conditions' do
+            pending 'TODO: figure out a way to represent that nothing matches'
+          end
+        end
+      end
+    end
+
+    context 'with single local variable assignment' do
+      before do
+        @return = @subject.filter { |u| name = 'Dan Kubb'; u.name == name }
+      end
+
+      it 'should return a Query' do
+        @return.should be_kind_of(DataMapper::Query)
+      end
+
+      it 'should not return self' do
+        @return.should_not equal(@subject)
+      end
+
+      it 'should set conditions' do
+        @return.conditions.should == DataMapper::Query::Conditions::Operation.new(:and,
+          DataMapper::Query::Conditions::Comparison.new(:eql, @model.properties[:name], 'Dan Kubb')
+        )
+      end
+    end
+
+    context 'with multiple local variable assignment' do
+      before do
+        @return = @subject.filter { |u| name1, name2 = 'Dan Kubb', 'John Doe'; [ name1, name2 ].include?(u.name) }
+      end
+
+      it 'should return a Query' do
+        @return.should be_kind_of(DataMapper::Query)
+      end
+
+      it 'should not return self' do
+        @return.should_not equal(@subject)
+      end
+
+      it 'should set conditions' do
+        @return.conditions.should == DataMapper::Query::Conditions::Operation.new(:and,
+          DataMapper::Query::Conditions::Comparison.new(:in, @model.properties[:name], [ 'Dan Kubb', 'John Doe' ])
+        )
+      end
+    end
+
+    context 'with an invalid block' do
+      specify do
+        expect {
+          # global assignment will not be allowed within the block
+          @subject.filter { |u| $name = 'Dan Kubb'; u.name == $name }
+        }.to raise_error(ArgumentError, 'calling process_gasgn with s(:$name, s(:str, "Dan Kubb"))')
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,49 +1,17 @@
-require 'pathname'
-require 'rubygems'
-require 'spec'
+require 'dm-ambition'
 
-require 'dm-core'
-require 'dm-migrations'
+require 'dm-core/spec/setup'
+require 'dm-core/spec/lib/adapter_helpers'
+require 'dm-core/spec/lib/spec_helper'
 
-SPEC_ROOT = Pathname(__FILE__).dirname.expand_path
-require SPEC_ROOT.parent / 'lib' / 'dm-ambition'
-Pathname.glob((SPEC_ROOT / '{lib,*/shared}/**/*.rb').to_s).each { |f| require f }
-
-def load_driver(name, default_uri)
-  return false if ENV['ADAPTER'] != name.to_s
-
-  begin
-    DataMapper.setup(name, ENV["#{name.to_s.upcase}_SPEC_URI"] || default_uri)
-    DataMapper::Repository.adapters[:default] = DataMapper::Repository.adapters[name]
-    true
-  rescue LoadError => e
-    warn "Could not load do_#{name}: #{e}"
-    false
-  end
-end
-
-ENV['ADAPTER'] ||= 'sqlite3'
-
-HAS_SQLITE3  = load_driver(:sqlite3,  'sqlite3::memory:')
-HAS_MYSQL    = load_driver(:mysql,    'mysql://localhost/dm_core_test')
-HAS_POSTGRES = load_driver(:postgres, 'postgres://postgres@localhost/dm_core_test')
+Dir['spec/*/shared/**/*.rb'].each { |file| require File.expand_path(file) }
 
 Spec::Runner.configure do |config|
-  config.after :all do
-    # global model cleanup
-    descendants = DataMapper::Model.descendants.to_a
-    while model = descendants.shift
-      descendants.concat(model.descendants.to_a - [ model ])
-
-      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
+  config.extend(DataMapper::Spec::Adapters::Helpers)
 
-      DataMapper::Model.descendants.delete(model)
-    end
+  config.after :all do
+    DataMapper::Spec.cleanup_models
   end
+
 end

data/tasks/local_gemfile.rake

@@ -0,0 +1,16 @@
+desc "Support bundling from local source code (allows BUNDLE_GEMFILE=Gemfile.local bundle foo)"
+task :local_gemfile do |t|
+
+  root       = Pathname(__FILE__).dirname.parent
+  datamapper = root.parent
+
+  root.join('Gemfile.local').open('w') do |f|
+    root.join('Gemfile').open.each do |line|
+      line.sub!(/DATAMAPPER = 'git:\/\/github.com\/datamapper'/, "DATAMAPPER = '#{datamapper}'")
+      line.sub!(/:git => \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/,  ':path => "#{DATAMAPPER}/\1"')
+      line.sub!(/do_options\[:git\] = \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/,  'do_options[:path] = "#{DATAMAPPER}/\1"')
+      f.puts line
+    end
+  end
+
+end

data/tasks/spec.rake

@@ -35,7 +35,4 @@ rescue LoadError
   end
 end
 
-task :spec => :check_dependencies
-task :rcov => :check_dependencies
-
 task :default => :spec