Merge pull request #10821 from kennyj/deprecations_4_1-2

Remove some deprecated methods in Rails 4.1 again.

7 files changed, 14 insertions, 68 deletions

diff --git a/activerecord/lib/active_record/attribute_methods/serialization.rb b/activerecord/lib/active_record/attribute_methods/serialization.rb
index 7f1ebab4cd..d326ef7c22 100644
--- a/activerecord/lib/active_record/attribute_methods/serialization.rb
+++ b/activerecord/lib/active_record/attribute_methods/serialization.rb
@@ -50,13 +50,6 @@ module ActiveRecord
         end
       end
 
-      # *DEPRECATED*: Use ActiveRecord::AttributeMethods::Serialization::ClassMethods#serialized_attributes class level method instead.
-      def serialized_attributes
-        message = "Instance level serialized_attributes method is deprecated, please use class level method."
-        ActiveSupport::Deprecation.warn message
-        defined?(@serialized_attributes) ? @serialized_attributes : self.class.serialized_attributes
-      end
-
       class Type # :nodoc:
         def initialize(column)
           @column = column
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
index 8ffe150de6..2a4eda3622 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -606,7 +606,7 @@ module ActiveRecord
         index_options = options.delete(:index)
         add_column(table_name, "#{ref_name}_id", :integer, options)
         add_column(table_name, "#{ref_name}_type", :string, polymorphic.is_a?(Hash) ? polymorphic : options) if polymorphic
-        add_index(table_name, polymorphic ? %w[id type].map{ |t| "#{ref_name}_#{t}" } : "#{ref_name}_id", index_options.is_a?(Hash) ? index_options : nil) if index_options
+        add_index(table_name, polymorphic ? %w[id type].map{ |t| "#{ref_name}_#{t}" } : "#{ref_name}_id", index_options.is_a?(Hash) ? index_options : {}) if index_options
       end
       alias :add_belongs_to :add_reference
 
@@ -775,37 +775,23 @@ module ActiveRecord
           column_names = Array(column_name)
           index_name   = index_name(table_name, column: column_names)
 
-          if Hash === options # legacy support, since this param was a string
-            options.assert_valid_keys(:unique, :order, :name, :where, :length, :internal, :using, :algorithm, :type)
+          options.assert_valid_keys(:unique, :order, :name, :where, :length, :internal, :using, :algorithm, :type)
 
-            index_type = options[:unique] ? "UNIQUE" : ""
-            index_type = options[:type].to_s if options.key?(:type)
-            index_name = options[:name].to_s if options.key?(:name)
-            max_index_length = options.fetch(:internal, false) ? index_name_length : allowed_index_name_length
+          index_type = options[:unique] ? "UNIQUE" : ""
+          index_type = options[:type].to_s if options.key?(:type)
+          index_name = options[:name].to_s if options.key?(:name)
+          max_index_length = options.fetch(:internal, false) ? index_name_length : allowed_index_name_length
 
-            if options.key?(:algorithm)
-              algorithm = index_algorithms.fetch(options[:algorithm]) {
-                raise ArgumentError.new("Algorithm must be one of the following: #{index_algorithms.keys.map(&:inspect).join(', ')}")
-              }
-            end
-
-            using = "USING #{options[:using]}" if options[:using].present?
-
-            if supports_partial_index?
-              index_options = options[:where] ? " WHERE #{options[:where]}" : ""
-            end
-          else
-            if options
-              message = "Passing a string as third argument of `add_index` is deprecated and will" +
-                " be removed in Rails 4.1." +
-                " Use add_index(#{table_name.inspect}, #{column_name.inspect}, unique: true) instead"
+          if options.key?(:algorithm)
+            algorithm = index_algorithms.fetch(options[:algorithm]) {
+              raise ArgumentError.new("Algorithm must be one of the following: #{index_algorithms.keys.map(&:inspect).join(', ')}")
+            }
+          end
 
-              ActiveSupport::Deprecation.warn message
-            end
+          using = "USING #{options[:using]}" if options[:using].present?
 
-            index_type = options
-            max_index_length = allowed_index_name_length
-            algorithm = using = nil
+          if supports_partial_index?
+            index_options = options[:where] ? " WHERE #{options[:where]}" : ""
           end
 
           if index_name.length > max_index_length
diff --git a/activerecord/lib/active_record/readonly_attributes.rb b/activerecord/lib/active_record/readonly_attributes.rb
index 8499bb16e7..b3ddfd63d4 100644
--- a/activerecord/lib/active_record/readonly_attributes.rb
+++ b/activerecord/lib/active_record/readonly_attributes.rb
@@ -20,11 +20,5 @@ module ActiveRecord
         self._attr_readonly
       end
     end
-
-    def _attr_readonly
-      message = "Instance level _attr_readonly method is deprecated, please use class level method."
-      ActiveSupport::Deprecation.warn message
-      defined?(@_attr_readonly) ? @_attr_readonly : self.class._attr_readonly
-    end
   end
 end
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 7051822f73..395f28f280 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -581,12 +581,6 @@ class BasicsTest < ActiveRecord::TestCase
     assert_equal "changed", post.body
   end
 
-  def test_attr_readonly_is_class_level_setting
-    post = ReadonlyTitlePost.new
-    assert_raise(NoMethodError) { post._attr_readonly = [:title] }
-    assert_deprecated { post._attr_readonly }
-  end
-
   def test_non_valid_identifier_column_name
     weird = Weird.create('a$b' => 'value')
     weird.reload
diff --git a/activerecord/test/cases/migration/index_test.rb b/activerecord/test/cases/migration/index_test.rb
index 0e375af6e8..04521a5f5a 100644
--- a/activerecord/test/cases/migration/index_test.rb
+++ b/activerecord/test/cases/migration/index_test.rb
@@ -109,16 +109,6 @@ module ActiveRecord
         end
       end
 
-      def test_deprecated_type_argument
-        message = "Passing a string as third argument of `add_index` is deprecated and will" +
-          " be removed in Rails 4.1." +
-          " Use add_index(:testings, [:foo, :bar], unique: true) instead"
-
-        assert_deprecated message do
-          connection.add_index :testings, [:foo, :bar], "UNIQUE"
-        end
-      end
-
       def test_unique_index_exists
         connection.add_index :testings, :foo, :unique => true
 
diff --git a/activerecord/test/cases/serialized_attribute_test.rb b/activerecord/test/cases/serialized_attribute_test.rb
index 765e92ccca..b49c27bc78 100644
--- a/activerecord/test/cases/serialized_attribute_test.rb
+++ b/activerecord/test/cases/serialized_attribute_test.rb
@@ -19,12 +19,6 @@ class SerializedAttributeTest < ActiveRecord::TestCase
     assert_equal %w(content), Topic.serialized_attributes.keys
   end
 
-  def test_serialized_attributes_are_class_level_settings
-    topic = Topic.new
-    assert_raise(NoMethodError) { topic.serialized_attributes = [] }
-    assert_deprecated { topic.serialized_attributes }
-  end
-
   def test_serialized_attribute
     Topic.serialize("content", MyObject)
 
diff --git a/activerecord/test/cases/store_test.rb b/activerecord/test/cases/store_test.rb
index 3e32d866ee..c2c56abacd 100644
--- a/activerecord/test/cases/store_test.rb
+++ b/activerecord/test/cases/store_test.rb
@@ -150,9 +150,4 @@ class StoreTest < ActiveRecord::TestCase
   test "all stored attributes are returned" do
     assert_equal [:color, :homepage, :favorite_food], Admin::User.stored_attributes[:settings]
   end
-
-  test "stores_attributes are class level settings" do
-    assert_raise(NoMethodError) { @john.stored_attributes = Hash.new }
-    assert_raise(NoMethodError) { @john.stored_attributes }
-  end
 end