tag_columns 0.1.4 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: defa7c70b8eab8d413f513c5b9941b1e5511ae49
-  data.tar.gz: e4beea230867f5bacb9c7ead7ab372bc323ee18c
+SHA256:
+  metadata.gz: 1bb5849e125d7d342653151b9376d43d904867a31c05df4716efde6f7a91d608
+  data.tar.gz: 55a5b086ac67b2cde68c7befd6707d084d49e388357a940d21e1500d764c8a2e
 SHA512:
-  metadata.gz: cc061350f163cb0b9ba87ac398c48dbbf676acf6e7d8dd737e71848d3ed7e6072aa107d4c1c4990c90d150f9af6999f5b50c2481d1caaf1ec5fa9e402c8b7bfe
-  data.tar.gz: 61f90575de2bf67f1d252bf4b6f94d109c504434a03c1f8ec5a345e8eb53f6fc9f2780204105970a6a028e7cf9d008f3e79c07e7d466cef178f500fb241bfbec
+  metadata.gz: f6fc69ae96f44815701774dee9b58fb72d51080c0c5930ddefa1cd2ee14a9ac444374cf1939b5a7133fdd56341a6be6c9410892476b6f6e83ee29c90c6115436
+  data.tar.gz: 46f4f957e0f95c4d4177345f7bcffa3ce46416f3d9a6d93eb47e4e6c619dabe423a32ab31e0e5fcaddeb1a7f71314f37d107f99e63643c550ab1f2259a8c7c2f

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in tag_columns.gemspec
 gemspec

data/Gemfile.lock

@@ -1,82 +1,99 @@
 PATH
   remote: .
   specs:
-    tag_columns (0.1.4)
+    tag_columns (0.1.9)
       activesupport
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.1.2)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    ast (2.3.0)
-    binding_of_caller (0.7.2)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    ast (2.4.1)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
-    byebug (9.0.6)
-    coderay (1.1.1)
-    concurrent-ruby (1.0.5)
-    coveralls (0.8.20)
+    byebug (11.1.3)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.7)
+    coveralls (0.8.23)
       json (>= 1.8, < 3)
-      simplecov (~> 0.14.1)
+      simplecov (~> 0.16.1)
       term-ansicolor (~> 1.3)
-      thor (~> 0.19.4)
+      thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
-    debug_inspector (0.0.2)
-    docile (1.1.5)
-    i18n (0.8.6)
+    debug_inspector (0.0.3)
+    docile (1.3.2)
+    i18n (1.8.5)
+      concurrent-ruby (~> 1.0)
     interception (0.5)
-    json (2.0.4)
-    method_source (0.8.2)
-    minitest (5.10.3)
-    os (1.0.0)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    powerpack (0.1.1)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.2)
-      byebug (~> 9.0)
-      pry (~> 0.10)
-    pry-rescue (1.4.5)
+    json (2.3.1)
+    method_source (1.0.0)
+    minitest (5.14.1)
+    os (1.1.1)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
+    pry-rescue (1.5.2)
       interception (>= 0.5)
-      pry
-    pry-stack_explorer (0.4.9.2)
-      binding_of_caller (>= 0.7)
-      pry (>= 0.9.11)
-    pry-test (0.6.4)
+      pry (>= 0.12.0)
+    pry-stack_explorer (0.5.1)
+      binding_of_caller (~> 0.7)
+      pry (~> 0.13)
+    pry-test (0.6.6)
       os
       pry
       pry-byebug
       pry-rescue
       pry-stack_explorer
-    rainbow (2.2.1)
-    rake (12.0.0)
-    rubocop (0.48.1)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+    rainbow (3.0.0)
+    rake (13.0.1)
+    regexp_parser (1.7.1)
+    rexml (3.2.4)
+    rubocop (0.89.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.1.1)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
+      rexml
+      rubocop-ast (>= 0.3.0, < 1.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
-    simplecov (0.14.1)
-      docile (~> 1.1.0)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.3.0)
+      parser (>= 2.7.1.4)
+    rubocop-performance (1.7.1)
+      rubocop (>= 0.82.0)
+    ruby-progressbar (1.10.1)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    slop (3.6.0)
-    term-ansicolor (1.5.0)
+    simplecov-html (0.10.2)
+    standard (0.5.2)
+      rubocop (~> 0.89.1)
+      rubocop-performance (~> 1.7.1)
+    standardrb (1.0.0)
+      standard
+    sync (0.5.0)
+    term-ansicolor (1.7.1)
       tins (~> 1.0)
-    thor (0.19.4)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    tins (1.13.2)
-    tzinfo (1.2.3)
+    tins (1.25.0)
+      sync
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    unicode-display_width (1.2.1)
+    unicode-display_width (1.7.0)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby
@@ -85,8 +102,8 @@ DEPENDENCIES
   coveralls
   pry-test
   rake
-  rubocop
+  standardrb
   tag_columns!
 
 BUNDLED WITH
-   1.14.6
+   1.17.2

data/README.md

@@ -1,16 +1,12 @@
-[![Lines of Code](http://img.shields.io/badge/lines_of_code-53-brightgreen.svg?style=flat)](http://blog.codinghorror.com/the-best-code-is-no-code-at-all/)
-[![Code Status](http://img.shields.io/codeclimate/github/hopsoft/tag_columns.svg?style=flat)](https://codeclimate.com/github/hopsoft/tag_columns)
-[![Dependency Status](http://img.shields.io/gemnasium/hopsoft/tag_columns.svg?style=flat)](https://gemnasium.com/hopsoft/tag_columns)
+[![Lines of Code](http://img.shields.io/badge/lines_of_code-88-brightgreen.svg?style=flat)](http://blog.codinghorror.com/the-best-code-is-no-code-at-all/)
+[![Maintainability](https://api.codeclimate.com/v1/badges/7503486b1bb494b5d976/maintainability)](https://codeclimate.com/github/hopsoft/tag_columns/maintainability)
 [![Build Status](http://img.shields.io/travis/hopsoft/tag_columns.svg?style=flat)](https://travis-ci.org/hopsoft/tag_columns)
 [![Coverage Status](https://img.shields.io/coveralls/hopsoft/tag_columns.svg?style=flat)](https://coveralls.io/r/hopsoft/tag_columns?branch=master)
 [![Downloads](http://img.shields.io/gem/dt/tag_columns.svg?style=flat)](http://rubygems.org/gems/tag_columns)
 
-[![Sponsor](https://app.codesponsor.io/embed/QMSjMHrtPhvfmCnk5Hbikhhr/hopsoft/tag_columns.svg)](https://app.codesponsor.io/link/QMSjMHrtPhvfmCnk5Hbikhhr/hopsoft/tag_columns)
-
 # TagColumns
 
 Fast & simple Rails ActiveRecord model tagging using [PostgreSQL's](https://www.postgresql.org/) [Array datatype](https://www.postgresql.org/docs/current/static/arrays.html).
-
 *Similar to [acts_as_taggable_on](https://github.com/mbleigh/acts-as-taggable-on) but lighter weight with fewer features.*
 *Also, be sure to check out [acts_as_taggable_array_on](https://github.com/tmiyamon/acts-as-taggable-array-on).*
 
@@ -33,7 +29,7 @@ gem "tag_columns"
 # db/migrate/TIMESTAMP_add_groups_to_user.rb
 class AddGroupsToUser < ActiveRecord::Migration[5.0]
   def change
-    add_column :users, :groups, :string, array: true, default: "{}", null: false
+    add_column :users, :groups, :string, array: true, default: [], null: false
     add_index :users, :groups, using: "gin"
   end
 end
@@ -61,6 +57,8 @@ is_reader_or_writer  = user.has_any_groups?(:reader, :writer)
 is_reader_and_writer = user.has_all_groups?(:reader, :writer)
 
 # finding tagged records
+assigned                = User.with_groups
+unassigned              = User.without_groups
 writers                 = User.with_any_groups(:writer)
 non_writers             = User.without_any_groups(:writer)
 readers_or_writers      = User.with_any_groups(:reader, :writer)

data/bin/standardize

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+bundle exec standardrb --fix

data/lib/tag_columns.rb

@@ -3,10 +3,10 @@ require "active_support/core_ext/string/inflections"
 require "tag_columns/version"
 
 module TagColumns
-  extend ::ActiveSupport::Concern
+  extend ActiveSupport::Concern
 
   module ClassMethods
-    def tag_columns_sanitize_list(values=[])
+    def tag_columns_sanitize_list(values = [])
       values.select(&:present?).map(&:to_s).uniq.sort
     end
 
@@ -20,27 +20,68 @@ module TagColumns
       @tag_columns.each do |column_name, initialized|
         next if initialized
 
+        column_name = column_name.to_s
         method_name = column_name.downcase
-        quoted_column_name = "#{quoted_table_name}.#{connection.quote_column_name column_name}"
-
-        define_singleton_method :"unique_#{method_name}" do |conditions='true'|
-          result = connection.execute <<~QUERY
-            SELECT DISTINCT unnest(#{quoted_column_name}) AS unique_#{method_name}
-            FROM #{quoted_table_name}
-            WHERE #{where(conditions).to_sql.split(/ WHERE /i).last}
-            AND #{quoted_column_name} IS NOT NULL
-            AND #{quoted_column_name} != '{}'
-            ORDER BY unique_#{method_name}
-          QUERY
-          result.values.flatten
+
+        define_singleton_method :"unique_#{method_name}" do |conditions = "true"|
+          unnest = Arel::Nodes::NamedFunction.new("unnest", [arel_table[column_name]])
+          query = distinct.select(unnest)
+            .where(conditions)
+            .where.not(arel_table[column_name].eq(nil))
+            .where.not(arel_table[column_name].eq("{}"))
+          connection.execute(query.to_sql).values.flatten.sort
+        end
+
+        define_singleton_method :"#{method_name}_cloud" do |conditions = "true"|
+          unnest = Arel::Nodes::NamedFunction.new("unnest", [arel_table[column_name]])
+          query = unscoped.select(unnest.as("tag"))
+            .where(conditions)
+            .where.not(arel_table[column_name].eq(nil))
+            .where.not(arel_table[column_name].eq("{}"))
+          from(query).group("tag").order("tag").pluck(Arel.sql("tag, count(*) as count"))
         end
 
-        scope :"with_any_#{method_name}",    ->(*tags) { where "#{quoted_column_name} && ARRAY[?]::varchar[]", tag_columns_sanitize_list(tags) }
-        scope :"with_all_#{method_name}",    ->(*tags) { where "#{quoted_column_name} @> ARRAY[?]::varchar[]", tag_columns_sanitize_list(tags) }
-        scope :"without_any_#{method_name}", ->(*tags) { where.not "#{quoted_column_name} && ARRAY[?]::varchar[]", tag_columns_sanitize_list(tags) }
-        scope :"without_all_#{method_name}", ->(*tags) { where.not "#{quoted_column_name} @> ARRAY[?]::varchar[]", tag_columns_sanitize_list(tags) }
+        scope :"with_#{method_name}", -> {
+          where.not(arel_table[column_name].eq(nil)).where.not(arel_table[column_name].eq("{}"))
+        }
+
+        scope :"without_#{method_name}", -> {
+          where(arel_table[column_name].eq(nil)).or(where(arel_table[column_name].eq("{}")))
+        }
+
+        scope :"with_any_#{method_name}", ->(*tags) {
+          column_cast = Arel::Nodes::NamedFunction.new("CAST", [arel_table[column_name].as("text[]")])
+          value = Arel::Nodes::SqlLiteral.new(sanitize_sql_array(["ARRAY[?]", tag_columns_sanitize_list(tags)]))
+          value_cast = Arel::Nodes::NamedFunction.new("CAST", [value.as("text[]")])
+          overlap = Arel::Nodes::InfixOperation.new("&&", column_cast, value_cast)
+          where overlap
+        }
 
-        before_validation Proc.new { self[column_name] = self.class.tag_columns_sanitize_list(self[column_name]) }
+        scope :"with_all_#{method_name}", ->(*tags) {
+          column_cast = Arel::Nodes::NamedFunction.new("CAST", [arel_table[column_name].as("text[]")])
+          value = Arel::Nodes::SqlLiteral.new(sanitize_sql_array(["ARRAY[?]", tag_columns_sanitize_list(tags)]))
+          value_cast = Arel::Nodes::NamedFunction.new("CAST", [value.as("text[]")])
+          contains = Arel::Nodes::InfixOperation.new("@>", column_cast, value_cast)
+          where contains
+        }
+
+        scope :"without_any_#{method_name}", ->(*tags) {
+          column_cast = Arel::Nodes::NamedFunction.new("CAST", [arel_table[column_name].as("text[]")])
+          value = Arel::Nodes::SqlLiteral.new(sanitize_sql_array(["ARRAY[?]", tag_columns_sanitize_list(tags)]))
+          value_cast = Arel::Nodes::NamedFunction.new("CAST", [value.as("text[]")])
+          overlap = Arel::Nodes::InfixOperation.new("&&", column_cast, value_cast)
+          where.not overlap
+        }
+
+        scope :"without_all_#{method_name}", ->(*tags) {
+          column_cast = Arel::Nodes::NamedFunction.new("CAST", [arel_table[column_name].as("text[]")])
+          value = Arel::Nodes::SqlLiteral.new(sanitize_sql_array(["ARRAY[?]", tag_columns_sanitize_list(tags)]))
+          value_cast = Arel::Nodes::NamedFunction.new("CAST", [value.as("text[]")])
+          contains = Arel::Nodes::InfixOperation.new("@>", column_cast, value_cast)
+          where.not contains
+        }
+
+        before_validation -> { self[column_name] = self.class.tag_columns_sanitize_list(self[column_name]) }
 
         define_method :"has_any_#{method_name}?" do |*values|
           values = self.class.tag_columns_sanitize_list(values)
@@ -52,7 +93,7 @@ module TagColumns
           values = self.class.tag_columns_sanitize_list(values)
           existing = self.class.tag_columns_sanitize_list(self[column_name] || [])
           (values & existing).size == values.size
-       end
+        end
 
         alias_method :"has_#{method_name.singularize}?", :"has_all_#{method_name}?"
 

data/lib/tag_columns/version.rb

@@ -1,3 +1,3 @@
 module TagColumns
-  VERSION = "0.1.4"
+  VERSION = "0.1.9"
 end

data/tag_columns.gemspec

@@ -0,0 +1,21 @@
+require File.expand_path("../lib/tag_columns/version", __FILE__)
+
+Gem::Specification.new do |gem|
+  gem.name = "tag_columns"
+  gem.license = "MIT"
+  gem.version = TagColumns::VERSION
+  gem.authors = ["Nathan Hopkins"]
+  gem.email = ["natehop@gmail.com"]
+  gem.homepage = "https://github.com/hopsoft/tag_columns"
+  gem.summary = "Fast & simple Rails ActiveRecord model tagging using PostgreSQL's Array datatype"
+
+  gem.files = Dir["lib/**/*.rb", "bin/*", "[A-Z]*"]
+  gem.test_files = Dir["test/**/*.rb"]
+
+  gem.add_dependency "activesupport"
+
+  gem.add_development_dependency "rake"
+  gem.add_development_dependency "pry-test"
+  gem.add_development_dependency "coveralls"
+  gem.add_development_dependency "standardrb"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tag_columns
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.9
 platform: ruby
 authors:
 - Nathan Hopkins
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-01 00:00:00.000000000 Z
+date: 2020-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: standardrb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -80,7 +80,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - natehop@gmail.com
 executables: []
@@ -94,14 +94,16 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- bin/standardize
 - lib/tag_columns.rb
 - lib/tag_columns/version.rb
+- tag_columns.gemspec
 - test/test_tag_columns.rb
 homepage: https://github.com/hopsoft/tag_columns
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -116,9 +118,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Fast & simple Rails ActiveRecord model tagging using PostgreSQL's Array datatype
 test_files: