segugio 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75c6f491d3b5e6ac863da40c504e652717b383f5943d6d75c253f30f9aa74440
-  data.tar.gz: f6b0bd2745f8b528ceaa90eb5e57b4f37a3039155abb27f77883b36dcc89a8fa
+  metadata.gz: a9713c2995c3372521c1ce92a3423697a502040bfb9b59eac27764da5429c36f
+  data.tar.gz: faabfc804ba1716489d3c05682410fe4c17e4ae77e103c3e08065db092b0d2b3
 SHA512:
-  metadata.gz: f7dfbec33e08af5ac152288b68c8209744a6378767f5f284345b8449f9b275441cd3eaa37a53395ab72e6c0d94e7687ee69910605d68fb51fea342a83790ee5b
-  data.tar.gz: f98c8b440752df6f7503945e80bbe1f81834800ac4ba729eba765146896a009fdc0af4c7000598685ee284154bc3889948f37c5ace1c761ef4cd55552f4d5683
+  metadata.gz: a4e40a80b422a75ffc093199522bc138f8141ebdcb2d5b5ac8752db51de607dc00aa61e01556b68b84c73eb37900413ae97c94b76adbf0beffefb712dfdc0fc6
+  data.tar.gz: 9bad96136056c2de795496ebaba25a24e4ab757e0d9035e63607a2dfa150ccf22d6f5b9beed3dfea0bd01dc3e8c6d8eeb376af8a0d9d64b348bba6866ff2d565

data/.ci.database.yml

@@ -0,0 +1,9 @@
+test:
+  adapter: postgresql
+  encoding: unicode
+  database: postgres
+  host: localhost
+  port: 5432
+  user: postgres
+  password: postgres
+  min_messages: warning

data/Gemfile

@@ -1,10 +1,15 @@
 # frozen_string_literal: true
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in segugio.gemspec
 gemspec
 
-gem "rake", "~> 13.0"
-
-gem "rspec", "~> 3.0"
+gem 'database_cleaner'
+gem 'factory_bot'
+gem 'faker'
+gem 'pg'
+gem 'pry'
+gem 'rake'
+gem 'rspec'
+gem 'shoulda-matchers'

data/Gemfile.lock

@@ -1,27 +1,44 @@
 PATH
   remote: .
   specs:
-    segugio (0.1.1)
-      activerecord (~> 7, >= 4.0)
+    segugio (0.1.2)
+      activerecord (>= 4.0)
+      service-utils (~> 0.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.4)
-      activesupport (= 7.0.4)
-    activerecord (7.0.4)
-      activemodel (= 7.0.4)
-      activesupport (= 7.0.4)
-    activesupport (7.0.4)
+    activemodel (7.0.4.1)
+      activesupport (= 7.0.4.1)
+    activerecord (7.0.4.1)
+      activemodel (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
+    activesupport (7.0.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
+    coderay (1.1.3)
     concurrent-ruby (1.1.10)
+    database_cleaner (2.0.1)
+      database_cleaner-active_record (~> 2.0.0)
+    database_cleaner-active_record (2.0.1)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
     diff-lcs (1.5.0)
+    factory_bot (6.2.1)
+      activesupport (>= 5.0.0)
+    faker (3.1.0)
+      i18n (>= 1.8.11, < 2)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
+    method_source (1.0.0)
     minitest (5.17.0)
+    pg (1.4.5)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     rake (13.0.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -29,13 +46,16 @@ GEM
       rspec-mocks (~> 3.12.0)
     rspec-core (3.12.0)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.1)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.1)
+    rspec-mocks (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
+    service-utils (0.2.0)
+    shoulda-matchers (5.3.0)
+      activesupport (>= 5.2.0)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
 
@@ -44,9 +64,15 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 2.0)
-  rake (~> 13.0)
-  rspec (~> 3.0)
+  database_cleaner
+  factory_bot
+  faker
+  pg
+  pry
+  rake
+  rspec
   segugio!
+  shoulda-matchers
 
 BUNDLED WITH
-   2.3.24
+   2.3.6

data/lib/segugio/search.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'service/utils'
+
 module Segugio
   # Implements a feature for generic search, that allows to search using ILIKE operator, filter records by exact value
   # and specify result order.
@@ -25,7 +27,7 @@ module Segugio
     end
 
     def logger
-      @logger ||= Rails.logger
+      @logger ||= ActiveRecord::Base.logger
     end
 
     private
@@ -71,7 +73,7 @@ module Segugio
 
       # Generate an array with conditions (ex. ['name ILIKE ? OR title ILIKE ?', '%xyz%', '%xyz%'])
       conditions = []
-      conditions << @query_fields.map { |field| "#{@relation.table_name}.#{field}::text ILIKE ?" }.join(' OR ')
+      conditions << @query_fields.map { |field| %("#{collection_name}"."#{field}"::text ILIKE ?) }.join(' OR ')
       @query_fields.each do
         conditions << "%#{@query}%"
       end
@@ -85,7 +87,7 @@ module Segugio
       # Iterate over @filter_fields and set filter conditions on result
       @filter_fields.each do |column|
         # TODO: handle filters on array columns
-        @result = @result.where(@collection_name => { column => @filters[column] }) if @filters[column]
+        @result = @result.where(collection_name => { column => @filters[column] }) if @filters[column]
       end
 
       # Warn about invalid filter fields
@@ -97,7 +99,7 @@ module Segugio
     def apply_exclude!
       # Iterate over @filter_fields and set exclude conditions on result
       @filter_fields.each do |column|
-        @result = @result.where.not(@collection_name => { column => @exclude[column] }) if @exclude[column]
+        @result = @result.where.not(collection_name => { column => @exclude[column] }) if @exclude[column]
       end
 
       # Warn about invalid exclude fields
@@ -120,7 +122,7 @@ module Segugio
           # When order item is a String or a Symbol, just check
           # if it's valid and use that value as order field
           if @order_fields.include?(item.to_s)
-            result << "#{@relation.table_name}.#{item}"
+            result << %("#{collection_name}"."#{item}" ASC)
           else
             # Report invalid order item
             logger.warn "Invalid order item: #{item.inspect}"
@@ -146,7 +148,7 @@ module Segugio
     # Build order field from a hash like { field: 'name', asc: true|false|nil, nulls_first: true|false|nil }
     def build_order_field_from_hash(data)
       # Use field name as base for order field
-      field = "#{@relation.table_name}.#{data[:field]}"
+      field = %("#{collection_name}"."#{data[:field]}")
 
       if data.key?(:asc)
         # When :asc is specified, add "ASC" or "DESC" when its value is "true" or "false" respectively

data/lib/segugio/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Segugio
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/segugio/wrappers/active_record/base.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'active_record'
+
 module ActiveRecord
   # Wraps ActiveRecord::Base to add `search` method and `query_fields`,
   # `filter_fields` and `order_fields` helper class methods.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: segugio
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Groza Sergiu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-19 00:00:00.000000000 Z
+date: 2023-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,9 +28,6 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7'
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
@@ -38,12 +35,23 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7'
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: service-utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: |
   Segugio is a Ruby gem that simplifies the implementation of search functionality in Rails using ActiveRecord.
   With this gem, you can easily search, filter and sort results in a simple and intuitive way.
@@ -61,6 +69,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".ci.database.yml"
 - ".rspec"
 - ".rubocop.yml"
 - CHANGELOG.md
@@ -75,7 +84,6 @@ files:
 - lib/segugio/searchable.rb
 - lib/segugio/version.rb
 - lib/segugio/wrappers/active_record/base.rb
-- sig/segugio.rbs
 homepage: https://github.com/demetra-it/segugio
 licenses:
 - MIT

data/sig/segugio.rbs

@@ -1,4 +0,0 @@
-module Segugio
-  VERSION: String
-  # See the writing guide of rbs: https://github.com/ruby/rbs#guides
-end