wcc-contentful 1.0.0 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: ad34af3480e2e993b8046826ef3ca65b6f28ccf28e57e19cca79061a17766877
-  data.tar.gz: e0e214bf19721287af20502260033f595dcf461d2b5d31fd943c838b3ced204e
+SHA1:
+  metadata.gz: 5e0a14cd883ecb58fe7d8dd07963eeb83c8f3f7d
+  data.tar.gz: 445174542f3d500a9e2872f0887efc98aa2c6554
 SHA512:
-  metadata.gz: 1e67eacbb406c6269c0a43b6b7a1284836a357c9b9ff0ffe297ee188aeea6a2c96107b9a6fc127d2e622223f38797528e18e93485575068d7eae4a73a77f9375
-  data.tar.gz: c16f075caa26c9a9a0f0c22fe725eabf0b0c2900f4c58bac33fcb8ad42a10dee09ae257e2a91d71e06e878d1c7b8165dea28b1a5a791480f5c03e328f8635355
+  metadata.gz: f3928e46b2ad722c4bcd003225b3092fac6dd602f5ab79994767e134966fd2592b35c1df1301f65c41a95f270d2ac99255dc9971a0ca3dde818d0918676a0f79
+  data.tar.gz: f3d31807796c12b9407b1a6e9dcb6ef92cd8b95ee7dcdddcb6ee6c925c071f6c61bf5b5396807105ebaec1129891f6d7fd0729bfa5604a16d3f4ee1a6efdefa2

data/lib/wcc/contentful/active_record_shim.rb

@@ -14,7 +14,11 @@ module WCC::Contentful::ActiveRecordShim
   end
 
   def cache_key_with_version
-    "#{self.class.model_name}/#{id}-#{cache_version}"
+    "#{cache_key_without_version}-#{cache_version}"
+  end
+
+  def cache_key_without_version
+    "#{self.class.model_name}/#{id}"
   end
 
   def cache_version

data/lib/wcc/contentful/store/postgres_store.rb

@@ -253,12 +253,22 @@ module WCC::Contentful::Store
         end
 
         " AND t.data->#{quote_parameter_path(path)}" \
-          " ? $#{push_param(expected, params)}::text"
+          " @> to_jsonb($#{push_param(expected, params)})"
       end
 
+      PARAM_TYPES = {
+        String => 'text'
+
+        # These can be cast directly to jsonb
+        # Integer => 'jsonb'
+        # Float => 'jsonb'
+      }.freeze
+
       def push_param(param, params)
         params << param
-        params.length
+        param_type = PARAM_TYPES[param.class] || 'jsonb'
+
+        "#{params.length}::#{param_type}"
       end
 
       def quote_parameter_path(path)

data/lib/wcc/contentful/store/rspec_examples/basic_store.rb

@@ -546,6 +546,68 @@ RSpec.shared_examples 'basic store' do
       expect(found.dig('sys', 'id')).to eq('idTwo')
       expect(found.dig('fields', 'system', 'en-US')).to eq('Two')
     end
+
+    [
+      [Integer, proc { rand(-4_611_686_018_427_387_903..4_611_686_018_427_387_903) }],
+      [Float, proc { rand }]
+    ].each do |(type, generator)|
+      context "by #{type} equality" do
+        it 'can apply filter object' do
+          data =
+            1.upto(10).map do |i|
+              {
+                'sys' => { 'id' => "k#{i}", 'contentType' => { 'sys' => { 'id' => 'test1' } } },
+                'fields' => { type.to_s => { 'en-US' => generator.call } }
+              }
+            end
+
+          desired_value = generator.call
+          desired = {
+            'sys' => { 'id' => "k#{rand}", 'contentType' => { 'sys' => { 'id' => 'test1' } } },
+            'fields' => { type.to_s => { 'en-US' => desired_value } }
+          }
+
+          data << desired
+          data.shuffle.each { |d| subject.set(d.dig('sys', 'id'), d) }
+
+          # act
+          found = subject.find_by(content_type: 'test1', filter: { type.to_s => desired_value })
+
+          # assert
+          expect(found).to_not be_nil
+          expect(found).to eq(desired)
+        end
+
+        it 'filter object can find value in array' do
+          data =
+            1.upto(10).map do |i|
+              {
+                'sys' => {
+                  'id' => "k#{i}",
+                  'contentType' => { 'sys' => { 'id' => 'test1' } }
+                },
+                'fields' => { 'name' => { 'en-US' => [generator.call, generator.call] } }
+              }
+            end
+
+          desired_value = generator.call
+          desired = {
+            'sys' => { 'id' => "k#{rand}", 'contentType' => { 'sys' => { 'id' => 'test1' } } },
+            'fields' => { type.to_s => { 'en-US' => [generator.call, desired_value].shuffle } }
+          }
+
+          data << desired
+          data.shuffle.each { |d| subject.set(d.dig('sys', 'id'), d) }
+
+          # act
+          found = subject.find_by(content_type: 'test1', filter: { type.to_s => { eq: desired_value } })
+
+          # assert
+          expect(found).to_not be_nil
+          expect(found).to eq(desired)
+        end
+      end
+    end
   end
 
   describe '#find_all' do

data/lib/wcc/contentful/version.rb

@@ -2,6 +2,6 @@
 
 module WCC
   module Contentful
-    VERSION = '1.0.0'
+    VERSION = '1.0.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wcc-contentful
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.4
 platform: ruby
 authors:
 - Watermark Dev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-16 00:00:00.000000000 Z
+date: 2021-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -519,7 +519,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.7.6.2
+rubygems_version: 2.6.11
 signing_key:
 specification_version: 4
 summary: '[![Gem Version](https://badge.fury.io/rb/wcc-contentful.svg)](https://rubygems.org/gems/wcc-contentful)