tag_columns 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7ff5c636e80445d9004a6a73f81bb00c2759bd52
-  data.tar.gz: cc7a8f4f24b8c444cca1d505bd2c20d0c536271c
+SHA256:
+  metadata.gz: 76c6ce1985882f48d00cd3120f5364f66d253a491f885c4a35803c1289e79af3
+  data.tar.gz: 01454b2b479b28064e9904f80c89da5ddbd5c99515de50a8f5fa1d1faf3f1f0d
 SHA512:
-  metadata.gz: b94d8debbfc4bebd2dfd6ccfb2e42e0b28f8c31473bc089b37c488fef2e91f065bc26e9334390ffd101465255e4103b848c3c11271694482b765cb6aa9c051ef
-  data.tar.gz: 5da5092f088610e1cc9bcb7d166ddf187a049037ce66f2d0b7ef80d64096cbef95e14f1024c881f619dacd5230b734aca9142dcdce40bf0d1ed0fc234f206292
+  metadata.gz: cc896caf28cc640b4a90511808ceb7f55c2b78383ec5121b392970990a31d4232aa49097a9f6daf887f231b87b033a7ffc92d8919c00a0e97bc7f51bb9cb544e
+  data.tar.gz: baa4821466bada3737e7bad0853ae9e1664621aff742475915bab595d63cec50db26264de6dcc2db291352dbf144150ac6b9f99f1e032597bf786dbf3fdeb0aa

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,68 +1,66 @@
 PATH
   remote: .
   specs:
-    tag_columns (0.1.6)
+    tag_columns (0.1.7)
       activesupport
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.1.5)
+    activesupport (5.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    binding_of_caller (0.7.2)
+    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 (10.0.2)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.4)
+    coveralls (0.8.22)
       json (>= 1.8, < 3)
-      simplecov (~> 0.14.1)
+      simplecov (~> 0.16.1)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.4)
       tins (~> 1.6)
-    debug_inspector (0.0.2)
-    docile (1.1.5)
-    i18n (0.9.5)
+    debug_inspector (0.0.3)
+    docile (1.3.1)
+    i18n (1.5.3)
       concurrent-ruby (~> 1.0)
     interception (0.5)
-    json (2.0.4)
-    method_source (0.8.2)
+    json (2.1.0)
+    method_source (0.9.2)
     minitest (5.11.3)
     os (1.0.0)
-    pry (0.10.4)
+    pry (0.12.2)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.2)
-      byebug (~> 9.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.6.0)
+      byebug (~> 10.0)
       pry (~> 0.10)
-    pry-rescue (1.4.5)
+    pry-rescue (1.5.0)
       interception (>= 0.5)
-      pry
-    pry-stack_explorer (0.4.9.2)
+      pry (>= 0.12.0)
+    pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    pry-test (0.6.4)
+    pry-test (0.6.5)
       os
       pry
       pry-byebug
       pry-rescue
       pry-stack_explorer
-    rake (12.0.0)
-    simplecov (0.14.1)
-      docile (~> 1.1.0)
+    rake (12.3.2)
+    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)
+    term-ansicolor (1.7.1)
       tins (~> 1.0)
     thor (0.19.4)
     thread_safe (0.3.6)
-    tins (1.13.2)
+    tins (1.20.2)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
 
@@ -76,4 +74,4 @@ DEPENDENCIES
   tag_columns!
 
 BUNDLED WITH
-   1.16.0
+   1.17.2

data/README.md

@@ -1,6 +1,5 @@
-[![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/)
+[![Lines of Code](http://img.shields.io/badge/lines_of_code-68-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)
-[![Dependency Status](http://img.shields.io/gemnasium/hopsoft/tag_columns.svg?style=flat)](https://gemnasium.com/hopsoft/tag_columns)
 [![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)

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,29 +20,46 @@ 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
 
-        scope :"with_#{method_name}",        -> { where("#{quoted_column_name}::text[] IS NOT NULL").where("#{quoted_column_name}::text[] != '{}'") }
-        scope :"without_#{method_name}",     -> { where("#{quoted_column_name}::text[] IS NULL").or where("#{quoted_column_name}::text[] = '{}'") }
-        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) { where.not id: public_send(:"with_any_#{method_name}", *tags) }
+        scope :"without_all_#{method_name}", ->(*tags) { where.not id: public_send(:"with_all_#{method_name}", *tags) }
+
+        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)
@@ -54,7 +71,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.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tag_columns
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Nathan Hopkins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-05 00:00:00.000000000 Z
+date: 2019-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -102,8 +102,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.0.1
 signing_key: 
 specification_version: 4
 summary: Fast & simple Rails ActiveRecord model tagging using PostgreSQL's Array datatype