snfoil 0.4.0 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08550dd2ea79c81a206bd765375d240a28ff5fadc734c279cbace455ae617650'
-  data.tar.gz: 934a30ee35d2c6e07f739e0e01c219efcbb6e9bb782b341477a70b06f51a60fd
+  metadata.gz: f6aa27a0dd5398b8e3abea471b5e8d3548aa4ff5239edabe7ee229306bde4787
+  data.tar.gz: 358b5e5b46347c30768272c5f50c08aa8f61a3fb44a016f26504a700f82c2c11
 SHA512:
-  metadata.gz: 96ac100420b4276442ccc955cfb5b35f93ea60bd11af4fdb4725b0e6a0a307e67391016dbab97cdeffc3af0532d419526138cb3770d76c1e8ed4388813fbc66a
-  data.tar.gz: f8d3cb25b57174aeea76be073d9a37b6fb12862cd0e6b5986468d33051038e84412315221db13a26d5a5f1b9e5b61d4143afcd10620045f69bb8a00420ad30b9
+  metadata.gz: cf0c36ee0cf32bdf2f43503aec6076f8115df1f84e9cb0b954c7d58d0ea2583236d2dd7dd9dcab14f2ccb7680b8e004ae43fdcfcfc0df627681d2c1e365b077c
+  data.tar.gz: 613b3ce470d9c567d4fa06c915a1610e8b3ad35d26691f69455dc4e95cad874497bcbf21ca40f7f717df506730f7ecbc8b0f0a297393b6dbd166c7cdf1c76d6c

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)

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)

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)
@@ -38,13 +38,13 @@ module SnFoil
         self.class.i_setup_index_hooks || []
       end
 
-      def index(params:, **options)
+      def index(**options)
         options[:action] = :index
         options = before_setup_index(**options)
         authorize(nil, :index?, **options)
         options.fetch(:searcher) { searcher }
                .new(scope: scope.resolve)
-               .search(params: params)
+               .search(options.fetch(:params) { {} })
       end
 
       def setup_index(**options)

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)

data/lib/sn_foil/searcher.rb

@@ -63,7 +63,7 @@ module SnFoil
       if setup.is_a?(Symbol) || setup.is_a?(String)
         send(setup, filtered_scope, params)
       else
-        setup.call(filtered_scope, params)
+        instance_exec filtered_scope, params, &setup
       end
     end
 
@@ -78,7 +78,7 @@ module SnFoil
 
       return send(i_filter[:method], filtered_scope, params) if i_filter[:method]
 
-      i_filter[:block].call(filtered_scope, params)
+      instance_exec filtered_scope, params, &i_filter[:block]
     end
 
     def filter_valid?(i_filter, params)

data/lib/sn_foil/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snfoil
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.3
 platform: ruby
 authors:
 - Matthew Howes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-06-30 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