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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2797d1673715b1af2e8d8afc15738a50c40b79c0
-  data.tar.gz: d28b1fdf7acd2348659f140f86221f8a6f754113
+  metadata.gz: c09a0c6a54ac017046879c831b9d38c9b8537814
+  data.tar.gz: 583b53b0da0582fc7edc5498370eb652d3504281
 SHA512:
-  metadata.gz: 0f2678e3004f58eb2ccbb3ba77521f6bed0efe492c657b39c0d19e5ce33081326730591d89c21049d859a4ef4f29a5cd4c38f96961662b658256353f835efe55
-  data.tar.gz: 1beed4b499349f31e093332e4e4f505aa9482bd46e47f989ae3aa0be13fc8a897596f9be2613bbf4db19e777ad76c471eafa4d72ea4e3f92d9f890f2cc523637
+  metadata.gz: a944519cc3c24d2119437c8161fb9f9b178cd9bb4a999baa2ae9b2956e73191b93e4bb148bbdd0adc7512b06d5b91a58bc2114ea5e0f819109c91b5c6c0a7fc8
+  data.tar.gz: 217552288c9020c9251634261e7634c7641f141a2bb059ff2488858ef015682828c55d5bb12e990fa84aee24ba611d81963fb1660404a087c200513428683475

data/.gitignore

@@ -36,6 +36,7 @@
 
 # Compiled source #
 ###################
+/pkg/
 *.com
 *.class
 *.dll

data/Gemfile

@@ -10,9 +10,6 @@ group :test do
   # Publishes coverage to codeclimate
   gem 'codeclimate-test-reporter'
 
-  # Gives CircleCI more perspective on our tests
-  gem 'rspec_junit_formatter'
-
   gem 'rspec'
 
   gem 'database_cleaner'

data/README.md

@@ -1,7 +1,8 @@
 [![Version      ](https://img.shields.io/gem/v/active_record-mti.svg?maxAge=2592000)](https://rubygems.org/gems/active_record-mti)
 [![Build Status ](https://travis-ci.org/TwilightCoders/active_record-mti.svg)](https://travis-ci.org/TwilightCoders/active_record-mti)
-[![Code Climate ](https://codeclimate.com/github/TwilightCoders/active_record-mti/badges/gpa.svg)](https://codeclimate.com/github/TwilightCoders/active_record-mti)
+[![Code Climate ](https://api.codeclimate.com/v1/badges/27b02e09b5da0a7ed2fc/maintainability)](https://codeclimate.com/github/TwilightCoders/active_record-mti/maintainability)
 [![Test Coverage](https://codeclimate.com/github/TwilightCoders/active_record-mti/badges/coverage.svg)](https://codeclimate.com/github/TwilightCoders/active_record-mti/coverage)
+[![Dependencies ](https://gemnasium.com/badges/github.com/TwilightCoders/active_record-mti.svg)](https://gemnasium.com/github.com/TwilightCoders/active_record-mti)
 
 # ActiveRecord::MTI
 

data/active_record-mti.gemspec

@@ -36,7 +36,7 @@ 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 'rake', '~> 12.0'
   spec.add_development_dependency 'combustion', '~> 0.7'
 
 end

data/lib/active_record/mti/calculations.rb

@@ -14,8 +14,8 @@ module ActiveRecord
         orignal_value = Thread.current['skip_tableoid_cast']
         Thread.current['skip_tableoid_cast'] = value
         return_value = yield if block_given?
+      ensure
         Thread.current['skip_tableoid_cast'] = orignal_value
-        return return_value
       end
 
     end

data/lib/active_record/mti/inheritance.rb

@@ -6,8 +6,8 @@ module ActiveRecord
       def self.prepended(subclass)
         subclass.extend(ClassMethods)
         class << subclass
-          class_attribute :mti_type_column
-          class_attribute :tableoid_column
+          attr_reader :mti_type_column
+          attr_reader :tableoid_column
         end
       end
 
@@ -81,14 +81,14 @@ module ActiveRecord
           ).first
 
           tableoid = tableoid_query.try(:[], 'tableoid') || false
-          self.tableoid_column = ActiveRecord::MTI.testify(tableoid_query.try(:[], 'has_tableoid_column'))
+          @tableoid_column = ActiveRecord::MTI.testify(tableoid_query.try(:[], 'has_tableoid_column'))
 
           if (has_tableoid_column?)
             ActiveRecord::MTI.logger.debug "#{table_schema}.#{table_name} has tableoid column! (#{tableoid})"
             add_tableoid_column
-            self.mti_type_column = arel_table[:tableoid]
+            @mti_type_column = arel_table[:tableoid]
           else
-            self.mti_type_column = nil
+            @mti_type_column = nil
           end
 
           tableoid

data/lib/active_record/mti/version.rb

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

data/spec/active_record/{calculations_spec.rb → mti/calculations_spec.rb}

@@ -2,6 +2,15 @@ require 'spec_helper'
 
 describe ActiveRecord::MTI::Calculations do
 
+  context 'when an exception occurs' do
+    it 'does not continue to adversely affect additional queries' do
+      Admin.create(email: 'bob')
+      expect{ Admin.joins(Transportation::Vehicle).count }.to raise_error(RuntimeError)
+      expect(Thread.current['skip_tableoid_cast']).to_not eq(true)
+      expect(Admin.count).to eq(1)
+    end
+  end
+
   context "don't project tableoid on" do
     it "grouping" do
 
@@ -44,5 +53,4 @@ describe ActiveRecord::MTI::Calculations do
       expect(sql).to match(/GROUP BY .*, \"admins\".\"tableoid\"/)
     end
   end
-
 end

data/spec/active_record/mti/inheritance_spec.rb

@@ -17,6 +17,15 @@ describe ActiveRecord::MTI::Inheritance do
   context 'class definition' do
 
     describe 'for classes that use MTI' do
+
+      it 'has non-nil mti_type_column' do
+        expect(Admin.mti_type_column).to_not be_nil
+      end
+
+      it 'has true tableoid_column' do
+        expect(Admin.tableoid_column).to eq(true)
+      end
+
       it "doesn't check inheritance multiple times" do
         # Due to the anonymous class ("god = Class.new(Admin)") rspec can't properly distinquish
         # between the two classes. So at most 2 times!
@@ -31,6 +40,15 @@ describe ActiveRecord::MTI::Inheritance do
     end
 
     describe "for classes that don't use MTI" do
+
+      it 'has nil tableoid_column' do
+        expect(Post.tableoid_column).to be_nil
+      end
+
+      it 'has nil mti_type_column' do
+        expect(Post.mti_type_column).to be_nil
+      end
+
       it "doesn't check inheritance multiple times" do
         # ActiveRecord::MTI::Inheritance.register(Post, false)
         expect(Post).to receive(:check_inheritance_of).and_call_original.exactly(1).times

data/spec/active_record/mti/query_methods_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe ActiveRecord::MTI::QueryMethods do
+
+  context "queries" do
+    it "select tableoid" do
+      sql = Admin.all.to_sql
+      expect(sql).to match(/SELECT .*, \"admins\".\"tableoid\" AS tableoid FROM \"admins\"/)
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -5,7 +5,6 @@ require 'combustion'
 
 require 'simplecov'
 SimpleCov.start do
-  # add_group 'Lib', 'lib'
   add_filter 'spec'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record-mti
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre.rc3
+  version: 0.3.0.pre.rc4
 platform: ruby
 authors:
 - Dale Stevens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-29 00:00:00.000000000 Z
+date: 2017-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
@@ -134,9 +134,10 @@ files:
 - lib/active_record/mti/schema_dumper.rb
 - lib/active_record/mti/version.rb
 - lib/core_ext/hash.rb
-- spec/active_record/calculations_spec.rb
+- spec/active_record/mti/calculations_spec.rb
 - spec/active_record/mti/inheritance_spec.rb
 - spec/active_record/mti/model_schema_spec.rb
+- spec/active_record/mti/query_methods_spec.rb
 - spec/active_record/mti/schema_dumper_spec.rb
 - spec/active_record/mti_spec.rb
 - spec/active_record/sti/inheritance_spec.rb
@@ -180,9 +181,10 @@ signing_key:
 specification_version: 4
 summary: Multi Table Inheritance for PostgreSQL in Rails
 test_files:
-- spec/active_record/calculations_spec.rb
+- spec/active_record/mti/calculations_spec.rb
 - spec/active_record/mti/inheritance_spec.rb
 - spec/active_record/mti/model_schema_spec.rb
+- spec/active_record/mti/query_methods_spec.rb
 - spec/active_record/mti/schema_dumper_spec.rb
 - spec/active_record/mti_spec.rb
 - spec/active_record/sti/inheritance_spec.rb