active_type 0.4.5 → 0.7.5

data/gemfiles/Gemfile.5.0.0.pg.lock

@@ -0,0 +1,56 @@
+PATH
+  remote: ..
+  specs:
+    active_type (0.7.0)
+      activerecord (>= 3.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.0.0)
+      activesupport (= 5.0.0)
+    activerecord (5.0.0)
+      activemodel (= 5.0.0)
+      activesupport (= 5.0.0)
+      arel (~> 7.0)
+    activesupport (5.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (7.0.0)
+    concurrent-ruby (1.0.2)
+    diff-lcs (1.2.5)
+    i18n (0.7.0)
+    minitest (5.9.0)
+    pg (0.18.4)
+    rake (10.4.2)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.0)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  active_type!
+  activerecord (~> 5.0.0)
+  pg
+  rake
+  rspec (~> 3.4)
+
+BUNDLED WITH
+   1.12.1

data/gemfiles/Gemfile.5.0.0.sqlite3

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~>5.0.0'
+gem 'rspec', '~> 3.4'
+gem 'sqlite3'
+gem 'rake'
+
+gem 'active_type', :path => '..'

data/gemfiles/Gemfile.5.0.0.sqlite3.lock

@@ -0,0 +1,56 @@
+PATH
+  remote: ..
+  specs:
+    active_type (0.7.5)
+      activerecord (>= 3.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.0.0)
+      activesupport (= 5.0.0)
+    activerecord (5.0.0)
+      activemodel (= 5.0.0)
+      activesupport (= 5.0.0)
+      arel (~> 7.0)
+    activesupport (5.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (7.0.0)
+    concurrent-ruby (1.0.2)
+    diff-lcs (1.2.5)
+    i18n (0.7.0)
+    minitest (5.9.0)
+    rake (10.4.2)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.0)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    sqlite3 (1.3.11)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  active_type!
+  activerecord (~> 5.0.0)
+  rake
+  rspec (~> 3.4)
+  sqlite3
+
+BUNDLED WITH
+   1.15.4

data/gemfiles/Gemfile.5.1.0.mysql2

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~>5.1.0'
+gem 'rspec', '~>3.4'
+gem 'mysql2'
+gem 'rake'
+
+gem 'active_type', :path => '..'

data/gemfiles/Gemfile.5.1.0.mysql2.lock

@@ -0,0 +1,56 @@
+PATH
+  remote: ..
+  specs:
+    active_type (0.7.5)
+      activerecord (>= 3.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.1.1)
+      activesupport (= 5.1.1)
+    activerecord (5.1.1)
+      activemodel (= 5.1.1)
+      activesupport (= 5.1.1)
+      arel (~> 8.0)
+    activesupport (5.1.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (8.0.0)
+    concurrent-ruby (1.0.5)
+    diff-lcs (1.3)
+    i18n (0.8.4)
+    minitest (5.10.2)
+    mysql2 (0.4.6)
+    rake (12.0.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  active_type!
+  activerecord (~> 5.1.0)
+  mysql2
+  rake
+  rspec (~> 3.4)
+
+BUNDLED WITH
+   1.15.4

data/gemfiles/Gemfile.5.1.0.pg

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~>5.1.0'
+gem 'rspec', '~>3.4'
+gem 'pg'
+gem 'rake'
+
+gem 'active_type', :path => '..'

data/gemfiles/Gemfile.5.1.0.pg.lock

@@ -0,0 +1,56 @@
+PATH
+  remote: ..
+  specs:
+    active_type (0.7.5)
+      activerecord (>= 3.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.1.1)
+      activesupport (= 5.1.1)
+    activerecord (5.1.1)
+      activemodel (= 5.1.1)
+      activesupport (= 5.1.1)
+      arel (~> 8.0)
+    activesupport (5.1.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (8.0.0)
+    concurrent-ruby (1.0.5)
+    diff-lcs (1.3)
+    i18n (0.8.4)
+    minitest (5.10.2)
+    pg (0.21.0)
+    rake (12.0.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  active_type!
+  activerecord (~> 5.1.0)
+  pg
+  rake
+  rspec (~> 3.4)
+
+BUNDLED WITH
+   1.15.4

data/gemfiles/Gemfile.5.1.0.sqlite3

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~>5.1.0'
+gem 'rspec', '~> 3.4'
+gem 'sqlite3'
+gem 'rake'
+
+gem 'active_type', :path => '..'

data/gemfiles/Gemfile.5.1.0.sqlite3.lock

@@ -0,0 +1,56 @@
+PATH
+  remote: ..
+  specs:
+    active_type (0.7.5)
+      activerecord (>= 3.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.1.1)
+      activesupport (= 5.1.1)
+    activerecord (5.1.1)
+      activemodel (= 5.1.1)
+      activesupport (= 5.1.1)
+      arel (~> 8.0)
+    activesupport (5.1.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (8.0.0)
+    concurrent-ruby (1.0.5)
+    diff-lcs (1.3)
+    i18n (0.8.4)
+    minitest (5.10.2)
+    rake (12.0.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    sqlite3 (1.3.13)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  active_type!
+  activerecord (~> 5.1.0)
+  rake
+  rspec (~> 3.4)
+  sqlite3
+
+BUNDLED WITH
+   1.15.4

data/lib/active_type/extended_record/inheritance.rb

@@ -23,13 +23,48 @@ module ActiveType
 
         private
 
-        def find_sti_class(type_name)
-          sti_class = super
-          if self <= sti_class
-            self
-          else
-            sti_class
+        if ActiveRecord::VERSION::MAJOR < 5
+
+          def find_sti_class(type_name)
+            sti_class = super
+            if self <= sti_class
+              self
+            else
+              sti_class
+            end
           end
+
+        else
+
+          # Rails 5 find_sti_class does a sanity check for proper inheritance that fails for
+          # our usecase
+          # copied from activerecord/lib/active_record/inheritance.rb
+          def find_sti_class(type_name)
+            type_name = base_class.type_for_attribute(inheritance_column).cast(type_name)
+            subclass = begin
+              if store_full_sti_class
+                ActiveSupport::Dependencies.constantize(type_name)
+              else
+                compute_type(type_name)
+              end
+            rescue NameError
+              raise ActiveRecord::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
+            #### our code starts here
+            if self <= subclass
+              subclass = self
+            end
+            #### our code ends here
+            unless subclass == self || descendants.include?(subclass)
+              raise ActiveRecord::SubclassNotFound, "Invalid single-table inheritance type: #{subclass.name} is not a subclass of #{name}"
+            end
+            subclass
+          end
+
         end
 
       end

data/lib/active_type/nested_attributes/association.rb

@@ -9,13 +9,18 @@ module ActiveType
     class Association
 
       def initialize(owner, target_name, options = {})
-        options.assert_valid_keys(:build_scope, :find_scope, :scope, :allow_destroy, :reject_if)
+        options.assert_valid_keys(*valid_options)
 
         @owner = owner
         @target_name = target_name.to_sym
         @allow_destroy = options.fetch(:allow_destroy, false)
         @reject_if = options.delete(:reject_if)
         @options = options.dup
+        @index_errors = if ActiveRecord::VERSION::MAJOR < 5
+          @options[:index_errors]
+        else
+          @options[:index_errors] || ActiveRecord::Base.index_nested_attribute_errors
+        end
       end
 
       def assign_attributes(parent, attributes)
@@ -36,10 +41,10 @@ module ActiveType
       end
 
       def validate(parent)
-        changed_children(parent).each do |child|
+        changed_children(parent).each_with_index do |child, index|
           unless child.valid?
             child.errors.each do |attribute, message|
-              attribute = "#{@target_name}.#{attribute}"
+              attribute = @index_errors ? "#{@target_name}[#{index}].#{attribute}" : "#{@target_name}.#{attribute}"
               parent.errors[attribute] << message
               parent.errors[attribute].uniq!
             end
@@ -106,7 +111,7 @@ module ActiveType
       end
 
       def truthy?(value)
-        @boolean_type_caster ||= TypeCaster.get(:boolean, @owner.connection)
+        @boolean_type_caster ||= TypeCaster.get(:boolean)
         @boolean_type_caster.type_cast_from_user(value)
       end
 
@@ -122,6 +127,10 @@ module ActiveType
         result
       end
 
+      def valid_options
+        [:build_scope, :find_scope, :scope, :allow_destroy, :reject_if]
+      end
+
     end
 
   end

data/lib/active_type/nested_attributes/builder.rb

@@ -28,7 +28,7 @@ module ActiveType
       end
 
       def add_attribute(name, options)
-        @owner.attribute(name, options)
+        @owner.attribute(name, :object, options)
       end
 
       def add_writer_method(name, association)
@@ -41,7 +41,7 @@ module ActiveType
       end
 
       def add_autosave(name, association)
-        save_method = "save_associated_records_for_#{name}"
+        save_method = :"save_associated_records_for_#{name}"
         @module.module_eval do
           define_method save_method do
             association.save(self)
@@ -51,7 +51,7 @@ module ActiveType
       end
 
       def add_validation(name, association)
-        validate_method = "validate_associated_records_for_#{name}"
+        validate_method = :"validate_associated_records_for_#{name}"
         @module.module_eval do
           define_method validate_method do
             association.validate(self)

data/lib/active_type/nested_attributes/nests_many_association.rb

@@ -31,7 +31,7 @@ module ActiveType
           destroy = truthy?(attributes.delete(:_destroy)) && @allow_destroy
 
           if id = attributes.delete(:id)
-            child = fetch_child(parent, id.to_i)
+            child = fetch_child(parent, id)
             if destroy
               child.mark_for_destruction
             else
@@ -64,6 +64,10 @@ module ActiveType
         @target_name.to_s.classify
       end
 
+      def valid_options
+        super + [:index_errors]
+      end
+
     end
 
   end

data/lib/active_type/nested_attributes/nests_one_association.rb

@@ -17,9 +17,10 @@ module ActiveType
         destroy = truthy?(attributes.delete(:_destroy)) && @allow_destroy
 
         if id = attributes.delete(:id)
-          assigned_child ||= fetch_child(parent, id.to_i)
+          assigned_child ||= fetch_child(parent, id)
           if assigned_child
-            if assigned_child.id == id.to_i
+            assigned_child.id = id
+            if assigned_child.id == assigned_child.id_was
               assigned_child.attributes = attributes
             else
               raise AssignmentError, "child record '#{@target_name}' did not match id '#{id}'"