rename filterable -> queryable

lib/cafe_car/model.rb

@@ -1,7 +1,7 @@
 module CafeCar::Model
   extend ActiveSupport::Concern
 
-  include CafeCar::Filterable
+  include CafeCar::Queryable
 
   class_methods do
     def sorted(*args)

lib/cafe_car/filter_builder.rb → lib/cafe_car/query_builder.rb

@@ -1,5 +1,5 @@
 module CafeCar
-  class FilterBuilder
+  class QueryBuilder
     require "activerecord_where_assoc"
 
     attr_reader :scope
@@ -30,26 +30,26 @@ def association!(name, value, ...)
         case value
         when true then  @scope.where_assoc_exists(name)
         when false then @scope.where_assoc_not_exists(name)
-        else            @scope.where_assoc_exists(name) { filtered(value, ...) }
+        else            @scope.where_assoc_exists(name) { query(value, ...) }
         end
       end
     end
 
-    def filter!(params = nil)
+    def query!(params = nil)
       params.each { param!(_1, _2) } if params
       self
     end
 
-    def filter(...) = update!(&:all).filter!(...)
+    def query(...) = update!(&:all).query!(...)
   end
 end
 
-# Article.filtered do
+# Article.query do
 #   published
 #   user { username(/bob/) }
 #   user.username(/bob/)
 # end
 #
-# Article.filtered(published: true, user: {username: /bob/})
+# Article.query(published: true, user: {username: /bob/})
 #
 # Article.published(true).where_assoc_exists(:user) { where(username: /bob/) }

lib/cafe_car/queryable.rb

@@ -0,0 +1,12 @@
+module CafeCar::Queryable
+  extend ActiveSupport::Concern
+
+  class_methods do
+    def query(params)  = query_builder.query(params).scope
+    def query!(params) = query_builder.query!(params).scope
+
+    def query_builder
+      CafeCar::QueryBuilder.new(self)
+    end
+  end
+end

test/cafe_car/queryable_test.rb

@@ -0,0 +1,12 @@
+require "test_helper"
+
+class CafeCar::QueryableTest < ActiveSupport::TestCase
+  test "query attributes" do
+    assert_includes Article.query(title: "bob").to_sql, %("title" = 'bob')
+  end
+
+  test "query associations" do
+    assert_includes Article.query(author: true).to_sql, %(EXISTS)
+    assert_includes Article.query(author: {username: "bob"}).to_sql, %(EXISTS)
+  end
+end

test/presenters/cafe_car/presenter_test.rb

@@ -1,13 +1,10 @@
 require "test_helper"
-# require "presenters/cafe_car/presenter"
 require "cafe_car"
 
 module CafeCar
   class PresenterTest < ActionView::TestCase
-    tests CafeCar::Presenter
-
-    def test_find
-      assert_equal SymbolPresenter, Presenter.find(:hi)
+    test "find" do
+      assert_equal SymbolPresenter, Presenter.find(Symbol)
     end
   end
 end