search_object 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 185c2ec2237293e6a214c921457a18ef221402c395a74c66a774d2f8e2b4e12b
-  data.tar.gz: 81dcfc6e5bfc8a3499cf24f37be6d2dd2fac23bdd6da39162a24ef66c20063bb
+  metadata.gz: ccb9a1eb55684f9df87c9d2c1ca76e20d946fb0c73d5fb52520c9c0b03bd41ab
+  data.tar.gz: b59ad0f1fd7e0bdbc2469a951ae7a6e36286690464897342cd954b3b4d6e9f54
 SHA512:
-  metadata.gz: 2f66341b1d6e542396ac8930b3b29eba4124081e4e9e08d208208667856c80253ca6c33136afca304a47e2a2bbff03b4202170acd71e1da012058b0aaa05b144
-  data.tar.gz: 1af8e023f69d4f30217a259018c6a866fb65ec26bf904ccbd28331cf62aa2bfce54cf937d8f9af24c30e2aa7a817eac0e7d51a9fcae6eb4f24fc737794eeea20
+  metadata.gz: ed7c3ca5011a75c1f43467b799af8914ff455f785060bb16733158ace7f24adb6f038aea6133c6de1c7fb04f6406c9bde8d1fddd88cc3b9628b9ba5f0347805c
+  data.tar.gz: 830399e3d6763d727911b5ea1279e7542c0fbb9608fad690d03e490e4329bc03fb201d05b2684f4e4aa0c7ca201e132feebc6e3f376fe413dda2d43b73c91bf3

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Version 1.2.4
+
+* __[feature]__ Added `:with` and block support to enum @hschne
+
 ## Version 1.2.3
 
 * __[fix]__ convert enum values to strings (@Postmodum37)

data/example/Gemfile

@@ -2,7 +2,7 @@
 
 source 'https://rubygems.org'
 
-gem 'rails', '5.0.1'
+gem 'rails', '6.0.2.1'
 
 gem 'bootstrap-sass'
 gem 'jquery-rails'

data/example/app/models/post_search.rb

@@ -3,7 +3,7 @@
 class PostSearch
   include SearchObject.module(:model, :sorting, :will_paginate, :enum)
 
-  scope { Post.all }
+  scope { Post.includes(:user).all }
 
   sort_by :id, :created_at, :views_count, :likes_count, :comments_count
 
@@ -20,11 +20,11 @@ class PostSearch
   option :rating, enum: %i[low high]
 
   option :title do |scope, value|
-    scope.where 'title LIKE ?', escape_search_term(value)
+    scope.where 'title LIKE ?', escape_search_term(value) if value.present?
   end
 
   option :published do |scope, value|
-    scope.where published: true if value.present?
+    scope.where published: true if value.present? && value != '0'
   end
 
   option :created_after do |scope, value|
@@ -40,7 +40,7 @@ class PostSearch
   private
 
   def apply_term(scope, value)
-    scope.where 'title LIKE :term OR body LIKE :term', term: escape_search_term(value)
+    scope.where 'title LIKE :term OR body LIKE :term', term: escape_search_term(value) if value.present?
   end
 
   def apply_rating_with_low(scope)

data/example/app/views/posts/index.html.slim

@@ -32,7 +32,7 @@
         th
         th = form.text_field :title
         th = form.select :user_id, User.all.map { |u| [u.name, u.id] }, include_blank: true
-        th = form.select :category_name, Post.pluck('DISTINCT category_name'), include_blank: true
+        th = form.select :category_name, Post.pluck(Arel.sql('DISTINCT category_name')), include_blank: true
         th
         th
         th

data/example/db/migrate/20131102130117_create_users.rb

@@ -1,4 +1,4 @@
-class CreateUsers < ActiveRecord::Migration
+class CreateUsers < ActiveRecord::Migration[4.2]
   def change
     create_table :users do |t|
       t.string :name, null: false

data/example/db/migrate/20131102130413_create_posts.rb

@@ -1,4 +1,4 @@
-class CreatePosts < ActiveRecord::Migration
+class CreatePosts < ActiveRecord::Migration[4.2]
   def change
     create_table :posts do |t|
       t.integer :user_id, null: false
@@ -9,7 +9,6 @@ class CreatePosts < ActiveRecord::Migration
       t.integer :likes_count, null: false, default: 0
       t.integer :comments_count, null: false, default: 0
       t.boolean :published, null: false, default: false
-      t.datetime :published_at
       t.timestamps
     end
 

data/example/db/schema.rb

@@ -1,40 +1,36 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
+# This file is the source Rails uses to define your schema when running `rails
+# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20131102130413) do
+ActiveRecord::Schema.define(version: 2013_11_02_130413) do
 
-  create_table "posts", force: true do |t|
-    t.integer  "user_id",                        null: false
-    t.string   "title",                          null: false
-    t.string   "body",                           null: false
-    t.string   "category_name",                  null: false
-    t.integer  "views_count",    default: 0,     null: false
-    t.integer  "likes_count",    default: 0,     null: false
-    t.integer  "comments_count", default: 0,     null: false
-    t.boolean  "published",      default: false, null: false
-    t.datetime "published_at"
+  create_table "posts", force: :cascade do |t|
+    t.integer "user_id", null: false
+    t.string "title", null: false
+    t.string "body", null: false
+    t.string "category_name", null: false
+    t.integer "views_count", default: 0, null: false
+    t.integer "likes_count", default: 0, null: false
+    t.integer "comments_count", default: 0, null: false
+    t.boolean "published", default: false, null: false
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.index ["user_id"], name: "index_posts_on_user_id"
   end
 
-  add_index "posts", ["user_id"], name: "index_posts_on_user_id"
-
-  create_table "users", force: true do |t|
-    t.string   "name",       null: false
+  create_table "users", force: :cascade do |t|
+    t.string "name", limit: 255, null: false
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.index ["name"], name: "index_users_on_name", unique: true
   end
 
-  add_index "users", ["name"], name: "index_users_on_name", unique: true
-
 end

data/lib/search_object/plugin/enum.rb

@@ -11,10 +11,7 @@ module SearchObject
         def option(name, options = nil, &block)
           return super unless options.is_a?(Hash) && options[:enum]
 
-          raise BlockIgnoredError if block
-          raise WithIgnoredError if options[:with]
-
-          handler = Handler.build(name, options[:enum])
+          handler = options[:with] || block || Handler.build(name, options[:enum])
 
           super(name, options, &handler)
         end

data/lib/search_object/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SearchObject
-  VERSION = '1.2.3'
+  VERSION = '1.2.4'
 end

data/spec/search_object/plugin/enum_spec.rb

@@ -58,24 +58,32 @@ module SearchObject
         expect(test_search.results(filters: { camelCase: 'someValue' })).to eq [1]
       end
 
-      it 'raises when block is passed with enum option' do
-        expect do
-          Class.new do
-            include SearchObject.module(:enum)
+      it 'can filter by passed block' do
+        block_search = Class.new do
+          include SearchObject.module(:enum)
 
-            option(:filter, enum: %w[a b]) { |_scope, _value| nil }
-          end
-        end.to raise_error Enum::BlockIgnoredError
+          scope { [1, 2, 3, 4, 5] }
+
+          option(:filter, enum: %w[odd even]) { |scope, value| scope.select(&:"#{value}?".to_sym) }
+        end
+        expect(block_search.results(filters: { filter: :odd })).to eq [1, 3, 5]
+        expect(block_search.results(filters: { filter: :even })).to eq [2, 4]
       end
 
-      it 'raises when :with is passed with enum option' do
-        expect do
-          Class.new do
-            include SearchObject.module(:enum)
+      it 'can filter by with option' do
+        with_search = Class.new do
+          include SearchObject.module(:enum)
+
+          scope { [1, 2, 3, 4, 5] }
 
-            option :filter, enum: %w[a b], with: :method_name
+          option(:filter, enum: %w[odd even], with: :filter)
+
+          def filter(scope, value)
+            scope.select(&:"#{value}?".to_sym)
           end
-        end.to raise_error Enum::WithIgnoredError
+        end
+        expect(with_search.results(filters: { filter: :odd })).to eq [1, 3, 5]
+        expect(with_search.results(filters: { filter: :even })).to eq [2, 4]
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: search_object
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Radoslav Stankov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-27 00:00:00.000000000 Z
+date: 2020-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler