dbee-active_record 2.0.4 → 2.2.0

data/spec/spec_helper.rb

@@ -7,8 +7,15 @@
 # LICENSE file in the root directory of this source tree.
 #
 
-require 'yaml'
 require 'pry'
+require 'super_diff/rspec'
+require 'yaml'
+
+RSpec.configure do |config|
+  # Allow for disabling auto focus mode in certain environments like CI to
+  # prevent false positives when only a subset of the suite passes.
+  config.filter_run_when_matching :focus unless ENV['DISABLE_RSPEC_FOCUS'] == 'true'
+end
 
 unless ENV['DISABLE_SIMPLECOV'] == 'true'
   require 'simplecov'
@@ -35,7 +42,7 @@ def fixture(*filename)
 end
 
 def yaml_fixture_files(*directory)
-  Dir[File.join('spec', 'fixtures', *directory, '*.yaml')].map do |filename|
+  Dir[File.join('spec', 'fixtures', *directory, '**', '*.yaml')].map do |filename|
     [
       filename,
       yaml_file_read(filename)
@@ -50,3 +57,7 @@ end
 def file_read(*filename)
   File.open(File.join(*filename), 'r:bom|utf-8').read
 end
+
+def models
+  yaml_fixture('models.yaml')
+end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: dbee-active_record
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.2.0
 platform: ruby
 authors:
 - Matthew Ruggio
-autorequire: 
-bindir: bin
+- Craig Kattner
+autorequire:
+bindir: exe
 cert_chain: []
-date: 2020-02-13 00:00:00.000000000 Z
+date: 2021-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -36,20 +37,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -92,6 +87,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -126,42 +135,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: simplecov-console
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -176,12 +213,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: super_diff
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 description: "    By default Dbee ships with no underlying SQL generator.  This library
   will plug in ActiveRecord into Dbee and Dbee will use it for SQL generation.\n"
 email:
 - mruggio@bluemarblepayroll.com
-executables:
-- console
+- ckattner@bluemarblepayroll.com
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -199,20 +250,25 @@ files:
 - Rakefile
 - bin/console
 - dbee-active_record.gemspec
+- exe/.gitkeep
 - lib/dbee/providers/active_record_provider.rb
 - lib/dbee/providers/active_record_provider/expression_builder.rb
-- lib/dbee/providers/active_record_provider/expression_builder/constraint_maker.rb
-- lib/dbee/providers/active_record_provider/expression_builder/order_maker.rb
-- lib/dbee/providers/active_record_provider/expression_builder/select_maker.rb
-- lib/dbee/providers/active_record_provider/expression_builder/where_maker.rb
+- lib/dbee/providers/active_record_provider/maker.rb
+- lib/dbee/providers/active_record_provider/makers/constraint.rb
+- lib/dbee/providers/active_record_provider/makers/order.rb
+- lib/dbee/providers/active_record_provider/makers/select.rb
+- lib/dbee/providers/active_record_provider/makers/where.rb
 - lib/dbee/providers/active_record_provider/obfuscated_alias_maker.rb
 - lib/dbee/providers/active_record_provider/safe_alias_maker.rb
 - lib/dbee/providers/active_record_provider/version.rb
 - spec/config/database.yaml.ci
 - spec/db_helper.rb
+- spec/dbee/providers/active_record_provider/expression_builder_spec.rb
+- spec/dbee/providers/active_record_provider/makers/where_spec.rb
 - spec/dbee/providers/active_record_provider_spec.rb
 - spec/fixtures/active_record_snapshots/five_table_query.yaml
 - spec/fixtures/active_record_snapshots/multiple_same_table_query_with_static_constraints.yaml
+- spec/fixtures/active_record_snapshots/one_table_empty_query.yaml
 - spec/fixtures/active_record_snapshots/one_table_query.yaml
 - spec/fixtures/active_record_snapshots/one_table_query_with_ascending_sort.yaml
 - spec/fixtures/active_record_snapshots/one_table_query_with_descending_sort.yaml
@@ -223,13 +279,20 @@ files:
 - spec/fixtures/active_record_snapshots/partitioner_example_2_query.yaml
 - spec/fixtures/active_record_snapshots/reverse_polymorphic_query.yaml
 - spec/fixtures/active_record_snapshots/two_table_query.yaml
+- spec/fixtures/active_record_snapshots/two_table_query_with_aggregation.yaml
+- spec/fixtures/active_record_snapshots/two_table_query_with_pivoting.yaml
 - spec/fixtures/models.yaml
 - spec/spec_helper.rb
 homepage: https://github.com/bluemarblepayroll/dbee-active_record
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+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: https://github.com/bluemarblepayroll/dbee-active_record
+  source_code_uri: https://github.com/bluemarblepayroll/dbee-active_record
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -237,7 +300,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.8
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -245,15 +308,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Plugs in ActiveRecord so Dbee can use Arel for SQL generation.
 test_files:
 - spec/config/database.yaml.ci
 - spec/db_helper.rb
+- spec/dbee/providers/active_record_provider/expression_builder_spec.rb
+- spec/dbee/providers/active_record_provider/makers/where_spec.rb
 - spec/dbee/providers/active_record_provider_spec.rb
 - spec/fixtures/active_record_snapshots/five_table_query.yaml
 - spec/fixtures/active_record_snapshots/multiple_same_table_query_with_static_constraints.yaml
+- spec/fixtures/active_record_snapshots/one_table_empty_query.yaml
 - spec/fixtures/active_record_snapshots/one_table_query.yaml
 - spec/fixtures/active_record_snapshots/one_table_query_with_ascending_sort.yaml
 - spec/fixtures/active_record_snapshots/one_table_query_with_descending_sort.yaml
@@ -264,5 +330,7 @@ test_files:
 - spec/fixtures/active_record_snapshots/partitioner_example_2_query.yaml
 - spec/fixtures/active_record_snapshots/reverse_polymorphic_query.yaml
 - spec/fixtures/active_record_snapshots/two_table_query.yaml
+- spec/fixtures/active_record_snapshots/two_table_query_with_aggregation.yaml
+- spec/fixtures/active_record_snapshots/two_table_query_with_pivoting.yaml
 - spec/fixtures/models.yaml
 - spec/spec_helper.rb

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

@@ -1,33 +0,0 @@
-# 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 SelectMaker
-          include Singleton
-
-          def make(column, arel_column, alias_maker)
-            column_alias = quote(alias_maker.make(column.display))
-
-            arel_column.as(column_alias)
-          end
-
-          private
-
-          def quote(value)
-            ActiveRecord::Base.connection.quote(value)
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,68 +0,0 @@
-# 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#where predicates.
-        class WhereMaker
-          include Singleton
-
-          FILTER_EVALUATORS = {
-            Query::Filters::Contains => ->(column, val) { column.matches("%#{val}%") },
-            Query::Filters::Equals => ->(column, val) { column.eq(val) },
-            Query::Filters::GreaterThan => ->(column, val) { column.gt(val) },
-            Query::Filters::GreaterThanOrEqualTo => ->(column, val) { column.gteq(val) },
-            Query::Filters::LessThan => ->(column, val) { column.lt(val) },
-            Query::Filters::LessThanOrEqualTo => ->(column, val) { column.lteq(val) },
-            Query::Filters::NotContain => ->(column, val) { column.does_not_match("%#{val}%") },
-            Query::Filters::NotEquals => ->(column, val) { column.not_eq(val) },
-            Query::Filters::NotStartWith => ->(column, val) { column.does_not_match("#{val}%") },
-            Query::Filters::StartsWith => ->(column, val) { column.matches("#{val}%") }
-          }.freeze
-
-          private_constant :FILTER_EVALUATORS
-
-          def make(filter, arel_column)
-            values = normalize(filter.value)
-
-            if filter.is_a?(Query::Filters::Equals) && values.length > 1
-              arel_column.in(values)
-            elsif filter.is_a?(Query::Filters::NotEquals) && values.length > 1
-              arel_column.not_in(values)
-            else
-              use_or(filter, arel_column)
-            end
-          end
-
-          private
-
-          def normalize(value)
-            value ? Array(value).flatten : [nil]
-          end
-
-          def use_or(filter, arel_column)
-            predicates = normalize(filter.value).map do |coerced_value|
-              method = FILTER_EVALUATORS[filter.class]
-
-              raise ArgumentError, "cannot compile filter: #{filter}" unless method
-
-              method.call(arel_column, coerced_value)
-            end
-
-            predicates.inject(predicates.shift) do |memo, predicate|
-              memo.or(predicate)
-            end
-          end
-        end
-      end
-    end
-  end
-end