talkie 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 387327deeaf25674ee27502bb4ed8b7b5b47f4041865cf5771cb14e74986531f
-  data.tar.gz: b369f237e253df6fc52c061bb90ff24eb87f3f62b86067db12272635ee2594e0
+  metadata.gz: 515c6dccadc7671d553437edfa87bfc7eb191c87c912c41ef3c66e3a4a543240
+  data.tar.gz: 001e9c2acb8fadc073c36143e3c239b0511893e8783ff492b0353f01c86d596f
 SHA512:
-  metadata.gz: 67cee7e1cedaca192c4288d89af9beee204705a7b5e4284ad68683fef1b10bc361dd2d6b3002e0c572d270783ac4be247d0cc6a2b0d3b52a68d84ece4d5ed0c3
-  data.tar.gz: 4818916e347a23a29bd3583f1f17d6c1b95847f1794104bd33ce54fb67d36b8cb68c7421a55071c90c700163f28f6973346b189dc7572943e20afc9c2e372ee0
+  metadata.gz: 3c8b1bbd9ea4f991622db621ddbac930432a2e7e2525f2dd2d2a67aa9de7b7e78730962b804f39c6340ec03111c923a69b16736c8771f519e18368f8897d3c0c
+  data.tar.gz: c12375bdec3f5f319981b93088b797c1bf6b8d0fd408c03cfd99d6a82f114eeda827399313855d28d073c7ad3f5c9b8fe8a5b9fd9fa737fb99e0d83fbb0e828a

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,7 @@
+### What does this PR do?
+
+*
+
+#### Merge Checklist:
+
+- [ ] The branch is up-to-date (i.e. rebased) with the base branch

data/app/helpers/talkie/application_helper.rb

@@ -16,5 +16,15 @@ module Talkie
     def avatar_url(creator)
       Talkie.creator_avatar_url.call(creator)
     end
+
+    def deletable_and_allowed?(comment)
+      deletable? && allow?(:destroy, comment)
+    end
+
+    def link_to_delete_comment(comment)
+      link_to t('talkie.comment.delete'), [talkie, comment],
+              method: :delete,
+              class: 'talkie-comment-delete'
+    end
   end
 end

data/app/views/talkie/comments/_comment.html.erb

@@ -20,11 +20,15 @@
     </p>
 
     <div class="talkie-comment-footer">
+      <% if !nested_enabled? && deletable_and_allowed?(comment) %>
+        <%= link_to_delete_comment comment %>
+      <% end %>
+
       <% if nested_enabled? %>
         <div class="talkie-comment-reply">
           <a href="#" class="talkie-comment-reply-link"><%= t("talkie.comment.reply") %></a>
-          <% if allow? :destroy, comment %>
-            <%= link_to t("talkie.comment.delete"), [talkie, comment], method: :delete, class: "talkie-comment-delete" %>
+          <% if deletable_and_allowed? comment %>
+            <%= link_to_delete_comment comment %>
           <% end %>
         </div>
         <div class="talkie-comments-reply-form-container" style="display:none">

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

@@ -10,7 +10,6 @@ class CreateTalkieComments < ActiveRecord::Migration[5.0]
       t.integer  :lft
       t.integer  :rgt
       t.integer  :children_count, default: 0
-      t.datetime :deleted_at
 
       t.timestamps null: false
     end

data/lib/talkie/comments_renderer.rb

@@ -18,6 +18,10 @@ module Talkie
       @options[:nested] || false
     end
 
+    def deletable?
+      @options[:deletable] || false
+    end
+
     def display_user_avatar?
       @options[:display_user_avatar].present?
     end

data/lib/talkie/renderer_helper.rb

@@ -10,12 +10,14 @@ module Talkie
                                                 root_comments
                                                 nested_enabled?
                                                 display_user_handler?
-                                                display_user_avatar?].freeze
+                                                display_user_avatar?
+                                                deletable?].freeze
 
     HELPER_METHODS = %i[talkie_on
                         nested_enabled?
                         display_user_handler?
                         display_user_avatar?
+                        deletable?
                         root_comments
                         commentable].freeze
 

data/lib/talkie/version.rb

@@ -1,3 +1,3 @@
 module Talkie
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: talkie
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Abraham Kuri
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-04 00:00:00.000000000 Z
+date: 2019-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ammeter
@@ -186,6 +186,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"