dbee-active_record 2.0.0 → 2.1.0.pre.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13ace02381ea618f552af8f6d4ff3c9c615479c45797ea0bf0e3ce77ce031d6f
-  data.tar.gz: 14027158ea930bdfce136621d9e49aad1927da1e9fa9a1c6213aae7a6044d067
+  metadata.gz: f8de8c388637ba455ffca406ff42751ecfb62f4a40bbcb9f560a085b585568a1
+  data.tar.gz: 9723886e37e886d7df7fa4661df4c81d35fe186d08a7d82de66083e08ed44bac
 SHA512:
-  metadata.gz: 31dda63e9a89898b387fc071aa3e7dc1b5253ad270de2042cfd2b73e2b53934a36b0d312b29091c1ccf2cc30e81f3dea61259ddc9cf889e6af272b75e75c1a09
-  data.tar.gz: 8ea4ff00d7cfea26be982681de6cc9e1dbce4113a03d09cd01815ddbd36a9ce49da68298239ef8906dfd3cc69d2e4f9fa66103be2cbda1fbec6fe83868faf7bb
+  metadata.gz: be75ae14b3c4b0154a0cc4f63950fa86a5f9f16272cd2d5133a4fc4649e2bcd6f7dc5836cf1706c7a9a6b9dba1f1183783038b013bc9e78f5cc5f25e9c980f78
+  data.tar.gz: 7f466202c164f0da7fb936010bc73393a0643682588f14093979fa1e8844f36bd0978020f3f435624d6bea25d95767af35884c6e453a35f41d219dd4331b22d7

data/.rubocop.yml

@@ -1,6 +1,20 @@
-Metrics/LineLength:
+AllCops:
+  TargetRubyVersion: 2.5
+
+Layout/LineLength:
   Max: 100
 
+Lint/RaiseException:
+  Enabled: True
+
+Lint/StructNewOverride:
+  Enabled: True
+
+Metrics/AbcSize:
+  Max: 16
+  Exclude:
+    - spec/db_helper.rb
+
 Metrics/BlockLength:
   ExcludedMethods:
     - let
@@ -13,18 +27,19 @@ Metrics/BlockLength:
     - spec/dbee/**/*
     - dbee-active_record.gemspec
 
+Metrics/ClassLength:
+  Max: 125
+
 Metrics/MethodLength:
   Max: 25
   Exclude:
     - spec/db_helper.rb
 
-AllCops:
-  TargetRubyVersion: 2.4
+Style/HashEachMethods:
+  Enabled: True
 
-Metrics/AbcSize:
-  Max: 16
-  Exclude:
-    - spec/db_helper.rb
+Style/HashTransformKeys:
+  Enabled: True
 
-Metrics/ClassLength:
-  Max: 125
+Style/HashTransformValues:
+  Enabled: True

data/.ruby-version

@@ -1 +1 @@
-2.6.3
+2.6.6

data/.travis.yml

@@ -6,16 +6,12 @@ services:
   - mysql
 rvm:
   # Build on the latest stable of all supported Rubies (https://www.ruby-lang.org/en/downloads/):
-  - 2.4.6
-  - 2.5.5
-  - 2.6.3
+  - 2.5.8
+  - 2.6.6
+  - 2.7.1
 env:
   - AR_VERSION=5
   - AR_VERSION=6
-matrix:
-  exclude:
-    - rvm: 2.4.6
-      env: AR_VERSION=6
 cache: bundler
 before_script:
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter

data/CHANGELOG.md

@@ -1,3 +1,33 @@
+# 2.1.0 (TBD)
+
+### Additions:
+
+* Implemented Dbee::Query::Field#aggregator
+* Implemented Dbee::Query::Field#filters
+
+### Changes:
+
+* Bumped minimum Ruby version to 2.5
+
+# 2.0.4 (February 13th, 2020)
+
+* use Arel#in for Equal filters when there is more than one value
+* use Arel#not_in for NotEqual filters when there are is than one value
+
+# 2.0.3 (January 7th, 2020)
+
+* Added/tested support for Dbee 2.0.3
+* Added support for Ruby 2.6.5
+
+# 2.0.2 (November 7th, 2019)
+
+* Added/tested support for Dbee 2.0.2
+* Added support for Ruby 2.3.8
+
+# 2.0.1 (October 25th, 2019)
+
+* Development dependency updates.
+
 # 2.0.0 (September 3rd, 2019)
 
 * Only support Dbee version 2.0.0 and above

data/dbee-active_record.gemspec

@@ -15,11 +15,19 @@ Gem::Specification.new do |s|
   s.email       = ['mruggio@bluemarblepayroll.com']
   s.files       = `git ls-files`.split("\n")
   s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.bindir      = 'exe'
+  s.executables = []
   s.homepage    = 'https://github.com/bluemarblepayroll/dbee-active_record'
   s.license     = 'MIT'
+  s.metadata    = {
+    'bug_tracker_uri' => 'https://github.com/bluemarblepayroll/dbee-active_record/issues',
+    'changelog_uri' => 'https://github.com/bluemarblepayroll/dbee-active_record/blob/master/CHANGELOG.md',
+    'documentation_uri' => 'https://www.rubydoc.info/gems/dbee-active_record',
+    'homepage_uri' => s.homepage,
+    'source_code_uri' => s.homepage
+  }
 
-  s.required_ruby_version = '>= 2.4.6'
+  s.required_ruby_version = '>= 2.5'
 
   ar_version = ENV['AR_VERSION'] || ''
 
@@ -34,15 +42,15 @@ Gem::Specification.new do |s|
     end
 
   s.add_dependency('activerecord', activerecord_version)
-  s.add_dependency('dbee', '~>2')
+  s.add_dependency('dbee', '=2.1.0.pre.alpha')
 
   s.add_development_dependency('guard-rspec', '~>4.7')
   s.add_development_dependency('mysql2', '~>0.5')
   s.add_development_dependency('pry', '~>0')
-  s.add_development_dependency('rake', '~> 12')
+  s.add_development_dependency('rake', '~> 13')
   s.add_development_dependency('rspec', '~> 3.8')
-  s.add_development_dependency('rubocop', '~>0.74.0')
+  s.add_development_dependency('rubocop', '~>0.81.0')
   s.add_development_dependency('simplecov', '~>0.17.0')
-  s.add_development_dependency('simplecov-console', '~>0.5.0')
+  s.add_development_dependency('simplecov-console', '~>0.7.0')
   s.add_development_dependency('sqlite3', '~>1')
 end

data/lib/dbee/providers/active_record_provider/expression_builder.rb

@@ -7,26 +7,24 @@
 # LICENSE file in the root directory of this source tree.
 #
 
-require_relative 'expression_builder/constraint_maker'
-require_relative 'expression_builder/order_maker'
-require_relative 'expression_builder/select_maker'
-require_relative 'expression_builder/where_maker'
+require_relative 'expression_builder/constraint'
+require_relative 'expression_builder/order'
+require_relative 'expression_builder/select'
+require_relative 'expression_builder/where'
 
 module Dbee
   module Providers
     class ActiveRecordProvider
       # This class can generate an Arel expression tree.
       class ExpressionBuilder
-        extend Forwardable
-
         class MissingConstraintError < StandardError; end
 
-        def_delegators :statement, :to_sql
-
         def initialize(model, table_alias_maker, column_alias_maker)
           @model              = model
           @table_alias_maker  = table_alias_maker
           @column_alias_maker = column_alias_maker
+          @requires_group_by  = false
+          @group_by_columns   = []
 
           clear
         end
@@ -49,13 +47,25 @@ module Dbee
           self
         end
 
+        def to_sql
+          if requires_group_by
+            @requires_group_by = false
+            statement.group(group_by_columns) unless group_by_columns.empty?
+            @group_by_columns = []
+          end
+
+          statement.to_sql
+        end
+
         private
 
         attr_reader :base_table,
                     :statement,
                     :model,
                     :table_alias_maker,
-                    :column_alias_maker
+                    :column_alias_maker,
+                    :requires_group_by,
+                    :group_by_columns
 
         def tables
           @tables ||= {}
@@ -70,7 +80,7 @@ module Dbee
 
           key_path    = filter.key_path
           arel_column = key_paths_to_arel_columns[key_path]
-          predicate   = WhereMaker.instance.make(filter, arel_column)
+          predicate   = Where.instance.make(filter, arel_column)
 
           build(statement.where(predicate))
 
@@ -82,22 +92,40 @@ module Dbee
 
           key_path    = sorter.key_path
           arel_column = key_paths_to_arel_columns[key_path]
-          predicate   = OrderMaker.instance.make(sorter, arel_column)
+          predicate   = Order.instance.make(sorter, arel_column)
 
           build(statement.order(predicate))
 
           self
         end
 
+        def add_filter_key_paths(filters)
+          filters.each_with_object({}) do |filter, memo|
+            arel_key_column = add_key_path(filter.key_path)
+
+            memo[arel_key_column] = filter
+          end
+        end
+
         def add_field(field)
-          add_key_path(field.key_path)
+          arel_value_column           = add_key_path(field.key_path)
+          arel_key_columns_to_filters = add_filter_key_paths(field.filters)
 
-          key_path    = field.key_path
-          arel_column = key_paths_to_arel_columns[key_path]
-          predicate   = SelectMaker.instance.make(field, arel_column, column_alias_maker)
+          predicate = Select.instance.make(
+            field,
+            arel_key_columns_to_filters,
+            arel_value_column,
+            column_alias_maker
+          )
 
           build(statement.project(predicate))
 
+          if field.aggregator?
+            @requires_group_by = true
+          else
+            group_by_columns << arel_value_column
+          end
+
           self
         end
 
@@ -123,7 +151,7 @@ module Dbee
         def table(name, model, previous_table)
           table = make_table(model.table, name)
 
-          on = ConstraintMaker.instance.make(model.constraints, table, previous_table)
+          on = Constraint.instance.make(model.constraints, table, previous_table)
 
           raise MissingConstraintError, "for: #{name}" unless on
 
@@ -142,16 +170,16 @@ module Dbee
         end
 
         def add_key_path(key_path)
-          return if key_paths_to_arel_columns.key?(key_path)
+          return key_paths_to_arel_columns[key_path] if key_paths_to_arel_columns.key?(key_path)
 
           ancestors = model.ancestors!(key_path.ancestor_names)
 
           table = traverse_ancestors(ancestors)
 
           arel_column = table[key_path.column_name]
-          key_paths_to_arel_columns[key_path] = arel_column
 
-          self
+          # Note that this returns arel_column
+          key_paths_to_arel_columns[key_path] = arel_column
         end
 
         def build(new_expression)

data/lib/dbee/providers/active_record_provider/expression_builder/{constraint_maker.rb → constraint.rb}

@@ -12,9 +12,19 @@ module Dbee
     class ActiveRecordProvider
       class ExpressionBuilder
         # Can derive constraints for Arel table JOIN statements.
-        class ConstraintMaker
+        class Constraint
           include Singleton
 
+          def make(constraints, table, previous_table)
+            constraints.inject(nil) do |memo, constraint|
+              method = CONSTRAINT_RESOLVERS[constraint.class]
+
+              raise ArgumentError, "constraint unhandled: #{constraint.class.name}" unless method
+
+              method.call(constraint, memo, table, previous_table)
+            end
+          end
+
           CONCAT_METHOD = lambda do |on, arel_column, value|
             on ? on.and(arel_column.eq(value)) : arel_column.eq(value)
           end
@@ -44,16 +54,6 @@ module Dbee
           }.freeze
 
           private_constant :CONSTRAINT_RESOLVERS
-
-          def make(constraints, table, previous_table)
-            constraints.inject(nil) do |memo, constraint|
-              method = CONSTRAINT_RESOLVERS[constraint.class]
-
-              raise ArgumentError, "constraint unhandled: #{constraint.class.name}" unless method
-
-              method.call(constraint, memo, table, previous_table)
-            end
-          end
         end
       end
     end

data/lib/dbee/providers/active_record_provider/expression_builder/{order_maker.rb → order.rb}

@@ -12,16 +12,9 @@ module Dbee
     class ActiveRecordProvider
       class ExpressionBuilder
         # Derives Arel#order predicates.
-        class OrderMaker
+        class Order
           include Singleton
 
-          SORTER_EVALUATORS = {
-            Query::Sorters::Ascending => ->(column) { column },
-            Query::Sorters::Descending => ->(column) { column.desc }
-          }.freeze
-
-          private_constant :SORTER_EVALUATORS
-
           def make(sorter, arel_column)
             method = SORTER_EVALUATORS[sorter.class]
 
@@ -29,6 +22,13 @@ module Dbee
 
             method.call(arel_column)
           end
+
+          SORTER_EVALUATORS = {
+            Query::Sorters::Ascending => ->(column) { column },
+            Query::Sorters::Descending => ->(column) { column.desc }
+          }.freeze
+
+          private_constant :SORTER_EVALUATORS
         end
       end
     end

data/lib/dbee/providers/active_record_provider/expression_builder/select.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+#
+# Copyright (c) 2019-present, Blue Marble Payroll, LLC
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+#
+
+module Dbee
+  module Providers
+    class ActiveRecordProvider
+      class ExpressionBuilder
+        # Derives Arel#project predicates.
+        class Select
+          include Singleton
+
+          def make(field, arel_key_nodes_to_filters, arel_value_node, alias_maker)
+            column_alias = quote(alias_maker.make(field.display))
+            predicate    = expression(field, arel_key_nodes_to_filters, arel_value_node)
+            predicate    = aggregate(field, predicate)
+
+            predicate.as(column_alias)
+          end
+
+          private
+
+          AGGREGRATOR_EVALUATORS = {
+            nil => ->(arel_node) { arel_node },
+            Query::Field::Aggregator::AVE => ->(node) { Arel::Nodes::Avg.new([node]) },
+            Query::Field::Aggregator::COUNT => ->(node) { Arel::Nodes::Count.new([node]) },
+            Query::Field::Aggregator::MAX => ->(node) { Arel::Nodes::Max.new([node]) },
+            Query::Field::Aggregator::MIN => ->(node) { Arel::Nodes::Min.new([node]) },
+            Query::Field::Aggregator::SUM => ->(node) { Arel::Nodes::Sum.new([node]) }
+          }.freeze
+
+          private_constant :AGGREGRATOR_EVALUATORS
+
+          def quote(value)
+            ActiveRecord::Base.connection.quote(value)
+          end
+
+          def aggregate(field, predicate)
+            AGGREGRATOR_EVALUATORS[field.aggregator].call(predicate)
+          end
+
+          def expression(field, arel_key_nodes_to_filters, arel_value_node)
+            if field.filters?
+              case_statement   = Arel::Nodes::Case.new
+              filter_predicate = make_filter_predicate(arel_key_nodes_to_filters)
+
+              case_statement.when(filter_predicate).then(arel_value_node)
+            else
+              arel_value_node
+            end
+          end
+
+          def make_filter_predicate(arel_key_nodes_to_filters)
+            predicates = arel_key_nodes_to_filters.map do |arel_key_node, filter|
+              Where.instance.make(filter, arel_key_node)
+            end
+
+            predicates.inject(predicates.shift) do |memo, predicate|
+              memo.and(predicate)
+            end
+          end
+        end
+      end
+    end
+  end
+end