metka 2.0.3 → 2.3.1

data/lib/metka/query_builder.rb

@@ -10,11 +10,11 @@ module Metka
     def call(model, columns, tags, options)
       strategy = options_to_strategy(options)
 
-      query = join(options[:join_operator]) do
+      query = join(options[:join_operator]) {
         columns.map do |column|
           build_query(strategy, model, column, tags)
         end
-      end
+      }
 
       if options[:exclude].present?
         Arel::Nodes::Not.new(query)
@@ -25,7 +25,7 @@ module Metka
 
     private
 
-    def options_to_strategy options
+    def options_to_strategy(options)
       if options[:any].present?
         AnyTagsQuery
       else
@@ -43,11 +43,13 @@ module Metka
       end
     end
 
-    # @param nodes [Array<Arel::Node>, Arel::Node]
-    # @return [Arel::Node]
+    # @param nodes [Array<Arel::Nodes::Node>, Arel::Nodes::Node]
+    # @return [Arel::Nodes::Node]
     def join_or(nodes)
+      node_base_klass = defined?(::Arel::Nodes::Node) ? ::Arel::Nodes::Node : ::Arel::Node
+
       case nodes
-      when ::Arel::Node
+      when node_base_klass
         nodes
       when Array
         l, *r = nodes

data/lib/metka/query_builder/base_query.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'singleton'
 
 module Metka
@@ -6,22 +7,42 @@ module Metka
     include Singleton
 
     def call(model, column_name, tag_list)
-      column_cast = Arel::Nodes::NamedFunction.new(
-        'CAST',
-        [model.arel_table[column_name].as('text[]')]
-      )
-
-      value = Arel::Nodes::SqlLiteral.new(
-        # In Rails 5.2 and above Sanitanization moved to public level, but still we have to support 4.2 and 5.0 and 5.1
-        ActiveRecord::Base.send(:sanitize_sql_for_conditions, ['ARRAY[?]', tag_list.to_a])
-      )
-
-      value_cast = Arel::Nodes::NamedFunction.new(
-        'CAST',
-        [value.as('text[]')]
-      )
-
-      Arel::Nodes::InfixOperation.new(infix_operator, column_cast, value_cast)
+      tags = tag_list.to_a
+
+      if tags.one?
+        value = Arel::Nodes::SqlLiteral.new(
+          ActiveRecord::Base.sanitize_sql_for_conditions(['?', tags.first])
+        )
+
+        column_cast = Arel::Nodes::NamedFunction.new(
+          'ANY',
+          [model.arel_table[column_name]]
+        )
+
+        Arel::Nodes::Equality.new(value, column_cast)
+      else
+        value = Arel::Nodes::SqlLiteral.new(
+          ActiveRecord::Base.sanitize_sql_for_conditions(['ARRAY[?]::varchar[]', tags])
+        )
+
+        Arel::Nodes::InfixOperation.new(infix_operator, model.arel_table[column_name], value)
+      end
+      # column_cast = Arel::Nodes::NamedFunction.new(
+      #   'CAST',
+      #   [model.arel_table[column_name].as('text[]')]
+      # )
+
+      # value = Arel::Nodes::SqlLiteral.new(
+      #   ActiveRecord::Base.sanitize_sql_for_conditions(['ARRAY[?]::varchar[]', tag_list.to_a])
+      # )
+
+      # value_cast = Arel::Nodes::NamedFunction.new(
+      #   'CAST',
+      #   [value.as('text[]')]
+      # )
+
+      # # Arel::Nodes::InfixOperation.new(infix_operator, column_cast, value_cast)
+      # Arel::Nodes::InfixOperation.new(infix_operator, model.arel_table[column_name], value)
     end
   end
 end

data/lib/metka/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Metka
-  VERSION = '2.0.3'
+  VERSION = '2.3.1'
 end

data/metka.gemspec

@@ -25,13 +25,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'dry-configurable', '>= 0.8'
-  spec.add_dependency 'rails', '>= 5.1'
+  spec.add_dependency 'rails', '>= 5.2'
 
   spec.add_development_dependency 'ammeter', '>= 1.1'
   spec.add_development_dependency 'pry', '>= 0.12.2'
   spec.add_development_dependency 'bundler', '>= 1.3'
   spec.add_development_dependency 'faker', '>= 2.8'
-  spec.add_development_dependency 'jetrockets-standard', '~> 1.0.1'
   spec.add_development_dependency 'pg', '>= 1.1'
   spec.add_development_dependency 'rake', '>= 0.8.7'
   spec.add_development_dependency 'rspec', '>= 3.9'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metka
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.3.1
 platform: ruby
 authors:
 - Igor Alexandrov
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-04 00:00:00.000000000 Z
+date: 2021-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: ammeter
   requirement: !ruby/object:Gem::Requirement
@@ -95,20 +95,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.8'
-- !ruby/object:Gem::Dependency
-  name: jetrockets-standard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -201,11 +187,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/continuous-integration-workflow.yml"
+- ".github/ISSUE_TEMPLATE.md"
+- ".github/workflows/lint_code.yml"
+- ".github/workflows/lint_docs.yml"
+- ".github/workflows/specs.yml"
 - ".gitignore"
+- ".mdlrc"
 - ".rspec"
+- ".rubocop-md.yml"
 - ".rubocop.yml"
-- ".travis.yml"
+- ".ruby-version"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -214,9 +205,12 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- gemfiles/rails5.gemfile
+- forspell.dict
 - gemfiles/rails52.gemfile
 - gemfiles/rails6.gemfile
+- gemfiles/rails61.gemfile
+- gemfiles/railsmain.gemfile
+- gemfiles/rubocop.gemfile
 - lib/generators/metka/strategies/materialized_view/materialized_view_generator.rb
 - lib/generators/metka/strategies/materialized_view/templates/migration.rb.erb
 - lib/generators/metka/strategies/view/templates/migration.rb.erb
@@ -250,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Rails tagging system based on PostgreSQL arrays

data/.github/workflows/continuous-integration-workflow.yml

@@ -1,11 +0,0 @@
-name: CI
-# This workflow is triggered on pushes to the repository.
-on: [push]
-
-jobs:
-  build:
-    name: RSpec
-    # This job runs on Linux
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1

data/.travis.yml

@@ -1,35 +0,0 @@
----
-language: ruby
-cache: bundler
-
-dist: trusty
-sudo: false
-
-notifications:
-  email: false
-
-services:
-  - postgresql
-addons:
-  postgresql: "11.2"
-
-before_install:
-  - gem install -v 2.0.2 bundler
-  - sudo apt-get update
-  - sudo apt-get --yes remove postgresql\*
-  - sudo apt-get install -y postgresql-11 postgresql-client-11
-  - sudo cp /etc/postgresql/{9.6,11}/main/pg_hba.conf
-  - sudo service postgresql restart 11
-
-before_script:
-  - psql -c 'CREATE ROLE travis SUPERUSER LOGIN CREATEDB;' -U postgres
-  - ./bin/setup
-
-matrix:
-  include:
-    - rvm: 2.5.1
-      gemfile: gemfiles/rails5.gemfile
-    - rvm: 2.5.5
-      gemfile: gemfiles/rails52.gemfile
-    - rvm: 2.6.2
-      gemfile: gemfiles/rails6.gemfile

data/gemfiles/rails5.gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-gem 'rails', '~>5.1'
-gem 'activerecord', '~> 5.2.4.3'
-
-gemspec path: '..'