From 2ad14cc2d602051500be69e71764b95d54009f55 Mon Sep 17 00:00:00 2001 From: Braulio Bhavamitra Date: Sat, 14 May 2016 12:30:04 -0300 Subject: [PATCH] plugins api: don't reinherit class on extension --- plugins/comment_paragraph/lib/ext/entities.rb | 4 ++-- plugins/statistics/lib/ext/entities.rb | 32 +++++++++++++++++--------------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/plugins/comment_paragraph/lib/ext/entities.rb b/plugins/comment_paragraph/lib/ext/entities.rb index 256803c..b7333e1 100644 --- a/plugins/comment_paragraph/lib/ext/entities.rb +++ b/plugins/comment_paragraph/lib/ext/entities.rb @@ -1,8 +1,8 @@ require_dependency 'api/entities' -module API +module Api module Entities - class Comment < CommentBase + class Comment expose :paragraph_uuid expose :comment_paragraph_selected_area expose :comment_paragraph_selected_content diff --git a/plugins/statistics/lib/ext/entities.rb b/plugins/statistics/lib/ext/entities.rb index 00ba6da..8d35faa 100644 --- a/plugins/statistics/lib/ext/entities.rb +++ b/plugins/statistics/lib/ext/entities.rb @@ -1,21 +1,23 @@ require_dependency 'api/entities' -module Entities - class Block < Api::Entity - available_counters = (StatisticsBlock::USER_COUNTERS + StatisticsBlock::COMMUNITY_COUNTERS + StatisticsBlock::ENTERPRISE_COUNTERS).uniq - expose :statistics, :if => lambda { |block, options| block.is_a? StatisticsBlock } do |block, options| - statistics = [] - available_counters.each do |counter_attr| - counter_method = counter_attr.to_s.gsub('_counter','').pluralize.to_sym - counter = { - name: counter_method, - display: block.is_counter_available?(counter_attr) && block.is_visible?(counter_attr), - quantity: (block.respond_to?(counter_method) && block.is_visible?(counter_attr)) ? block.send(counter_method) : nil - } - statistics << counter +module Api + module Entities + class Block + available_counters = (StatisticsBlock::USER_COUNTERS + StatisticsBlock::COMMUNITY_COUNTERS + StatisticsBlock::ENTERPRISE_COUNTERS).uniq + expose :statistics, :if => lambda { |block, options| block.is_a? StatisticsBlock } do |block, options| + statistics = [] + available_counters.each do |counter_attr| + counter_method = counter_attr.to_s.gsub('_counter','').pluralize.to_sym + counter = { + name: counter_method, + display: block.is_counter_available?(counter_attr) && block.is_visible?(counter_attr), + quantity: (block.respond_to?(counter_method) && block.is_visible?(counter_attr)) ? block.send(counter_method) : nil + } + statistics << counter + end + statistics end - statistics - end + end end end -- libgit2 0.21.2