active_record-mti 0.3.0.pre.rc4 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c09a0c6a54ac017046879c831b9d38c9b8537814
-  data.tar.gz: 583b53b0da0582fc7edc5498370eb652d3504281
+SHA256:
+  metadata.gz: 781df2afedf44dd2bdcc4014d8d2e165ebea29eaccea9360573941df5a937ef4
+  data.tar.gz: 544c4507ae2c1bbc25b59414b97579ac5cfe52b2c449fe7739ee17366bc76866
 SHA512:
-  metadata.gz: a944519cc3c24d2119437c8161fb9f9b178cd9bb4a999baa2ae9b2956e73191b93e4bb148bbdd0adc7512b06d5b91a58bc2114ea5e0f819109c91b5c6c0a7fc8
-  data.tar.gz: 217552288c9020c9251634261e7634c7641f141a2bb059ff2488858ef015682828c55d5bb12e990fa84aee24ba611d81963fb1660404a087c200513428683475
+  metadata.gz: e70e8399e5c11b8b8d33fb914debaa072e5e9c7fad8e99aea01385426460a8d461e807be2b7dcea9a8d9aac3108607ad8c3ce17f2bcaacd295ab71b0487451f8
+  data.tar.gz: f51d31db93ba3c77d026eb673b4315e7e2d927584505eaea7c28e855aaf6978302ad2b05ec9dacd225cd5802bfbe46119033edc70cb7d65018e7c86c7dc12a0a

data/.travis.yml

@@ -16,7 +16,6 @@ rvm:
   - 2.3
   - 2.2
   - 2.1
-  - 2.0
 
 gemfile:
   - gemfiles/activerecord-5.1.Gemfile
@@ -27,10 +26,6 @@ gemfile:
 
 matrix:
   exclude:
-  - rvm: 2.0
-    gemfile: gemfiles/activerecord-5.0.Gemfile
-  - rvm: 2.0
-    gemfile: gemfiles/activerecord-5.1.Gemfile
 
   - rvm: 2.1
     gemfile: gemfiles/activerecord-5.0.Gemfile

data/CHANGELOG.md

@@ -1,8 +1,13 @@
 # ActiveRecord::MTI
 
-## 0.3.0 _(Unreleased)_
+## 0.3.2 _(July 15th 2018)_
+- 0.3.1 Yanked due to failing specs in spec matrix
+- Fixed issue causing fails
+
+## 0.3.1 ~_(July 15th 2018)_~ YANKED
 - Greatly improved future-proofing injection strategy.
   - No longer overwriting (and maintaining) ActiveRecord Calculation sub-routines.
+  - Improve order of grouping and projection so other gems have more information to work with. (Like [`DeletedAt`](https://github.com/TwilightCoders/deleted_at))
 - Instead of injecting at `build_select`, we're injecting at `build_arel` with one additional new sub-routine (`build_mti`)
   - `build_mti` sub-routine detects if an MTI projection is needed based on grouping and selecting from query being built.
 - No longer need to use `uses_mti`

data/Gemfile

@@ -4,6 +4,8 @@ gemspec
 
 group :test do
 
+  gem 'pry'
+
   # Generates coverage stats of specs
   gem 'simplecov'
 

data/active_record-mti.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib', 'spec']
 
   rails_versions = ['>= 4', '< 6']
-  spec.required_ruby_version = '>= 2.0'
+  spec.required_ruby_version = '>= 2.1'
 
   spec.add_runtime_dependency 'pg', '~> 0'
   spec.add_runtime_dependency 'activerecord', rails_versions

data/lib/active_record/mti/query_methods.rb

@@ -3,17 +3,20 @@ module ActiveRecord
     module QueryMethods
 
       def build_arel
-        select_by_tableoid = select_values.delete(:tableoid) == :tableoid
-        group_by_tableoid = group_values.delete(:tableoid) == :tableoid
+        @select_by_tableoid = [select_values.delete(:tableoid), tableoid?(klass)].compact.first
+        @group_by_tableoid = group_values.delete(:tableoid)
 
-        arel = super
-
-        if tableoid?(@klass) || group_by_tableoid || select_by_tableoid
-          arel.project(tableoid_project(@klass))
-          arel.group(tableoid_group(@klass)) if group_values.any? || group_by_tableoid
+        super.tap do |arel|
+          if @group_by_tableoid || (@select_by_tableoid && group_values.any?)
+            arel.group(tableoid_group(@klass))
+          end
         end
+      end
 
-        arel
+      def build_select(*args)
+        super.tap do |arel|
+          arel.project(tableoid_project(@klass)) if (@group_by_tableoid || @select_by_tableoid)
+        end
       end
 
       private
@@ -21,7 +24,7 @@ module ActiveRecord
       def tableoid?(klass)
         !Thread.current['skip_tableoid_cast'] &&
         klass.using_multi_table_inheritance? &&
-        klass.has_tableoid_column?
+        klass.mti_type_column
       end
 
       def tableoid_project(klass)

data/lib/active_record/mti/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module MTI
-    VERSION = '0.3.0-rc4'
+    VERSION = '0.3.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record-mti
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre.rc4
+  version: 0.3.2
 platform: ruby
 authors:
 - Dale Stevens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-15 00:00:00.000000000 Z
+date: 2018-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -168,15 +168,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Multi Table Inheritance for PostgreSQL in Rails