search_object 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f55c0e518e6eb83f63ca7670605b85c7caf3a3736b070759edd7e76688b85ec
-  data.tar.gz: 8435ace3621b80b7b146f9cb78f7586036fb6e849ce660844bbd0f49e4a8d3ec
+  metadata.gz: 185c2ec2237293e6a214c921457a18ef221402c395a74c66a774d2f8e2b4e12b
+  data.tar.gz: 81dcfc6e5bfc8a3499cf24f37be6d2dd2fac23bdd6da39162a24ef66c20063bb
 SHA512:
-  metadata.gz: 55a03c93e854a7de0aa2412a071a031219105131a036ca96c20f351ff5989566e278ee76b18d776adbed3d553f633ffd03158318667efef235a75748bfebb79c
-  data.tar.gz: 568572db3450627999c39fc0e5304f52dc06bb49cad958fe8f19e8506e17bfd6684b599a64027d91dcdc426f632454ccff89b4123510b624231b5434823fa04e
+  metadata.gz: 2f66341b1d6e542396ac8930b3b29eba4124081e4e9e08d208208667856c80253ca6c33136afca304a47e2a2bbff03b4202170acd71e1da012058b0aaa05b144
+  data.tar.gz: 1af8e023f69d4f30217a259018c6a866fb65ec26bf904ccbd28331cf62aa2bfce54cf937d8f9af24c30e2aa7a817eac0e7d51a9fcae6eb4f24fc737794eeea20

data/.rubocop.yml

@@ -7,15 +7,15 @@ AllCops:
     - search_object.gemspec
 
 # Disables "Line is too long"
-LineLength:
+Metrics/LineLength:
   Enabled: false
 
 # Disables Module has too many lines
-ModuleLength:
+Metrics/ModuleLength:
   Enabled: false
 
 # Disables "Missing top-level class documentation comment"
-Documentation:
+Style/Documentation:
   Enabled: false
 
 # Disables "Use each_with_object instead of inject"

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 rvm:
-  - 2.2
   - 2.3
+  - 2.4
+  - 2.6
 script:
   - bundle exec rubocop
   - bundle exec rspec spec

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## Version 1.2.3
+
+* __[fix]__ convert enum values to strings (@Postmodum37)
 
 ## Version 1.2.2
 

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in search_object.gemspec

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'

data/example/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gem 'rails', '5.0.1'

data/example/Rakefile

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
+require File.expand_path('config/application', __dir__)
 
 Example::Application.load_tasks

data/example/app/controllers/application_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ApplicationController < ActionController::Base
   protect_from_forgery with: :exception
 end

data/example/app/controllers/posts_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class PostsController < ApplicationController
   def index
     @search = PostSearch.new filters: params[:f], page: params[:page], per_page: params[:per_page]

data/example/app/models/post.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Post < ActiveRecord::Base
   belongs_to :user
 

data/example/app/models/post_search.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class PostSearch
   include SearchObject.module(:model, :sorting, :will_paginate, :enum)
 

data/example/app/models/user.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class User < ActiveRecord::Base
   has_many :posts
 

data/example/bin/bundle

@@ -1,3 +1,5 @@
 #!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+# frozen_string_literal: true
+
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 load Gem.bin_path('bundler', 'bundle')

data/example/bin/rails

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application', __FILE__)
+# frozen_string_literal: true
+
+APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'

data/example/bin/rake

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 require_relative '../config/boot'
 require 'rake'
 Rake.application.run

data/example/config.ru

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file is used by Rack-based servers to start the application.
 
 require ::File.expand_path('../config/environment', __FILE__)

data/example/spec/models/post_search_spec.rb

@@ -1,4 +1,4 @@
-# rubocop:disable Lint/UselessAssignment:%s
+# frozen_string_literal: true
 
 require 'spec_helper'
 
@@ -11,11 +11,11 @@ describe PostSearch do
 
   def create(attributes = {})
     Post.create! attributes.reverse_merge(
-      user:           user,
-      title:          'Title',
-      body:           'Body',
-      category_name:  'Tech',
-      published:      true
+      user: user,
+      title: 'Title',
+      body: 'Body',
+      category_name: 'Tech',
+      published: true
     )
   end
 
@@ -24,29 +24,29 @@ describe PostSearch do
   end
 
   it 'can search by category name' do
-    post  = create category_name: 'Personal'
-    other = create category_name: 'Other'
+    post = create category_name: 'Personal'
+    _other = create category_name: 'Other'
 
     expect_search(category_name: 'Personal').to eq [post]
   end
 
   it 'can search by user_id' do
-    post  = create user: create_user
-    other = create user: create_user
+    post = create user: create_user
+    _other = create user: create_user
 
     expect_search(user_id: post.user_id).to eq [post]
   end
 
   it 'can search by title' do
-    post  = create title: 'Title'
-    other = create title: 'Other'
+    post = create title: 'Title'
+    _other = create title: 'Other'
 
     expect_search(title: 'itl').to eq [post]
   end
 
   it 'can search by published' do
-    post  = create published: true
-    other = create published: false
+    post = create published: true
+    _other = create published: false
 
     expect_search(published: true).to eq [post]
   end
@@ -54,21 +54,21 @@ describe PostSearch do
   it 'can search by term' do
     post_with_body  = create body: 'pattern'
     post_with_title = create title: 'pattern'
-    other           = create
+    _other = create
 
     expect_search(term: 'pattern').to eq [post_with_title, post_with_body]
   end
 
   it 'can search by created after' do
-    post  = create created_at: 1.month.ago
-    other = create created_at: 3.month.ago
+    post = create created_at: 1.month.ago
+    _other = create created_at: 3.month.ago
 
     expect_search(created_after: 2.month.ago.strftime('%Y-%m-%d')).to eq [post]
   end
 
   it 'can search by created before' do
-    post  = create created_at: 3.month.ago
-    other = create created_at: 1.month.ago
+    post = create created_at: 3.month.ago
+    _other = create created_at: 1.month.ago
 
     expect_search(created_before: 2.month.ago.strftime('%Y-%m-%d')).to eq [post]
   end

data/example/spec/spec_helper.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV['RAILS_ENV'] ||= 'test'
 
-require File.expand_path('../../config/environment', __FILE__)
+require File.expand_path('../config/environment', __dir__)
 require 'rspec/rails'
 
 # Requires supporting ruby files with custom matchers and macros, etc,

data/lib/search_object/base.rb

@@ -7,7 +7,7 @@ module SearchObject
       base.instance_eval do
         @config = {
           defaults: {},
-          options:  {}
+          options: {}
         }
       end
     end

data/lib/search_object/plugin/enum.rb

@@ -32,9 +32,7 @@ module SearchObject
         def apply_filter(object:, option:, enums:, scope:, value:)
           return if value.nil? || value == ''
 
-          unless enums.include? value
-            return handle_invalid_value(object: object, option: option, enums: enums, scope: scope, value: value)
-          end
+          return handle_invalid_value(object: object, option: option, enums: enums, scope: scope, value: value) unless enums.include? value.to_s
 
           object.send("apply_#{Helper.underscore(option)}_with_#{Helper.underscore(value)}", scope)
         end
@@ -43,8 +41,7 @@ module SearchObject
           specific = "handle_invalid_#{option}"
           return object.send(specific, scope, value) if object.respond_to? specific, true
 
-          catch_all = 'handle_invalid_enum'
-          return object.send(catch_all, option, scope, value) if object.respond_to? catch_all, true
+          return object.handle_invalid_enum(option, scope, value) if object.respond_to? :handle_invalid_enum, true
 
           raise InvalidEnumValueError.new(option, enums, value)
         end

data/lib/search_object/plugin/paging.rb

@@ -28,17 +28,20 @@ module SearchObject
 
       module ClassMethods
         def per_page(number)
-          raise InvalidNumberError.new('Per page', number) unless number > 0
+          raise InvalidNumberError.new('Per page', number) unless number.positive?
+
           config[:per_page] = number
         end
 
         def min_per_page(number)
-          raise InvalidNumberError.new('Min per page', number) unless number > 0
+          raise InvalidNumberError.new('Min per page', number) unless number.positive?
+
           config[:min_per_page] = number
         end
 
         def max_per_page(number)
-          raise InvalidNumberError.new('Max per page', number) unless number > 0
+          raise InvalidNumberError.new('Max per page', number) unless number.positive?
+
           config[:max_per_page] = number
         end
 

data/lib/search_object/version.rb

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

data/search_object.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.13"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency 'rspec', '~> 3.5'
   spec.add_development_dependency 'rspec-mocks', '~> 3.5'
@@ -29,6 +29,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'will_paginate'
   spec.add_development_dependency 'kaminari'
   spec.add_development_dependency 'kaminari-activerecord'
-  spec.add_development_dependency 'rubocop', '0.51.0'
-  spec.add_development_dependency 'rubocop-rspec', '1.20.1'
+  spec.add_development_dependency 'rubocop', '0.75.1'
+  spec.add_development_dependency 'rubocop-rspec', '1.36.0'
 end

data/spec/search_object/base_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'active_support/core_ext/object/blank'
 

data/spec/search_object/helper_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'action_controller'
 

data/spec/search_object/plugin/enum_spec.rb

@@ -1,52 +1,61 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'ostruct'
 
 module SearchObject
   module Plugin
     describe Enum do
-      class TestSearch
-        include SearchObject.module(:enum)
+      let(:test_search) do
+        Class.new do
+          include SearchObject.module(:enum)
 
-        scope { [1, 2, 3, 4, 5] }
+          scope { [1, 2, 3, 4, 5] }
 
-        option :filter, enum: %w[odd even]
-        option :camelCase, enum: %w[someValue]
+          option :filter, enum: %w[odd even]
+          option :camelCase, enum: %w[someValue]
 
-        private
+          private
 
-        def apply_filter_with_odd(scope)
-          scope.select(&:odd?)
-        end
+          def apply_filter_with_odd(scope)
+            scope.select(&:odd?)
+          end
 
-        def apply_filter_with_even(scope)
-          scope.select(&:even?)
-        end
+          def apply_filter_with_even(scope)
+            scope.select(&:even?)
+          end
 
-        def apply_camel_case_with_some_value(_scope)
-          [1]
-        end
+          def apply_camel_case_with_some_value(_scope)
+            [1]
+          end
 
-        def handle_invalid_filter(_scope, value)
-          "invalid filter - #{value}"
+          def handle_invalid_filter(_scope, value)
+            "invalid filter - #{value}"
+          end
         end
       end
 
       it 'can filter by enum values' do
-        expect(TestSearch.results(filters: { filter: 'odd' })).to eq [1, 3, 5]
-        expect(TestSearch.results(filters: { filter: 'even' })).to eq [2, 4]
+        expect(test_search.results(filters: { filter: 'odd' })).to eq [1, 3, 5]
+        expect(test_search.results(filters: { filter: 'even' })).to eq [2, 4]
+      end
+
+      it 'converts input to string' do
+        expect(test_search.results(filters: { filter: :odd })).to eq [1, 3, 5]
+        expect(test_search.results(filters: { filter: :even })).to eq [2, 4]
       end
 
       it 'ignores blank values' do
-        expect(TestSearch.results(filters: { filter: nil })).to eq [1, 2, 3, 4, 5]
-        expect(TestSearch.results(filters: { filter: '' })).to eq [1, 2, 3, 4, 5]
+        expect(test_search.results(filters: { filter: nil })).to eq [1, 2, 3, 4, 5]
+        expect(test_search.results(filters: { filter: '' })).to eq [1, 2, 3, 4, 5]
       end
 
       it 'handles wrong enum values' do
-        expect(TestSearch.results(filters: { filter: 'foo' })).to eq 'invalid filter - foo'
+        expect(test_search.results(filters: { filter: 'foo' })).to eq 'invalid filter - foo'
       end
 
       it 'underscores method and enum values' do
-        expect(TestSearch.results(filters: { camelCase: 'someValue' })).to eq [1]
+        expect(test_search.results(filters: { camelCase: 'someValue' })).to eq [1]
       end
 
       it 'raises when block is passed with enum option' do

data/spec/search_object/plugin/kaminari_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper_active_record'
 require 'kaminari'
 

data/spec/search_object/plugin/model_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 require 'active_support/core_ext/object/blank'

data/spec/search_object/plugin/paging_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper_active_record'
 
 module SearchObject

data/spec/search_object/plugin/sorting_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper_active_record'
 
 module SearchObject

data/spec/search_object/plugin/will_paginate_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper_active_record'
 
 require 'will_paginate'

data/spec/search_object/search_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'ostruct'
 

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/setup'
 
 if ENV['TRAVIS']

data/spec/spec_helper_active_record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'spec_helper'
 require_relative 'support/paging_shared_example'
 require 'active_record'

data/spec/support/paging_shared_example.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 shared_examples_for 'a paging plugin' do
   after do
     Product.delete_all

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: search_object
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Radoslav Stankov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-18 00:00:00.000000000 Z
+date: 2019-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -170,28 +170,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: 0.75.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: 0.75.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.20.1
+        version: 1.36.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.20.1
+        version: 1.36.0
 description: Search object DSL
 email:
 - rstankov@gmail.com