tag_columns 0.1.5 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 24f11ec231a99f562784740d0fac6e7cff7c5d83
-  data.tar.gz: 07711c4b518ebc23d2204745a10612f4b2ffa7a5
+SHA256:
+  metadata.gz: 6ff159c5c446ddf8b7ed9c075a5bdc200d86f752be429de79b0fcfc96460d437
+  data.tar.gz: 6c94c7984d4edb22400d3a2c547d20217d1b6985f495aa56884695283b936655
 SHA512:
-  metadata.gz: 31d75863702077cfd2d87cd1ebd96feaab89beafbc3057b527196c8f3c1a2f106de80deb9c0a79581ad28df849a0bf3d2054f0a10178c466a877949718264449
-  data.tar.gz: 4bc98eab66d115fb8caf0f91c9a892d1c539f28e7f0c9a7b22763d2948b3bd01940bd1c4cdfff76a7f43f08cfc1ddd6156ba353cacc44001a76457089f2b04d4
+  metadata.gz: d57ab0bf42cc73ece60d40442fa009365246951b05bed00862dcba15a894e867c6cb8df7bcea0711123c05be31a9516e605275940e11743b296c2c92a4176a03
+  data.tar.gz: ae6222763a85f42eaea517c81bb065d81b3ccbf77a928948beb9f77c553b0d799c5f150473a18d4cc72f3bcdc981a1bc763bdb281c9622faabbf55fb325e8a8e

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.5)
+    tag_columns (0.1.10)
       activesupport
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.1.4)
+    activesupport (6.1.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    ast (2.3.0)
-    binding_of_caller (0.7.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    ast (2.4.2)
+    binding_of_caller (1.0.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.8)
+    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 (1.0.0)
+    docile (1.3.5)
+    i18n (1.8.8)
+      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.5.1)
+    method_source (1.0.0)
+    minitest (5.14.3)
+    os (1.1.1)
+    parallel (1.20.1)
+    parser (3.0.0.0)
+      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.6.1)
+      binding_of_caller (~> 1.0)
+      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.3)
+    regexp_parser (2.0.3)
+    rexml (3.2.4)
+    rubocop (1.8.1)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.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, < 3.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
+    rubocop-performance (1.9.2)
+      rubocop (>= 0.90.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    ruby-progressbar (1.11.0)
+    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.12.0)
+      rubocop (= 1.8.1)
+      rubocop-performance (= 1.9.2)
+    standardrb (1.0.0)
+      standard
+    sync (0.5.0)
+    term-ansicolor (1.7.1)
       tins (~> 1.0)
-    thor (0.19.4)
-    thread_safe (0.3.6)
-    tins (1.13.2)
-    tzinfo (1.2.3)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.2.1)
+    thor (1.1.0)
+    tins (1.28.0)
+      sync
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.0.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -85,8 +102,8 @@ DEPENDENCIES
   coveralls
   pry-test
   rake
-  rubocop
+  standardrb
   tag_columns!
 
 BUNDLED WITH
-   1.15.4
+   2.1.4

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-89-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).*
 
@@ -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/loc

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+cloc --exclude-dir=node_modules,test --include-ext=rb,js .

data/bin/standardize

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

data/lib/tag_columns.rb

@@ -3,10 +3,11 @@ 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 = [])
+      return [] if values.nil?
       values.select(&:present?).map(&:to_s).uniq.sort
     end
 
@@ -20,39 +21,80 @@ 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}::text[] && ARRAY[?]::text[]", tag_columns_sanitize_list(tags) }
-        scope :"with_all_#{method_name}",    ->(*tags) { where "#{quoted_column_name}::text[] @> ARRAY[?]::text[]", tag_columns_sanitize_list(tags) }
-        scope :"without_any_#{method_name}", ->(*tags) { where.not "#{quoted_column_name}::text[] && ARRAY[?]::text[]", tag_columns_sanitize_list(tags) }
-        scope :"without_all_#{method_name}", ->(*tags) { where.not "#{quoted_column_name}::text[] @> ARRAY[?]::text[]", 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)
-          existing = self.class.tag_columns_sanitize_list(self[column_name] || [])
+          existing = self.class.tag_columns_sanitize_list(self[column_name])
           (values & existing).present?
         end
 
         define_method :"has_all_#{method_name}?" do |*values|
           values = self.class.tag_columns_sanitize_list(values)
-          existing = self.class.tag_columns_sanitize_list(self[column_name] || [])
+          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.5"
+  VERSION = "0.1.10"
 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

data/tags

@@ -0,0 +1,12 @@
+!_TAG_FILE_FORMAT	2	/extended format; --format=1 will not append ;" to lines/
+!_TAG_FILE_SORTED	1	/0=unsorted, 1=sorted, 2=foldcase/
+!_TAG_PROGRAM_AUTHOR	Darren Hiebert	/dhiebert@users.sourceforge.net/
+!_TAG_PROGRAM_NAME	Exuberant Ctags	//
+!_TAG_PROGRAM_URL	http://ctags.sourceforge.net	/official site/
+!_TAG_PROGRAM_VERSION	5.8	//
+ClassMethods	lib/tag_columns.rb	/^  module ClassMethods$/;"	m	class:TagColumns
+TagColumns	lib/tag_columns.rb	/^module TagColumns$/;"	m
+TagColumns	lib/tag_columns/version.rb	/^module TagColumns$/;"	m
+TestTagColumns	test/test_tag_columns.rb	/^class TestTagColumns < PryTest::Test$/;"	c
+tag_columns	lib/tag_columns.rb	/^    def tag_columns(*column_names)$/;"	f	class:TagColumns.ClassMethods
+tag_columns_sanitize_list	lib/tag_columns.rb	/^    def tag_columns_sanitize_list(values = [])$/;"	f	class:TagColumns.ClassMethods

data/test/test_tag_columns.rb

@@ -4,8 +4,30 @@ Coveralls.wear!
 SimpleCov.command_name "pry-test"
 require_relative "../lib/tag_columns"
 
+class TagColumnsTester
+  include TagColumns
+end
+
 class TestTagColumns < PryTest::Test
-  test "stub" do
-    assert true
+  include TagColumns
+
+  test "tag_columns_sanitize_list with no arg" do
+    assert TagColumnsTester.tag_columns_sanitize_list == []
+  end
+
+  test "tag_columns_sanitize_list with empty list arg" do
+    assert TagColumnsTester.tag_columns_sanitize_list([]) == []
+  end
+
+  test "tag_columns_sanitize_list with nil arg" do
+    assert TagColumnsTester.tag_columns_sanitize_list(nil) == []
+  end
+
+  test "tag_columns_sanitize_list with upper case list" do
+    assert TagColumnsTester.tag_columns_sanitize_list(%w[C B A]) == %w[A B C]
+  end
+
+  test "tag_columns_sanitize_list with lower case list" do
+    assert TagColumnsTester.tag_columns_sanitize_list(%w[c b a]) == %w[a b c]
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tag_columns
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.10
 platform: ruby
 authors:
 - Nathan Hopkins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-09 00:00:00.000000000 Z
+date: 2021-02-12 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:
     - - ">="
@@ -93,9 +93,13 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/loc
 - bin/setup
+- bin/standardize
 - lib/tag_columns.rb
 - lib/tag_columns/version.rb
+- tag_columns.gemspec
+- tags
 - test/test_tag_columns.rb
 homepage: https://github.com/hopsoft/tag_columns
 licenses:
@@ -116,8 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Fast & simple Rails ActiveRecord model tagging using PostgreSQL's Array datatype