dbee-active_record 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13a6e859cfda81bef925efcdf8b7686df6aab8c50dc614b869face063445ccb0
-  data.tar.gz: 5702022d37244525b7c88ea87ffba3c9836209d3fafbb42a27f09dc8ee167ec8
+  metadata.gz: ec33481a6a1eb0dd9ddb60ace985456f5e8d085559d8923607bb252c013498de
+  data.tar.gz: 49fe65ebf0caeb1f0e87482309352ed0e258cfd57c2ab26e2c3867d2c7e4a27a
 SHA512:
-  metadata.gz: 22f8257ae899206e51bcbcc702e22913d0e174d6b4baaf906b12ed498a8c2e1c8d3cd8294b64df8a1b53570d666910afe0e8263ef06d57df4c5ff4e6327ea085
-  data.tar.gz: fc2ac48d0710372a7bce9b9113a43638a2c66245c645a577a7c01e86ec23d6a76972e4ee28a9fa4cfb88d197dec0b7e162fbb72cf641f483864b3f19d687b2af
+  metadata.gz: 44d6130ac9b617fddc0943caeabc65576e5617eac9bad7367757ab8ddff1dc98e3e542b9ec564da20f4d1c3c3e1094b8c4e8e27156e76ddea248d12afb38e570
+  data.tar.gz: 7288cd2c2cbb0ee5e57278aa0d5ec308dc0c3dfeb8fe032cb5a50c5e9c42f2110388fd3933d2a46199fea901fda10509359c422e19d9be9d55e9228e449a292a

data/.rubocop.yml

@@ -9,6 +9,9 @@ Metrics/BlockLength:
     - context
     - specify
     - define
+  Exclude:
+    - spec/dbee/**/*
+    - dbee-active_record.gemspec
 
 Metrics/MethodLength:
   Max: 25

data/.travis.yml

@@ -9,6 +9,13 @@ rvm:
   - 2.4.6
   - 2.5.5
   - 2.6.3
+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,8 @@
+# 1.0.2 (August 26th, 2019)
+
+* Only support Dbee version 1.0.2 and above
+* Added support and test matrices for ActiveRecord 6
+
 # 1.0.1 (August 26th, 2019)
 
 * Only support Dbee version 1.0.1 and above

data/dbee-active_record.gemspec

@@ -21,8 +21,20 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.4.6'
 
-  s.add_dependency('activerecord', '~>5', '>=5.2.1')
-  s.add_dependency('dbee', '~>1', '>=1.0.1')
+  ar_version = ENV['AR_VERSION'] || ''
+
+  activerecord_version =
+    case ar_version
+    when '6'
+      ['>=6.0.0', '<7']
+    when '5'
+      ['>=5.2.1', '<6']
+    else
+      ['>=5.2.1', '<7']
+    end
+
+  s.add_dependency('activerecord', activerecord_version)
+  s.add_dependency('dbee', '~>1', '>=1.0.2')
 
   s.add_development_dependency('guard-rspec', '~>4.7')
   s.add_development_dependency('mysql2', '~>0.5')

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

@@ -10,7 +10,7 @@
 module Dbee
   module Providers
     class ActiveRecordProvider
-      VERSION = '1.0.1'
+      VERSION = '1.0.2'
     end
   end
 end

data/spec/dbee/providers/active_record_provider_spec.rb

@@ -30,15 +30,18 @@ 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_5_sql  = snapshot[key].to_s.chomp.tr("\n", ' ')
+                  expected_6_sql  = expected_5_sql.gsub('  ', ' ').gsub("'t'", '1').gsub("'f'", '0')
+                  actual_sql      = described_class.new(readable: readable).sql(model, query)
 
                   error_msg = <<~ERROR_MSG
-                    Expected: #{expected_sql}
-                    Actual:   #{actual_sql}
+                    Expected 5 SQL: #{expected_5_sql}
+                    Expected 6 SQL: #{expected_6_sql}
+                    Actual:         #{actual_sql}
                   ERROR_MSG
 
-                  expect(actual_sql).to eq(expected_sql), error_msg
+                  expect([expected_5_sql, expected_6_sql]).to include(actual_sql), error_msg
                 end
               end
             end

data/spec/fixtures/active_record_snapshots/one_table_query_with_filters.yaml

@@ -18,7 +18,7 @@ query:
       value: m
     - type: equals
       key_path: active
-      value: 'false' # notice how the value is a string, but the data model should be setup to be a boolean
+      value: 'false'
     - type: equals
       key_path: active
       value: [ true, false, [ null ] ] # test out nested value arrays

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: dbee-active_record
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Matthew Ruggio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-26 00:00:00.000000000 Z
+date: 2019-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.2.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.2.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: dbee
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement