inheritance_integer_type 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9a916703b732e9a89a88946d16cf6a29c9674fd0
-  data.tar.gz: 8dcd46dded61c5168d8e964659887bb33768d343
+SHA256:
+  metadata.gz: e932d673791b85556b6b801aaa5c95bac18874349a439f66a5f8e0caa86b057f
+  data.tar.gz: cba578bdfa831665545c8d434d217352d7cacb5e5d6e127be56f2752e6dce438
 SHA512:
-  metadata.gz: 2bcf51124af5f9e4ebcf75b30dea1cff9f3e207da988b9b3dea327917e82367541c5ae6f4e852c07251e641f6bf79b316113c1cf01dff492794db13427105838
-  data.tar.gz: 6abd3fc1aebc455713a8127adb040179abc993b73d2ffdf7433444f60d28fa8a367a183436bb334c9dd9509b7c140695bf4b7a3efb904f7bf9a9c95c94d1c487
+  metadata.gz: 995c8ac0ec86a511f2e3be2af931edea4b60e0989a509807b51e3f3ea5258145919921808bea74ad8267e767d464b53b814fdb9c9999c2bb3619018cffd9844f
+  data.tar.gz: 8c87eba6859ed899affdd8ffa2344bc93d38d5631855a3057eced8efb223b17e8df3a5abaacd638814f2a4bf8ce6aeb85dad4530ec5284bbf2e9af25aab585e4

data/Gemfile.lock

@@ -6,25 +6,25 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (3.2.11)
-      activesupport (= 3.2.11)
-      builder (~> 3.0.0)
-    activerecord (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.11)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    arel (3.0.3)
-    builder (3.0.4)
+    activemodel (5.2.0)
+      activesupport (= 5.2.0)
+    activerecord (5.2.0)
+      activemodel (= 5.2.0)
+      activesupport (= 5.2.0)
+      arel (>= 9.0)
+    activesupport (5.2.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (9.0.0)
     coderay (1.1.2)
+    concurrent-ruby (1.0.5)
     diff-lcs (1.2.5)
-    i18n (0.6.9)
+    i18n (1.0.0)
+      concurrent-ruby (~> 1.0)
     method_source (0.9.0)
-    multi_json (1.10.1)
-    mysql2 (0.3.18)
+    minitest (5.11.3)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -41,7 +41,10 @@ GEM
     rspec-mocks (3.0.1)
       rspec-support (~> 3.0.0)
     rspec-support (3.0.0)
-    tzinfo (0.3.39)
+    sqlite3 (1.3.13)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
@@ -50,10 +53,10 @@ DEPENDENCIES
   activerecord
   bundler (~> 1.6)
   inheritance_integer_type!
-  mysql2 (= 0.3.18)
   pry
   rake
   rspec
+  sqlite3 (~> 1.3.6)
 
 BUNDLED WITH
-   1.16.1
+   1.16.6

data/inheritance_integer_type.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "activerecord"
-  spec.add_development_dependency "mysql2", "0.3.18"
+  spec.add_development_dependency "sqlite3", "~> 1.3.6"
   spec.add_development_dependency "pry"
 end

data/lib/inheritance_integer_type.rb

@@ -2,10 +2,5 @@ require "inheritance_integer_type/version"
 require "inheritance_integer_type/extensions"
 
 class ActiveRecord::Base
-
-  def self.inherited(child_class)
-    child_class.include InheritanceIntegerType::Extensions
-    super
-  end
-
+  singleton_class.prepend(InheritanceIntegerType::Extensions)
 end

data/lib/inheritance_integer_type/extensions.rb

@@ -1,63 +1,53 @@
 module InheritanceIntegerType
   module Extensions
-    extend ActiveSupport::Concern
-    module ClassMethods
-
-      def integer_inheritance=(val)
-        self._inheritance_mapping[val] = sti_name_without_integer_types
-      end
+    def sti_name
+      klass = super
+      self._inheritance_mapping.key(klass) || klass
+    end
 
-      def find_sti_class(type_name)
-        lookup = self._inheritance_mapping[type_name.to_i]
-        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."
+    def find_sti_class(type_name)
+      lookup = self._inheritance_mapping[type_name.to_i]
+      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
-        else
-          super
         end
-      end
-
-      def sti_name_with_integer_types
-        klass = sti_name_without_integer_types
-        self._inheritance_mapping.key(klass) || klass
+      else
+        super
       end
     end
 
-    included do
-      class << self
-        def _inheritance_mapping
-          @_inheritance_mapping ||= (superclass == ActiveRecord::Base ? {} : superclass._inheritance_mapping.dup)
-        end
+    def integer_inheritance=(val)
+      self._inheritance_mapping[val] = method(:sti_name).super_method.call
+    end
 
-        def _inheritance_mapping=(val)
-          @_inheritance_mapping = val
-        end
+    def _inheritance_mapping
+      @_inheritance_mapping ||= (superclass == ActiveRecord::Base ? {} : superclass._inheritance_mapping.dup)
+    end
 
-        def merge_mapping!(mapping)
-          conflicts = _inheritance_mapping.keys & mapping.keys
-          raise ArgumentError.new("Duplicate mapping detected for keys: #{conflicts}") if conflicts.any?
+    def _inheritance_mapping=(val)
+      @_inheritance_mapping = val
+    end
 
-          _inheritance_mapping.merge!(mapping)
-        end
+    def merge_mapping!(mapping)
+      conflicts = _inheritance_mapping.keys & mapping.keys
+      raise ArgumentError.new("Duplicate mapping detected for keys: #{conflicts}") if conflicts.any?
 
-        alias_method_chain :sti_name, :integer_types
-      end
+      _inheritance_mapping.merge!(mapping)
     end
-
   end
+
 end

data/lib/inheritance_integer_type/version.rb

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

data/spec/spec_helper.rb

@@ -8,9 +8,8 @@ require 'support/other'
 require 'support/belongs_to'
 
 RSpec.configure do |config|
-
   config.before(:suite) do
-    ActiveRecord::Migrator.up "#{File.dirname(__FILE__)}/support/migrations"
+    ActiveRecord::MigrationContext.new("#{File.dirname(__FILE__)}/support/migrations").migrate
   end
 
   # No need to return the run the down migration after the test
@@ -19,7 +18,6 @@ RSpec.configure do |config|
   #   ActiveRecord::Migrator.down "#{File.dirname(__FILE__)}/support/migrations"
   # end
 
-
   config.around do |example|
     ActiveRecord::Base.transaction do
       example.run

data/spec/support/active_record.rb

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

data/spec/support/base.rb

@@ -1,6 +1,4 @@
 class Base < ActiveRecord::Base
-  include InheritanceIntegerType::Extensions
-  
   has_many :belongs_to
   belongs_to :other
 

data/spec/support/migrations/1_create_base_table.rb

@@ -1,4 +1,4 @@
-class CreateBaseTable < ActiveRecord::Migration
+class CreateBaseTable < ActiveRecord::Migration[5.2]
 
   def change
     create_table :bases do |t|

data/spec/support/migrations/2_create_belong_to_table.rb

@@ -1,4 +1,4 @@
-class CreateBelongToTable < ActiveRecord::Migration
+class CreateBelongToTable < ActiveRecord::Migration[5.2]
 
   def change
     create_table :belongs_tos do |t|

data/spec/support/migrations/3_create_other_table.rb

@@ -1,4 +1,4 @@
-class CreateOtherTable < ActiveRecord::Migration
+class CreateOtherTable < ActiveRecord::Migration[5.2]
 
   def change
     create_table :others do |t|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inheritance_integer_type
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Kyle d'Oliveira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-12 00:00:00.000000000 Z
+date: 2019-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.18
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.18
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -145,8 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Allow the type field in teh DB to be an integer rather than a string