thredded 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9da3f257731b6397128563a35788225046e8a589
-  data.tar.gz: fc0b9d0117acd6de8c6d21fa1d3ff629e3e463e3
+  metadata.gz: 72449d853f031c774bc914127754b165c39212e9
+  data.tar.gz: 16594c731eba3115e424cf58d3fe687945b0750e
 SHA512:
-  metadata.gz: d811130638a892c28e07b2065f05b0c8e6edd8d2aabea59691dd0f5653424818978fd4bb2d0676875aa85110e9b58bacda911efc60c26ce4dd5bb53fefa306c6
-  data.tar.gz: b78b12a3e681153c4b82363b6334a5c09648e86910f17f8d997e4f53dac0cd84555a3141c83d7da20f885b4b532a385913703ad6ff8a36982cc7c4ecc91636d1
+  metadata.gz: 32b007d694cc9c51a8262afdf59a92e5d2369ba6e4632e113eba8190cca34e286aa400a667e99b62534625b7e0e6cf51d5ea23afb54d628a7b1218f6e6e6e390
+  data.tar.gz: fdb3249473023e280f11fd05e00dcc9f21f6b39029bb296377d7da580df00fe8e91a288e94e27ed2cee1663967a589a1fb43f786baa0282684e06eaf709019a2

data/README.md

@@ -99,7 +99,7 @@ Then, see the rest of this Readme for more information about using and customizi
 Add the gem to your Gemfile:
 
 ```ruby
-gem 'thredded', '~> 0.12.0'
+gem 'thredded', '~> 0.12.1'
 ```
 
 Add the Thredded [initializer] to your parent app by running the install generator.
@@ -148,11 +148,11 @@ rails g thredded:install
 
 But then compare this with the previous version to decide what to keep.
 
-2) To upgrade the database (in this example from v0.10 to v0.11):
+2) To upgrade the database (in this example from v0.11 to v0.12):
 
 ```console
-# Note that for guaranteed best results you will want to run this with the gem checked out with v0.11
-cp `bundle show thredded`/db/upgrade_migrations/20170312131417_upgrade_thredded_v0_10_to_v0_11.rb db/migrate
+# Note that for guaranteed best results you will want to run this with the thredded gem at v0.12
+cp "$(bundle show thredded)"/db/upgrade_migrations/20170420163138_upgrade_thredded_v0_11_to_v0_12.rb db/migrate
 rake db:migrate
 ```
 

data/app/helpers/thredded/application_helper.rb

@@ -72,11 +72,11 @@ module Thredded
     # @param posts [Thredded::PostsPageView, Array<Thredded::PostView>]
     # @param partial [String]
     # @param content_partial [String]
-    def render_posts(posts, partial: 'thredded/posts/post', content_partial: 'thredded/posts/content')
+    def render_posts(posts, partial: 'thredded/posts/post', content_partial: 'thredded/posts/content', locals: {})
       posts_with_contents = render_collection_to_strings_with_cache(
         partial: content_partial, collection: posts, as: :post, expires_in: 1.week
       )
-      render partial: partial, collection: posts_with_contents, as: :post_and_content
+      render partial: partial, collection: posts_with_contents, as: :post_and_content, locals: locals
     end
 
     def paginate(collection, args = {})

data/app/views/thredded/posts/_post.html.erb

@@ -1,6 +1,6 @@
 <% post, content = post_and_content if local_assigns.key?(:post_and_content) %>
 <%= content_tag :article, id: dom_id(post), class: "thredded--post thredded--#{post.read_state}--post" do %>
-  <%= render 'thredded/posts_common/actions', post: post %>
+  <%= render 'thredded/posts_common/actions', post: post, actions: local_assigns[:actions] %>
   <%= render 'thredded/posts_common/header', post: post %>
   <%= content || render('thredded/posts/content', post: post) %>
   <% if post.pending_moderation? && !Thredded.content_visible_while_pending_moderation %>

data/app/views/thredded/posts_common/_actions.html.erb

@@ -1,6 +1,7 @@
-<% actions = capture do %>
+<% actions ||= {} %>
+<% actions_html = capture do %>
   <%= view_hooks.post_common.actions.render self, post: post do %>
-    <% if post.can_reply? %>
+    <% if actions[:quote] && post.can_reply? %>
       <%= render 'thredded/posts_common/actions/quote', post: post %>
     <% end  %>
     <% if post.can_update? %>
@@ -17,11 +18,11 @@
   <% end %>
 <% end %>
 
-<%- if actions.present? %>
+<%- if actions_html.present? %>
   <div class='thredded--post--dropdown'>
     <%= inline_svg 'thredded/three-dot-menu.svg', class: 'thredded--post--dropdown--toggle' %>
     <div class='thredded--post--dropdown--actions'>
-      <%= actions %>
+      <%= actions_html %>
     </div>
   </div>
 <% end %>

data/app/views/thredded/private_posts/_private_post.html.erb

@@ -1,6 +1,6 @@
 <% private_post, content = post_and_content if local_assigns.key?(:post_and_content) %>
 <%= content_tag :article, id: dom_id(private_post), class: 'thredded--post' do %>
-  <%= render 'thredded/posts_common/actions', post: private_post %>
+  <%= render 'thredded/posts_common/actions', post: private_post, actions: local_assigns[:actions] %>
   <%= render 'thredded/posts_common/header', post: private_post %>
   <%= content || render('thredded/private_posts/content', post: post) %>
 <% end %>

data/app/views/thredded/private_topics/show.html.erb

@@ -13,7 +13,8 @@
     <% end %>
     <%= render_posts @posts,
                      partial: 'thredded/private_posts/private_post',
-                     content_partial: 'thredded/private_posts/content' %>
+                     content_partial: 'thredded/private_posts/content',
+                     locals: { actions: { quote: true } }  %>
     <%= view_hooks.posts_common.pagination_bottom.render(self, posts: @posts) do %>
       <footer class="thredded--pagination-bottom"><%= paginate @posts %></footer>
     <% end %>

data/app/views/thredded/topics/show.html.erb

@@ -12,7 +12,10 @@
     <%= view_hooks.posts_common.pagination_top.render(self, posts: @posts) do %>
       <footer class="thredded--pagination-top"><%= paginate @posts %></footer>
     <% end %>
-    <%= render_posts @posts, partial: 'thredded/posts/post', content_partial: 'thredded/posts/content' %>
+    <%= render_posts @posts,
+                     partial: 'thredded/posts/post',
+                     content_partial: 'thredded/posts/content',
+                     locals: { actions: { quote: true } } %>
     <%= view_hooks.posts_common.pagination_bottom.render(self, posts: @posts) do %>
       <footer class="thredded--pagination-bottom"><%= paginate @posts %></footer>
     <% end %>

data/lib/thredded/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Thredded
-  VERSION = '0.12.0'
+  VERSION = '0.12.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thredded
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Joel Oliveira
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-03 00:00:00.000000000 Z
+date: 2017-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pundit
@@ -1057,7 +1057,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: The best Rails forums engine ever.