responders 2.0.0 → 3.0.1

data/lib/generators/rails/templates/controller.rb.tt

@@ -0,0 +1,59 @@
+<% if namespaced? -%>
+require_dependency "<%= namespaced_file_path %>/application_controller"
+
+<% end -%>
+<% module_namespacing do -%>
+class <%= controller_class_name %>Controller < ApplicationController
+  before_action :set_<%= singular_table_name %>, only: [:show, :edit, :update, :destroy]
+
+  respond_to :html
+
+<% unless options[:singleton] -%>
+  def index
+    @<%= plural_table_name %> = <%= orm_class.all(class_name) %>
+    respond_with(@<%= plural_table_name %>)
+  end
+<% end -%>
+
+  def show
+    respond_with(@<%= singular_table_name %>)
+  end
+
+  def new
+    @<%= singular_table_name %> = <%= orm_class.build(class_name) %>
+    respond_with(@<%= singular_table_name %>)
+  end
+
+  def edit
+  end
+
+  def create
+    @<%= singular_table_name %> = <%= orm_class.build(class_name, attributes_params) %>
+    <%= "flash[:notice] = '#{class_name} was successfully created.' if " if flash? %>@<%= orm_instance.save %>
+    respond_with(@<%= singular_table_name %>)
+  end
+
+  def update
+    <%= "flash[:notice] = '#{class_name} was successfully updated.' if " if flash? %>@<%= orm_instance.update(attributes_params) %>
+    respond_with(@<%= singular_table_name %>)
+  end
+
+  def destroy
+    @<%= orm_instance.destroy %>
+    respond_with(@<%= singular_table_name %>)
+  end
+
+  private
+    def set_<%= singular_table_name %>
+      @<%= singular_table_name %> = <%= orm_class.find(class_name, "params[:id]") %>
+    end
+
+    def <%= "#{singular_table_name}_params" %>
+      <%- if attributes_names.empty? -%>
+      params[:<%= singular_table_name %>]
+      <%- else -%>
+      params.require(:<%= singular_table_name %>).permit(<%= attributes_names.map { |name| ":#{name}" }.join(', ') %>)
+      <%- end -%>
+    end
+end
+<% end -%>

data/lib/generators/responders/install_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Responders
   module Generators
     class InstallGenerator < Rails::Generators::Base
@@ -18,6 +20,14 @@ end
         RUBY
       end
 
+      def update_application
+        inject_into_class "config/application.rb", "Application", <<-RUBY
+    # Use the responders controller from the responders gem
+    config.app_generators.scaffold_controller :responders_controller
+
+        RUBY
+      end
+
       def update_application_controller
         prepend_file "app/controllers/application_controller.rb", %{require "application_responder"\n\n}
         inject_into_class "app/controllers/application_controller.rb", "ApplicationController", <<-RUBY

data/lib/responders/collection_responder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Responders
   # This responder modifies your current responder to redirect
   # to the collection page on POST/PUT/DELETE.

data/lib/responders/controller_method.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Responders
   module ControllerMethod
     # Adds the given responders to the current controller's responder, allowing you to cherry-pick
@@ -18,7 +20,8 @@ module Responders
     #
     def responders(*responders)
       self.responder = responders.inject(Class.new(responder)) do |klass, responder|
-        responder = case responder
+        responder = \
+          case responder
           when Module
             responder
           when String, Symbol
@@ -34,4 +37,6 @@ module Responders
   end
 end
 
-ActionController::Base.extend Responders::ControllerMethod
+ActiveSupport.on_load(:action_controller) do
+  ActionController::Base.extend Responders::ControllerMethod
+end

data/lib/responders/flash_responder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Responders
   # Responder to automatically set flash messages based on I18n API. It checks for
   # message based on the current action, but also allows defaults to be set, using
@@ -33,9 +35,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
   #
@@ -94,7 +96,7 @@ module Responders
       ActionView::Helpers::TagHelper
     )
 
-    def initialize(controller, resources, options={})
+    def initialize(controller, resources, options = {})
       super
       @flash     = options.delete(:flash)
       @notice    = options.delete(:notice)
@@ -126,7 +128,7 @@ module Responders
       return if controller.flash[status].present?
 
       options = mount_i18n_options(status)
-      message = Responders::FlashResponder.helper.t options[:default].shift, options
+      message = Responders::FlashResponder.helper.t options[:default].shift, **options
       set_flash(status, message)
     end
 
@@ -147,34 +149,46 @@ 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
+        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('/')
+      slices   = controller.controller_path.split("/")
       lookup   = Responders::FlashResponder.namespace_lookup
 
       begin
-        controller_scope = :"flash.#{slices.fill(controller.controller_name, -1).join('.')}.#{controller.action_name}.#{status}"
+        controller_scope = :"flash.#{slices.fill(controller.controller_name, -1).join(".")}.#{controller.action_name}.#{status}"
 
-        actions_scope = lookup ? slices.fill('actions', -1).join('.') : :actions
+        actions_scope = lookup ? slices.fill("actions", -1).join(".") : :actions
         actions_scope = :"flash.#{actions_scope}.#{controller.action_name}.#{status}"
 
         defaults << :"#{controller_scope}_html"

data/lib/responders/http_cache_responder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Responders
   # Set HTTP Last-Modified headers based on the given resource. It's used only
   # on API behavior (to_format) and is useful for a client to check in the server
@@ -9,7 +11,7 @@ module Responders
   # the digest of the body.
   #
   module HttpCacheResponder
-    def initialize(controller, resources, options={})
+    def initialize(controller, resources, options = {})
       super
       @http_cache = options.delete(:http_cache)
     end
@@ -34,11 +36,11 @@ module Responders
 
     def do_http_cache?
       get? && @http_cache != false && ActionController::Base.perform_caching &&
-        persisted? && resourceful? && resource.respond_to?(:updated_at)
+        persisted? && resource.respond_to?(:updated_at)
     end
 
     def persisted?
       resource.respond_to?(:persisted?) ? resource.persisted? : true
     end
   end
-end
+end

data/lib/responders/location_responder.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Responders
   module LocationResponder
     def self.included(_base)
-      ActiveSupport::Deprecation.warn "Responders::LocationResponder is enabled by default, "
+      ActiveSupport::Deprecation.warn "Responders::LocationResponder is enabled by default, " \
                                       "no need to include it", caller
     end
   end

data/lib/responders/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Responders
-  VERSION = "2.0.0".freeze
+  VERSION = "3.0.1"
 end

data/lib/responders.rb

@@ -1,32 +1,29 @@
-require 'action_controller/base'
+# frozen_string_literal: true
+
+require "action_controller"
+require "rails/railtie"
 
 module ActionController
-  autoload :Responder, 'action_controller/responder'
-  autoload :RespondWith, 'action_controller/respond_with'
+  autoload :Responder, "action_controller/responder"
+  autoload :RespondWith, "action_controller/respond_with"
 end
 
 module Responders
-  autoload :FlashResponder,      'responders/flash_responder'
-  autoload :HttpCacheResponder,  'responders/http_cache_responder'
-  autoload :CollectionResponder, 'responders/collection_responder'
-  autoload :LocationResponder,   'responders/location_responder'
+  autoload :FlashResponder,      "responders/flash_responder"
+  autoload :HttpCacheResponder,  "responders/http_cache_responder"
+  autoload :CollectionResponder, "responders/collection_responder"
+  autoload :LocationResponder,   "responders/location_responder"
 
-  require 'responders/controller_method'
+  require "responders/controller_method"
 
   class Railtie < ::Rails::Railtie
     config.responders = ActiveSupport::OrderedOptions.new
     config.responders.flash_keys = [:notice, :alert]
     config.responders.namespace_lookup = false
 
-    if config.respond_to?(:app_generators)
-      config.app_generators.scaffold_controller = :responders_controller
-    else
-      config.generators.scaffold_controller = :responders_controller
-    end
-
     # Add load paths straight to I18n, so engines and application can overwrite it.
-    require 'active_support/i18n'
-    I18n.load_path << File.expand_path('../responders/locales/en.yml', __FILE__)
+    require "active_support/i18n"
+    I18n.load_path << File.expand_path("../responders/locales/en.yml", __FILE__)
 
     initializer "responders.flash_responder" do |app|
       Responders::FlashResponder.flash_keys = app.config.responders.flash_keys

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: responders
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - José Valim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-17 00:00:00.000000000 Z
+date: 2020-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -16,22 +16,30 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0.alpha
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0.alpha
-    - - "<"
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.0'
 description: A set of Rails responders to dry up your application
-email: contact@plataformatec.com.br
+email: heartcombo@googlegroups.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -43,7 +51,8 @@ files:
 - lib/action_controller/responder.rb
 - lib/generators/rails/USAGE
 - lib/generators/rails/responders_controller_generator.rb
-- lib/generators/rails/templates/controller.rb
+- lib/generators/rails/templates/api_controller.rb.tt
+- lib/generators/rails/templates/controller.rb.tt
 - lib/generators/responders/install_generator.rb
 - lib/responders.rb
 - lib/responders/collection_responder.rb
@@ -53,25 +62,7 @@ files:
 - lib/responders/locales/en.yml
 - lib/responders/location_responder.rb
 - lib/responders/version.rb
-- test/action_controller/respond_with_test.rb
-- test/locales/en.yml
-- test/responders/collection_responder_test.rb
-- test/responders/controller_method_test.rb
-- test/responders/flash_responder_test.rb
-- test/responders/http_cache_responder_test.rb
-- test/test_helper.rb
-- test/views/addresses/create.js.erb
-- test/views/addresses/edit.html.erb
-- test/views/addresses/new.html.erb
-- test/views/locations/new.html.erb
-- test/views/respond_with/edit.html.erb
-- test/views/respond_with/new.html.erb
-- test/views/respond_with/respond_with_additional_params.html.erb
-- test/views/respond_with/using_invalid_resource_with_template.xml.erb
-- test/views/respond_with/using_options_with_template.xml.erb
-- test/views/respond_with/using_resource.js.erb
-- test/views/respond_with/using_resource_with_block.html.erb
-homepage: http://github.com/plataformatec/responders
+homepage: https://github.com/heartcombo/responders
 licenses:
 - MIT
 metadata: {}
@@ -83,34 +74,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: responders
-rubygems_version: 2.2.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A set of Rails responders to dry up your application
-test_files:
-- test/action_controller/respond_with_test.rb
-- test/locales/en.yml
-- test/responders/collection_responder_test.rb
-- test/responders/controller_method_test.rb
-- test/responders/flash_responder_test.rb
-- test/responders/http_cache_responder_test.rb
-- test/test_helper.rb
-- test/views/addresses/create.js.erb
-- test/views/addresses/edit.html.erb
-- test/views/addresses/new.html.erb
-- test/views/locations/new.html.erb
-- test/views/respond_with/edit.html.erb
-- test/views/respond_with/new.html.erb
-- test/views/respond_with/respond_with_additional_params.html.erb
-- test/views/respond_with/using_invalid_resource_with_template.xml.erb
-- test/views/respond_with/using_options_with_template.xml.erb
-- test/views/respond_with/using_resource.js.erb
-- test/views/respond_with/using_resource_with_block.html.erb
+test_files: []

data/lib/generators/rails/templates/controller.rb

@@ -1,55 +0,0 @@
-<% module_namespacing do -%>
-class <%= controller_class_name %>Controller < ApplicationController
-  <%= controller_before_filter %> :set_<%= file_name %>, only: [:show, :edit, :update, :destroy]
-
-<% unless options[:singleton] -%>
-  def index
-    @<%= table_name %> = <%= orm_class.all(class_name) %>
-    respond_with(@<%= table_name %>)
-  end
-<% end -%>
-
-  def show
-    respond_with(@<%= file_name %>)
-  end
-
-  def new
-    @<%= file_name %> = <%= orm_class.build(class_name) %>
-    respond_with(@<%= file_name %>)
-  end
-
-  def edit
-  end
-
-  def create
-    @<%= file_name %> = <%= orm_class.build(class_name, attributes_params) %>
-    <%= "flash[:notice] = '#{class_name} was successfully created.' if " if flash? %>@<%= orm_instance.save %>
-    respond_with(@<%= file_name %>)
-  end
-
-  def update
-    <%= "flash[:notice] = '#{class_name} was successfully updated.' if " if flash? %>@<%= orm_instance_update(attributes_params) %>
-    respond_with(@<%= file_name %>)
-  end
-
-  def destroy
-    @<%= orm_instance.destroy %>
-    respond_with(@<%= file_name %>)
-  end
-
-  private
-    def set_<%= file_name %>
-      @<%= file_name %> = <%= orm_class.find(class_name, "params[:id]") %>
-    end
-    <%- if strong_parameters_defined? -%>
-
-    def <%= "#{file_name}_params" %>
-      <%- if attributes_names.empty? -%>
-      params[:<%= file_name %>]
-      <%- else -%>
-      params.require(:<%= file_name %>).permit(<%= attributes_names.map { |name| ":#{name}" }.join(', ') %>)
-      <%- end -%>
-    end
-    <%- end -%>
-end
-<% end -%>