crud_responder 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f03f86ecfa0f4780b38e8b5359df48d958015346
-  data.tar.gz: 58ff64d312c19cc00b1367eb59afaf4e110e601d
+  metadata.gz: f1540ab291ed39557bbeadca726c8e779a42efc5
+  data.tar.gz: 5a10265472340364d6827b3b41525e0bdf20532d
 SHA512:
-  metadata.gz: 53aa1a797d679fa3f9a1796ed6ee3bb681bf88fcbc80e59ef6e0f7eb13503ce82c9145c0d9f2e1664af32337f077566b06fbe54ef148b643ea4b1db1dda887a9
-  data.tar.gz: a09b0c75931263b586d8d0f7a92301effa1089a2a155e88429975383003911b2c3cc1bb3752fb34d6726695df1d58ae6a41461b7fd45b7ada641ba1565e33723
+  metadata.gz: 0b9269aaca320514db7978f60bc35542fea2131565f58b4f0e6c3cf37fdd51f8ca9420fe7077bce5eab59a7c472d008fe870f2e5e9e8cff91bf499d4eae04d61
+  data.tar.gz: d677683035184027b7da066e8c20c24dced83a3d1e7c2660694191ff0b3e714f9901422d895ab46b6ee10a56e7e51fd48095bc10cda92c647ceb04ab483bdb6a

data/README.md

@@ -117,7 +117,7 @@ end
 ```
 By default you will be redirected to object show, objects index or back in this order. And render :new when creating object and :edit when updating.
 
-You can specify `error_url` instead of `error_action` to be redirected instead of action render in case of error.
+You can specify `error_url` instead of `error_action` to be redirected instead of action render in case of error:
 ```ruby
 def create
   @post = Post.new(post_params)
@@ -125,6 +125,14 @@ def create
   # will redirect to root_path in case of success or to https://google.com otherwise
 end
 ```
+You can specify custom flash messages:
+```ruby
+def create
+  @post = Post.new(post_params)
+  crud_respond @post, success_message: 'Yep :)', error_message: 'Nope :('
+  # will render flash 'Yep :)' on success or 'Nope :(' on failure instead of default ones
+end
+```
 
 You can also specify per-controller default options:
 ```ruby
@@ -177,7 +185,6 @@ Now your controllers are skinny again! Also, you are forced to think in terms of
 
 ## TODO
 
-* Customizing flash messages
 * Support for pure API controllers (which is much simpler)
 * Testing
 

data/lib/crud_responder/caller_extractor.rb

@@ -0,0 +1,34 @@
+module CrudResponder
+  class CallerExtractor
+    attr_reader :kaller
+
+    def initialize(kaller)
+      @kaller = kaller
+    end
+
+    def name
+      kaller[0][/`.*'/][1..-2]
+    end
+
+    def method
+      if name =~ /destroy/
+        :destroy
+      else
+        :save
+      end
+    end
+
+    def action
+      case name
+      when /destroy/
+        :destroy
+      when /update/
+        :update
+      when /create/
+        :create
+      else
+        name.to_sym
+      end
+    end
+  end
+end

data/lib/crud_responder/default_notification.rb

@@ -0,0 +1,35 @@
+require 'crud_responder/caller_extractor'
+
+module CrudResponder
+  class DefaultNotification
+    attr_reader :object, :kaller
+
+    def initialize(object, kaller)
+      @object = object
+      @kaller = kaller
+    end
+
+    def text(ok)
+      t_key = "flash.actions.#{CallerExtractor.new(kaller).action}.#{ok ? 'notice' : 'alert'}"
+      if ok
+        I18n.t(t_key, resource_name: resource_name, resource_desc: resource_desc)
+      else
+        I18n.t(t_key, resource_name: resource_name, resource_desc: resource_desc, errors: errors)
+      end
+    end
+
+    private
+
+    def errors
+      object.errors.full_messages.to_sentence
+    end
+
+    def resource_desc
+      object.to_s
+    end
+
+    def resource_name
+      object.try(:model_name).try(:human) || object.class.name
+    end
+  end
+end

data/lib/crud_responder/default_options.rb

@@ -33,6 +33,14 @@ module CrudResponder
       nil
     end
 
+    def success_message
+      nil # lazily calcucalted in DefaultNotification
+    end
+
+    def error_message
+      nil # lazily calcucalted in DefaultNotification
+    end
+
     private
 
     attr_reader :method, :object

data/lib/crud_responder/version.rb

@@ -1,3 +1,3 @@
 module CrudResponder
-  VERSION = '0.2.6'
+  VERSION = '0.3.0'
 end

data/lib/crud_responder.rb

@@ -1,29 +1,32 @@
+require 'action_view/helpers/text_helper'
+
 require 'crud_responder/version'
 require 'crud_responder/default_options'
-require 'action_view/helpers/text_helper'
+require 'crud_responder/default_notification'
+require 'crud_responder/caller_extractor'
 
 module CrudResponder
   include ActionView::Helpers::TextHelper
 
-  protected
-
   def crud_respond(object, opts = {})
-    method = opts.fetch(:method, method_by_caller(caller))
+    method = opts.fetch(:method, CallerExtractor.new(caller).method)
     options = final_options(opts, method, object)
-    if perform(caller, object, method)
-      success(options)
+    if object.public_send(method)
+      success(options, object, caller)
     else
-      error(options)
+      error(options, object, caller)
     end
   end
 
   private
 
-  def success(options)
+  def success(options, object, kaller)
+    flash_success(options[:success_message] || DefaultNotification.new(object, kaller).text(true))
     redirect_to options[:success_url]
   end
 
-  def error(options)
+  def error(options, object, kaller)
+    flash_error(options[:error_message] || DefaultNotification.new(object, kaller).text(false))
     if options[:error_url]
       redirect_to options[:error_url]
     else
@@ -56,46 +59,6 @@ module CrudResponder
     result.fetch(opt, nil)
   end
 
-  def caller_name(kaller)
-    kaller[0][/`.*'/][1..-2]
-  end
-
-  def method_by_caller(kaller)
-    if caller_name(kaller) =~ /destroy/
-      :destroy
-    else
-      :save
-    end
-  end
-
-  def perform(kaller, object, method)
-    ok = object.public_send(method)
-    t_key = "flash.actions.#{action_by_caller(kaller)}.#{ok ? 'notice' : 'alert'}"
-    if ok
-      flash_success I18n.t(t_key, resource_name: resource_name_by_object(object), resource_desc: object.to_s)
-    else
-      flash_error I18n.t(t_key, resource_name: resource_name_by_object(object), resource_desc: object.to_s, errors: object.errors.full_messages.to_sentence)
-    end
-    ok
-  end
-
-  def action_by_caller(kaller)
-    case caller_name(kaller)
-    when /destroy/
-      :destroy
-    when /update/
-      :update
-    when /create/
-      :create
-    else
-      "unknown_action_from_#{caller_name(kaller)}".to_sym
-    end
-  end
-
-  def resource_name_by_object(object)
-    object.try(:model_name).try(:human) || object.class.name
-  end
-
   def flash_success(msg)
     flash[:notice] = truncate_message(msg)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crud_responder
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Oleg Antonyan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -135,6 +135,8 @@ files:
 - config/locales/ru.yml
 - crud_responder.gemspec
 - lib/crud_responder.rb
+- lib/crud_responder/caller_extractor.rb
+- lib/crud_responder/default_notification.rb
 - lib/crud_responder/default_options.rb
 - lib/crud_responder/version.rb
 - lib/generators/crud_responder/install_generator.rb