seek_party 0.0.3 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd01bd1bb2d9d6a147901d752704a95fede83e2e36594a99d6c88e1c8785661b
-  data.tar.gz: 49598f17de968766008e4a8ecec0abf77f69221afe137c5be578c7fbdb7e3478
+  metadata.gz: 9453dd7bcd81b06616c716a74a14ae740d6173adee4cfc437f471f6d13c5b2b4
+  data.tar.gz: b7733e5a0ddcf2863881e0684a89c58e71d3aa7b23bf61d05fc60e605ba5d971
 SHA512:
-  metadata.gz: c5c80726313dad975cc05bf938c144df0e5ccfa10eafd3d3cbaec8f5045e4cc033ea386c7e045f0a08b6a4d4703d70b8a8383db1b0764577ba1cb6d08cf9eb8f
-  data.tar.gz: 853228f2fffbdc90121f416ba8bdddb76157e1bab720e424947b5da28709168a10ef78331ba9820b5145dfb9fc27280223de1062a01f883613ed388d4afdbec5
+  metadata.gz: 13701a60b84af168b394e3dce1d997017b86a6643a893693dcf37305094776705d4420eba30916ec884e387449ed4cf4e696ddc8749cdf81dd1986f40fabe304
+  data.tar.gz: cdbb6f829d15c0c8af6b7b0e029f51a464bbe3b61dc62fd42fee23d939ba144a99a89c555c414b8c44b13c981ccf206358ef35c48e18722c9f9d93a9f97adeb0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    seek_party (0.0.3)
+    seek_party (0.0.8)
 
 GEM
   remote: https://rubygems.org/
@@ -51,32 +51,31 @@ GEM
     builder (3.2.4)
     codeclimate-test-reporter (1.0.7)
       simplecov
-    concurrent-ruby (1.1.5)
-    crass (1.0.5)
+    concurrent-ruby (1.1.6)
+    crass (1.0.6)
     diff-lcs (1.3)
     docile (1.3.2)
     erubi (1.9.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.7.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
-    json (2.3.0)
-    loofah (2.4.0)
+    loofah (2.5.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
-    method_source (0.9.2)
-    mimemagic (0.3.3)
+    method_source (1.0.0)
+    mimemagic (0.3.5)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.13.0)
+    minitest (5.14.1)
     nio4r (2.5.2)
-    nokogiri (1.10.7)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
-    rack (2.0.8)
+    rack (2.2.2)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails (5.2.4.1)
@@ -125,11 +124,10 @@ GEM
       rspec-mocks (~> 3.8.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.2)
-    simplecov (0.17.1)
+    simplecov (0.18.5)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.2)
     sprockets (4.0.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -137,10 +135,10 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.4.1)
+    sqlite3 (1.4.2)
     thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)

data/README.md

@@ -1,5 +1,9 @@
 # SeekParty - Searches made easy
 
+[![Build Status](https://travis-ci.org/caws/seek_party.svg?branch=master)](https://travis-ci.org/caws/seek_party)
+[![Maintainability](https://api.codeclimate.com/v1/badges/a05e479c6f535645d307/maintainability)](https://codeclimate.com/github/caws/seek_party/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/a05e479c6f535645d307/test_coverage)](https://codeclimate.com/github/caws/seek_party/test_coverage)
+
 ### What is this?
 
 Have you ever had to write a search functionality for a web application and found yourself
@@ -33,8 +37,6 @@ Below is what's currently doable:
 PS: The DEFAULT_BLACK_LIST contains the attributes :id, :created_at and :updated_at. You can pass your own
     DEFAULT_BLACK_LIST when calling the #search method from your model, but I recommend using the WHITE_LIST, 
     as SeekParty will then only generate queries using the column names present there.
-    You should also keep in mind that when building the queries, seek_party tries to pluralize your table name in order to refer to the table
-    columns by their full name (ex: 'your_table.your_column_name').
 
 ## Getting started
 
@@ -43,7 +45,7 @@ PS: The DEFAULT_BLACK_LIST contains the attributes :id, :created_at and :updated
 Add the following to your Gemfile
 
 ``` ruby
-gem 'seek_party', '~> 0.0.3'
+gem 'seek_party', '~> 0.0.7'
 ```
 Then run:
 
@@ -134,7 +136,7 @@ User.search(params: params)
 And this would result in the following query being produced:
 
 ``` sql
-SELECT "users".* FROM "users" WHERE (LOWER(CAST(users.name AS TEXT)) LIKE '%sugoi%' AND LOWER(CAST(users.name AS TEXT)) = 'bilbo' OR LOWER(CAST(users.email AS TEXT)) LIKE '%sugoi%' AND LOWER(CAST(users.name AS TEXT)) = 'bilbo')
+SELECT "users".* FROM "users" WHERE (LOWER(CAST(users.name AS TEXT)) LIKE '%bilbo@theshire.com%' AND LOWER(CAST(users.name AS TEXT)) = 'bilbo' OR LOWER(CAST(users.email AS TEXT)) LIKE '%bilbo@theshire.com%' AND LOWER(CAST(users.name AS TEXT)) = 'bilbo')
 ```
 
 ### TO DO

data/lib/seek_party.rb

@@ -14,9 +14,6 @@ module SeekParty
              black_list: DEFAULT_BLACK_LIST,
              white_list: nil,
              scopes: [])
-    # If there are params to work with, use SeekParty.
-    # Otherwise, just return an empty instance of ActiveRecord_Relation.
-    return none if params.empty?
 
     SeekPartyEngine
         .new(self,

data/lib/seek_party/models/sp_query.rb

@@ -15,18 +15,17 @@ class SPQuery
   end
 
   def build_final_query
-    final_query = ''
-    @queries.each do |_key, value|
-      next unless value
+    return if @queries.blank?
 
-      final_query << if value == @queries[@queries.keys.first]
-                       value
-                     else
-                       @params[:search].present? ? " OR #{value}" : " AND #{value}"
-                     end
-    end
-
-    final_query
+    @queries.map { |key, value|
+      if key == @queries.keys.first
+        value
+      else
+        or_and(value)
+      end }.sum
   end
 
+  def or_and(value)
+    @params[:search].present? ? " OR #{value}" : " AND #{value}"
+  end
 end

data/lib/seek_party/seek_party_attribute.rb

@@ -23,7 +23,7 @@ module SeekParty
     def check_attributes(another_model)
       return nil if another_model.nil?
 
-      sp_attribute = SPAttribute.new(table_name: pluralize_and_snake_case_class_name)
+      sp_attribute = SPAttribute.new(table_name: get_table_name)
 
       another_model.attributes.keys.each do |attribute|
         next unless another_model.has_attribute? attribute
@@ -45,8 +45,8 @@ module SeekParty
       @black_list.include? attribute_name
     end
 
-    def pluralize_and_snake_case_class_name
-      @inspected_class.name.pluralize.underscore
+    def get_table_name
+      @inspected_class.table_name.underscore
     end
   end
 end

data/lib/seek_party/seek_party_engine.rb

@@ -39,8 +39,22 @@ module SeekParty
       # else, as the returned object from run_search is an
       # ActiveRecord_Relation object that would accept
       # method chaining
-      @scopes.each do |key, value|
-        @inspected_class = @inspected_class.method(key).call(value)
+      @scopes.each do |scope|
+        if scope.respond_to?(:keys)
+          scope.keys.each do |key|
+            scope_call(key, scope[key])
+          end
+        else
+          scope_call(scope, nil)
+        end
+      end
+    end
+
+    def scope_call(key, value)
+      if value.present?
+        @inspected_class = @inspected_class.method(key).call(*value)
+      else
+        @inspected_class = @inspected_class.method(key).call
       end
     end
   end

data/lib/seek_party/seek_party_query_builder.rb

@@ -32,8 +32,8 @@ module SeekParty
         if params[:search].present?
           full_column_name = spattribute.get_full_column_name(attribute)
           cast_column_name = cast_according_to_adapter(full_column_name)
-          @sp_query.set_attribute_query(attribute, "#{cast_column_name} LIKE "\
-                                                 "'%#{params[:search].downcase}%'")
+          sanitized_sql = sanitize_sql(["#{cast_column_name} LIKE ?", "%#{params[:search].downcase}%"])
+          @sp_query.set_attribute_query(attribute, sanitized_sql)
         end
 
         # If there are other params being used other than :search
@@ -58,8 +58,11 @@ module SeekParty
     end
 
     def build_equals_query(attribute)
-      "#{cast_according_to_adapter(attribute)} = "\
-      "'#{@params[attribute.to_sym].to_s.downcase}'"
+      sanitize_sql(["#{cast_according_to_adapter(attribute)} = ?", @params[attribute.to_sym].to_s.downcase])
+    end
+
+    def sanitize_sql(sql_array)
+      ActiveRecord::Base::sanitize_sql_array(sql_array)
     end
 
     def db_sqlite3?

data/lib/seek_party/version.rb

@@ -1,3 +1,3 @@
 module SeekParty
-  VERSION = '0.0.3'.freeze
+  VERSION = '0.0.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seek_party
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.9
 platform: ruby
 authors:
 - Charles Washington
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-23 00:00:00.000000000 Z
+date: 2020-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler