metka 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2d1cbead401418f74fa159b65813cac6175207e17350dd04ee4edff621337e7
-  data.tar.gz: 8298b9a619bdcaade8f6973251e3864f19a8bceec1f9fabb3d6502f89ca24902
+  metadata.gz: 1ea5e1ca3ea95cdb4f0beb2704afc1d92986b0a7c38aa49a70e794b2653c5764
+  data.tar.gz: e9994da8c7db21d1d079c5464d2ffae2bf06ee742f2a664df505f144b1d995be
 SHA512:
-  metadata.gz: 2660e8b1312aeab36fc5fd6f68b30384a595602384f5fb8e1303833944443c484715f40bf0cecb50ac9d660a375fcf97604a0537f2e7f10fc331e306d803bb7f
-  data.tar.gz: 1035d89affbe0c66d7eb31d27a863b234253f2dc5800c5d7a5f0ebcd8ef0f270589d9fc748bbdea6c4a070d71a7b38bd6c993eb845c5200d9fd06000315b5f8d
+  metadata.gz: 5c8da36cf3bec90c63888d24ac7d09dbec00219ca547df88289b3f858c25eb7f6a0ca729ee46021bfe47f7086a0cb7209a309ae95d8a88bb1b696acd0e772901
+  data.tar.gz: 4f7791a9be469c60ed1505d9f037653eccb0e81c1dcb18954c90daca440264eb9c0ca57067770c4d7222a86b2fca1c6a0ae1ad977becaad7d92ecda5ebf4513a

data/.rubocop.yml

@@ -19,7 +19,7 @@ Style/TrailingCommaInArrayLiteral:
 Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: no_comma
 
-Layout/AlignParameters:
+Layout/ParameterAlignment:
   EnforcedStyle: with_first_parameter
 
 # See https://github.com/rubocop-hq/rubocop/issues/4222

data/.ruby-version

@@ -0,0 +1 @@
+2.7.2

data/.travis.yml

@@ -33,3 +33,5 @@ matrix:
       gemfile: gemfiles/rails52.gemfile
     - rvm: 2.6.2
       gemfile: gemfiles/rails6.gemfile
+    - rvm: 2.7.2
+      gemfile: gemfiles/rails61.gemfile

data/Gemfile

@@ -8,5 +8,5 @@ local_gemfile = "#{File.dirname(__FILE__)}/Gemfile.local"
 if File.exist?(local_gemfile)
   eval(File.read(local_gemfile)) # rubocop:disable Lint/Eval
 else
-  gem 'activerecord', '~> 5.1.1'
+  gem 'activerecord', '>= 5.2.4', '< 6.2'
 end

data/Gemfile.lock

@@ -8,184 +8,197 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.1.7)
-      actionpack (>= 5.2.4.3)
+    actioncable (5.2.4.4)
+      actionpack (= 5.2.4.4)
       nio4r (~> 2.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.1.7)
-      actionpack (>= 5.2.4.3)
-      actionview (>= 5.2.4.3)
-      activejob (= 5.1.7)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.4.4)
+      actionpack (= 5.2.4.4)
+      actionview (= 5.2.4.4)
+      activejob (= 5.2.4.4)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.3.2)
-      actionview (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
+    actionpack (5.2.4.4)
+      actionview (= 5.2.4.4)
+      activesupport (= 5.2.4.4)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.0.3.2)
-      activesupport (= 6.0.3.2)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.4.4)
+      activesupport (= 5.2.4.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (5.1.7)
-      activesupport (>= 5.2.4.3)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.4.4)
+      activesupport (= 5.2.4.4)
       globalid (>= 0.3.6)
-    activemodel (5.1.7)
-      activesupport (>= 5.2.4.3)
-    activerecord (5.1.7)
-      activemodel (= 5.1.7)
-      activesupport (>= 5.2.4.3)
-      arel (~> 8.0)
-    activesupport (6.0.3.2)
+    activemodel (5.2.4.4)
+      activesupport (= 5.2.4.4)
+    activerecord (5.2.4.4)
+      activemodel (= 5.2.4.4)
+      activesupport (= 5.2.4.4)
+      arel (>= 9.0)
+    activestorage (5.2.4.4)
+      actionpack (= 5.2.4.4)
+      activerecord (= 5.2.4.4)
+      marcel (~> 0.3.1)
+    activesupport (5.2.4.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
     ammeter (1.1.4)
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec-rails (>= 2.2)
-    arel (8.0.0)
-    ast (2.4.0)
+    arel (9.0.0)
+    ast (2.4.1)
     builder (3.2.4)
-    coderay (1.1.2)
+    coderay (1.1.3)
     concurrent-ruby (1.1.7)
     crass (1.0.6)
-    database_cleaner (1.7.0)
-    diff-lcs (1.3)
-    dry-configurable (0.11.3)
+    database_cleaner (1.8.5)
+    diff-lcs (1.4.4)
+    dry-configurable (0.11.6)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.4, >= 0.4.7)
       dry-equalizer (~> 0.2)
-    dry-core (0.4.9)
+    dry-core (0.5.0)
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.3.0)
-    erubi (1.9.0)
-    faker (2.8.0)
-      i18n (>= 1.6, < 1.8)
+    erubi (1.10.0)
+    faker (2.15.1)
+      i18n (>= 1.6, < 2)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.7.1)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.4)
-    jetrockets-standard (1.0.4)
-      rubocop-rails (~> 2.3.2)
-      rubocop-rspec (~> 1.35.0)
-      standard (~> 0.1.4)
-    loofah (2.7.0)
+    jetrockets-standard (1.0.7)
+      rubocop-rails (~> 2.8.1)
+      rubocop-rspec (~> 1.43.2)
+      standard (~> 0.6.1)
+    loofah (2.8.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    method_source (0.9.2)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (1.0.0)
+    mimemagic (0.3.5)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.14.2)
-    nio4r (2.5.2)
+    nio4r (2.5.4)
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    parallel (1.19.1)
-    parser (2.6.5.0)
-      ast (~> 2.4.0)
-    pg (1.1.4)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
+    parallel (1.20.1)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
+    pg (1.2.3)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.1.7)
-      actioncable (= 5.1.7)
-      actionmailer (= 5.1.7)
-      actionpack (>= 5.2.4.3)
-      actionview (>= 5.2.4.3)
-      activejob (= 5.1.7)
-      activemodel (= 5.1.7)
-      activerecord (= 5.1.7)
-      activesupport (>= 5.2.4.3)
+    rails (5.2.4.4)
+      actioncable (= 5.2.4.4)
+      actionmailer (= 5.2.4.4)
+      actionpack (= 5.2.4.4)
+      actionview (= 5.2.4.4)
+      activejob (= 5.2.4.4)
+      activemodel (= 5.2.4.4)
+      activerecord (= 5.2.4.4)
+      activestorage (= 5.2.4.4)
+      activesupport (= 5.2.4.4)
       bundler (>= 1.3.0)
-      railties (= 5.1.7)
+      railties (= 5.2.4.4)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (5.1.7)
-      actionpack (>= 5.2.4.3)
-      activesupport (>= 5.2.4.3)
+    railties (5.2.4.4)
+      actionpack (= 5.2.4.4)
+      activesupport (= 5.2.4.4)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
+      thor (>= 0.19.0, < 2.0)
     rainbow (3.0.0)
-    rake (13.0.1)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
+    rake (13.0.3)
+    regexp_parser (2.0.1)
+    rexml (3.2.4)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.0)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-rails (3.9.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
-    rubocop (0.75.1)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.10.0)
+    rspec-rails (4.0.1)
+      actionpack (>= 4.2)
+      activesupport (>= 4.2)
+      railties (>= 4.2)
+      rspec-core (~> 3.9)
+      rspec-expectations (~> 3.9)
+      rspec-mocks (~> 3.9)
+      rspec-support (~> 3.9)
+    rspec-support (3.10.0)
+    rubocop (0.91.1)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.1.1)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
+      rexml
+      rubocop-ast (>= 0.4.0, < 1.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-performance (1.5.1)
-      rubocop (>= 0.71.0)
-    rubocop-rails (2.3.2)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.8.0)
+      parser (>= 2.7.1.5)
+    rubocop-performance (1.8.1)
+      rubocop (>= 0.87.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.8.1)
+      activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.72.0)
-    rubocop-rspec (1.35.0)
-      rubocop (>= 0.60.0)
+      rubocop (>= 0.87.0)
+    rubocop-rspec (1.43.2)
+      rubocop (~> 0.87)
     ruby-progressbar (1.10.1)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
+    sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    standard (0.1.6)
-      rubocop (~> 0.75.0)
-      rubocop-performance (~> 1.5.0)
-    thor (0.20.3)
+    standard (0.6.2)
+      rubocop (= 0.91.1)
+      rubocop-performance (= 1.8.1)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    timecop (0.9.1)
-    tzinfo (1.2.7)
+    timecop (0.9.2)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
-    unicode-display_width (1.6.0)
-    websocket-driver (0.6.5)
+    unicode-display_width (1.7.0)
+    websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 5.1.1)
+  activerecord (>= 5.2.4, < 6.2)
   ammeter (>= 1.1)
   bundler (>= 1.3)
   database_cleaner (>= 1.7)

data/gemfiles/rails52.gemfile

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

data/gemfiles/rails6.gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'rails', '~>6.0'
-gem 'activerecord', '~> 6.0'
+gem 'rails', '~> 6.0', ' < 6.1'
+gem 'activerecord', '~> 6.0', '< 6.1'
 
 gemspec path: '..'

data/gemfiles/rails61.gemfile

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

data/lib/metka/generic_parser.rb

@@ -25,7 +25,7 @@ module Metka
           gsub_quote_pattern!(tag_list, value, double_quote_pattern)
           gsub_quote_pattern!(tag_list, value, single_quote_pattern)
 
-          tag_list.merge value.split(Regexp.new delimiter).map(&:strip).reject(&:empty?)
+          tag_list.merge value.split(Regexp.new(delimiter)).map(&:strip).reject(&:empty?)
         when Enumerable
           tag_list.merge value.reject(&:empty?)
         end
@@ -46,7 +46,7 @@ module Metka
     end
 
     def single_quote_pattern
-     @single_quote_pattern[delimiter] ||= /(\A|#{delimiter})\s*'(.*?)'\s*(?=#{delimiter}\s*|\z)/
+      @single_quote_pattern[delimiter] ||= /(\A|#{delimiter})\s*'(.*?)'\s*(?=#{delimiter}\s*|\z)/
     end
 
     def double_quote_pattern

data/lib/metka/model.rb

@@ -43,10 +43,10 @@ module Metka
 
       base.class_eval do
         columns.each do |column|
-          scope "with_all_#{column}",    ->(tags) { tagged_with(tags, on: [ column ]) }
-          scope "with_any_#{column}",    ->(tags) { tagged_with(tags, on: [ column ], any: true) }
-          scope "without_all_#{column}", ->(tags) { tagged_with(tags, on: [ column ], exclude: true) }
-          scope "without_any_#{column}", ->(tags) { tagged_with(tags, on: [ column ], any: true, exclude: true) }
+          scope "with_all_#{column}", ->(tags) { tagged_with(tags, on: [column]) }
+          scope "with_any_#{column}", ->(tags) { tagged_with(tags, on: [column], any: true) }
+          scope "without_all_#{column}", ->(tags) { tagged_with(tags, on: [column], exclude: true) }
+          scope "without_any_#{column}", ->(tags) { tagged_with(tags, on: [column], any: true, exclude: true) }
         end
 
         unless respond_to?(:tagged_with)
@@ -66,7 +66,7 @@ module Metka
         prepared_unnest = columns.map { |column| "#{table_name}.#{column}" }.join(' || ')
         subquery = all.select("UNNEST(#{prepared_unnest}) AS tag_name")
 
-        unscoped.from(subquery).group(:tag_name).pluck(:tag_name, 'COUNT(*) AS taggings_count')
+        unscoped.from(subquery).group(:tag_name).pluck(:tag_name, Arel.sql('COUNT(*) AS taggings_count'))
       end
 
       columns.each do |column|

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)
@@ -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

data/lib/metka/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metka
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 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: 2020-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -205,6 +205,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -214,9 +215,9 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- gemfiles/rails5.gemfile
 - gemfiles/rails52.gemfile
 - gemfiles/rails6.gemfile
+- gemfiles/rails61.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 +251,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/gemfiles/rails5.gemfile

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