Commit 8850284

@@ -50,9 +50,5 @@ module Scim
       node = Scim::Search::Node.parse(filter)
       node.accept(Scim::Visitor.new(@clazz, @clazz.scim_mapper))
     end
-
-    def self.for(filter, clazz)
-      new(clazz).for(filter)
-    end
   end
 end

@@ -3,45 +3,45 @@
 require 'rails_helper'
 
 RSpec.describe ::Scim::Search do
-  subject { described_class }
+  subject { described_class.new(User) }
 
   describe "#visit" do
     let!(:users) { create_list(:user, 10) }
     let(:random_user) { users.sample }
 
     specify do
-      results = subject.for("userName pr", User)
+      results = subject.for("userName pr")
       expect(results.to_sql).to eql(User.where.not(email: nil).to_sql)
       expect(results).to match_array(users)
     end
 
     pending do
-      results = subject.for("userName pr and not (userName eq \"#{random_user.email}\")", User)
+      results = subject.for("userName pr and not (userName eq \"#{random_user.email}\")")
       expect(results).to match_array(users - [random_user])
     end
 
     specify do
-      results = subject.for("userName eq \"#{random_user.email}\"", User)
+      results = subject.for("userName eq \"#{random_user.email}\"")
       expect(results).to match_array([random_user])
     end
 
     specify do
-      results = subject.for("userName ne \"#{random_user.email}\"", User)
+      results = subject.for("userName ne \"#{random_user.email}\"")
       expect(results.pluck(:email)).not_to include(random_user.email)
     end
 
     specify do
-      results = subject.for("userName co \"#{random_user.email[1..-2]}\"", User)
+      results = subject.for("userName co \"#{random_user.email[1..-2]}\"")
       expect(results).to match_array([random_user])
     end
 
     specify do
-      results = subject.for("userName sw \"#{random_user.email[0..3]}\"", User)
+      results = subject.for("userName sw \"#{random_user.email[0..3]}\"")
       expect(results).to match_array([random_user])
     end
 
     specify do
-      results = subject.for("userName ew \"#{random_user.email[-8..-1]}\"", User)
+      results = subject.for("userName ew \"#{random_user.email[-8..-1]}\"")
       expect(results).to match_array([random_user])
     end
 
@@ -49,7 +49,7 @@ RSpec.describe ::Scim::Search do
       freeze_time
       random_user.update!(updated_at: 10.minutes.from_now)
 
-      results = subject.for("meta.lastModified gt \"#{Time.now.iso8601}\"", User)
+      results = subject.for("meta.lastModified gt \"#{Time.now.iso8601}\"")
       expect(results).to match_array([random_user])
     end
 
@@ -57,7 +57,7 @@ RSpec.describe ::Scim::Search do
       freeze_time
       random_user.update!(updated_at: 10.minutes.from_now)
 
-      results = subject.for("meta.lastModified ge \"#{random_user.updated_at.iso8601}\"", User)
+      results = subject.for("meta.lastModified ge \"#{random_user.updated_at.iso8601}\"")
       expect(results).to match_array([random_user])
     end
 
@@ -65,7 +65,7 @@ RSpec.describe ::Scim::Search do
       freeze_time
       random_user.update!(updated_at: 10.minutes.from_now)
 
-      results = subject.for("meta.lastModified lt \"#{Time.now.iso8601}\"", User)
+      results = subject.for("meta.lastModified lt \"#{Time.now.iso8601}\"")
       expect(results).to match_array(users - [random_user])
     end
 
@@ -73,14 +73,14 @@ RSpec.describe ::Scim::Search do
       freeze_time
       random_user.update!(updated_at: 10.minutes.ago)
 
-      results = subject.for("meta.lastModified le \"#{random_user.updated_at.iso8601}\"", User)
+      results = subject.for("meta.lastModified le \"#{random_user.updated_at.iso8601}\"")
       expect(results).to match_array([random_user])
     end
 
     context "when searching for condition a OR condition b" do
       let(:first_user) { users.first }
       let(:second_user) { users.last }
-      let(:results) { subject.for(%(userName eq "#{first_user.email}" or userName eq "#{second_user.email}"), User) }
+      let(:results) { subject.for(%(userName eq "#{first_user.email}" or userName eq "#{second_user.email}")) }
 
       specify { expect(results.pluck(:email)).to match_array([first_user.email, second_user.email]) }
     end
@@ -88,7 +88,7 @@ RSpec.describe ::Scim::Search do
     context "when searching for condition a AND condition b" do
       let(:first_user) { users.first }
       let(:second_user) { users.last }
-      let(:results) { subject.for(%(meta.lastModified gt "#{10.minutes.from_now.iso8601}" and meta.lastModified lt "#{15.minutes.from_now.iso8601}"), User) }
+      let(:results) { subject.for(%(meta.lastModified gt "#{10.minutes.from_now.iso8601}" and meta.lastModified lt "#{15.minutes.from_now.iso8601}")) }
 
       before do
         freeze_time