talkie 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 515c6dccadc7671d553437edfa87bfc7eb191c87c912c41ef3c66e3a4a543240
-  data.tar.gz: 001e9c2acb8fadc073c36143e3c239b0511893e8783ff492b0353f01c86d596f
+  metadata.gz: 82f6715118d4b0022047d97dc002dba51f831e09da19bc374cc0d75ddc2a62aa
+  data.tar.gz: df4af0404f088395e42c5c92c5dfdd55624292dc0759dbb421d18a941a775e1b
 SHA512:
-  metadata.gz: 3c8b1bbd9ea4f991622db621ddbac930432a2e7e2525f2dd2d2a67aa9de7b7e78730962b804f39c6340ec03111c923a69b16736c8771f519e18368f8897d3c0c
-  data.tar.gz: c12375bdec3f5f319981b93088b797c1bf6b8d0fd408c03cfd99d6a82f114eeda827399313855d28d073c7ad3f5c9b8fe8a5b9fd9fa737fb99e0d83fbb0e828a
+  metadata.gz: 3dea24f754eb1f95328120601f284ef6530f798c1de001ff233963b8bff83becad84d98cf064741df7df74c3541887c11c7d3855f535785b6538b8be11a100cf
+  data.tar.gz: f52e51279684b0fa5266ed13d30d5a5ca29d4ff247f76b32012ffacb41549c0a3598d0de4ca2b6707b75538c08d3d76fecede184aa0afcba34755c1d56ebae47

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    talkie (0.1.0)
+    talkie (0.2.0)
       awesome_nested_set (~> 3.1)
       rails (~> 5.0)
       sassc-rails (~> 2.1)
@@ -152,7 +152,7 @@ GEM
     sassc (2.0.1)
       ffi (~> 1.9)
       rake
-    sassc-rails (2.1.1)
+    sassc-rails (2.1.2)
       railties (>= 4.0.0)
       sassc (>= 2.0)
       sprockets (> 3.0)
@@ -178,9 +178,9 @@ GEM
     tilt (2.0.9)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    websocket-driver (0.7.0)
+    websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
+    websocket-extensions (0.1.4)
 
 PLATFORMS
   ruby

data/README.md

@@ -89,6 +89,7 @@ Talkie, currently only offers 3 options for the `talkie_on` helper method:
 | **nested**                                                   | Whether users are able to reply to comments or not. *Default: false* |
 | **display_user_avatar**                                      | Whether the helper should render an avatar. *Default: true* |
 | **display_user_handler**                                     | Whether the helper should render the user handler. *Default: false* |
+| **deletable**                                                | Whether the helper should render the delete link. *Default: false* |
 
 Don't worry about those nasty N+1 queries, Talkie is smart enough to take care of them. You don't need to restart the server for chanes on this invokation.
 

data/app/controllers/talkie/comments_controller.rb

@@ -9,10 +9,12 @@ module Talkie
       respond_to do |format|
         if @comment.save
           make_child_comment if reply?
-          format.html { redirect_to main_app.polymorphic_path(@comment.commentable), notice: "Comment was successfully added." }
+          format.html { redirect_to Talkie.success_redirect_to.call(main_app, @comment.commentable),
+                                    notice: t('talkie.controllers.comments.flash.success') }
           format.js
         else
-          format.html { redirect_to :back, notice: "Something went wrong, blank comments are not allowed" }
+          format.html { redirect_back fallback_location: Talkie.fail_redirect_to.call(main_app),
+                        notice: t('talkie.controllers.comments.flash.error') }
           format.js
         end
       end

data/config/locales/en.yml

@@ -1,6 +1,11 @@
 ---
 en:
   talkie:
+    controllers:
+      comments:
+        flash:
+          success: "Comment was successfully added."
+          error: "Something went wrong, blank comments are not allowed."
     comments:
       form:
         submit: "Publish"

data/config/locales/es.yml

@@ -1,6 +1,11 @@
 ---
 es:
   talkie:
+    controllers:
+      comments:
+        flash:
+          success: "El comentario fue agregado satisfactoriamente."
+          error: "Algo salió mal, tu comentario no puede estar en blanco."
     comments:
       form:
         submit: "Publicar"

data/lib/generators/talkie/templates/talkie.rb

@@ -43,4 +43,21 @@ Talkie.configure do |config|
   #
   # The default looks like:
   # config.creator_avatar_url = lambda { |user| "//api.adorable.io/avatars/40/abott@adorable.png" }
+  #
+
+  # ==> Redirect for comments controller
+  # There are sometimes you want to redirect to different locations
+  # for the app on success or failure of a comment post,
+  # you can easily achieve this through the following configurations
+  #
+  # The default value for success redirection is:
+  # config.success_redirect_to = lambda { |router, commentable| router.polymorphic_path(commentable) }
+  # You can override it to anything you want. Inside this lambda function
+  # you have access to the main router and the commentable object
+  #
+  # The default value for failure redirection is:
+  # config.fail_redirect_to = lambda { |router| router.url }
+  # Inside the comments controller, the redirection would be to go back
+  # to the page where the submit came, and if not, it will go to this
+  # lambda
 end

data/lib/talkie/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Talkie
-  VERSION = "0.1.1"
+  VERSION = '0.2.0'.freeze
 end

data/lib/talkie.rb

@@ -6,17 +6,23 @@ require "awesome_nested_set"
 
 module Talkie
 
-  @@default_comments_scope = -> { order(created_at: :desc) }
-  mattr_accessor :default_comments_scope
+  mattr_accessor :default_comments_scope,
+                 default: -> { order(created_at: :desc) }
 
-  @@comment_creator_handler = :email
-  mattr_accessor :comment_creator_handler
+  mattr_accessor :comment_creator_handler,
+                 default: :email
 
-  @@creator_path = lambda { |_user, _router| "#" }
-  mattr_accessor :creator_path
+  mattr_accessor :creator_path,
+                 default: lambda { |_user, _router| "#" }
 
-  @@creator_avatar_url = lambda { |_user| "//api.adorable.io/avatars/40/abott@adorable.png" }
-  mattr_accessor :creator_avatar_url
+  mattr_accessor :creator_avatar_url,
+                 default: lambda { |_user| "//api.adorable.io/avatars/40/abott@adorable.png" }
+
+  mattr_accessor :success_redirect_to,
+                 default: lambda { |router, commentable| router.polymorphic_path(commentable) }
+
+  mattr_accessor :fail_redirect_to,
+                 default: lambda { |router| router.root_url }
 
   def self.configure
     yield self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: talkie
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Abraham Kuri
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-05 00:00:00.000000000 Z
+date: 2019-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ammeter