snfoil 0.4.3 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94edbd898ba19e7e2f1b0d37a2b03ffce8dc2018fdc77b5ec46ae6819c0c8dc4
-  data.tar.gz: 927f494fa9742985745b6ce94d577077f637917c45c89f685433a4bd10e003a7
+  metadata.gz: cfab0f49425b4cd1ba02f48f0c3bc114e45fd061118d9673740f2ec05b7655e2
+  data.tar.gz: 9c66aac6b0edf869f8243db1c447c5e0ef4df1162734c086dfe26fde86427e74
 SHA512:
-  metadata.gz: d7d9a2469b3ab414920670fdf4883a88366e1004c4776d0373eea1d6f973e0fac2e089071e8b6360c6ebc0be4d825f155af5955047df2587dc0b61cc11d651be
-  data.tar.gz: 1dc91151e2fb75647380079f58b2064377874c7e37c764ac58cf0805e8b23fe82d92947abfae1ed1d2cb8c12eae095f66a36a1ff83cbfad0dbacd5f2a34dd659
+  metadata.gz: 239615bc72acaa404521d0771fddaf05a7489cbbf7d9f8b5f1ba8e271c4cb520a2146bdeaf153e933c1c34d83b662a72ebe41f2fd3162825bbd52615fa6b5d8d
+  data.tar.gz: b4ac4f458812bfce5002e30103f35a30fc44a8509c3ec3cfb8fa86e612d2fa6f48ada5b34713c29e4910ae321477fbc9bfffdc4e47468121424523f33ba8c3db

data/lib/sn_foil.rb

@@ -10,6 +10,8 @@ require_relative 'sn_foil/contexts/destroy_context'
 require_relative 'sn_foil/context'
 require_relative 'sn_foil/policy'
 require_relative 'sn_foil/searcher'
+require_relative 'sn_foil/adapters/orms/base_adapter'
+require_relative 'sn_foil/adapters/orms/active_record'
 require 'active_support/core_ext/module/attribute_accessors'
 require 'logger'
 

data/lib/sn_foil/adapters/orms/active_record.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
+require_relative 'base_adapter'
+
 module SnFoil
   module Adapters
     module ORMs
       class ActiveRecord < SnFoil::Adapters::ORMs::BaseAdapter
-        def new(*params)
-          self.class.new(__getobj__.new(*params))
+        def new(**params)
+          self.class.new(__getobj__.new(params))
         end
 
         def all
@@ -21,9 +23,13 @@ module SnFoil
           __getobj__.destroyed?
         end
 
-        def attributes=(*attributes)
+        def attributes=(attributes)
           __getobj__.attributes = attributes
         end
+
+        def is_a?(klass)
+          __getobj__.class.object_id == klass.object_id
+        end
       end
     end
   end

data/lib/sn_foil/adapters/orms/base_adapter.rb

@@ -4,7 +4,7 @@ module SnFoil
   module Adapters
     module ORMs
       class BaseAdapter < SimpleDelegator
-        def new(*_params)
+        def new(**_params)
           raise NotImplementedError, '#new not implemented in adapter'
         end
 
@@ -20,7 +20,7 @@ module SnFoil
           raise NotImplementedError, '#destroy not implemented in adapter'
         end
 
-        def attributes=(**_attributes)
+        def attributes=(_attributes)
           raise NotImplementedError, '#attributes= not implemented in adapter'
         end
       end

data/lib/sn_foil/contexts/build_context.rb

@@ -15,8 +15,8 @@ module SnFoil
       end
 
       class_methods do
-        def build(params:, user: nil, **options)
-          new(user).build(**options, params: params)
+        def build(params:, entity: nil, **options)
+          new(entity).build(**options, params: params)
         end
       end
 

data/lib/sn_foil/contexts/create_context.rb

@@ -17,8 +17,8 @@ module SnFoil
       class_methods do
         attr_reader :i_setup_create_hooks, :i_before_create_hooks, :i_after_create_hooks,
                     :i_after_create_success_hooks, :i_after_create_failure_hooks
-        def create(params:, user: nil, **options)
-          new(user).create(**options, params: params)
+        def create(params:, entity: nil, **options)
+          new(entity).create(**options, params: params)
         end
 
         def setup_create(method = nil, **options, &block)
@@ -70,7 +70,7 @@ module SnFoil
         options = setup_create_object(**options)
         authorize(options[:object], :create?, **options)
         options = create_hooks(**options)
-        unwrap_object(options[:object])
+        options[:object]
       end
 
       def setup_create(**options)
@@ -127,7 +127,9 @@ module SnFoil
       # This method is private to help protect the order of execution of hooks
       def create_hooks(options)
         options = before_create_save(**options)
-        options = if options[:object].save
+        save_successful = options[:object].save
+        options.merge!(object: unwrap_object(options[:object]))
+        options = if save_successful
                     after_create_save_success(**options)
                   else
                     after_create_save_failure(**options)

data/lib/sn_foil/contexts/destroy_context.rb

@@ -17,8 +17,8 @@ module SnFoil
       class_methods do
         attr_reader :i_setup_destroy_hooks, :i_before_destroy_hooks, :i_after_destroy_hooks,
                     :i_after_destroy_success_hooks, :i_after_destroy_failure_hooks
-        def destroy(id:, user: nil, **options)
-          new(user).destroy(**options, id: id)
+        def destroy(id:, entity: nil, **options)
+          new(entity).destroy(**options, id: id)
         end
 
         def setup_destroy(method = nil, **options, &block)
@@ -121,7 +121,9 @@ module SnFoil
       # This method is private to help protect the order of execution of hooks
       def destroy_hooks(options)
         options = before_destroy_save(options)
-        options = if options[:object].destroy
+        destroy_successful = options[:object].destroy
+        options.merge!(object: unwrap_object(options[:object]))
+        options = if destroy_successful
                     after_destroy_save_success(options)
                   else
                     after_destroy_save_failure(options)

data/lib/sn_foil/contexts/index_context.rb

@@ -15,8 +15,8 @@ module SnFoil
       class_methods do
         attr_reader :i_searcher, :i_setup_index_hooks
 
-        def index(params: {}, user: nil, **options)
-          new(user).index(**options, params: params)
+        def index(params: {}, entity: nil, **options)
+          new(entity).index(**options, params: params)
         end
 
         def searcher(klass = nil)

data/lib/sn_foil/contexts/setup_context.rb

@@ -42,13 +42,13 @@ module SnFoil
         self.class.i_setup_hooks || []
       end
 
-      attr_reader :user
-      def initialize(user = nil)
-        @user = user
+      attr_reader :entity
+      def initialize(entity = nil)
+        @entity = entity
       end
 
       def authorize(object, action, **options)
-        return unless user # Add logging
+        return unless entity # Add logging
 
         policy = lookup_policy(object, options)
         raise Pundit::NotAuthorizedError, query: action, record: object, policy: policy unless policy.public_send(action)
@@ -59,7 +59,7 @@ module SnFoil
       def scope(object_class = nil, **options)
         object_class ||= model
         policy_name = lookup_policy(object_class, options).class.name
-        "#{policy_name}::Scope".safe_constantize.new(wrap_object(object_class), user)
+        "#{policy_name}::Scope".safe_constantize.new(wrap_object(object_class), entity)
       end
 
       def wrap_object(object)
@@ -103,11 +103,11 @@ module SnFoil
 
       def lookup_policy(object, options)
         lookup = if options[:policy]
-                   options[:policy].new(user, object)
+                   options[:policy].new(entity, object)
                  elsif policy
-                   policy.new(user, object)
+                   policy.new(entity, object)
                  else
-                   Pundit.policy!(user, object)
+                   Pundit.policy!(entity, object)
                  end
 
         lookup.options = options if lookup.respond_to? :options=

data/lib/sn_foil/contexts/show_context.rb

@@ -15,8 +15,8 @@ module SnFoil
       class_methods do
         attr_reader :i_setup_show_hooks
 
-        def show(id:, user: nil, **options)
-          new(user).show(**options, id: id)
+        def show(id:, entity: nil, **options)
+          new(entity).show(**options, id: id)
         end
 
         def setup_show(method = nil, **options, &block)

data/lib/sn_foil/contexts/update_context.rb

@@ -17,8 +17,8 @@ module SnFoil
       class_methods do
         attr_reader :i_setup_update_hooks, :i_before_update_hooks, :i_after_update_hooks,
                     :i_after_update_success_hooks, :i_after_update_failure_hooks
-        def update(id:, params:, user: nil, **options)
-          new(user).update(**options, id: id, params: params)
+        def update(id:, params:, entity: nil, **options)
+          new(entity).update(**options, id: id, params: params)
         end
 
         def setup_update(method = nil, **options, &block)
@@ -124,7 +124,9 @@ module SnFoil
       # This method is private to help protect the order of execution of hooks
       def update_hooks(options)
         options = before_update_save(options)
-        options = if options[:object].save
+        update_successful = options[:object].save
+        options.merge!(object: unwrap_object(options[:object]))
+        options = if update_successful
                     after_update_save_success(options)
                   else
                     after_update_save_failure(options)

data/lib/sn_foil/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SnFoil
-  VERSION = '0.4.3'
+  VERSION = '0.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snfoil
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: '0.6'
 platform: ruby
 authors:
 - Matthew Howes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-12 00:00:00.000000000 Z
+date: 2020-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 5.2.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 5.2.4.3
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement