Merge pull request #426 from subvertallchris/helpful_methods

adds exists? method

lib/neo4j/active_node/labels.rb

@@ -80,7 +80,13 @@ def count
         end
 
         def include?(other)
-          self.query_as(:n).limit(1).where("ID(n) = #{other.neo_id}").return("count(n) AS count").first.count == 1
+          self.query_as(:n).where("ID(n) = #{other.neo_id}").return("count(n) AS count").first.count > 0
+        end
+
+        def exists?(node_id=nil)
+          start_q = self.query_as(:n)
+          end_q = node_id.nil? ? start_q : start_q.where("ID(n) = #{node_id}")
+          end_q.return("COUNT(n) AS count").first.count > 0
         end
 
         # Returns the object with the specified neo4j id.

lib/neo4j/active_node/query/query_proxy.rb

@@ -131,7 +131,11 @@ def count
         end
 
         def include?(other)
-          call_class_method(:include?, *other)
+          call_class_method(:include?, other)
+        end
+
+        def exists?(node_id=nil)
+          call_class_method(:exists?, node_id)
         end
 
         # QueryProxy objects act as a representation of a model at the class level so we pass through calls

spec/e2e/active_model_spec.rb

@@ -520,7 +520,7 @@ class MyRelClass
     end
   end
 
-  describe 'include?' do
+  describe 'include?, exists?' do
     #goofy names to differentiate from same classes used elsewhere
     before(:all) do
       class IncludeLesson; end
@@ -548,16 +548,41 @@ class IncludeTeacher
     let!(:mr_jones) { IncludeTeacher.create }
     let!(:mr_adams) { IncludeTeacher.create }
 
-    it 'correctly reports when a node is included in a query result' do
-      jimmy.lessons << science
-      science.teachers << mr_adams
-      expect(jimmy.lessons.include?(science)).to be_truthy
-      expect(jimmy.lessons.include?(math)).to be_falsey
-      expect(jimmy.lessons.teachers.include?(mr_jones)).to be_falsey
-      expect(jimmy.lessons.where(name: 'science').teachers.include?(mr_jones)).to be_falsey
-      expect(jimmy.lessons.where(name: 'science').teachers.include?(mr_adams)).to be_truthy
-      expect(IncludeTeacher.include?(mr_jones)).to be_truthy
-      expect(IncludeTeacher.include?(math)).to be_falsey
+    describe 'include?' do
+      it 'correctly reports when a node is included in a query result' do
+        jimmy.lessons << science
+        science.teachers << mr_adams
+        expect(jimmy.lessons.include?(science)).to be_truthy
+        expect(jimmy.lessons.include?(math)).to be_falsey
+        expect(jimmy.lessons.teachers.include?(mr_jones)).to be_falsey
+        expect(jimmy.lessons.where(name: 'science').teachers.include?(mr_jones)).to be_falsey
+        expect(jimmy.lessons.where(name: 'science').teachers.include?(mr_adams)).to be_truthy
+        expect(IncludeTeacher.include?(mr_jones)).to be_truthy
+        expect(IncludeTeacher.include?(math)).to be_falsey
+      end
+
+      it 'works with multiple relationships to the same object' do
+        jimmy.lessons << science
+        jimmy.lessons << science
+        expect(jimmy.lessons.include?(science)).to be_truthy
+      end
+    end
+
+    describe 'exists?' do
+      it 'can be run on a query' do
+        expect(IncludeLesson.where(name: 'math').exists?).to be_truthy
+        expect(IncludeLesson.where(name: 'history').exists?).to be_falsey
+      end
+
+      it 'can be run with a neo_id' do
+        expect(IncludeLesson.where(name: 'math').exists?(math.neo_id)).to be_truthy
+        expect(IncludeLesson.where(name: 'math').exists?(science.neo_id)).to be_falsey
+      end
+
+      it 'can be called by the class with a neo_id' do
+        expect(IncludeLesson.exists?(math.neo_id)).to be_truthy
+        expect(IncludeLesson.exists?(8675309)).to be_falsey
+      end
     end
   end