class-table-inheritance 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a95bda292c5e755340b27be9fd90f957b01ecc47b73c89c177f572596a2f129
-  data.tar.gz: bd126cd28e8a4f7211d610c8316e50f76936db8cb0cc5204941292d1d4dc514f
+  metadata.gz: 8e27e0105847bc9bf4b3be11d2908984c1a74537c25d677552cc14308e7c4090
+  data.tar.gz: 90a3df095f9c9a177aceea9654950c461d3f17d9752267ad450478c1b1e779a0
 SHA512:
-  metadata.gz: 74c2e34b1409d158dde93426294e15bea61cad76ed8e7855b39041350b5e7e5cff0e2a180d9e087fbf9244c8b5d282c2d3b35a882c842e055dde8c09e85383dc
-  data.tar.gz: 1d2bfb4824571a4dcf873846c07693f8ba949d5b580ba8327a8cd57135a0a5c6d57c62d81861aab15e3d6015553174b6de488e2c76ac2f0ca04ab57587d321a9
+  metadata.gz: c8d85a2ec1e415c425c589355647d48c63fdf2029a97c3b8274a0d89f291c17cff381d32d1e6d231a35e540a55e4322c325a1ffad168828c4cb3bdced88eceb2
+  data.tar.gz: 7be4ebbb05a2544cc7a9797fc152324995b274c5835bc014935f3bc804df20a4961b6155bcb6514be3443ce587e4fc7207b6ada990f524722044c940cd4d7f88

data/{README.markdown → README.md}

@@ -1,6 +1,14 @@
+[![Build Status](https://travis-ci.org/brunofrank/class-table-inheritance.svg?branch=master)](https://travis-ci.org/brunofrank/class-table-inheritance)
+
 Change log
 ----------
 
+### 1.4.0
+
+* Add ActiveRecord 5.2 support
+* Require Ruby 2.2 or newer.
+
+
 ### 1.3.1
 
 * Removed 'set_primary_key' deprecation warning
@@ -41,7 +49,7 @@ Example
 ```ruby
   create_table :products do |t|
     t.string :description, :null => false
-	t.string :subtype # Only if you need access of both side see example
+    t.string :subtype # Only if you need access of both side see example
     t.decimal :price
     t.timestamps
   end
@@ -60,7 +68,7 @@ Example
 
 ```ruby
   class Product < ActiveRecord::Base
-	acts_as_superclass # only if you want top-down access.
+    acts_as_superclass # only if you want top-down access.
   end
 
   class Book < ActiveRecord::Base

data/class-table-inheritance.gemspec

@@ -19,7 +19,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'activerecord', '>=4', '<5.1'
+  s.required_ruby_version = '~> 2.2'
+
+  s.add_runtime_dependency 'activerecord', '>=4', '<6'
 
   s.add_development_dependency 'minitest-reporters','~>1.1'
   s.add_development_dependency 'rake', '>=11'

data/lib/class-table-inheritance/class-table-inheritance.rb

@@ -51,15 +51,12 @@ class ActiveRecord::Base
     self.primary_key = "#{association_id}_id"
 
 
-    # Autobuild method to make a instance of association
-    define_method("#{association_id}_with_autobuild") do
-      send("#{association_id}_without_autobuild") || send("build_#{association_id}")
+    # Autobuild method to make an instance of association
+    m = const_set("#{association_id.to_s.camelize}Builder", Module.new)
+    m.send(:define_method, association_id) do
+      super() || send("build_#{association_id}")
     end
-
-  
-    # Set a method chain whith autobuild.
-    alias_method_chain association_id, :autobuild    
-
+    prepend(m)
   
     # bind the before save, this method call the save of association, and
     # get our generated ID an set to association_id field.
@@ -106,9 +103,9 @@ class ActiveRecord::Base
     	  # if the field is ID than i only bind that with the association field.
     	  # this is needed to bypass the overflow problem when the ActiveRecord
     	  # try to get the id to find the association.
-    	  if name == 'id'
+        if name == 'id'
     	    self["#{association_id}_id"]
-    	  else 
+        else
           assoc = send(association_id)
           assoc.send(name)
         end
@@ -119,9 +116,9 @@ class ActiveRecord::Base
     	  # if the field is ID than i only bind that with the association field.
     	  # this is needed to bypass the overflow problem when the ActiveRecord
     	  # try to get the id to find the association.
-    	  if name == 'id'
+        if name == 'id'
     	    self["#{association_id}_id"] = new_value
-    	  else     	  
+        else
           assoc = send(association_id)
           assoc.send("#{name}=", new_value)
         end

data/lib/class-table-inheritance/inherits-migration.rb

@@ -1,17 +1,9 @@
-
-module InheritsMigration  
-
-  def self.included(base)
-    base.class_eval do
-      alias_method_chain :create_table , :inherits
-    end
-  end
-  
+module InheritsMigration
   # Generate the association field.
-  def create_table_with_inherits(table_name, options = {}, &block)
+  def create_table(table_name, options = {}, &block)
     options[:id] ||= false if options[:inherits]
     
-    create_table_without_inherits(table_name, options) do |table_defintion|
+    super(table_name, options) do |table_defintion|
       if options[:inherits]
         if options[:inherits].kind_of?(String)
           column_to_create = options[:inherits].gsub(/::/, '_').downcase
@@ -32,5 +24,4 @@ module InheritsMigration
   end  
 end
 
-ActiveRecord::Base
-ActiveRecord::ConnectionAdapters::SchemaStatements::send(:include, InheritsMigration)
+ActiveRecord::ConnectionAdapters::SchemaStatements.prepend(InheritsMigration)

data/lib/class-table-inheritance/version.rb

@@ -1,3 +1,3 @@
 class ClassTableInheritance
-  VERSION = "1.3.1"
+  VERSION = "1.4.0"
 end

data/test/test_helper.rb

@@ -9,7 +9,7 @@ Minitest::Reporters.use!
 
 database = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
 ActiveRecord::Base.establish_connection(database['sqlite3'])
-load(File.dirname(__FILE__) + "/schema.rb") if !File.exists?(database['sqlite3'][:database])
+load(File.dirname(__FILE__) + "/schema.rb") if !File.exist?(database['sqlite3'][:database])
 
 require 'models/product'
 require 'models/book'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: class-table-inheritance
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Bruno Frank
@@ -19,7 +19,7 @@ dependencies:
         version: '4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
-- README.markdown
+- README.md
 - Rakefile
 - class-table-inheritance.gemspec
 - init.rb
@@ -109,9 +109,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="