push_type_core 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6aa55009b4f8a6c03b6fb102406df0571d67b025
-  data.tar.gz: 84db15a256012cfade4359e65df44e3ad25c6e0b
+  metadata.gz: 16d0e6e76e9303633cd1eeae3cf04f46bfddacdd
+  data.tar.gz: cfd2d279b8ea9c0b1795aac50ede8807a45fe10a
 SHA512:
-  metadata.gz: 23d987c95bedbc81a6391c0204cb1d6b499b8dc98ad70d291f0a8f348423264b0cf76a030a6e233d0b11644363726ac1a5f307203354ab3fa895bff600408225
-  data.tar.gz: 1bd32879b186951bbf24ac36320fdbd101b75547040a7e9f30e0fdba476cc12e83dc2941f6741d000a6e7ae0d71e0db8e6ff69197b5bc1757e620c897cd4f5d7
+  metadata.gz: 179816006e6ef88d2e7bbaaa1fd69234b19a88f715e450197eaed905730660dfaf455711fd14389cf16257b6710d08b2504fe34e2882e70236a7778294bc6858
+  data.tar.gz: a33b0d15e08c116d449b76d804384276b6f88db9b2428aa619667a3c6beff46ea1686f9c72b3d1a0e2154844a0acfc2014b3ca80e8b9541237b6633dad743a70

data/app/fields/push_type/tag_list_field.rb

@@ -1,5 +1,3 @@
-require 'push_type/tag_list_query'
-
 module PushType
   class TagListField < PushType::FieldType
 
@@ -12,8 +10,66 @@ module PushType
     end
 
     initialized_on_node do |object, field|
-      object.define_singleton_method "all_#{ field.name }".to_sym do |*args|
-        TagListQuery.new(field.name, object.name.underscore.to_sym).all *args
+
+      object.class_eval do
+
+        # Dynamically define standard scope .with_all_`field_name`
+        # Returns ActiveRecord::Relation
+        #
+        scope "with_all_#{ field.name }".to_sym, ->(*args) {
+          raise ArgumentError, 'wrong number of arguments' unless args.present?
+          tags = args[0].is_a?(Array) ? args[0] : args
+
+          where(["field_store->'tags' ?& ARRAY[:tags]", { tags: tags }])
+        }
+
+
+        # Dynamically define class method .with_any_`field_name`
+        # Returns Array
+        #
+        define_singleton_method "with_any_#{ field.name }".to_sym do |*args, &block|
+          raise ArgumentError, 'wrong number of arguments' unless args.present?
+          tags = args[0].is_a?(Array) ? args[0] : args
+
+          composed_scope = (
+            block.respond_to?(:call) ? block.call : all
+          ).where(["field_store->'#{ field.name }' ?| ARRAY[:tags]", { tags: tags }])
+
+          t   = Arel::Table.new('t',  ActiveRecord::Base)
+          ct  = Arel::Table.new('ct', ActiveRecord::Base)
+
+          arr_sql = Arel.sql "ARRAY[#{ tags.map { |t| Arel::Nodes::Quoted.new(t).to_sql }.join(', ') }]"
+          any_tags_func = Arel::Nodes::NamedFunction.new('ANY', [arr_sql])
+
+          lateral = ct
+            .project(Arel.sql('e').count(true).as('ct'))
+            .from(Arel.sql "jsonb_array_elements_text(t.field_store->'#{ field.name }') e")
+            .where(Arel::Nodes::Equality.new Arel.sql('e'), any_tags_func)
+
+          query = t
+            .project(t[Arel.star])
+            .from(composed_scope.as('t'))
+            .join(Arel.sql ", LATERAL (#{ lateral.to_sql }) ct")
+            .order(ct[:ct].desc)
+
+          find_by_sql query.to_sql
+        end
+
+
+        # Dynamically define class method .all_`field_name`
+        # Returns Array
+        #
+        define_singleton_method "all_#{ field.name }".to_sym do |*args, &block|
+          composed_scope = block.respond_to?(:call) ? block.call : all
+          composed_scope.projections = []
+
+          query = composed_scope
+            .project(Arel.sql "jsonb_array_elements_text(field_store->'#{ field.name }') t")
+            .distinct
+            .order(Arel.sql 't')
+          connection.select_all(query.to_sql).rows.flatten
+        end
+
       end
     end
 

data/lib/push_type/version.rb

@@ -1,3 +1,3 @@
 module PushType
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

data/test/dummy/config/initializers/push_type.rb

@@ -33,6 +33,6 @@ PushType.setup do |config|
   #   secret_access_key:  ENV['SECRET_ACCESS_KEY_ID']
   # }
 
-  # config.dragonfly_secret = 'ecd8c099d97873bfcba21a3f63d298e86a7b4342be8493eb56b291d0ca46b187'
+  # config.dragonfly_secret = '35fe8a2c1976558822a17ce1b8467a821f5d6e78a7a2396eaf3212ab35c3f198'
 
 end

data/test/dummy/config/secrets.yml

@@ -11,10 +11,10 @@
 # if you're sharing your code publicly.
 
 development:
-  secret_key_base: b88deb276072e733b6a6b83a5d5362b6e21a3b0d083b025c5317c5f5a52c037bf58548da93d789c587f33d73484df50681fd5389ba378a9c3a2431cc1a01ad7f
+  secret_key_base: 6d3edcb0dc341ba9de0d6903d0807a89ecb267c0873d6106374e4a0f0b9bebc3d61126bff26ff0a655f302990ba8c5bd7beca17d03f1228eb9dfb1aeb8d23833
 
 test:
-  secret_key_base: 2bdc9c611035f1a8d28c68f1fccfc3a9917277fb2785620953a8d30c8665e88a0f5fd52195a4e815f63687233bc57fa358aad0a71d8531d64f252b44841d25c8
+  secret_key_base: dc233cacc45ce0389ddcfe8308585cf78b4c71db25ab442fa5fde21e32c98eb51e56f5551f124b00bda30d77d2db040ca5abecd23d1d992b53235ab0c3dc038a
 
 # Do not keep production secrets in the repository,
 # instead read values from the environment.

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150716155023) do
+ActiveRecord::Schema.define(version: 20150816155446) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"