responders 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ba43cee72d6a197eff78818683a01dfe43814d3
-  data.tar.gz: 37ceb10a23ee46f1ec142176eee690c33a98b73d
+  metadata.gz: a0c692c9db8d41efad52bc5dcbe523d7ffae971a
+  data.tar.gz: ec9fab6aee728b24ac40a984c3d186a023a3d488
 SHA512:
-  metadata.gz: e198e8715fefd1e87c21d7a52ed255ad51445bdfe2eb83e0e8a5eb8845eae8d3b1e665217ce1ac6f836156abd1d56cff5a2082f48cfb6f44e3cabe875117125f
-  data.tar.gz: c59cbdaf34207e264e7551bdd700f2d9afe200fa29c2a31672d79debce0979853c76ee8ce0500347f5ee8fb19ebf8b86fc270a45add262d06b4d9c43c7c7ae17
+  metadata.gz: 7359a3b96df95cd3faba4c416f9fdb183fb75f6a7ec429e8377a13efd542e1f434c585d93e5cfe7f1ba4d16e1cdc3b617a6cd2ec7b5f99fd5f41cc6f8cd38229
+  data.tar.gz: cdbd028d24c15b5225b06174dd8776b3200dc0d3c6ffada06b49c5a3341c9bc26d0bff1df27509187d94f763fd57a83b9dd4619bf46f69d65959d4937f022123

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## Unreleased
+
+## 2.3.0
+
+* `verify_request_format!` is aliased to `verify_requested_format!` now.
+* Implementing the `interpolation_options` method on your controller is deprecated
+  in favor of naming it `flash_interpolation_options` instead.
+
 ## 2.2.0
 
 * Added the `verify_request_format!` method, that can be used as a `before_action`

data/README.md

@@ -160,7 +160,7 @@ end
 
 ## Interpolation Options
 
-You can pass in extra interpolation options for the translation by adding an `interpolation_options` method to your controller:
+You can pass in extra interpolation options for the translation by adding an `flash_interpolation_options` method to your controller:
 
 ```ruby
 class InvitationsController < ApplicationController
@@ -173,7 +173,7 @@ class InvitationsController < ApplicationController
 
   private
 
-  def interpolation_options
+  def flash_interpolation_options
     { resource_name: @invitation.email }
   end
 end
@@ -222,13 +222,13 @@ end
 mime type was not configured through the class level `respond_to`, but the
 action will still be executed and any side effects (like creating a new record)
 will still occur. To raise the `UnknownFormat` exception before your action
-is invoked you can set the `verify_request_format!` method as a `before_action`
+is invoked you can set the `verify_requested_format!` method as a `before_action`
 on your controller.
 
 ```ruby
 class WidgetsController < ApplicationController
   respond_to :json
-  before_action :verify_request_format!
+  before_action :verify_requested_format!
 
   # POST /widgets.html won't reach the `create` action.
   def create

data/lib/action_controller/respond_with.rb

@@ -216,9 +216,9 @@ module ActionController #:nodoc:
     #   class PeopleController < ApplicationController
     #     respond_to :html, :xml, :json
     #
-    #     before_action :verify_request_format!
+    #     before_action :verify_requested_format!
     #   end
-    def verify_request_format!
+    def verify_requested_format!
       mimes = collect_mimes_from_class_level
       collector = ActionController::MimeResponds::Collector.new(mimes, request.variant)
 
@@ -227,6 +227,8 @@ module ActionController #:nodoc:
       end
     end
 
+    alias :verify_request_format! :verify_requested_format!
+
     # Collect mimes declared in the class method respond_to valid for the
     # current action.
     def collect_mimes_from_class_level #:nodoc:

data/lib/responders/flash_responder.rb

@@ -33,9 +33,9 @@ module Responders
   #         notice: "Hooray! You just tuned your %{car_brand}!"
   #
   # Since :car_name is not available for interpolation by default, you have
-  # to overwrite interpolation_options in your controller.
+  # to overwrite `flash_interpolation_options` in your controller.
   #
-  #   def interpolation_options
+  #   def flash_interpolation_options
   #     { :car_brand => @car.brand }
   #   end
   #
@@ -147,25 +147,37 @@ module Responders
     end
 
     def mount_i18n_options(status) #:nodoc:
-      resource_name = if resource.class.respond_to?(:model_name)
-        resource.class.model_name.human
-      else
-        resource.class.name.underscore.humanize
-      end
-
       options = {
         :default => flash_defaults_by_namespace(status),
         :resource_name => resource_name,
         :downcase_resource_name => resource_name.downcase
       }
 
-      if controller.respond_to?(:interpolation_options, true)
-        options.merge!(controller.send(:interpolation_options))
+      controller_options = controller_interpolation_options
+      if controller_options
+        options.merge!(controller_options)
       end
 
       options
     end
 
+    def controller_interpolation_options
+      if controller.respond_to?(:flash_interpolation_options, true)
+        controller.send(:flash_interpolation_options)
+      elsif controller.respond_to?(:interpolation_options, true)
+        ActiveSupport::Deprecation.warn("[responders] `#{controller.class}#interpolation_options` is deprecated, please rename it to `flash_interpolation_options`.")
+        controller.send(:interpolation_options)
+      end
+    end
+
+    def resource_name
+      if resource.class.respond_to?(:model_name)
+        resource.class.model_name.human
+      else
+        resource.class.name.underscore.humanize
+      end
+    end
+
     def flash_defaults_by_namespace(status) #:nodoc:
       defaults = []
       slices   = controller.controller_path.split('/')

data/lib/responders/version.rb

@@ -1,3 +1,3 @@
 module Responders
-  VERSION = "2.2.0".freeze
+  VERSION = "2.3.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: responders
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - José Valim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2016-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties