metka 0.1.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd6f202972d558afed083a0095530a47e1e2f35028beb4a457c1b13741614b0d
-  data.tar.gz: e11832ae26b49cdb99aa7b6fd5dddb9f559b862b8460c19b492c05467ea04331
+  metadata.gz: 960a0b262fa5e1dc7a4a08baf844f4f12063696133527f0ef201a4414ee498c0
+  data.tar.gz: 2792d8b84d0ebf6c9aa197c3bbbe8d6b257f522493a2b770887105cd0d6b539d
 SHA512:
-  metadata.gz: ea2f237f88c8a661931db07532243ddd6c7af85741f77422cc6f6fafd3460fbfaacad205064eeecb438a29a25c3aff11157ddf6309ff6bb559d317674bbdc019
-  data.tar.gz: b9e9f74757a541c6bf8fb123ba27cf619ebafeb7b92b61ea0a71b0482b5e3a3def87bae4c5292cd159e4bc6beeeb9274811e77e7dd461736d16bb15529ec7673
+  metadata.gz: 4b47eb9c9b7e64609b0933b02e5704aa8e5dd5cca5ca1a9c796625942fed6b67551574cb6fe3c45190954ce8bfb56ae40bb125659751d55b5ef8f780a35beb0d
+  data.tar.gz: fe1b4c69679173d7f8c639f3c060722c617f39f537dba1253ff1f9cd70e26a44028e8ae6676d440c2b9165691162f907a0cf4e546510c8e37194db13c59adb44

data/.gitignore

@@ -10,3 +10,7 @@
 
 # rspec failure tracking
 .rspec_status
+spec/debug.log
+
+spec/dummy/log/test.log
+spec/dummy/log/development.log

data/.travis.yml

@@ -8,17 +8,29 @@ sudo: false
 notifications:
   email: false
 
+services:
+  - postgresql
 addons:
-  postgresql: '9.6'
-
-env:
-  global:
-    - METKA_DB_USER=postgres
-    - METKA_DB_NAME=metka
+  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:
   - gem update --system
-  - RAILS_ENV=test bundle exec rake dummy:db:create dummy:db:schema:load
+  - 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/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    metka (0.1.1)
+    metka (1.0.0)
       dry-configurable
-      rails (>= 4.2)
+      rails (~> 5.1)
 
 GEM
   remote: https://rubygems.org/
@@ -52,27 +52,29 @@ GEM
     arel (8.0.0)
     ast (2.4.0)
     builder (3.2.3)
+    coderay (1.1.2)
     concurrent-ruby (1.1.5)
-    crass (1.0.4)
+    crass (1.0.5)
+    database_cleaner (1.7.0)
     diff-lcs (1.3)
-    dry-configurable (0.8.3)
+    dry-configurable (0.9.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.4, >= 0.4.7)
     dry-core (0.4.9)
       concurrent-ruby (~> 1.0)
-    erubi (1.8.0)
-    faker (2.3.0)
-      i18n (~> 1.6.0)
+    erubi (1.9.0)
+    faker (2.8.0)
+      i18n (>= 1.6, < 1.8)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.6.0)
+    i18n (1.7.0)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.3)
-    jetrockets-standard (1.0.1)
+    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.2.3)
+    loofah (2.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -80,14 +82,17 @@ GEM
     method_source (0.9.2)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    nio4r (2.5.1)
-    nokogiri (1.10.4)
+    minitest (5.13.0)
+    nio4r (2.5.2)
+    nokogiri (1.10.7)
       mini_portile2 (~> 2.4.0)
-    parallel (1.17.0)
-    parser (2.6.4.1)
+    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)
     rack (2.0.7)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -106,8 +111,8 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.2.0)
-      loofah (~> 2.2, >= 2.2.2)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
     railties (5.1.7)
       actionpack (= 5.1.7)
       activesupport (= 5.1.7)
@@ -115,36 +120,36 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (3.0.0)
-    rake (12.3.3)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-rails (3.8.2)
+      rspec-support (~> 3.9.0)
+    rspec-rails (3.9.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    rubocop (0.72.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)
       parallel (~> 1.10)
       parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-performance (1.4.1)
+    rubocop-performance (1.5.1)
       rubocop (>= 0.71.0)
     rubocop-rails (2.3.2)
       rack (>= 1.1)
@@ -152,16 +157,16 @@ GEM
     rubocop-rspec (1.35.0)
       rubocop (>= 0.60.0)
     ruby-progressbar (1.10.1)
-    sprockets (3.7.2)
+    sprockets (4.0.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    standard (0.1.4)
-      rubocop (~> 0.72.0)
-      rubocop-performance (~> 1.4.0)
+    standard (0.1.6)
+      rubocop (~> 0.75.0)
+      rubocop-performance (~> 1.5.0)
     thor (0.20.3)
     thread_safe (0.3.6)
     timecop (0.9.1)
@@ -179,13 +184,15 @@ DEPENDENCIES
   activerecord (~> 5.1.1)
   ammeter
   bundler
+  database_cleaner
   faker
   jetrockets-standard (~> 1.0.1)
   metka!
   pg
+  pry (~> 0.12.2)
   rake
-  rspec
-  rspec-rails
+  rspec (~> 3.9)
+  rspec-rails (~> 3.9)
   timecop
 
 BUNDLED WITH

data/README.md

@@ -3,7 +3,7 @@
 
 # Metka
 
-Rails gem to manage tags with PostgreSQL array columns.
+Rails gem to manage tags with SonggreSQL array columns.
 
 ## Installation
 
@@ -24,33 +24,109 @@ Or install it yourself as:
 ## Tag objects
 
 ```ruby
-class Post < ActiveRecord::Base
-  include Metka::Model
-
+class Song < ActiveRecord::Base
+  include Metka::Model(column: 'tags')
+  include Metka::Model(column: 'genres')
 end
 
-@post = Post.new(title: 'Migrate tags in Rails to PostgreSQL')
-@post.tags = ['ruby', 'postgres', 'rails']
-@post.save
+@Song = Song.new(title: 'Migrate tags in Rails to SonggreSQL')
+@Song.tag_list = 'top, chill'
+@Song.genre_list = 'rock, jazz, pop'
+@Song.save
 ```
 
 ## Find tagged objects
 
+### .with_all_#{column_name}
+```ruby
+Song.with_all_tags('top')
+=> [#<Song id: 1, title: 'Migrate tags in Rails to SonggreSQL', tags: ['top', 'chill'], genres: ['rock', 'jazz', 'pop']]
+
+Song.with_all_tags('top, 1990')
+=> []
+
+Song.with_all_tags('')
+=> []
+
+Song.with_all_genres('rock')
+=> [#<Song id: 1, title: 'Migrate tags in Rails to SonggreSQL', tags: ['top', 'chill'], genres: ['rock', 'jazz', 'pop']]
+```
+
+### .with_any_#{column_name}
+```ruby
+Song.with_any_tags('chill')
+=> [#<Song id: 1, title: 'Migrate tags in Rails to SonggreSQL', tags: ['top', 'chill'], genres: ['rock', 'jazz', 'pop']]
+
+Song.with_any_tags('chill, 1980')
+=> [#<Song id: 1, title: 'Migrate tags in Rails to SonggreSQL', tags: ['top', 'chill'], genres: ['rock', 'jazz', 'pop']]
+
+Song.with_any_tags('')
+=> []
+
+Song.with_any_genres('rock, rap')
+=> [#<Song id: 1, title: 'Migrate tags in Rails to SonggreSQL', tags: ['top', 'chill'], genres: ['rock', 'jazz', 'pop']]
+```
+### .without_all_#{column_name}
+```ruby
+Song.without_all_tags('top')
+=> []
+
+Song.without_all_tags('top, 1990')
+=> [#<Song id: 1, title: 'Migrate tags in Rails to SonggreSQL', tags: ['top', 'chill'], genres: ['rock', 'jazz', 'pop']]
+
+Song.without_all_tags('')
+=> [#<Song id: 1, title: 'Migrate tags in Rails to SonggreSQL', tags: ['top', 'chill'], genres: ['rock', 'jazz', 'pop']]
+
+Song.without_all_genres('rock, pop')
+=> [#<Song id: 1, title: 'Migrate tags in Rails to SonggreSQL', tags: ['top', 'chill'], genres: ['rock', 'jazz', 'pop']]
+
+Song.without_all_genres('rock')
+=> []
+```
+
+### .without_any_#{column_name}
 ```ruby
-Post.tagged_with('ruby')
-=> [#<Post id: 1, title: 'Migrate tags in Rails to PostgreSQL', tags: ['ruby', 'postgres', 'rails']
+Song.without_any_tags('top, 1990')
+=> []
+
+Song.without_any_tags('1990, 1980')
+=> [#<Song id: 1, title: 'Migrate tags in Rails to SonggreSQL', tags: ['top', 'chill'], genres: ['rock', 'jazz', 'pop']]
 
-Post.tagged_with('ruby, crystal')
-=> nil
+Song.without_any_genres('rock, pop')
+=> []
+
+Song.without_any_genres('')
+=> [#<Song id: 1, title: 'Migrate tags in Rails to SonggreSQL', tags: ['top', 'chill'], genres: ['rock', 'jazz', 'pop']]
 ```
 
-In example above you will get records that are tagged with `ruby` and `crystal`. To get records that are tagged with any of these tags use `any` option.
+## Custom delimiter
+By default, a comma is used as a delimiter to create tags from a string.
+You can make your own custom separator:
+```ruby
+Metka.config.delimiter = [',', ' ', '\|']
+parsed_data = Metka::GenericParser.instance.call('cool, data|I have')
+parsed_data.to_a
+=>['cool', 'data', 'I', 'have']
+```
 
+## Tags with quote
 ```ruby
-Post.tagged_with('ruby, crystal', any: true)
-=> [#<Post id: 1, title: 'Migrate tags in Rails to PostgreSQL', tags: ['ruby', 'postgres', 'rails']
+parsed_data = Metka::GenericParser.instance.call("'cool, data', code")
+parsed_data.to_a
+=> ['cool, data', 'code']
 ```
 
+## Custom parser
+By default we use [generic_parser](lib/metka/generic_parser.rb "generic_parser")
+If you want use your custom parser you can do:
+```ruby
+class Song < ActiveRecord::Base
+  include Metka::Model(column: 'tags', parser: Your::Custom::Parser.instance)
+  include Metka::Model(column: 'genres')
+end
+```
+Custom parser must be a singleton class that has a `.call` method that accepts the tag string
+
 ## Tag Cloud Strategies
 
 There are several strategies to get tag statistics
@@ -123,7 +199,31 @@ Now you can create `TaggedNote` model and work with the view like you usually do
 
 Similar to the strategy above, but the view will be Materialized and refreshed with the trigger
 
-TBD
+```bash
+rails g metka:strategies:materialized_view --source-table-name=NAME_OF_TABLE_WITH_TAGS
+```
+
+The code above will generate a migration that creates view to store aggregated data about tag in `NAME_OF_TABLE_WITH_TAGS` table.
+
+Lets take a look at real example. We have a `notes` table with `tags` column.
+
+| Column | Type                | Default                           |
+|--------|---------------------|-----------------------------------|
+| id     | integer             | nextval('notes_id_seq'::regclass) |
+| body   | text                |                                   |
+| tags   | character varying[] | '{}'::character varying[]         |
+
+Now lets generate a migration.
+
+```bash
+rails g metka:strategies:materialized_view --source-table-name=notes
+```
+
+The migration code you can see [here](spec/dummy/db/migrate/05_create_tagged_materialized_view_Songs_materialized_view.rb "here")
+
+Now lets take a look at `tagged_notes` materialized view.
+
+Now you can create `TaggedNote` model and work with the view like you usually do with Rails models.
 
 ### Table Strategy with Triggers
 
@@ -131,6 +231,11 @@ TBD
 
 TBD
 
+## Inspired by
+1. [ActsAsTaggableOn](https://github.com/mbleigh/acts-as-taggable-on)
+2. [ActsAsTaggableArrayOn](https://github.com/tmiyamon/acts-as-taggable-array-on)
+3. [TagColumns](https://github.com/hopsoft/tag_columns)
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -141,6 +246,10 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/metka. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
+## Credits
+![JetRockets](https://jetrockets.pro/jetrockets-icons-black.png)
+Metka is maintained by [JetRockets](http://www.jetrockets.ru).
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/bin/setup

@@ -5,5 +5,4 @@ set -e
 gem install bundler --conservative
 bundle check || bundle install
 
-RAILS_ENV=test bundle exec rake dummy:db:create
-RAILS_ENV=test bundle exec rake dummy:db:schema:load
+RAILS_ENV=test bundle exec rake dummy:db:migrate:reset

data/gemfiles/rails5.gemfile

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

data/gemfiles/rails52.gemfile

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

data/gemfiles/rails6.gemfile

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

data/lib/generators/metka/strategies/materialized_view/materialized_view_generator.rb

@@ -41,7 +41,7 @@ module Metka
           end
 
           def migration_name
-            "create_#{view_name}_view"
+            "create_#{view_name}_materialized_view"
           end
 
           def migration_class_name

data/lib/generators/metka/strategies/materialized_view/templates/migration.rb.erb

@@ -3,38 +3,45 @@
 class <%= @migration_class_name %> < ActiveRecord::Migration<%= ActiveRecord::VERSION::MAJOR < 5 ? '' : '[5.0]' %>
   def up
     execute <<-SQL
-    CREATE 
-      OR REPLACE FUNCTION metka_refresh_<%= view_name %>_materialized_view RETURNS TRIGGER LANGUAGE plpgsql AS $$
+    CREATE OR REPLACE FUNCTION metka_refresh_<%= view_name %>_materialized_view() RETURNS trigger LANGUAGE plpgsql AS $$
       BEGIN
         IF TG_OP = 'INSERT' AND NEW.<%= source_column_name %> IS NOT NULL THEN
           REFRESH MATERIALIZED VIEW CONCURRENTLY <%= view_name %>;
-        ELSIF TG_OP = 'UPDATE' AND OLD.<%= source_column_name %> IS NOT NULL AND NEW.<%= source_column_name %> IS NOT NULL THEN
-          REFRESH MATERIALIZED VIEW CONCURRENTLY <%= view_name %>;
-        ELSIF TG_OP = 'DELETE' AND OLD.<%= source_column_name %> IS NOT NULL THEN
+        END IF;
+
+        IF TG_OP = 'UPDATE' AND OLD.<%= source_column_name %> != NEW.<%= source_column_name %> THEN
           REFRESH MATERIALIZED VIEW CONCURRENTLY <%= view_name %>;
         END IF;
 
-      RETURN NULL;
-    END $$;
+        IF TG_OP = 'DELETE' AND OLD.<%= source_column_name %> IS NOT NULL THEN
+          REFRESH MATERIALIZED VIEW CONCURRENTLY <%= view_name %>;
+        END IF;
+        RETURN NEW;
+      END $$;
 
-    CREATE OR REPLACE MATERIALZIED VIEW <%= view_name %> AS
+    DROP MATERIALIZED VIEW IF EXISTS <%= view_name %>;
+    CREATE MATERIALIZED VIEW <%= view_name %> AS
+      SELECT UNNEST
+        ( <%= source_column_name %> ) AS <%= source_column_name.singularize %>_name,
+        COUNT ( * ) AS taggings_count
+      FROM
+        <%= source_table_name %>
+      GROUP BY
+        <%= source_column_name.singularize %>_name;
 
-    SELECT UNNEST
-      ( <%= source_column_name %> ) AS <%= source_column_name.singularize %>_name,
-      COUNT ( * ) AS taggings_count
-    FROM
-      <%= source_table_name %>
-    GROUP BY
-      <%= source_column_name.singularize %>_name;
+    CREATE UNIQUE INDEX idx_<%= source_table_name %>_<%= source_column_name %> ON <%= view_name %>(<%= source_column_name.singularize %>_name);
 
     CREATE TRIGGER metka_on_<%= source_table_name %>
-    BEFORE UPDATE OR INSERT OR DELETE ON <%= source_table_name %> FOR EACH ROW
-    EXECUTE PROCEDURE metka_refresh_<%= view_name %>_materialized_view();    
+    AFTER UPDATE OR INSERT OR DELETE ON <%= source_table_name %> FOR EACH ROW
+    EXECUTE PROCEDURE metka_refresh_<%= view_name %>_materialized_view();
+    SQL
   end
 
   def down
     execute <<-SQL
-      DROP VIEW <%= view_name %>;
+      DROP TRIGGER IF EXISTS metka_on_<%= source_table_name %> ON <%= source_table_name %>;
+      DROP FUNCTION IF EXISTS metka_refresh_<%= view_name %>_materialized_view;
+      DROP MATERIALIZED VIEW IF EXISTS <%= view_name %>;
     SQL
   end
 end

data/lib/metka/generic_parser.rb

@@ -16,11 +16,37 @@ module Metka
       TagList.new.tap do |tag_list|
         case value
         when String
-          tag_list.merge value.split(',').map(&:strip).reject(&:empty?)
+          value = value.to_s.dup
+          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 joined_delimiter).map(&:strip).reject(&:empty?)
         when Enumerable
           tag_list.merge value.reject(&:empty?)
         end
       end
     end
+
+    private
+
+    def gsub_quote_pattern!(tag_list, value, pattern)
+      value.gsub!(pattern) {
+        tag_list.add(Regexp.last_match[2])
+        ''
+      }
+    end
+
+    def joined_delimiter
+      delimeter = Metka.config.delimiter
+      delimeter.is_a?(Array) ? delimeter.join('|') : delimeter
+    end
+
+    def single_quote_pattern
+      /(\A|#{joined_delimiter})\s*'(.*?)'\s*(?=#{joined_delimiter}\s*|\z)/
+    end
+
+    def double_quote_pattern
+      /(\A|#{joined_delimiter})\s*"(.*?)"\s*(?=#{joined_delimiter}\s*|\z)/
+    end
   end
 end

data/lib/metka/model.rb

@@ -1,33 +1,47 @@
 # frozen_string_literal: true
 
-require 'active_support/concern'
-
 module Metka
-  # Extends AR model with methods to use tags
-  module Model
-    extend ActiveSupport::Concern
-
-    included do
-      scope :tagged_with, ->(tags, options = {}) do
-        tag_list = Metka.config.parser.instance.call(tags)
-        options = options.dup
-
-        return none if tag_list.empty?
+  def self.Model(column:, **options)
+    Metka::Model.new(column: column, **options)
+  end
 
-        where(::Metka::QueryBuilder.new.call(self, 'tags', tag_list, options))
-      end
+  class Model < Module
+    def initialize(column: , **options)
+      @column = column
+      @options = options
     end
 
-    def tag_list=(v)
-      self.tags = Metka.config.parser.instance.call(v).to_a
-      self.tags = nil if tags.empty?
-    end
+    def included(base)
+      column = @column
+      parser = ->(tags) {
+        @options[:parser] ? @options[:parser].call(tags) : Metka.config.parser.instance.call(tags)
+      }
+
+      search_by_tags = ->(model, tags, column, **options) {
+        parsed_tag_list = parser.call(tags)
+        if options[:without].present?
+          model.where.not(::Metka::QueryBuilder.new.call(model, column, parsed_tag_list, options))
+        else
+          return model.none if parsed_tag_list.empty?
+          model.where(::Metka::QueryBuilder.new.call(model, column, parsed_tag_list, options))
+        end
+      }
+
+      base.class_eval do
+        scope "with_all_#{column}", ->(tags) { search_by_tags.call(self, tags, column) }
+        scope "with_any_#{column}", ->(tags) { search_by_tags.call(self, tags, column, { any: true }) }
+        scope "without_all_#{column}", ->(tags) { search_by_tags.call(self, tags, column, { exclude_all: true, without: true }) }
+        scope "without_any_#{column}", ->(tags) { search_by_tags.call(self, tags, column, { exclude_any: true, without: true }) }
+      end
 
-    def tag_list
-      Metka.config.parser.instance.call(tags)
-    end
+      base.define_method(column.singularize + '_list=') do |v|
+        self.write_attribute(column, parser.call(v).to_a)
+        self.write_attribute(column, nil) if self.send(column).empty?
+      end
 
-    module ClassMethods # :nodoc:
+      base.define_method(column.singularize + '_list') do
+        parser.call(self.send(column))
+      end
     end
   end
-end
+end

data/lib/metka/query_builder.rb

@@ -1,14 +1,18 @@
 # frozen_string_literal: true
 
-require_relative 'query_builder/exclude_tags_query'
+require_relative 'query_builder/base_query'
+require_relative 'query_builder/exclude_all_tags_query'
+require_relative 'query_builder/exclude_any_tags_query'
 require_relative 'query_builder/any_tags_query'
 require_relative 'query_builder/all_tags_query'
 
 module Metka
   class QueryBuilder
     def call(taggable_model, column, tag_list, options)
-      if options[:exclude].present?
-        ExcludeTagsQuery.new(taggable_model, tag_model, tagging_model, tag_list, options).build
+      if options[:exclude_all].present?
+        ExcludeAllTagsQuery.instance.call(taggable_model, column, tag_list)
+      elsif options[:exclude_any].present?
+        ExcludeAnyTagsQuery.instance.call(taggable_model, column, tag_list)
       elsif options[:any].present?
         AnyTagsQuery.instance.call(taggable_model, column, tag_list)
       else

data/lib/metka/query_builder/all_tags_query.rb

@@ -1,26 +1,11 @@
 # frozen_string_literal: true
 
 module Metka
-  class AllTagsQuery
-    include Singleton
+  class AllTagsQuery < BaseQuery
+    private
 
-    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('@>', column_cast, value_cast)
+    def infix_operator
+      '@>'
     end
   end
 end

data/lib/metka/query_builder/any_tags_query.rb

@@ -1,28 +1,11 @@
 # frozen_string_literal: true
 
-require 'singleton'
-
 module Metka
-  class AnyTagsQuery
-    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[]')]
-      )
+  class AnyTagsQuery < BaseQuery
+    private
 
-      Arel::Nodes::InfixOperation.new('&&', column_cast, value_cast)
+    def infix_operator
+      '&&'
     end
   end
 end

data/lib/metka/query_builder/base_query.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+require 'singleton'
+
+module Metka
+  class BaseQuery
+    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)
+    end
+  end
+end

data/lib/metka/query_builder/exclude_all_tags_query.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Metka
+  class ExcludeAllTagsQuery< BaseQuery
+    private
+
+    def infix_operator
+      '@>'
+    end
+  end
+end

data/lib/metka/query_builder/exclude_any_tags_query.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Metka
+  class ExcludeAnyTagsQuery< BaseQuery
+    private
+
+    def infix_operator
+      '&&'
+    end
+  end
+end

data/lib/metka/version.rb

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

data/metka.gemspec

@@ -7,8 +7,8 @@ require 'metka/version'
 Gem::Specification.new do |spec|
   spec.name = 'metka'
   spec.version = Metka::VERSION
-  spec.authors = ['Igor Alexandrov']
-  spec.email = ['igor.alexandrov@gmail.com']
+  spec.authors = ['Igor Alexandrov', 'Andrey Morozov']
+  spec.email = ['igor.alexandrov@gmail.com', 'andrey.morozov@jetrockets.ru']
 
   spec.summary = 'Rails tagging system based on PostgreSQL arrays'
   spec.description = 'Rails tagging system based on PostgreSQL arrays'
@@ -25,15 +25,17 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'dry-configurable'
-  spec.add_dependency 'rails', '>= 4.2'
+  spec.add_dependency 'rails', '~> 5.1'
 
   spec.add_development_dependency 'ammeter'
+  spec.add_development_dependency 'pry', '~> 0.12.2'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'faker'
   spec.add_development_dependency 'jetrockets-standard', '~> 1.0.1'
   spec.add_development_dependency 'pg'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rspec-rails'
+  spec.add_development_dependency 'rspec', '~> 3.9'
+  spec.add_development_dependency 'rspec-rails', '~> 3.9'
   spec.add_development_dependency 'timecop'
+  spec.add_development_dependency 'database_cleaner'
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: metka
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Igor Alexandrov
+- Andrey Morozov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-29 00:00:00.000000000 Z
+date: 2019-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -28,16 +29,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: ammeter
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +53,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -126,18 +141,32 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
+- !ruby/object:Gem::Dependency
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +180,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -167,6 +196,7 @@ dependencies:
 description: Rails tagging system based on PostgreSQL arrays
 email:
 - igor.alexandrov@gmail.com
+- andrey.morozov@jetrockets.ru
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -184,6 +214,9 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- gemfiles/rails5.gemfile
+- gemfiles/rails52.gemfile
+- gemfiles/rails6.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
@@ -194,7 +227,9 @@ files:
 - lib/metka/query_builder.rb
 - lib/metka/query_builder/all_tags_query.rb
 - lib/metka/query_builder/any_tags_query.rb
-- lib/metka/query_builder/exclude_tags_query.rb
+- lib/metka/query_builder/base_query.rb
+- lib/metka/query_builder/exclude_all_tags_query.rb
+- lib/metka/query_builder/exclude_any_tags_query.rb
 - lib/metka/tag_list.rb
 - lib/metka/version.rb
 - metka.gemspec
@@ -217,7 +252,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Rails tagging system based on PostgreSQL arrays

data/lib/metka/query_builder/exclude_tags_query.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-module Metka
-  class ExcludeTagsQuery
-  end
-end