dbee-active_record 1.0.0.pre.alpha.1 → 1.0.0.pre.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b90006ed4131966543f8f275e4deb54980ffab496a498815773aa5aa67b4b8cf
-  data.tar.gz: f62a8f583274f83119f269b2c7a5f718ed72801067d359254ae9de30df5a5775
+  metadata.gz: cab1f2d6c2a6d667b383c44478b3252720abd3b15ce6a2592e74de9c9ac4154a
+  data.tar.gz: 241dd04790275b714766f1132b6266a05027f972a073de71f0cc9839451b29ad
 SHA512:
-  metadata.gz: f1fd3ac8fbda1255d6eabecb1d932274e799727223220c08fa93db0ea1970ea0438416ae83e6d7da34477fc43ff43cc3a78afe1763bb5cd19292822e74f3ae99
-  data.tar.gz: c26ff6e76f480578fbee1a6f51ad37a07826189307b9e65dc4b5fa4d8acb1ccf43b36ab2322dc498f91e7e60d5b3c1b1a1fc8ac30fdd5fc0eb090a5046fae632
+  metadata.gz: 393dbacbcb27172556d5957777e72b0d3a5428a7f833a9c24c80e7a733f56b794fba8beb372f6661152806042df0c1b13bcd7e9d12eef936bd1ab7236a94d49b
+  data.tar.gz: c65fdeb21d29c3af66d8dfb353fecae9fb01991314914c5113d85c2912c4e1f775b89237077c935f217f0f8c69f24fd3d7cc7455904528da4ecd1da2fd7f9af9

data/.rubocop.yml

@@ -16,7 +16,7 @@ Metrics/MethodLength:
     - spec/db_helper.rb
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.4
 
 Metrics/AbcSize:
   Max: 16

data/.travis.yml

@@ -6,8 +6,8 @@ services:
   - mysql
 rvm:
   # Build on the latest stable of all supported Rubies (https://www.ruby-lang.org/en/downloads/):
-  - 2.5.3
-  - 2.6.0
+  - 2.4.6
+  - 2.5.5
   - 2.6.3
 cache: bundler
 before_script:

data/dbee-active_record.gemspec

@@ -19,18 +19,18 @@ Gem::Specification.new do |s|
   s.homepage    = 'https://github.com/bluemarblepayroll/dbee-active_record'
   s.license     = 'MIT'
 
-  s.required_ruby_version = '>= 2.5.3'
+  s.required_ruby_version = '>= 2.4.6'
 
   s.add_dependency('activerecord', '~>5', '>=5.2.1')
-  s.add_dependency('dbee', '>=1.0.0.pre.alpha.2')
+  s.add_dependency('dbee', '~>1')
 
   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('rspec', '~> 3.8')
-  s.add_development_dependency('rubocop', '~>0.63.1')
-  s.add_development_dependency('simplecov', '~>0.16.1')
-  s.add_development_dependency('simplecov-console', '~>0.4.2')
+  s.add_development_dependency('rubocop', '~>0.74.0')
+  s.add_development_dependency('simplecov', '~>0.17.0')
+  s.add_development_dependency('simplecov-console', '~>0.5.0')
   s.add_development_dependency('sqlite3', '~>1')
 end

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

@@ -28,10 +28,8 @@ module Dbee
 
           private_constant :METHODS
 
-          def make(filter, arel_column, model_column)
-            coerced_values = Array(filter.value).map { |v| model_column.coerce(v) }
-
-            predicates = coerced_values.map do |coerced_value|
+          def make(filter, arel_column)
+            predicates = normalize(filter.value).map do |coerced_value|
               method = METHODS[filter.class]
 
               raise ArgumentError, "cannot compile filter: #{filter}" unless method
@@ -39,13 +37,15 @@ module Dbee
               method.call(arel_column, coerced_value)
             end
 
-            clause = predicates.shift
-
-            predicates.each do |predicate|
-              clause = clause.or(predicate)
+            predicates.inject(predicates.shift) do |memo, predicate|
+              memo.or(predicate)
             end
+          end
+
+          private
 
-            clause
+          def normalize(value)
+            value ? Array(value).flatten : [nil]
           end
         end
       end

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

@@ -58,10 +58,6 @@ module Dbee
           @key_paths_to_arel_columns ||= {}
         end
 
-        def key_paths_to_model_columns
-          @key_paths_to_model_columns ||= {}
-        end
-
         def where_maker
           @where_maker ||= WhereMaker.new
         end
@@ -81,11 +77,10 @@ module Dbee
         def add_filter(filter)
           add_key_path(filter.key_path)
 
-          key_path      = filter.key_path
-          arel_column   = key_paths_to_arel_columns[key_path]
-          model_column  = key_paths_to_model_columns[key_path]
+          key_path    = filter.key_path
+          arel_column = key_paths_to_arel_columns[key_path]
 
-          predicate = where_maker.make(filter, arel_column, model_column)
+          predicate = where_maker.make(filter, arel_column)
 
           @statement = statement.where(predicate)
 
@@ -126,11 +121,6 @@ module Dbee
           self
         end
 
-        def model_column(ancestors, key_path)
-          model_column = (ancestors.values.last || model).column(key_path.column_name)
-          key_paths_to_model_columns[key_path] = model_column
-        end
-
         def table(name, model, previous_table)
           table = Arel::Table.new(model.table)
           table.table_alias = table_alias_maker.make(name)
@@ -154,8 +144,6 @@ module Dbee
 
           ancestors = model.ancestors(key_path.ancestor_names)
 
-          model_column(ancestors, key_path)
-
           table = traverse_ancestors(ancestors)
 
           arel_column = table[key_path.column_name]

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

@@ -10,7 +10,7 @@
 module Dbee
   module Providers
     class ActiveRecordProvider
-      VERSION = '1.0.0-alpha.1'
+      VERSION = '1.0.0-alpha.2'
     end
   end
 end

data/lib/dbee/providers/active_record_provider.rb

@@ -21,6 +21,8 @@ module Dbee
       DEFAULT_TABLE_PREFIX  = 't'
       DEFAULT_COLUMN_PREFIX = 'c'
 
+      private_constant :DEFAULT_TABLE_PREFIX, :DEFAULT_COLUMN_PREFIX
+
       attr_reader :readable, :table_alias_maker, :column_alias_maker
 
       def initialize(

data/spec/dbee/providers/active_record_provider_spec.rb

@@ -30,8 +30,8 @@ describe Dbee::Providers::ActiveRecordProvider do
                   model_name = snapshot['model_name']
                   query = Dbee::Query.make(snapshot['query'])
                   model = Dbee::Model.make(models[model_name])
-                  expected_sql  = snapshot[key].to_s.chomp.tr("\n", ' ')
-                  actual_sql    = described_class.new(readable: readable).sql(model, query)
+                  expected_sql = snapshot[key].to_s.chomp.tr("\n", ' ')
+                  actual_sql = described_class.new(readable: readable).sql(model, query)
 
                   error_msg = <<~ERROR_MSG
                     Expected: #{expected_sql}

data/spec/fixtures/active_record_snapshots/one_table_query_with_filters.yaml

@@ -21,22 +21,13 @@ query:
       value: 'false' # notice how the value is a string, but the data model should be setup to be a boolean
     - type: equals
       key_path: active
-      value:
-        - false
-        - true
-        - null
-        - 'y'
-        - 'n'
-        - ''
+      value: [ true, false, [ null ] ] # test out nested value arrays
     - type: equals
       key_path: inspected
       value:
         - false
         - true
         - null
-        - 'y'
-        - 'n'
-        - ''
     - type: less_than_or_equal_to
       value: '2019-03-04'
       key_path: created_at
@@ -65,24 +56,15 @@ query:
         - 'hu'
       key_path: name
 sqlite_readable: |+
-  SELECT
-  "theaters"."id" AS 'ID #',
+  SELECT "theaters"."id" AS 'ID #',
   "theaters"."name" AS 'name'
   FROM "theaters" "theaters"
-  WHERE
-  ("theaters"."name" = 'AMC' OR "theaters"."name" = 'Regal') AND
+  WHERE ("theaters"."name" = 'AMC' OR "theaters"."name" = 'Regal') AND
   "theaters"."name" LIKE 'A%' AND
   "theaters"."name" LIKE '%m%' AND
-  "theaters"."active" = 'f' AND
-  ((((("theaters"."active" = 'f' OR "theaters"."active" = 't') OR
-  "theaters"."active" = 'f') OR "theaters"."active" = 't') OR
-  "theaters"."active" = 'f') OR
-  "theaters"."active" = 'f') AND
-  ((((("theaters"."inspected" = 'f' OR "theaters"."inspected" = 't') OR
-  "theaters"."inspected" IS NULL) OR
-  "theaters"."inspected" = 't') OR
-  "theaters"."inspected" = 'f') OR
-  "theaters"."inspected" IS NULL) AND
+  "theaters"."active" = 'false' AND
+  (("theaters"."active" = 't' OR "theaters"."active" = 'f') OR "theaters"."active" IS NULL) AND
+  (("theaters"."inspected" = 'f' OR "theaters"."inspected" = 't') OR "theaters"."inspected" IS NULL) AND
   "theaters"."created_at" <= '2019-03-04' AND
   "theaters"."created_at" < '2018-03-04' AND
   "theaters"."created_at" >= '2001-03-04' AND
@@ -91,24 +73,15 @@ sqlite_readable: |+
   ("theaters"."name" NOT LIKE '%tfli%' OR "theaters"."name" NOT LIKE '%ul%') AND
   ("theaters"."name" NOT LIKE 'netf%' OR "theaters"."name" NOT LIKE 'hu%')
 sqlite_not_readable: |+
-  SELECT
-  "t0"."id" AS 'c0',
+  SELECT "t0"."id" AS 'c0',
   "t0"."name" AS 'c1'
   FROM "theaters" "t0"
-  WHERE
-  ("t0"."name" = 'AMC' OR "t0"."name" = 'Regal') AND
+  WHERE ("t0"."name" = 'AMC' OR "t0"."name" = 'Regal') AND
   "t0"."name" LIKE 'A%' AND
   "t0"."name" LIKE '%m%' AND
-  "t0"."active" = 'f' AND
-  ((((("t0"."active" = 'f' OR "t0"."active" = 't') OR
-  "t0"."active" = 'f') OR "t0"."active" = 't') OR
-  "t0"."active" = 'f') OR
-  "t0"."active" = 'f') AND
-  ((((("t0"."inspected" = 'f' OR "t0"."inspected" = 't') OR
-  "t0"."inspected" IS NULL) OR
-  "t0"."inspected" = 't') OR
-  "t0"."inspected" = 'f') OR
-  "t0"."inspected" IS NULL) AND
+  "t0"."active" = 'false' AND
+  (("t0"."active" = 't' OR "t0"."active" = 'f') OR "t0"."active" IS NULL) AND
+  (("t0"."inspected" = 'f' OR "t0"."inspected" = 't') OR "t0"."inspected" IS NULL) AND
   "t0"."created_at" <= '2019-03-04' AND
   "t0"."created_at" < '2018-03-04' AND
   "t0"."created_at" >= '2001-03-04' AND
@@ -117,24 +90,15 @@ sqlite_not_readable: |+
   ("t0"."name" NOT LIKE '%tfli%' OR "t0"."name" NOT LIKE '%ul%') AND
   ("t0"."name" NOT LIKE 'netf%' OR "t0"."name" NOT LIKE 'hu%')
 mysql_readable: |+
-  SELECT
-  `theaters`.`id` AS 'ID #',
+  SELECT `theaters`.`id` AS 'ID #',
   `theaters`.`name` AS 'name'
   FROM `theaters` `theaters`
-  WHERE
-  (`theaters`.`name` = 'AMC' OR `theaters`.`name` = 'Regal') AND
+  WHERE (`theaters`.`name` = 'AMC' OR `theaters`.`name` = 'Regal') AND
   `theaters`.`name` LIKE 'A%' AND
   `theaters`.`name` LIKE '%m%' AND
-  `theaters`.`active` = FALSE AND
-  (((((`theaters`.`active` = FALSE OR `theaters`.`active` = TRUE) OR
-  `theaters`.`active` = FALSE) OR `theaters`.`active` = TRUE) OR
-  `theaters`.`active` = FALSE) OR
-  `theaters`.`active` = FALSE) AND
-  (((((`theaters`.`inspected` = FALSE OR `theaters`.`inspected` = TRUE) OR
-  `theaters`.`inspected` IS NULL) OR
-  `theaters`.`inspected` = TRUE) OR
-  `theaters`.`inspected` = FALSE) OR
-  `theaters`.`inspected` IS NULL) AND
+  `theaters`.`active` = 'false' AND
+  ((`theaters`.`active` = TRUE OR `theaters`.`active` = FALSE) OR `theaters`.`active` IS NULL) AND
+  ((`theaters`.`inspected` = FALSE OR `theaters`.`inspected` = TRUE) OR `theaters`.`inspected` IS NULL) AND
   `theaters`.`created_at` <= '2019-03-04' AND
   `theaters`.`created_at` < '2018-03-04' AND
   `theaters`.`created_at` >= '2001-03-04' AND
@@ -143,24 +107,15 @@ mysql_readable: |+
   (`theaters`.`name` NOT LIKE '%tfli%' OR `theaters`.`name` NOT LIKE '%ul%') AND
   (`theaters`.`name` NOT LIKE 'netf%' OR `theaters`.`name` NOT LIKE 'hu%')
 mysql_not_readable: |+
-  SELECT
-  `t0`.`id` AS 'c0',
+  SELECT `t0`.`id` AS 'c0',
   `t0`.`name` AS 'c1'
   FROM `theaters` `t0`
-  WHERE
-  (`t0`.`name` = 'AMC' OR `t0`.`name` = 'Regal') AND
+  WHERE (`t0`.`name` = 'AMC' OR `t0`.`name` = 'Regal') AND
   `t0`.`name` LIKE 'A%' AND
   `t0`.`name` LIKE '%m%' AND
-  `t0`.`active` = FALSE AND
-  (((((`t0`.`active` = FALSE OR `t0`.`active` = TRUE) OR
-  `t0`.`active` = FALSE) OR `t0`.`active` = TRUE) OR
-  `t0`.`active` = FALSE) OR
-  `t0`.`active` = FALSE) AND
-  (((((`t0`.`inspected` = FALSE OR `t0`.`inspected` = TRUE) OR
-  `t0`.`inspected` IS NULL) OR
-  `t0`.`inspected` = TRUE) OR
-  `t0`.`inspected` = FALSE) OR
-  `t0`.`inspected` IS NULL) AND
+  `t0`.`active` = 'false' AND
+  ((`t0`.`active` = TRUE OR `t0`.`active` = FALSE) OR `t0`.`active` IS NULL) AND
+  ((`t0`.`inspected` = FALSE OR `t0`.`inspected` = TRUE) OR `t0`.`inspected` IS NULL) AND
   `t0`.`created_at` <= '2019-03-04' AND
   `t0`.`created_at` < '2018-03-04' AND
   `t0`.`created_at` >= '2001-03-04' AND

data/spec/fixtures/models.yaml

@@ -1,12 +1,6 @@
 Theaters, Members, and Movies:
   name: theaters
   table: theaters
-  columns:
-    - name: active
-      type: boolean
-      nullable: false
-    - name: inspected
-      type: boolean # this one is nullable
   models:
     - name: members
       table: members

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dbee-active_record
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.alpha.1
+  version: 1.0.0.pre.alpha.2
 platform: ruby
 authors:
 - Matthew Ruggio
@@ -34,16 +34,16 @@ dependencies:
   name: dbee
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre.alpha.2
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre.alpha.2
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -120,42 +120,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.63.1
+        version: 0.74.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.63.1
+        version: 0.74.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: simplecov-console
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -228,7 +228,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.3
+      version: 2.4.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"