consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify MergedCommentTree#initialize

Browse Source 
By setting the comments lazily in a different method, we can share its
code with the parent class.
This commit is contained in:
Javi Martín
2018-08-24 09:03:59 +02:00
parent 14a5ea87a1
commit 7b5ce80593
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/comment_tree.rb
View File

@@ -2,14 +2,17 @@ class CommentTree
ROOT_COMMENTS_PER_PAGE = 10 ROOT_COMMENTS_PER_PAGE = 10
attr_accessor :root_comments, :comments, :commentable, :page, :order attr_reader :root_comments, :commentable, :page, :order
def initialize(commentable, page, order = "confidence_score", valuations: false) def initialize(commentable, page, order = "confidence_score", valuations: false)
@commentable = commentable @commentable = commentable
@page = page @page = page
@order = order @order = order
@valuations = valuations @valuations = valuations
@comments = root_comments + root_descendants end
def comments
@comments ||= root_comments + root_descendants
end end
def root_comments def root_comments

8
lib/merged_comment_tree.rb
View File

@@ -1,14 +1,10 @@
class MergedCommentTree < CommentTree class MergedCommentTree < CommentTree
attr_accessor :commentables, :array_order attr_reader :commentables, :array_order
def initialize(commentables, page, order = "confidence_score") def initialize(commentables, page, order = "confidence_score")
@commentables = commentables @commentables = commentables
@commentable = commentables.first super(commentables.first, page, order)
@page = page
@order = order
@array_order = set_array_order(order) @array_order = set_array_order(order)
@comments = root_comments + root_descendants
end end
def root_comments def root_comments