iknow_view_models 3.6.2 → 3.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 267212f1572c3f81b65462be6c30e02a12a6562a29d01bd5e0c342a12396acbc
-  data.tar.gz: e8c4addd984351d6df889ba7d75abbe8d5bde7793a48791e24a1b42e7a3fdf42
+  metadata.gz: 0f71d69093b0d35214edcfe799aa3fc4493e0640a349e93c828e0158260d4b6c
+  data.tar.gz: 2c2368cd3b0bb27f37ef8e609eae6a396d4de12c4555b90c153386e8bd2a9998
 SHA512:
-  metadata.gz: 6039dcc05bed20bce4681c322c3509be3f2a276c0a755fb3e27240eec74fd9eddef68f3c272df33554407853065a98e0f4d03a068c8c0e068cfc02be6f73ab67
-  data.tar.gz: 95fb89d93724d5028905612d846534916c4bdacd1bb88009ae434090b183e17d7311bb2709bfa81b08ff3dff45940ced0ce080ff861529c59cbb96671a661b64
+  metadata.gz: c27c10d2940db8b9ed7f0ec512873053f4a2d94283d11004d68b4b70153f696fe3fd45aa103f7ee02ed75fbf3c5d0d8ac899b9df769196308cf67c32dbb3af35
+  data.tar.gz: 882931e849905b9caaf8af154725339b7cda761b1f3ad2deb4d93c4f489cb11c8699143df1e907e51d572ec0a93c07d2f960c86f3e6c35b844d2f86c2839eb66

data/.circleci/config.yml

@@ -8,7 +8,7 @@ executors:
         default: "2.7"
       pg-version:
         type: string
-        default: "11"
+        default: "12.10"
       gemfile:
         type: string
         default: "Gemfile"
@@ -16,14 +16,14 @@ executors:
       PGHOST: 127.0.0.1
       PGUSER: eikaiwa
     docker:
-      - image: circleci/ruby:<< parameters.ruby-version >>
+      - image: cimg/ruby:<< parameters.ruby-version >>
         environment:
           BUNDLE_JOBS: 3
           BUNDLE_RETRY: 3
           BUNDLE_PATH: vendor/bundle
           RAILS_ENV: test
           BUNDLE_GEMFILE: << parameters.gemfile >>
-      - image: circleci/postgres:<< parameters.pg-version >>-alpine
+      - image: cimg/postgres:<< parameters.pg-version >>
         environment:
           POSTGRES_USER: eikaiwa
           POSTGRES_DB: iknow_view_models
@@ -104,27 +104,27 @@ workflows:
       - test:
           name: 'ruby 2.7 rails 5.2 pg 12'
           ruby-version: "2.7"
-          pg-version: "12"
+          pg-version: "12.10"
           gemfile: gemfiles/rails_5_2.gemfile
       - test:
           name: 'ruby 2.7 rails 6.0 pg 12'
           ruby-version: "2.7"
-          pg-version: "12"
+          pg-version: "12.10"
           gemfile: gemfiles/rails_6_0.gemfile
       - test:
           name: 'ruby 2.7 rails 6.1 pg 12'
           ruby-version: "2.7"
-          pg-version: "12"
+          pg-version: "12.10"
           gemfile: gemfiles/rails_6_1.gemfile
       - test:
           name: 'ruby 3.0 rails 6.1 pg 12'
           ruby-version: "3.0"
-          pg-version: "12"
+          pg-version: "12.10"
           gemfile: gemfiles/rails_6_1.gemfile
       - test:
-          name: 'ruby 3.0 rails 7.0 pg 12'
-          ruby-version: "3.0"
-          pg-version: "12"
+          name: 'ruby 3.1 rails 7.0 pg 13'
+          ruby-version: "3.1"
+          pg-version: "13.6"
           gemfile: gemfiles/rails_7_0.gemfile
       - publish:
           filters:

data/lib/iknow_view_models/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IknowViewModels
-  VERSION = '3.6.2'
+  VERSION = '3.6.3'
 end

data/lib/view_model/access_control/composed.rb

@@ -39,10 +39,20 @@ class ViewModel::AccessControl::Composed < ViewModel::AccessControl
           case
           when new_allow
             nil
-          when mergeable_error?(self.allow_error) && mergeable_error?(other.allow_error)
-            self.allow_error.merge(other.allow_error)
+          when self.allow_error.nil?
+            other.allow_error
+          when other.allow_error.nil?
+            self.allow_error
+          # Mergeable (standard) errors should be merged if possible; if not
+          # possible, we should take the first non-standard error.
+          when mergeable_error?(self.allow_error)
+            if mergeable_error?(other.allow_error)
+              self.allow_error.merge(other.allow_error)
+            else
+              other.allow_error
+            end
           else
-            self.allow_error || other.allow_error
+            self.allow_error
           end
 
         ComposedResult.new(new_allow, other.veto, new_allow_error, other.veto_error)
@@ -52,7 +62,7 @@ class ViewModel::AccessControl::Composed < ViewModel::AccessControl
     private
 
     def mergeable_error?(err)
-      err&.is_a?(NoRequiredConditionsError)
+      err.is_a?(NoRequiredConditionsError)
     end
   end
 

data/lib/view_model/migration/no_path_error.rb

@@ -14,7 +14,7 @@ class ViewModel::Migration::NoPathError < ViewModel::AbstractError
   end
 
   def detail
-    "No migration path for #{vm_name} from #{from} to #{to}"
+    "No migration path for #{vm_name} between client version #{from} and server version #{to}"
   end
 
   def meta

data/lib/view_model.rb

@@ -3,6 +3,7 @@
 # A ViewModel encapsulates a particular aggregation of data calculated via the
 # underlying models and provides a means of serializing it into views.
 require 'jbuilder'
+require 'base64'
 require 'deep_preloader'
 
 class ViewModel

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iknow_view_models
 version: !ruby/object:Gem::Version
-  version: 3.6.2
+  version: 3.6.3
 platform: ruby
 authors:
 - iKnow Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-16 00:00:00.000000000 Z
+date: 2022-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -509,7 +509,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.11
 signing_key: 
 specification_version: 4
 summary: ViewModels provide a means of encapsulating a collection of related data