wallaby-active_record 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93579d0cc4c2a81356d19acc3a24a7cac7160406f4c09c829de95f10d3db1020
-  data.tar.gz: d591a516f5c2fc04d7b6f46af992498e093d5d3f706d03c639a77a11eeeba339
+  metadata.gz: 77775377884b090f9d0c0679a0eda24caccaece57e0429f8307457d91ebce2a5
+  data.tar.gz: 23bdf49c685c9b938cfea121ab3bf44fad2f2bffeba964a4bfcfacd3595368f8
 SHA512:
-  metadata.gz: 9197ae20142ea0190ed68314ef6eb5c7ec4915febe072f62f0144bb6f42dddbada38adadf05b83eba0ed9744d2c3bc050f2836b25a46c394ab553decaa4f0dee
-  data.tar.gz: 0a59dcd809acb177822b3665b576b18eefdb0ef55b4fdcfdc6a3cf9344ce73fa1ddc4cb608c47de4d630b6149d0f1a36569eee8c63253830ddad92aae3c3f514
+  metadata.gz: 35d9dcf0387cae97199ad0aa47628bbc4719c1f3b48cccd0e04450b87c5b54c5358e8fe5ab3a9fc960e5fa410990438a4b5d00bb7431ab0d8ade6ea7f2aa26af
+  data.tar.gz: 07c885247c19f20b71db0f4f85b07e7cb955e68d4cbdec727057dc55938ecac103e4e42f813584869df932638dd7559f2544372aead0903beb86089f75d18c04

data/lib/adapters/wallaby/active_record/logger.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Wallaby
+  class ActiveRecord
+    # move this to wallaby-core later
+    class Logger
+      class << self
+        %w(debug warn info).each do |method_id|
+          define_method method_id do |message, replacements = {}|
+            source = caller(replacements.delete(:sourcing).try(:to_i) || 1, 1).first
+            Rails.logger.public_send(
+              method_id,
+              "#{method_id.upcase}: #{format message, replacements}\nfrom #{source}"
+            )
+            nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/adapters/wallaby/active_record/model_pagination_provider.rb

@@ -12,7 +12,7 @@ module Wallaby
           # kaminari
           @collection.respond_to?(:total_count) || \
           @collection.respond_to?(:total_entries) # will_paginate
-        Rails.logger.warn "#{@collection.inspect} is not paginatable.\nfrom #{__FILE__}:#{__LINE__}" unless paginatable
+        Logger.warn "#{@collection.inspect} is not paginatable." unless paginatable
 
         paginatable
       end

data/lib/adapters/wallaby/active_record/model_service_provider/querier/transformer.rb

@@ -34,9 +34,21 @@ module Wallaby
             ':!()' => :not_between
           }.freeze
 
+          SEQUENCE_JOIN_OPERATORS = { # :nodoc:
+            ':' => :or,
+            ':=' => :or,
+            ':!' => :and,
+            ':!=' => :and,
+            ':<>' => :and
+          }.freeze
+
+          BETWEEN_OPERATORS = { # :nodoc:
+            ':()' => true,
+            ':!()' => true
+          }.freeze
+
           # For single null
           rule null: simple(:value)
-          rule null: sequence(:value)
 
           # For single boolean
           rule(boolean: simple(:value)) { /true/i.match? value }
@@ -51,8 +63,7 @@ module Wallaby
           rule left: simple(:left), op: simple(:op), right: simple(:right) do
             oped = op.try :to_str
             operator = SIMPLE_OPERATORS[oped]
-            # skip if the operator is unknown
-            next unless operator
+            next Transformer.warn "Unknown operator #{oped} for %<exp>s", instance_values unless operator
 
             lefted = left.try :to_str
             convert =
@@ -68,24 +79,45 @@ module Wallaby
           rule left: simple(:left), op: simple(:op), right: sequence(:right) do
             oped = op.try :to_str
             operator = SEQUENCE_OPERATORS[oped]
-            next unless operator
+            next Transformer.warn "Unknown operator #{oped} for %<exp>s", instance_values unless operator
 
             exps = Wrapper.new
             lefted = left.try :to_str
-            if right.include? nil
-              nil_operator = SIMPLE_OPERATORS[oped]
-              next unless nil_operator
+            if BETWEEN_OPERATORS[oped] # BETWEEN related operators
+              next Transformer.warn 'Invalid values for %<exp>s', instance_values unless right.first && right.second
 
-              exps.push left: lefted, op: nil_operator, right: right.delete(nil)
+              convert = Range.new right.first, right.second
+              exps.push left: lefted, op: operator, right: convert
+            else
+              join = SEQUENCE_JOIN_OPERATORS[oped]
+              if right.include? nil
+                exps.push left: lefted, op: SIMPLE_OPERATORS[oped], right: right.delete(nil), join: join
+              end
+              exps.push left: lefted, op: operator, right: right, join: join
             end
-            convert = Range.new right.try(:first), right.try(:second) if %w(:() :!()).include?(oped)
-            exps.push left: lefted, op: operator, right: convert || right
             exps
           end
 
-          def transform(query_string)
-            result = apply Parser.new.parse(query_string || EMPTY_STRING)
-            result.is_a?(Array) ? result : [result]
+          class << self
+            # @param query_string [String]
+            # @return [Array]
+            def execute(query_string)
+              result = new.apply Parser.new.parse(query_string || EMPTY_STRING)
+              result.is_a?(Array) ? result : [result]
+            end
+
+            # @param message [String]
+            # @param exp [Hash,nil] transformed expression
+            # @return [nil]
+            def warn(message, exp = nil)
+              Logger.warn message, exp: to_origin(exp), sourcing: 2
+            end
+
+            # @param exp [Hash,nil] transformed expression
+            # @return [String] origin expression
+            def to_origin(exp)
+              "'#{exp['left']}#{exp['op']}#{exp['right']}'"
+            end
           end
         end
       end

data/lib/adapters/wallaby/active_record/model_service_provider/querier/wrapper.rb

@@ -4,18 +4,17 @@ module Wallaby
   class ActiveRecord
     class ModelServiceProvider
       class Querier
-        # Build up query using the results
+        # Wrapper for the transform result
         class Wrapper
           attr_reader :list
-          delegate :push, :each, to: :list
+          delegate :push, to: :list
+          delegate :each, to: :list
+          delegate :last, to: :list
+          delegate :[], to: :last
 
           def initialize(list = [])
             @list = list
           end
-
-          def [](key)
-            list.last[key]
-          end
         end
       end
     end

data/lib/adapters/wallaby/active_record/model_service_provider/querier.rb

@@ -36,7 +36,7 @@ module Wallaby
         # @param params [ActionController::Parameters]
         # @return [Array<String, Array, Array>] filter_name, keywords, field_queries
         def extract(params)
-          expressions = Transformer.new.transform params[:q]
+          expressions = Transformer.execute params[:q]
           keywords = expressions.select { |v| v.is_a? String }
           field_queries = expressions.select { |v| v.is_a? Wrapper }
           filter_name = params[:filter]
@@ -149,7 +149,7 @@ module Wallaby
           query = nil
           exps.each do |exp|
             sub = table[exp[:left]].try(exp[:op], exp[:right])
-            query = query.try(:or, sub) || sub
+            query = query.try(exp[:join], sub) || sub
           end
           query
         end

data/lib/adapters/wallaby/active_record/pundit_provider.rb

@@ -11,7 +11,7 @@ module Wallaby
       def accessible_for(_action, scope)
         Pundit.policy_scope! user, scope
       rescue Pundit::NotDefinedError
-        Rails.logger.warn "Cannot find scope policy for #{scope.inspect}.\nfrom #{__FILE__}:#{__LINE__}"
+        Logger.warn "Cannot find scope policy for #{scope.inspect}."
         scope
       end
     end

data/lib/wallaby/active_record/version.rb

@@ -2,6 +2,6 @@
 
 module Wallaby
   module ActiveRecordGem
-    VERSION = '0.2.2' # :nodoc:
+    VERSION = '0.2.4' # :nodoc:
   end
 end

data/lib/wallaby/active_record.rb

@@ -6,6 +6,7 @@ require 'wallaby/active_record/version'
 
 # All files required for ActiveRecord ORM
 require 'adapters/wallaby/active_record'
+require 'adapters/wallaby/active_record/logger'
 require 'adapters/wallaby/active_record/model_finder'
 
 # ModelPaginationProvider: begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wallaby-active_record
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Tian Chen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-19 00:00:00.000000000 Z
+date: 2020-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -106,6 +106,7 @@ files:
 - lib/adapters/wallaby/active_record.rb
 - lib/adapters/wallaby/active_record/cancancan_provider.rb
 - lib/adapters/wallaby/active_record/default_provider.rb
+- lib/adapters/wallaby/active_record/logger.rb
 - lib/adapters/wallaby/active_record/model_decorator.rb
 - lib/adapters/wallaby/active_record/model_decorator/fields_builder.rb
 - lib/adapters/wallaby/active_record/model_decorator/fields_builder/association_builder.rb