Remove deprecated method

It's been 4 years since it was deprecated :)
heartcombo · Jan 3, 2015 · dceb61a · dceb61a
1 parent 47736b3
commit dceb61a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## Unreleased
 
 ### enhancements
+  * Remove deprecated `:method` in favor of `:using`.
   * Improve support to Rails 4.x associations with more duck typing instead of Array checks.
   * Support Rails 4.1 and Ruby 2.1.1.
   * Add `skip_blanks` configuration option to skip generating blank attributes

diff --git a/lib/show_for/association.rb b/lib/show_for/association.rb
@@ -39,12 +39,6 @@ def association(association_name, options={}, &block)
 
     def values_from_association(association, options) #:nodoc:
       sample = association.respond_to?(:to_ary) ? association.first : association
-
-      if options[:method]
-        options[:using] = options.delete(:method)
-        ActiveSupport::Deprecation.warn ":method is deprecated. Please use :using instead", caller
-      end
-
       method = options.delete(:using) || ShowFor.association_methods.find { |m| sample.respond_to?(m) }
 
       if method