active_record_api-rest 1.0.7 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f789b0f7c72a1bf809e0d16c6fc4f5ce3d470d6555b89cc324c5b7f136632ee
-  data.tar.gz: b1dfb6bd902e52e766bccf11e98fd93dcb2ab65a7523236e7b27f73382920031
+  metadata.gz: '0284ae32b17d9e2c3f50f363be3bfca4ad200b3dbce2687bc01c8c8a297f95c4'
+  data.tar.gz: b5d1572d745988e7f5aafcad941e882c552b78ad631a4c633672d1759c119154
 SHA512:
-  metadata.gz: bc5a379c6659cfe63cbb9d0dcd567f5965bf88dd716ad17c51ccd0eec5e3fbe6486c4c5d5daf0ce0118efb72dc9738e52966c8cb3f15baa2f4b5c80302af855c
-  data.tar.gz: 1129bc0f29eddec8c9892ff0f0f230f9a71eb6953f7f1d4c93962f4ba4b0354f7fe2f04ec8ab93f01e850b371576d274ba6c1a02265ce88d62f1207075fb91f5
+  metadata.gz: b13d5f232ed72e579e7bcfd732f9f5004aa3cfe0569eb7feb49dd04721fcabb96f458b7e86fe3efd83a9585b7539e89dcaff62a0c15b239f612a3d7054ea115d
+  data.tar.gz: e1b0efb110dbeebb055a59d210f063a19ae78723f23aa8f3d783fcc0fe89095f91dab8bdf9c94bc43bbd462a0151de8ee226e63b7dae1cb5299aa6dda25badf3

data/lib/active_record_api/rest/controller.rb

@@ -76,6 +76,28 @@ module ActiveRecordApi
         "#{policy.class.name}::Scope".constantize.new(session, scope).resolve
       end
 
+      def filtered_params
+        @filtered_params ||= params.permit(allowed_params).to_h
+      end
+
+      def allowed_params
+        @allowed_params ||= model_klass.column_names.flat_map do |column_name|
+          col = column_name.to_s.gsub('encrypted_', '').to_sym
+          col_def = column_definition(column_name)
+          if col_def&.type == :jsonb
+            [col, col => {}]
+          else
+            col
+          end
+        end
+      end
+
+      def column_definition(column_name)
+        model_klass.columns.detect do |column|
+          column.name == column_name
+        end
+      end
+
       def policy
         @policy ||= ("#{controller_name.classify}Policy".safe_constantize) ? "#{controller_name.classify}Policy".constantize.new(session, model_klass) : ApplicationPolicy.new(session, model_klass)
       end

data/lib/active_record_api/rest/index_controller.rb

@@ -24,19 +24,19 @@ module ActiveRecordApi
         "#{model_klass.name}Serializer".safe_constantize
       end
 
-      def allowed_params
-        @allowed_params ||= model_klass.column_names.flat_map do |column_name|
+      def allowed_params_query
+        @allowed_params_query ||= model_klass.column_names.flat_map do |column_name|
           col = column_name.to_s.gsub('encrypted_', '').to_sym
           [col, col => []]
         end
       end
 
-      def filtered_params
-        @filtered_params ||= params.permit(allowed_params).to_h
+      def filtered_params_query
+        @filtered_params_query ||= params.permit(allowed_params_query).to_h
       end
 
       def load_models
-        @models = scope_filter(model_klass).where(filtered_params)
+        @models = scope_filter(model_klass).where(filtered_params_query)
         @total = models.count
         page_models
       end

data/lib/active_record_api/rest/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecordApi
   module Rest
-    VERSION = '1.0.7'.freeze
+    VERSION = '1.0.9'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_api-rest
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.9
 platform: ruby
 authors:
 - Full Measure Education
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-01 00:00:00.000000000 Z
+date: 2019-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler