inheritance_integer_type 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24a8dfac2f20647d7ae593cd3c4703585cc3206f
-  data.tar.gz: b3740e25777985015bfc3e69bfd1bce1694045ff
+  metadata.gz: 9a916703b732e9a89a88946d16cf6a29c9674fd0
+  data.tar.gz: 8dcd46dded61c5168d8e964659887bb33768d343
 SHA512:
-  metadata.gz: 9645040244a4a1fdef44d79362ef075e356fdfa2648f36f794045d229b3e1ffc49deef651e52e65fc2c5f0cc7bcbf8e4a49b3dd405aea92685a7091c6368522a
-  data.tar.gz: 30bd7e83d396df14f7901e992a9d61dc557b95d79109a414fb9253a43009fd680d8a6b595a22c7172a0a36edfa321ef0ab3d56c63896ea539f3e060dd35bdec8
+  metadata.gz: 2bcf51124af5f9e4ebcf75b30dea1cff9f3e207da988b9b3dea327917e82367541c5ae6f4e852c07251e641f6bf79b316113c1cf01dff492794db13427105838
+  data.tar.gz: 6abd3fc1aebc455713a8127adb040179abc993b73d2ffdf7433444f60d28fa8a367a183436bb334c9dd9509b7c140695bf4b7a3efb904f7bf9a9c95c94d1c487

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    inheritance_integer_type (0.0.1)
+    inheritance_integer_type (0.1.2)
 
 GEM
   remote: https://rubygems.org/
@@ -19,17 +19,15 @@ GEM
       multi_json (~> 1.0)
     arel (3.0.3)
     builder (3.0.4)
-    columnize (0.8.9)
-    debugger (1.6.8)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.3.5)
-    debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.3.5)
+    coderay (1.1.2)
     diff-lcs (1.2.5)
     i18n (0.6.9)
+    method_source (0.9.0)
     multi_json (1.10.1)
-    mysql (2.8.1)
+    mysql2 (0.3.18)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
     rake (10.3.2)
     rspec (3.0.0)
       rspec-core (~> 3.0.0)
@@ -49,10 +47,13 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (= 3.2.11)
+  activerecord
   bundler (~> 1.6)
-  debugger
   inheritance_integer_type!
-  mysql (= 2.8.1)
+  mysql2 (= 0.3.18)
+  pry
   rake
   rspec
+
+BUNDLED WITH
+   1.16.1

data/inheritance_integer_type.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "activerecord", "3.2.11"
-  spec.add_development_dependency "mysql", "2.8.1"
-  spec.add_development_dependency "debugger" 
+  spec.add_development_dependency "activerecord"
+  spec.add_development_dependency "mysql2", "0.3.18"
+  spec.add_development_dependency "pry"
 end

data/lib/inheritance_integer_type/extensions.rb

@@ -9,7 +9,27 @@ module InheritanceIntegerType
 
       def find_sti_class(type_name)
         lookup = self._inheritance_mapping[type_name.to_i]
-        lookup ? super(lookup) : super
+        if lookup
+          if ActiveRecord::VERSION::MAJOR < 5
+            super(lookup)
+          else
+            begin
+              if store_full_sti_class
+                ActiveSupport::Dependencies.constantize(lookup)
+              else
+                compute_type(lookup)
+              end
+            rescue NameError
+              raise SubclassNotFound,
+                "The single-table inheritance mechanism failed to locate the subclass: '#{type_name}'. " +
+                "This error is raised because the column '#{inheritance_column}' is reserved for storing the class in case of inheritance. " +
+                "Please rename this column if you didn't intend it to be used for storing the inheritance class " +
+                "or overwrite #{name}.inheritance_column to use another column for that information."
+            end
+          end
+        else
+          super
+        end
       end
 
       def sti_name_with_integer_types

data/lib/inheritance_integer_type/version.rb

@@ -1,3 +1,3 @@
 module InheritanceIntegerType
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/inheritance_integer_type_spec.rb

@@ -1,81 +1,59 @@
 require 'spec_helper'
-require 'debugger'
+require 'pry'
 describe InheritanceIntegerType do
+  [3,5].each do |major_version|
+    let(:base) { Base.create(name: "Hello") }
+    let(:left) { LeftChild.create(name: "Hello") }
+    let(:deep) { DeepChild.create(name: "Hello") }
 
-  let(:base) { Base.create(name: "Hello") }
-  let(:left) { LeftChild.create(name: "Hello") }
-  let(:deep) { DeepChild.create(name: "Hello") }
+    before { allow(ActiveRecord::VERSION).to receive(:MAJOR).and_return(major_version) }
 
-  describe "The parent" do
-    subject { base }
-    it { is_expected.to be_persisted }
-    it "has no type" do
-      expect(subject.type).to be_nil
+    describe "The parent" do
+      subject { base }
+      it { is_expected.to be_persisted }
+      it "has no type" do
+        expect(subject.type).to be_nil
+      end
+      it { is_expected.to eql Base.first }
     end
-    it { is_expected.to eql Base.first }
-  end
-
-  describe "The inherited classes" do
-    subject { left }
-    it { is_expected.to be_persisted }
-    it { is_expected.to eql LeftChild.first }
-  end
 
-  describe "The deep inherited classes" do
-    subject { deep }
-    it { is_expected.to be_persisted }
-    it { is_expected.to eql DeepChild.first }
-  end
-
-  describe "Belongs to associations" do
-
-    let(:belong) { BelongsTo.create(base: base, left_child: left) }
-    subject { belong }
-
-    it "properly assocaites the base class" do
-      expect(subject.base).to eql base
+    describe "The inherited classes" do
+      subject { left }
+      it { is_expected.to be_persisted }
+      it { is_expected.to eql LeftChild.first }
     end
 
-    it "properly assocaites the children class" do
-      expect(subject.left_child).to eql left
+    describe "The deep inherited classes" do
+      subject { deep }
+      it { is_expected.to be_persisted }
+      it { is_expected.to eql DeepChild.first }
     end
 
+    describe "Belongs to associations" do
 
-  end
+      let(:belong) { BelongsTo.create(base: base, left_child: left) }
+      subject { belong }
 
-  describe "Has many associations" do
-    let(:other) { Other.create }
-    before do
-      [base, left, deep].each{|a| a.update_attributes(other: other) }
-    end
-    subject { other }
-    it "properly finds the classes through the association" do
-      expect(other.bases).to match_array [base, left, deep]
-    end
-
-  end
+      it "properly assocaites the base class" do
+        expect(subject.base).to eql base
+      end
 
-  describe "Old style inheritance" do
+      it "properly assocaites the children class" do
+        expect(subject.left_child).to eql left
+      end
 
-    let(:old_style) { OldStyle.create }
-    let(:inherited_old_style) { InheritOldStyle.create }
 
-    context "on the base class" do
-      subject { old_style }
-      it "has no type" do
-        expect(subject.type).to be_nil
-      end
-      it { is_expected.to eql OldStyle.first }
     end
 
-    context "on the inherited class" do
-      subject { inherited_old_style }
-      it "has the string type" do
-        expect(inherited_old_style.type).to eql "InheritOldStyle"
+    describe "Has many associations" do
+      let(:other) { Other.create }
+      before do
+        [base, left, deep].each{|a| a.update_attributes(other: other) }
+      end
+      subject { other }
+      it "properly finds the classes through the association" do
+        expect(other.bases).to match_array [base, left, deep]
       end
-      it { is_expected.to eql InheritOldStyle.first }
     end
-
   end
-
 end

data/spec/spec_helper.rb

@@ -6,8 +6,6 @@ require 'support/right_child'
 require 'support/deep_child'
 require 'support/other'
 require 'support/belongs_to'
-require 'support/old_style'
-require 'support/inherit_old_style'
 
 RSpec.configure do |config|
 

data/spec/support/active_record.rb

@@ -2,7 +2,7 @@ require 'active_record'
 Dir["#{File.dirname(__FILE__)}/migrations/*.rb"].each {|f| require f}
 
 config = {
-  :adapter => "mysql",
+  :adapter => "mysql2",
   :host => "localhost",
   :database => "inheritance_integer_type_test",
   :username => "iit",

data/spec/support/base.rb

@@ -4,4 +4,9 @@ class Base < ActiveRecord::Base
   has_many :belongs_to
   belongs_to :other
 
+  self._inheritance_mapping = {
+    1 => "LeftChild",
+    2 => "RightChild",
+    3 => "DeepChild",
+  }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inheritance_integer_type
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Kyle d'Oliveira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2018-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,32 +56,32 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.11
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.11
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: 0.3.18
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: 0.3.18
 - !ruby/object:Gem::Dependency
-  name: debugger
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="