active_record-mti 0.3.0.pre.rc2 → 0.3.0.pre.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d60ec74fdc811ec4b99d12daed96d8d44989026b
-  data.tar.gz: 5e11732fcfec73c329050915107a088876886b37
+  metadata.gz: 2797d1673715b1af2e8d8afc15738a50c40b79c0
+  data.tar.gz: d28b1fdf7acd2348659f140f86221f8a6f754113
 SHA512:
-  metadata.gz: 62ce99ba9014e671d53c84b1bab0ac37de5dc7ee3317767b27b3dcc8084b6f544b0a1ffe25674a83723b9f8ee8e19d4ccc0fa22ee728df9b21d2186075ee8ecf
-  data.tar.gz: 8fac323f73f8d83aeb417a28243c711ff3073d58a541179aaa5ccb9f985fe2329917c286368a17b9d50426304eb10d3661352ad6f0b1896ed4106e6e17bfdaa7
+  metadata.gz: 0f2678e3004f58eb2ccbb3ba77521f6bed0efe492c657b39c0d19e5ce33081326730591d89c21049d859a4ef4f29a5cd4c38f96961662b658256353f835efe55
+  data.tar.gz: 1beed4b499349f31e093332e4e4f505aa9482bd46e47f989ae3aa0be13fc8a897596f9be2613bbf4db19e777ad76c471eafa4d72ea4e3f92d9f890f2cc523637

data/.travis.yml

@@ -12,18 +12,18 @@ addons:
   postgresql: "9.3"
 
 rvm:
-  - 2.0
-  - 2.1
-  - 2.2
-  - 2.3
   - 2.4
+  - 2.3
+  - 2.2
+  - 2.1
+  - 2.0
 
 gemfile:
-  - gemfiles/activerecord-4.0.Gemfile
-  - gemfiles/activerecord-4.1.Gemfile
-  - gemfiles/activerecord-4.2.Gemfile
-  - gemfiles/activerecord-5.0.Gemfile
   - gemfiles/activerecord-5.1.Gemfile
+  - gemfiles/activerecord-5.0.Gemfile
+  - gemfiles/activerecord-4.2.Gemfile
+  - gemfiles/activerecord-4.1.Gemfile
+  - gemfiles/activerecord-4.0.Gemfile
 
 matrix:
   exclude:

data/CHANGELOG.md

@@ -1,10 +1,11 @@
 # ActiveRecord::MTI
 
-## 0.3.0 _(November 7th 2017)_
+## 0.3.0 _(Unreleased)_
 - Greatly improved future-proofing injection strategy.
   - No longer overwriting (and maintaining) ActiveRecord Calculation sub-routines.
 - 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`
 
 ## 0.2.1 _(September 20th 2017)_
 - More reliable class discrimination

data/Gemfile

@@ -17,4 +17,6 @@ group :test do
 
   gem 'database_cleaner'
 
+  gem 'combustion'
+
 end

data/active_record-mti.gemspec

@@ -37,5 +37,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry-byebug', '~> 3'
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'combustion', '~> 0.7'
 
 end

data/lib/active_record/mti.rb

@@ -24,21 +24,6 @@ module ActiveRecord
     # Rails likes to make breaking changes in it's minor versions (like 4.1 - 4.2) :P
     mattr_accessor :oid_class
 
-    # Cannot assign default inside block because of rails 4.0
-    self.oid_class =
-      [
-        '::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID::Integer', # 4.0, 4.1
-        '::ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Integer', # 4.2
-        '::ActiveRecord::Type::Integer' # 5.0, 5.1
-      ].find(nil) { |klass|
-        begin
-          klass.constantize
-          true
-        rescue NameError
-          false
-        end
-      }.constantize
-
     class << self
       attr_writer :logger
 
@@ -68,5 +53,29 @@ module ActiveRecord
       value == true || value == 't' || value == 1 || value == '1'
     end
 
+    private
+
+    mattr_accessor :oid_class_candidates
+
+    # Cannot assign default inside block because of rails 4.0
+    self.oid_class_candidates = [
+      '::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID::Integer', # 4.0, 4.1
+      '::ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Integer', # 4.2
+      '::ActiveRecord::Type::Integer' # 5.0, 5.1
+    ]
+
+    def self.find_oid_class
+      oid_class_candidates.find(nil) { |klass|
+        begin
+          klass.constantize
+          true
+        rescue NameError
+          false
+        end
+      }.constantize
+    end
+
+    self.oid_class = self.find_oid_class
+
   end
 end

data/lib/active_record/mti/inheritance.rb

@@ -22,7 +22,6 @@ module ActiveRecord
         end
 
         def uses_mti(*args)
-          # ActiveRecord::MTI.logger.
           warn "DEPRECATED - `uses_mti` is no longer needed (nor has any effect)"
         end
 
@@ -117,7 +116,9 @@ module ActiveRecord
           if self.respond_to? :attribute
             self.attribute :tableoid, ActiveRecord::MTI.oid_class.new
           else
-            columns.unshift ActiveRecord::ConnectionAdapters::PostgreSQLColumn.new('tableoid', nil, ActiveRecord::MTI.oid_class.new, "oid", false)
+            new_column = ActiveRecord::ConnectionAdapters::PostgreSQLColumn.new('tableoid', nil, ActiveRecord::MTI.oid_class.new, "oid", false)
+            columns.unshift new_column
+            columns_hash['tableoid'] = new_column
           end
         end
       end

data/lib/active_record/mti/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module MTI
-    VERSION = '0.3.0-rc2'
+    VERSION = '0.3.0-rc3'
   end
 end

data/spec/active_record/mti/inheritance_spec.rb

@@ -10,6 +10,10 @@ describe ActiveRecord::MTI::Inheritance do
     expect(Admin.using_multi_table_inheritance?).to eq(true)
   end
 
+  it "warns of deprication when using old `uses_mti`" do
+    expect { Admin.uses_mti }.to output("DEPRECATED - `uses_mti` is no longer needed (nor has any effect)\n").to_stderr
+  end
+
   context 'class definition' do
 
     describe 'for classes that use MTI' do

data/spec/active_record/mti_spec.rb

@@ -10,6 +10,15 @@ describe ActiveRecord::MTI do
       end
     end
 
+    it "root has the right value" do
+      expect(ActiveRecord::MTI.root).not_to be_nil
+    end
+
+    it "recovers if oid class candidate is not constantizable" do
+      ActiveRecord::MTI.oid_class_candidates.unshift("IDontExist")
+      expect(ActiveRecord::MTI.find_oid_class).not_to be_nil
+    end
+
   end
 
 end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 ENV['RAILS_ENV'] = 'test'
 
 require 'database_cleaner'
+require 'combustion'
 
 require 'simplecov'
 SimpleCov.start do
@@ -8,26 +9,8 @@ SimpleCov.start do
   add_filter 'spec'
 end
 
-require 'active_record/mti'
-
-ActiveRecord::MTI.load
-
-db_config = {
-  adapter: 'postgresql', database: 'active_record-mti-test'
-}
-
-db_config_admin = db_config.merge({ database: 'postgres', schema_search_path: 'public' })
-
-ActiveRecord::Base.establish_connection db_config_admin
-ActiveRecord::Base.connection.drop_database(db_config[:database])
-ActiveRecord::Base.connection.create_database(db_config[:database])
-ActiveRecord::Base.establish_connection db_config
-
-load File.dirname(__FILE__) + '/schema.rb'
-
-Dir[ActiveRecord::MTI.root.join('spec', 'support', '**', '**.rb')].each do |f|
-  require f
-end
+Combustion.path = 'spec/support/rails'
+Combustion.initialize! :active_record
 
 RSpec.configure do |config|
   config.order = 'random'

data/spec/support/rails/app/models/admin.rb

@@ -0,0 +1,3 @@
+class Admin < User
+  self.table_name = 'admins'
+end

data/spec/support/rails/app/models/comment.rb

@@ -0,0 +1,4 @@
+class Comment < ::ActiveRecord::Base
+  belongs_to :user
+  belongs_to :post
+end

data/spec/support/rails/app/models/post.rb

@@ -0,0 +1,4 @@
+class Post < ::ActiveRecord::Base
+  belongs_to :user
+  has_many :comments
+end

data/spec/support/rails/app/models/transportation/military/vehicle.rb

@@ -0,0 +1,7 @@
+module Transportation
+  module Military
+    class Vehicle < ::Transportation::Vehicle
+      self.inheritance_column = 'type'
+    end
+  end
+end

data/spec/support/rails/app/models/transportation/truck.rb

@@ -0,0 +1,5 @@
+module Transportation
+  class Truck < Vehicle
+    self.table_name = 'vehicles/trucks'
+  end
+end

data/spec/support/rails/app/models/transportation/vehicle.rb

@@ -0,0 +1,4 @@
+module Transportation
+  class Vehicle < ::ActiveRecord::Base
+  end
+end

data/spec/support/rails/app/models/user.rb

@@ -0,0 +1,6 @@
+class User < ::ActiveRecord::Base
+
+  has_many :posts
+  has_many :comments
+
+end

data/spec/support/rails/config/database.yml

@@ -0,0 +1,4 @@
+test:
+  adapter: postgresql
+  encoding: unicode
+  database: active_record-mti-test

data/spec/support/rails/config/routes.rb

@@ -0,0 +1,3 @@
+Rails.application.routes.draw do
+  #
+end

data/spec/{schema.rb → support/rails/db/schema.rb}

@@ -1,4 +1,8 @@
 ActiveRecord::Schema.define do
+
+  enable_extension 'pgcrypto'
+  enable_extension "uuid-ossp"
+
   self.verbose = false
 
   create_table :users, schema: :public, force: true do |t|
@@ -14,12 +18,17 @@ ActiveRecord::Schema.define do
     t.integer :god_powers
   end
 
-  create_table :posts, force: true do |t|
+  create_table :posts, id: :bigserial, force: true do |t|
     t.integer :user_id
     t.string :title
     t.timestamps null: false
   end
 
+  create_table :post_tags, id: :bigserial, default: nil, primary_key: :post_id, force: true do |t|
+    t.string :title
+    t.timestamps null: false
+  end
+
   create_table :comments, force: true do |t|
     t.integer :user_id
     t.integer :post_id

data/spec/support/rails/log/.gitignore

@@ -0,0 +1 @@
+*.log

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record-mti
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre.rc2
+  version: 0.3.0.pre.rc3
 platform: ruby
 authors:
 - Dale Stevens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-23 00:00:00.000000000 Z
+date: 2017-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -86,6 +86,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: combustion
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 description: Gives ActiveRecord support for PostgreSQL's native inherited tables
 email:
 - dale@twilightcoders.net
@@ -126,9 +140,19 @@ files:
 - spec/active_record/mti/schema_dumper_spec.rb
 - spec/active_record/mti_spec.rb
 - spec/active_record/sti/inheritance_spec.rb
-- spec/schema.rb
 - spec/spec_helper.rb
-- spec/support/models.rb
+- spec/support/rails/app/models/admin.rb
+- spec/support/rails/app/models/comment.rb
+- spec/support/rails/app/models/post.rb
+- spec/support/rails/app/models/transportation/military/vehicle.rb
+- spec/support/rails/app/models/transportation/truck.rb
+- spec/support/rails/app/models/transportation/vehicle.rb
+- spec/support/rails/app/models/user.rb
+- spec/support/rails/config/database.yml
+- spec/support/rails/config/routes.rb
+- spec/support/rails/db/schema.rb
+- spec/support/rails/log/.gitignore
+- spec/support/rails/public/favicon.ico
 homepage: https://github.com/twilightcoders/active_record-mti
 licenses:
 - MIT
@@ -162,6 +186,16 @@ test_files:
 - spec/active_record/mti/schema_dumper_spec.rb
 - spec/active_record/mti_spec.rb
 - spec/active_record/sti/inheritance_spec.rb
-- spec/schema.rb
 - spec/spec_helper.rb
-- spec/support/models.rb
+- spec/support/rails/app/models/admin.rb
+- spec/support/rails/app/models/comment.rb
+- spec/support/rails/app/models/post.rb
+- spec/support/rails/app/models/transportation/military/vehicle.rb
+- spec/support/rails/app/models/transportation/truck.rb
+- spec/support/rails/app/models/transportation/vehicle.rb
+- spec/support/rails/app/models/user.rb
+- spec/support/rails/config/database.yml
+- spec/support/rails/config/routes.rb
+- spec/support/rails/db/schema.rb
+- spec/support/rails/log/.gitignore
+- spec/support/rails/public/favicon.ico

data/spec/support/models.rb

@@ -1,38 +0,0 @@
-require 'active_record'
-
-class Comment < ::ActiveRecord::Base
-  belongs_to :user
-  belongs_to :post
-
-end
-
-class Post < ::ActiveRecord::Base
-  belongs_to :user
-  has_many :comments
-end
-
-class User < ::ActiveRecord::Base
-
-  has_many :posts
-  has_many :comments
-
-end
-
-class Admin < User
-  self.table_name = 'admins'
-end
-
-module Transportation
-  class Vehicle < ::ActiveRecord::Base
-  end
-
-  class Truck < Vehicle
-    self.table_name = 'vehicles/trucks'
-  end
-
-  module Military
-    class Vehicle < ::Transportation::Vehicle
-      self.inheritance_column = 'type'
-    end
-  end
-end