toqua 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 745d7d0ec268a8a7509179982abbfeef4f4e98cd6e6390e57c77616e87f8c10c
-  data.tar.gz: 45aa239ad2062c5818de689d1d84008ae2042ad38e97f20727ee2d8ea5859faa
+  metadata.gz: 0c7dc34b6e76e654884ef282dbe23f1c0b709767229c3008361db8a45770a479
+  data.tar.gz: 935dbc12c97df5ec215b9d966a5a43ea079eff93c727d533467cc377c697bb7c
 SHA512:
-  metadata.gz: 7e9aded04af084691a599cd770656d709567705165687aa29103365e68b670d967331b277c851bc97217ff9cbd397e2ed41b14c627c1501b5b0622e13b82f754
-  data.tar.gz: 5a10920bea8413c152a9bb322b8940ba9faf7d731a8ad0532ec4955d5a22580d337dd7196c0a09a0e069680fc660023bbafa852da9debc58a7aa247488e11fff
+  metadata.gz: 52964e9d094691ec2717179cc517017edce77dd2a2ab55165a644896388521ea02795cff76c1055e6a9016807ba3f73641389a7225f8be5505fb3e5c1265caf9
+  data.tar.gz: 43cc8e524fd9c0db64c9d1f8853f41576636c488e08a04ad7d8733b61de41f605cb4335929ef670c4971467e083b141d99f649f5fe9a1d77b5ec15a2f7c48041

data/lib/toqua/pagination.rb

@@ -26,8 +26,8 @@ module Toqua
         scope(scope_opts) do |scope|
           @paginated = true
 
-          @page = params.fetch(page_key, opts.fetch(:page, DEFAULT_PAGE))
-          per = params.fetch(per_page_key, opts.fetch(:per, DEFAULT_PER_PAGE))
+          @page = params.to_unsafe_h.fetch(page_key, opts.fetch(:page, DEFAULT_PAGE))
+          per = params.to_unsafe_h.fetch(per_page_key, opts.fetch(:per, DEFAULT_PER_PAGE))
 
           if opts[:headers]
             scope_count = scope.count

data/lib/toqua/scoping.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Toqua
   module Scoping
     extend ActiveSupport::Concern
@@ -10,23 +12,41 @@ module Toqua
       s
     end
 
+    class ScopeApplicable
+      def self.accept?(opts, context)
+        if_condition(context, opts) && action_condition(context, opts)
+      end
+
+      def self.action_condition(context, opts)
+        if opts[:only]
+          [opts[:only]].flatten.include?(context.action_name.to_sym)
+        else
+          true
+        end
+      end
+
+      def self.if_condition(context, opts)
+        if opts[:if]
+          !!evaluate(context, opts[:if])
+        elsif opts[:unless]
+          !evaluate(context, opts[:unless])
+        else
+          true
+        end
+      end
+
+      def self.evaluate(context, object)
+        if object.respond_to?(:call)
+          context.instance_exec(&object)
+        else
+          context.send(object)
+        end
+      end
+    end
+
     def __run_scope(relation, scope, opts)
-      if_condition = if opts[:if]
-                       opts[:if].respond_to?(:call) ? !!instance_exec(&opts[:if]) : send(opts[:if])
-                     elsif opts[:unless]
-                       opts[:unless].respond_to?(:call) ? !instance_exec(&opts[:unless]) : !send(opts[:unless])
-                     else
-                       true
-                     end
-
-      action_condition = if opts[:only]
-                           [opts[:only]].flatten.include?(action_name.to_sym)
-                         else
-                           true
-                         end
-
-      if if_condition && action_condition
-        self.instance_exec(relation, &scope)
+      if ScopeApplicable.accept?(opts, self)
+        instance_exec(relation, &scope)
       else
         relation
       end
@@ -43,4 +63,4 @@ module Toqua
       end
     end
   end
-end
+end

data/lib/toqua/search.rb

@@ -38,7 +38,7 @@ module Toqua
 
     class_methods do
       def searchable
-        scope { |s| s.filter(search_params) }
+        scope { |s| s.doure_filter(search_params) }
       end
     end
   end

data/lib/toqua/version.rb

@@ -1,3 +1,3 @@
 module Toqua
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toqua
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Roger Campos
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-28 00:00:00.000000000 Z
+date: 2021-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -205,8 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Collection of small utilities for controllers in rails applications