arel-extensions 6.0.0.1 → 6.0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d95a12f5c8e5e48eebb56d5ab99ffc4fe80db96ee28041beede8dbfc8a8920cc
-  data.tar.gz: 5e9c19213eb0d7c0d43e2f506c5f08acc651b3f4e33e5ec62dc53d0b79c87ced
+  metadata.gz: '08c6ce3898d57f105c59837161e36e1fe45f25afd4daa95d54916bef1c3782e5'
+  data.tar.gz: 1f2efc0c80e2b25c826421126eb8d963a7244b1c386a7a0f871b46fcad701c11
 SHA512:
-  metadata.gz: fd222a989cb6374f50669d3a9ec6c7e5959b763e62bbdf6c8578db7bc4d3bc94281257c41d6c3927645ef6c5cdb6be3df6f786d8f81e1517772dfb880449ed66
-  data.tar.gz: 50669ec434c338f89fe2d5318a868e74afc3fbf388929788c94a54853eb0c4364916fcce9f908e8dc494bcf46b03a6fe5773cdc58e5445effe85e509e8d00414
+  metadata.gz: d5610a339bd005e10ef756715bf25b0cc96dc471e6fec233a8f9735e6c4bb05f50425aaf0f465b6d4e57c0320949ed80a6e93d46b399e1975a4753185112fac3
+  data.tar.gz: a5fde1fd877f44e52bde43595d4eb1237742f85ea338ad1a00597d075c5d0f30320bac95b41d5b58bf1460784035d51f14728702e22dd4cc401293137b28b1fb

data/.gitignore

@@ -1 +1,2 @@
 .DS_Store
+*.gem

data/Gemfile.lock

@@ -1,23 +1,23 @@
 PATH
   remote: .
   specs:
-    arel-extensions (6.0.0)
+    arel-extensions (6.0.0.2)
       activerecord (>= 6.0.0.rc1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.0.rc1)
-      activesupport (= 6.0.0.rc1)
-    activerecord (6.0.0.rc1)
-      activemodel (= 6.0.0.rc1)
-      activesupport (= 6.0.0.rc1)
-    activesupport (6.0.0.rc1)
+    activemodel (6.0.0.rc2)
+      activesupport (= 6.0.0.rc2)
+    activerecord (6.0.0.rc2)
+      activemodel (= 6.0.0.rc2)
+      activesupport (= 6.0.0.rc2)
+    activesupport (6.0.0.rc2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.1, >= 2.1.4)
+      zeitwerk (~> 2.1, >= 2.1.8)
     ansi (1.5.0)
     builder (3.2.3)
     concurrent-ruby (1.1.5)
@@ -36,7 +36,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    zeitwerk (2.1.6)
+    zeitwerk (2.1.9)
 
 PLATFORMS
   ruby

data/arel-extensions.gemspec

@@ -1,7 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name = 'arel-extensions'
-  gem.version = '6.0.0.1'
-  
+  gem.version = '6.0.0.4'
   gem.authors       = ["Jon Bracy"]
   gem.email         = ["jonbracy@gmail.com"]
   gem.summary       = %q{Adds support for missing SQL operators and functions to Arel}

data/lib/arel/visitors/sunstone_extensions.rb

@@ -2,7 +2,15 @@ module Arel
   module Visitors
     class Sunstone
       private
-      
+
+      def visit_Hash o, collector
+        value = {}
+        o.each do |key, value|
+          value[visit(key, collector)] = visit(value, collector)
+        end
+        value
+      end
+
       def visit_Arel_Nodes_Contains o, collector
         key = visit(o.left, collector)
         value = { contains: visit(o.right, collector) }
@@ -88,7 +96,7 @@ module Arel
       
       def visit_Arel_Nodes_HasAnyKey o, collector
         key = visit(o.left, collector)
-        value = {has_any_key: Array(o.right).map(&:to_s)}
+        value = { has_any_key: visit(Array(o.right), collector) }
         
         if key.is_a?(Hash)
           add_to_bottom_of_hash(key, value)

data/test/database.rb

@@ -22,6 +22,7 @@ ActiveRecord::Migration.suppress_messages do
     create_table "properties", force: :cascade do |t|
       t.string   "name",                 limit: 255
       t.tsvector 'vector_col'
+      t.jsonb     'metadata'
     end
 
   end

data/test/sunstone_test.rb

@@ -0,0 +1,98 @@
+require 'test_helper'
+
+class SunstoneTest < ActiveSupport::TestCase
+
+  # schema do
+  #   create_table "properties", force: :cascade do |t|
+  #     t.jsonb     'metadata'
+  #   end
+  # end
+
+  # class Property < ActiveRecord::Base
+  # end
+
+  # test "::filter json_column: STRING throws an error" do
+  #   assert_raises(ActiveRecord::UnkownFilterError) do
+  #     Property.filter(metadata: 'string').load
+  #   end
+  # end
+  
+  # test "::filter json_column: {eq: JSON_HASH}" do
+  #   query = Property.where(metadata: {eq: {json: 'string'}})
+  #   assert_equal(<<-SQL.strip.gsub(/\s+/, ' '), query.to_sql.strip)
+  #     SELECT "properties".*
+  #     FROM "properties"
+  #     WHERE "properties"."metadata" = '{\"json\":\"string\"}'
+  #   SQL
+  # end
+  
+  test "::filter json_column: {contains: JSON_HASH}" do
+    query = Property.where(Property.arel_attribute('metadata').contains({json: 'string'}))
+    assert_equal '', query.to_sar.path
+    # query = Property.where(metadata: {contains: {json: 'string'}})
+    # assert_equal(<<-SQL.strip.gsub(/\s+/, ' '), query.to_sql.strip)
+    #   SELECT "properties".*
+    #   FROM "properties"
+    #   WHERE "properties"."metadata" @> '{\"json\":\"string\"}'
+    # SQL
+  end
+
+  # test "::filter json_column: {contained_by: JSON_HASH}" do
+  #   query = Property.filter(metadata: {contained_by: {json: 'string'}})
+  #   assert_equal(<<-SQL.strip.gsub(/\s+/, ' '), query.to_sql.strip)
+  #     SELECT "properties".*
+  #     FROM "properties"
+  #     WHERE "properties"."metadata" <@ '{\"json\":\"string\"}'
+  #   SQL
+  # end
+  
+  # test "::filter json_column: {has_key: STRING}" do
+  #   query = Property.filter(metadata: {has_key: 'string'})
+  #   assert_equal(<<-SQL.strip.gsub(/\s+/, ' '), query.to_sql.strip)
+  #     SELECT "properties".*
+  #     FROM "properties"
+  #     WHERE "properties"."metadata" ? 'string'
+  #   SQL
+  # end
+  
+  # test "::filter json_column.subkey: {eq: JSON_HASH}" do
+  #   query = Property.filter("metadata.subkey" => {eq: 'string'})
+  #   assert_equal(<<-SQL.strip.gsub(/\s+/, ' '), query.to_sql.strip)
+  #     SELECT "properties".*
+  #     FROM "properties"
+  #     WHERE "properties"."metadata"#>'{subkey}' = 'string'
+  #   SQL
+  # end
+  
+  # test "::filter json_column: BOOLEAN" do
+  #   query = Property.filter(metadata: true)
+  #   assert_equal(<<-SQL.strip.gsub(/\s+/, ' '), query.to_sql.strip)
+  #     SELECT "properties".*
+  #     FROM "properties"
+  #     WHERE "properties"."metadata" IS NOT NULL
+  #   SQL
+    
+  #   query = Property.filter(metadata: "true")
+  #   assert_equal(<<-SQL.strip.gsub(/\s+/, ' '), query.to_sql.strip)
+  #     SELECT "properties".*
+  #     FROM "properties"
+  #     WHERE "properties"."metadata" IS NOT NULL
+  #   SQL
+    
+  #   query = Property.filter(metadata: false)
+  #   assert_equal(<<-SQL.strip.gsub(/\s+/, ' '), query.to_sql.strip)
+  #     SELECT "properties".*
+  #     FROM "properties"
+  #     WHERE "properties"."metadata" IS NULL
+  #   SQL
+    
+  #   query = Property.filter(metadata: "false")
+  #   assert_equal(<<-SQL.strip.gsub(/\s+/, ' '), query.to_sql.strip)
+  #     SELECT "properties".*
+  #     FROM "properties"
+  #     WHERE "properties"."metadata" IS NULL
+  #   SQL
+  # end
+
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arel-extensions
 version: !ruby/object:Gem::Version
-  version: 6.0.0.1
+  version: 6.0.0.4
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-26 00:00:00.000000000 Z
+date: 2019-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -148,6 +148,7 @@ files:
 - lib/arel/visitors/postgresql_extensions.rb
 - lib/arel/visitors/sunstone_extensions.rb
 - test/database.rb
+- test/sunstone_test.rb
 - test/test_helper.rb
 - test/ts_test.rb
 homepage: https://github.com/malomalo/arel-extensions
@@ -175,5 +176,6 @@ specification_version: 4
 summary: Adds support for missing SQL operators and functions to Arel
 test_files:
 - test/database.rb
+- test/sunstone_test.rb
 - test/test_helper.rb
 - test/ts_test.rb