wallaby-active_record 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d10a3ddeced877f4c004c1d2a5141b6463865a22d673ae91a9ca87a22a3523c
-  data.tar.gz: c194bdfef64070a23a5bc0ebdf7d0bdbc327047eb330a459e81b616fd5ab6f84
+  metadata.gz: 93579d0cc4c2a81356d19acc3a24a7cac7160406f4c09c829de95f10d3db1020
+  data.tar.gz: d591a516f5c2fc04d7b6f46af992498e093d5d3f706d03c639a77a11eeeba339
 SHA512:
-  metadata.gz: '0695f8352480c7597eae7e5049e8d009ae3f30afa4400c233bd4f036a42abab71780cfe7b62f5c362f21b0a31384dee564655de5fbd76628fd282714eb6f2b8d'
-  data.tar.gz: 3c34d83727141ee696e9f839f78ac209fabec0edd1437265f013f23f0ff6531dcba8aa762038cc4487c11a3b599ead2520f0f0b3e46e80b3e0184febf9cd267a
+  metadata.gz: 9197ae20142ea0190ed68314ef6eb5c7ec4915febe072f62f0144bb6f42dddbada38adadf05b83eba0ed9744d2c3bc050f2836b25a46c394ab553decaa4f0dee
+  data.tar.gz: 0a59dcd809acb177822b3665b576b18eefdb0ef55b4fdcfdc6a3cf9344ce73fa1ddc4cb608c47de4d630b6149d0f1a36569eee8c63253830ddad92aae3c3f514

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

@@ -40,14 +40,14 @@ module Wallaby
       # @return [ActiveSupport::HashWithIndifferentAccess] metadata
       def fields
         @fields ||= ::ActiveSupport::HashWithIndifferentAccess.new.tap do |hash|
-          # NOTE: There is a chance that people create ActiveRecord class
-          # before they do the migration, so initialising the fields will raise
-          # all kinds of error. Therefore, we need to check the table existence
-          if @model_class.table_exists?
-            hash.merge! general_fields
-            hash.merge! association_fields
-            hash.except!(*foreign_keys_from_associations)
-          end
+          # NOTE: Need to check database and table's existence
+          # before pulling out the metadata from model.
+          # So that the database and migration related task can be executed.
+          next unless ::ActiveRecord::Base.connected? && @model_class.table_exists?
+
+          hash.merge! general_fields
+          hash.merge! association_fields
+          hash.except!(*foreign_keys_from_associations)
         end.freeze
       end
 

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

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

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

@@ -61,7 +61,7 @@ module Wallaby
               when ':^', ':!^' then "#{right}%"
               when ':$', ':!$' then "%#{right}"
               end
-            { left: lefted, op: operator, right: convert || right }
+            Wrapper.new [{ left: lefted, op: operator, right: convert || right }]
           end
 
           # For operators that have multiple items
@@ -70,9 +70,22 @@ module Wallaby
             operator = SEQUENCE_OPERATORS[oped]
             next unless operator
 
+            exps = Wrapper.new
             lefted = left.try :to_str
-            convert = Range.new right.try(:first), right.try(:last) if %w(:() :!()).include?(oped)
-            { left: lefted, op: operator, right: convert || right }
+            if right.include? nil
+              nil_operator = SIMPLE_OPERATORS[oped]
+              next unless nil_operator
+
+              exps.push left: lefted, op: nil_operator, right: right.delete(nil)
+            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]
           end
         end
       end

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Wallaby
+  class ActiveRecord
+    class ModelServiceProvider
+      class Querier
+        # Build up query using the results
+        class Wrapper
+          attr_reader :list
+          delegate :push, :each, to: :list
+
+          def initialize(list = [])
+            @list = list
+          end
+
+          def [](key)
+            list.last[key]
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -13,9 +13,9 @@ module Wallaby
           @model_class = @model_decorator.model_class
         end
 
-        # Pull out the query expression string from the parameter `q`,
-        # use parser to understand the expression, then use transformer to run
-        # SQL arel query.
+        # Extract the filter and query information
+        # from parameters `filter` and `q` respectively,
+        # and execute query based on the information.
         # @param params [ActionController::Parameters]
         # @return [ActiveRecord::Relation]
         def search(params)
@@ -28,40 +28,21 @@ module Wallaby
 
         private
 
-        # @see Wallaby::Parser
-        def parser
-          @parser ||= Parser.new
-        end
-
-        # @see Wallaby::ActiveRecord::ModelServiceProvider::Querier::Transformer
-        def transformer
-          @transformer ||= Transformer.new
-        end
-
         # @return [Arel::Table] arel table
         def table
           @model_class.arel_table
         end
 
         # @param params [ActionController::Parameters]
-        # @return [Array<String, Array, Array>] a list of object for other
-        #   method to use.
+        # @return [Array<String, Array, Array>] filter_name, keywords, field_queries
         def extract(params)
-          expressions = to_expressions params
+          expressions = Transformer.new.transform params[:q]
           keywords = expressions.select { |v| v.is_a? String }
-          field_queries = expressions.select { |v| v.is_a? Hash }
+          field_queries = expressions.select { |v| v.is_a? Wrapper }
           filter_name = params[:filter]
           [filter_name, keywords, field_queries]
         end
 
-        # @param params [ActionController::Parameters]
-        # @return [Array] a list of transformed operations
-        def to_expressions(params)
-          parsed = parser.parse(params[:q] || EMPTY_STRING)
-          converted = transformer.apply parsed
-          converted.is_a?(Array) ? converted : [converted]
-        end
-
         # Use the filter name to find out the scope in the following precedents:
         # - scope from metadata
         # - defined scope from the model
@@ -81,25 +62,23 @@ module Wallaby
         end
 
         # Find out the scope for given filter
-        # - from metadata
+        # - from filter metadata
         # - filter name itself
         # @param filter_name [String] filter name
         # @return [String]
         def find_scope(filter_name)
-          filter = @model_decorator.filters[filter_name] || {}
-          filter[:scope] || filter_name
+          @model_decorator.filters[filter_name].try(:[], :scope) || filter_name
         end
 
-        # Unscoped query
-        # @return [ActiveRecord::Relation]
+        # @return [ActiveRecord::Relation] Unscoped query
         def unscoped
           @model_class.where nil
         end
 
-        # Search text for the text columns that appear in `index_field_names`
+        # Search text for the text columns (see {}) in `index_field_names`
         # @param keywords [String] keywords
         # @param query [ActiveRecord::Relation, nil]
-        # @return [ActiveRecord::Relation]
+        # @return [ActiveRecord::Relation, nil]
         def text_search(keywords, query = nil)
           return query unless keywords_check? keywords
 
@@ -121,9 +100,9 @@ module Wallaby
         def field_search(field_queries, query)
           return query unless field_check? field_queries
 
-          field_queries.each do |exp|
-            sub_query = table[exp[:left]].try(exp[:op], exp[:right])
-            query = query.try(:and, sub_query) || sub_query
+          field_queries.each do |exps|
+            sub_queries = build_sub_queries_with exps
+            query = query.try(:and, sub_queries) || sub_queries
           end
           query
         end
@@ -140,21 +119,20 @@ module Wallaby
         end
 
         # @param keywords [Array<String>] a list of keywords
-        # @return [Boolean] false when keywords are empty
-        #   true when text fields for query exist
-        #   otherwise, raise exception
+        # @return [false] when keywords are empty
+        # @return [true] when text fields for query exist
+        # @raise [Wallaby::UnprocessableEntity] if no text columns can be used for text search
         def keywords_check?(keywords)
           return false if keywords.blank?
           return true if text_fields.present?
 
-          message = I18n.t 'errors.unprocessable_entity.keyword_search'
-          raise UnprocessableEntity, message
+          raise UnprocessableEntity, 'Unable to perform keyword search when no text fields can be used for this.'
         end
 
         # @param field_queries [Array]
-        # @return [Boolean] false when field queries are blank
-        #   true when the fields used are valid (exist in `fields`)
-        #   otherwise, raise exception
+        # @return [false] when field queries are blank
+        # @return [true] when field queries are blank
+        # @raise [Wallaby::UnprocessableEntity] if invalid fields are entered
         def field_check?(field_queries)
           return false if field_queries.blank?
 
@@ -162,9 +140,18 @@ module Wallaby
           invalid_fields = fields - @model_decorator.fields.keys
           return true if invalid_fields.blank?
 
-          message = I18n.t 'errors.unprocessable_entity.field_colon_search',
-                           invalid_fields: invalid_fields.to_sentence
-          raise UnprocessableEntity, message
+          raise UnprocessableEntity, "Unable to perform field colon search for #{invalid_fields.to_sentence}"
+        end
+
+        # @param exps [Wallaby::ActiveRecord::ModelServiceProvider::Querier::Wrapper]
+        # @return [ActiveRecord::Relation] sub queries connected using OR
+        def build_sub_queries_with(exps)
+          query = nil
+          exps.each do |exp|
+            sub = table[exp[:left]].try(exp[:op], exp[:right])
+            query = query.try(:or, sub) || sub
+          end
+          query
         end
       end
     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 I18n.t('errors.pundit.not_found.scope_policy', scope: scope)
+        Rails.logger.warn "Cannot find scope policy for #{scope.inspect}.\nfrom #{__FILE__}:#{__LINE__}"
         scope
       end
     end

data/lib/wallaby/active_record/version.rb

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

data/lib/wallaby/active_record.rb

@@ -28,6 +28,7 @@ require 'adapters/wallaby/active_record/model_service_provider/permitter'
 require 'adapters/wallaby/active_record/model_service_provider/querier'
 require 'adapters/wallaby/active_record/model_service_provider/querier/escaper'
 require 'adapters/wallaby/active_record/model_service_provider/querier/transformer'
+require 'adapters/wallaby/active_record/model_service_provider/querier/wrapper'
 require 'adapters/wallaby/active_record/model_service_provider/validator'
 # ModelServiceProvider: end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wallaby-active_record
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Tian Chen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-17 00:00:00.000000000 Z
+date: 2020-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -120,6 +120,7 @@ files:
 - lib/adapters/wallaby/active_record/model_service_provider/querier.rb
 - lib/adapters/wallaby/active_record/model_service_provider/querier/escaper.rb
 - lib/adapters/wallaby/active_record/model_service_provider/querier/transformer.rb
+- lib/adapters/wallaby/active_record/model_service_provider/querier/wrapper.rb
 - lib/adapters/wallaby/active_record/model_service_provider/validator.rb
 - lib/adapters/wallaby/active_record/pundit_provider.rb
 - lib/wallaby/active_record.rb