protected_record 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5936b33d95c7b170f1c1f0a90dbb94ba3d5cddc5
-  data.tar.gz: 4d6bbe694afa07f22a4b04e93fc6dc13fc9819a6
+  metadata.gz: 9b986b59a39e95c1cf010e1d832fe5e3b113a09b
+  data.tar.gz: 9aaf2d518fb70dc521b35fee444af5b745448ab7
 SHA512:
-  metadata.gz: fd08a85e169ce3ebc9e47f0217fd031d90ef01b1330640113e6b39c1d57a071cb0de107863b5269e2b3904716976131e19b4c974a64773eede60efa33b6d30e4
-  data.tar.gz: f5829512aba3077dc008b4fa47145ecda4c3f54713b50f679ef4f2d7f42da09c3043df93f1db0e1c3864e5a1b7fa6ba44444b05a40d2a771dd7c15147dde9f64
+  metadata.gz: e56a6564bf7007ab129daba444ff2d3e05416e0e0430203de47a6eee348ee42714bb3e0b939aaba998fef5ff48ffb9991f11d4d35e6be1709d50661440afd073
+  data.tar.gz: cc0a5f9563e9bb726611c8935d967f182136881060f28bd22604818c0150afde4eb9b828acbeecf86bbee452af3a6a4cec264a233d6b3836001e0f81713f90b3

data/lib/protected_record/use_case/change_filter/create.rb

@@ -3,13 +3,15 @@ module ProtectedRecord
     module ChangeFilter
       class Create < PayDirt::Base
         def initialize(options)
-          load_options(:protected_keys, :protected_record, options) and validate_state
+          load_options(:protected_keys, :protected_record, options)
         end
 
         def execute!
-          revert_protected_attrs
+          if @protected_record.changes.present?
+            revert_protected_attrs
+          end
 
-          return PayDirt::Result.new(data: { change_request_record: @protected_record })
+          return PayDirt::Result.new(data: { change_request_record: @protected_record }, success: true)
         end
 
         private
@@ -20,14 +22,6 @@ module ProtectedRecord
             end
           end
         end
-
-        protected
-        def validate_state
-          # If there are no changes, there's no need to do any filtering
-          if !@protected_record.changes.present?
-            raise ActiveRecord::ActiveRecordError.new(':protected_record not dirty')
-          end
-        end
       end
     end
   end

data/lib/protected_record/use_case/change_log/create.rb

@@ -7,14 +7,17 @@ module ProtectedRecord
             record_class: ::ProtectedRecord::ChangeLog::Record
           }.merge!(options) if !options.has_key?(:record_class)
 
-          load_options(:record_class, :user, :changed_object, options) and validate_state
+          load_options(:record_class, :user, :changed_object, options)
         end
 
         def execute!
+          if !@changed_object.previous_changes.present?
+            return PayDirt::Result.new(data: { change_log_record: @record }, success: true)
+          end
           initialize_change_log_record
 
           if @record.save
-            return PayDirt::Result.new(data: { change_log_record: @record })
+            return PayDirt::Result.new(data: { change_log_record: @record }, success: true)
           else
             return PayDirt::Result.new(data: { change_log_record: @record }, success: false)
           end
@@ -27,14 +30,6 @@ module ProtectedRecord
           @record.recordable        = @changed_object
           @record.observed_changes  = ActiveSupport::JSON.encode(@changed_object.previous_changes)
         end
-
-        protected
-        def validate_state
-          # What are we doing here, if not logging a change that has already happened?
-          if !@changed_object.previous_changes.present?
-            raise ActiveRecord::ActiveRecordError.new(':changed_object has no previous_changes')
-          end
-        end
       end
     end
   end

data/lib/protected_record/use_case/change_request/create.rb

@@ -1,3 +1,4 @@
+require 'pry'
 module ProtectedRecord
   module UseCase
     module ChangeRequest
@@ -7,7 +8,7 @@ module ProtectedRecord
             record_class: ::ProtectedRecord::ChangeRequest::Record
           }.merge!(options) if !options.has_key?(:record_class)
 
-          load_options(:protected_keys, :record_class, :user, :protected_record, options) and validate_state
+          load_options(:protected_keys, :record_class, :user, :protected_record, options)
         end
 
         def execute!
@@ -16,7 +17,7 @@ module ProtectedRecord
           initialize_change_request_record
 
           if @record.save
-            return PayDirt::Result.new(data: { change_request_record: @record })
+            return PayDirt::Result.new(data: { change_request_record: @record }, success: true)
           else
             return PayDirt::Result.new(data: { change_request_record: @record }, success: false)
           end
@@ -31,7 +32,7 @@ module ProtectedRecord
         end
 
         def requested_changes
-          @dirty_object.changes.select do |key|
+          @protected_record.changes.select do |key|
             @protected_keys.map(&:to_s).include? key.to_s
           end
         end
@@ -45,15 +46,6 @@ module ProtectedRecord
 
           raise if @protected_keys.any? { |key| @protected_record.send("#{key}_changed?") }
         end
-
-        protected
-        def validate_state
-          # If there are no changes, there's no need to make a request
-          if !@dirty_object.changes.present?
-            raise ActiveRecord::ActiveRecordError.new(':dirty_object not dirty')
-          end
-        end
-
       end
     end
   end

data/lib/protected_record/use_case/update.rb

@@ -18,9 +18,9 @@ module ProtectedRecord
 
         # We are successful if all changes have been applied
         if !@protected_record.changes.present?
-          return UseCase::Result.new(data: { updated: @protected_record })
+          return PayDirt::Result.new(data: { updated: @protected_record }, success: true)
         else
-          return UseCase::Result.new({
+          return PayDirt::Result.new({
             data: { remaining_changes: @protected_record.changes },
             success: false
           })
@@ -63,7 +63,7 @@ module ProtectedRecord
       def log_changes
         log_result = @change_log.new(user: @user, changed_object: @protected_record).execute!
 
-        result.successful? ? return : raise
+        log_result.successful? ? return : raise
       end
 
       protected

data/lib/protected_record/version.rb

@@ -1,3 +1,3 @@
 module ProtectedRecord
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protected_record
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Tad Hosford