ruby_simple_search 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fff76b38b0d4b750a205788f0213735da4d14e0e
-  data.tar.gz: 91d61ad7a53a00f9b818951aff37c2b88c4c8095
+SHA256:
+  metadata.gz: 33cda6d4c33aefea4fe48b0270b97ca8ec2f8a2cd2ab5f5e1888b36e5803e46f
+  data.tar.gz: c7cdc38d3e5b0ca43732e5197e800628e2bbb3b00274587a628b0c2bfb8d21d8
 SHA512:
-  metadata.gz: 0dad0091246f35424bb7a529f2ab8259096074ea5de4e2a0c3c200cde61bcd7c4f0868b10ac19453c2b192bcf25a75bf6af69d63493b18e3e4c10f783ad15187
-  data.tar.gz: 3e59a4db93d6c3302a8a89cfbe8758c28fbfaf5f59203663a582e479461b20a24dc34632f087821616874ee2fe676bec79979e42ea33d1e28c921935c0efbfbf
+  metadata.gz: 6ddba0207e0e1a533a6764e6573e6b205a9b6b4df5279fd9c17af24aabf5a0ca1da0784d701c33ddb93505f3badf6ec58ddb8d05afc6b1e2dd8c8e7d24ad2d99
+  data.tar.gz: '08018957ab245bd9a03c08857ed4ab95be8b92ae81e8d5310eff8191cb4576772e018eafe329f4cc0dbfe511d7e7adf44e2e1a912c10455a2b644f6b5344ef0f'

data/CHANGELOG.md

@@ -4,7 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [2.0.0]
+
+## 2.0.1
+- Supported Rails 6
+- Dropped support Rails < 5
+
+## 2.0.0
 ### Added
 - Supports `attributes` parameter to `simple_search` method. [PR#4](https://github.com/mechanicles/ruby_simple_search/pull/4)
 - Supports data types other than `string` and `text` to `simple_search_attributes`
@@ -18,7 +23,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Removed
 - Removed `plain` pattern from `LIKE` query
 
-## [0.0.3]
+## 0.0.3
 ### Fixed
 - Fixed problem when using simple search with joins. [GI#1](https://github.com/mechanicles/ruby_simple_search/issues/1)
 
@@ -26,13 +31,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Moved pattern option to `simple_search` method and removed it from `simple_search_attributes` method
 - Updated specs accordingly
 
-## [0.0.2]
+## 0.0.2
 ### Added
 - Added support for `LIKE` patterns e.g. 'beginning', 'ending', 'containing', 'underscore', and 'plain'
 - Added block support to `simple_search` method so user can extend it based on its need
 - Added specs
 - Added some exceptions handling
 
-## [0.0.1]
+## 0.0.1
 ### Added
 - First major release

data/README.md

@@ -1,5 +1,10 @@
 # RubySimpleSearch
 
+
+[![Build Status](https://travis-ci.org/mechanicles/ruby_simple_search.svg?branch=master)](https://travis-ci.org/mechanicles/ruby_simple_search)
+[![Maintainability](https://api.codeclimate.com/v1/badges/20e84a4c3be302b07653/maintainability)](https://codeclimate.com/github/mechanicles/ruby_simple_search/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/20e84a4c3be302b07653/test_coverage)](https://codeclimate.com/github/mechanicles/ruby_simple_search/test_coverage)
+
 The simplest way to search the data in ActiveRecord models.
 
 It offers simple but useful features:
@@ -18,8 +23,6 @@ and again on the different models, you add lots of duplication in your code.
 
 #### Do not repeat yourself, use RubySimpleSearch.
 
-[![Build Status](https://travis-ci.org/mechanicles/ruby_simple_search.svg?branch=master)](https://travis-ci.org/mechanicles/ruby_simple_search)
-
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/ruby_simple_search.rb

@@ -1,7 +1,9 @@
-require 'ruby_simple_search/version'
-require 'ruby_simple_search/like_patterns'
-require 'ruby_simple_search/errors'
-require 'active_support/concern'
+# frozen_string_literal: true
+
+require "ruby_simple_search/version"
+require "ruby_simple_search/like_patterns"
+require "ruby_simple_search/errors"
+require "active_support/concern"
 
 module RubySimpleSearch
   extend ActiveSupport::Concern
@@ -26,90 +28,89 @@ module RubySimpleSearch
 
       @simple_search_term             = search_term
       @simple_search_pattern          = get_pattern(options[:pattern])
-      @simple_search_patterned_text   = @simple_search_pattern.gsub('q', @simple_search_term.try(:downcase))
-      @simple_search_query_conditions = ''
+      @simple_search_patterned_text   = @simple_search_pattern.gsub("q", @simple_search_term.try(:downcase))
+      @simple_search_query_conditions = []
       @simple_search_query_values     = []
 
       build_query_conditions_and_values(options)
       extend_query(block) if block.is_a? Proc
 
-      sql_query = [@simple_search_query_conditions, @simple_search_query_values]
+      sql_query = [@simple_search_query_conditions.join, @simple_search_query_values]
       where(sql_query.flatten)
     end
 
     private
-
-    def get_pattern(pattern)
-      if pattern.nil?
-        # default pattern is '%q%'
-        LIKE_PATTERNS[:containing]
-      else
-        pattern = LIKE_PATTERNS[pattern.to_sym]
-        raise Errors::INVALID_PATTERN if pattern.nil?
-
-        pattern
+      def get_pattern(pattern)
+        if pattern.nil?
+          # default pattern is '%q%'
+          LIKE_PATTERNS[:containing]
+        else
+          pattern = LIKE_PATTERNS[pattern.to_sym]
+          raise Errors::INVALID_PATTERN if pattern.nil?
+
+          pattern
+        end
       end
-    end
 
-    def build_query_conditions_and_values(options)
-      attributes = if options[:attributes].nil?
-                     @simple_search_attributes
-                   else
-                     _attr = *options[:attributes]
-                   end
+      def build_query_conditions_and_values(options)
+        attributes = if options[:attributes].nil?
+          @simple_search_attributes
+        else
+          _attr = *options[:attributes]
+        end
 
-      attributes.each do |attribute|
-        condition, value = build_query_condition_and_value(attribute)
+        attributes.each do |attribute|
+          condition, value = build_query_condition_and_value(attribute)
 
-        @simple_search_query_conditions << condition
-        @simple_search_query_values << value
+          @simple_search_query_conditions << condition
+          @simple_search_query_values << value
+        end
       end
-    end
 
-    def build_query_condition_and_value(attribute)
-      condition = if %i[string text].include?(columns_hash[attribute.to_s].type)
-                    build_query_for_string_and_text_types(attribute)
-                  else
-                    build_query_non_string_and_text_types(attribute)
-                  end
+      def build_query_condition_and_value(attribute)
+        condition = if %i[string text].include?(columns_hash[attribute.to_s].type)
+          build_query_for_string_and_text_types(attribute)
+        else
+          build_query_non_string_and_text_types(attribute)
+        end
 
-      [condition, @simple_search_patterned_text]
-    end
+        [condition, @simple_search_patterned_text]
+      end
 
-    def build_query_for_string_and_text_types(attribute)
-      if @simple_search_query_conditions.blank?
-        "LOWER(#{table_name}.#{attribute}) LIKE ?"
-      else
-        " OR LOWER(#{table_name}.#{attribute}) LIKE ?"
+      def build_query_for_string_and_text_types(attribute)
+        if @simple_search_query_conditions.blank?
+          "LOWER(#{table_name}.#{attribute}) LIKE ?"
+        else
+          " OR LOWER(#{table_name}.#{attribute}) LIKE ?"
+        end
       end
-    end
 
-    def build_query_non_string_and_text_types(attribute)
-      if @simple_search_query_conditions.blank?
-        "CAST(#{table_name}.#{attribute} AS CHAR(255)) LIKE ?"
-      else
-        " OR CAST(#{table_name}.#{attribute} AS CHAR(255)) LIKE ?"
+      def build_query_non_string_and_text_types(attribute)
+        if @simple_search_query_conditions.blank?
+          "CAST(#{table_name}.#{attribute} AS CHAR(255)) LIKE ?"
+        else
+          " OR CAST(#{table_name}.#{attribute} AS CHAR(255)) LIKE ?"
+        end
       end
-    end
 
-    def extend_query(block)
-      @simple_search_query_conditions = "(#{@simple_search_query_conditions})"
-      extended_query = block.call @simple_search_term
-      extend_simple_search(extended_query) if extended_query
-    end
+      def extend_query(block)
+        @simple_search_query_conditions = ["(#{@simple_search_query_conditions.join})"]
+        extended_query = block.call @simple_search_term
+        extend_simple_search(extended_query) if extended_query
+      end
 
-    def extend_simple_search(extended_query)
-      raise Errors::INVALID_TYPE unless extended_query.is_a?(Array)
+      def extend_simple_search(extended_query)
+        raise Errors::INVALID_TYPE unless extended_query.is_a?(Array)
 
-      extended_query_condition = extended_query[0]
-      extended_query_values    = extended_query - [extended_query[0]]
+        extended_query_condition = extended_query[0]
+        extended_query_values    = extended_query - [extended_query[0]]
 
-      if extended_query_condition.count('?') != extended_query_values.size
-        raise Errors::INVALID_CONDITION
-      end
+        if extended_query_condition.count("?") != extended_query_values.size
+          raise Errors::INVALID_CONDITION
+        end
 
-      @simple_search_query_conditions << " #{extended_query_condition}"
-      @simple_search_query_values += extended_query_values
-    end
+        @simple_search_query_conditions << " #{extended_query_condition}"
+        @simple_search_query_values += extended_query_values
+      end
   end
 end

data/lib/ruby_simple_search/errors.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module RubySimpleSearch
   module Errors
-    ATTRIBUTES_MISSING = 'Simple search attributes are missing'.freeze
-    INVALID_CONDITION  = "Extended query's array conditions are wrong".freeze
-    INVALID_TYPE       = 'Extended query is not an array type'.freeze
-    INVALID_PATTERN    = "Looks like given pattern is wrong, valid pattern list is '#{LIKE_PATTERNS.keys}'".freeze
-    SEARCH_ARG_TYPE    = '`search_term` argument is not a string'.freeze
-    WRONG_ATTRIBUTES   = "`simple_search_arguments` method's arguments should be in symbol format".freeze
+    ATTRIBUTES_MISSING = "Simple search attributes are missing"
+    INVALID_CONDITION  = "Extended query's array conditions are wrong"
+    INVALID_TYPE       = "Extended query is not an array type"
+    INVALID_PATTERN    = "Looks like given pattern is wrong, valid pattern list is '#{LIKE_PATTERNS.keys}'"
+    SEARCH_ARG_TYPE    = "`search_term` argument is not a string"
+    WRONG_ATTRIBUTES   = "`simple_search_arguments` method's arguments should be in symbol format"
   end
 end

data/lib/ruby_simple_search/like_patterns.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module RubySimpleSearch
   LIKE_PATTERNS = {
-    plain: 'q',
-    beginning: 'q%',
-    ending: '%q',
-    containing: '%q%'
-  }.freeze
+    plain: "q",
+    beginning: "q%",
+    ending: "%q",
+    containing: "%q%"
+  }
 end

data/lib/ruby_simple_search/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RubySimpleSearch
-  VERSION = '2.0.0'
+  VERSION = "2.0.1"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ruby_simple_search
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Santosh Wadghule
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-24 00:00:00.000000000 Z
+date: 2020-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -154,8 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: The simplest way to search the data