effective_resources 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d09ead4e73ed9c1e6f9064c616de93aafe3b3cf8
-  data.tar.gz: 1ba9303908b33ef1ab90b1653063a42f95afbaaa
+  metadata.gz: e14f7c83d7a643249e87588a22d4f53cca940de2
+  data.tar.gz: e93845d47bbd5edf230481ceba29d8c88d6582e9
 SHA512:
-  metadata.gz: c61d0ad9c674066d6ba6cabe188f82b24c213bda9a59cdb4e0252aa96acc65a8dd46ab24109f7af00149099debea5bf4b42217f9956da86a3fe84979c0429e55
-  data.tar.gz: 31ebc6075403542fb13f578ae8f2af58a3db4c2cd90d341f74f71d6c3a87cc2399c310ebeafe1489cde4107339630e539ed943152c06d00bdc4214b65ab5b3df
+  metadata.gz: 8a21d5b413d009156de7d4c24da2b1607ddbfac8e5c4dc566264c053e5ff07cb9c4f1ad5a67f326af3537244bca2bf654059230706416dde3a7430b2e7229900
+  data.tar.gz: 82a0760f7d0893323317029defb3afd409d05cc66b07501bccfeebcad4bea644e48598c1ba6c309cb983b69048a20a409090974ce31eeb441d3cfbe99e581eda

data/app/controllers/concerns/effective/crud_controller/permitted_params.rb

@@ -70,6 +70,8 @@ module Effective
             { k => [] }
           elsif datatype == :permitted_param && k.to_s.ends_with?('_ids')
             { k => [] }
+          elsif datatype == :permitted_param && v.key?(:permitted_attributes)
+            { k => v[:permitted_attributes] }
           elsif datatype == :effective_address
             { k => EffectiveAddresses.permitted_params }
           elsif datatype == :effective_assets

data/app/models/effective/model_reader.rb

@@ -20,7 +20,17 @@ module Effective
       end
 
       # Not really an attribute, just a permitted param.
-      args.unshift(:permitted_param) if args.first.kind_of?(Hash) && args.first.key?(:permitted)
+      # something permitted: true
+      if args.first.kind_of?(Hash) && args.first.key?(:permitted)
+        args.unshift(:permitted_param)
+      end
+
+      # Specifying permitted param attributes
+      # invitation [:name, :email], permitted: true
+      if args.first.kind_of?(Array)
+        options = args.find { |arg| arg.kind_of?(Hash) } || { permitted: true }
+        args = [:permitted_param, options.merge(permitted_attributes: args.first)]
+      end
 
       unless DATATYPES.include?(args.first)
         raise "expected first argument to be a datatype. Try name :string"

data/app/models/effective/resources/instance.rb

@@ -29,6 +29,8 @@ module Effective
             next if association.options[:through]
 
             Array(instance.send(association.name)).each_with_index do |child, index|
+              next unless child.present?
+
               resource = Effective::Resource.new(child)
               attributes[association.name][index] = resource.instance_attributes(include_associated: include_associated, include_nested: include_nested)
             end
@@ -54,9 +56,9 @@ module Effective
 
       # used by effective_logging
       def instance_changes
-        return {} unless (instance.present? && instance.changes.present?)
+        return {} unless (instance.present? && instance.previous_changes.present?)
 
-        changes = instance.changes.delete_if do |attribute, (before, after)|
+        changes = instance.previous_changes.dup.delete_if do |attribute, (before, after)|
           begin
             (before.kind_of?(ActiveSupport::TimeWithZone) && after.kind_of?(ActiveSupport::TimeWithZone) && before.to_i == after.to_i) ||
             (before == nil && after == false) || (before == nil && after == ''.freeze)

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.1.2'.freeze
+  VERSION = '1.1.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2019-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails