snfoil 0.4.1 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc47fb191f1f5d56697c25c2b962335e18f73a1e82412878abeed31598af1ca5
-  data.tar.gz: 8b76658fdc27340fb775c3031cc77e34cf59677047e04daeae3b4b5e77784970
+  metadata.gz: 8691b33751a878d5963ff71517fc31a11e75d2be79fa5816155f62f13d490042
+  data.tar.gz: c97c4b4f5e17ccb51ba00bfca92e17243c93e591ee1e7967021bedeb8db3d5ce
 SHA512:
-  metadata.gz: 254408859377671a1882d5737827596e6ec12b9338bc5cdd388046a70e8e684b2536dbbaff8a2851abb3c9722bfe25452a1bf9201d99ff44f55aea52830fd6b7
-  data.tar.gz: 6aa2d31a626697299a8c5afb67cfc901395e469fffe523a5fc6c18017014ae370b2c209cc657d15fce16e1c6706dc678000b4f56e742cee2e066066c6dc55b54
+  metadata.gz: d40b1751013aa15d36752126f8d0950c38b53c370ec6be45b62a7ebbcfd6744bd17803dd63b3e32dba5659e07c54b5b67e5c594adc07341bd2f156344cd545b3
+  data.tar.gz: 8c17c0a10e1fa7507596ea19d34a4af9ca3c718e21b14bc200ef55c6f0afa18e2ecd5a999631caa67b0a67bf6eca269cab4671c9cc57252306b59366a1375cc7

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,7 +23,7 @@ module SnFoil
           __getobj__.destroyed?
         end
 
-        def attributes=(*attributes)
+        def attributes=(attributes)
           __getobj__.attributes = attributes
         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)

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.1'
+  VERSION = '0.5.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snfoil
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.4
 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-07-01 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