rubocop placations

Author: mfrederickson

lib/base_shuffle.rb

@@ -7,8 +7,8 @@ class BaseShuffle
   # @param [Screen] screen Screen showing the content.
   # @param [Field] field Field showing the content.
   # @param [Array<Subscription>] subscriptions All the subscriptions to use.
-  # @param [Hash] options Any additional options. 
-  def initialize(screen, field, subscriptions, options={})
+  # @param [Hash] options Any additional options.
+  def initialize(screen, field, subscriptions, options = {})
     @screen = screen
     @field = field
     @subscriptions = subscriptions
@@ -18,13 +18,13 @@ def initialize(screen, field, subscriptions, options={})
   # Return the next set content to be shown.
   #
   # @return [Array<Content>] Next content that should be rendered.
-  def next_contents()
+  def next_contents
     content.to_a.compact
   end
 
   private
 
   def content
-    @subscriptions.collect{|s| s.contents }.flatten
+    @subscriptions.collect(&:contents).flatten
   end
 end

lib/strict_priority_shuffle.rb

@@ -1,19 +1,16 @@
 require 'base_shuffle'
 
 # Weight and shuffle the content.
-# Uses a weighting and shuffling approach similiar to Concerto 1,
-# where content is added N times for the weight of each subscription
-# then jumbled up and served from a timeline.
+# includes only content belonging to the highest weighted subscription
 class StrictPriorityShuffle < BaseShuffle
-
-  def next_contents()
+  def next_contents
     prioritised_content.to_a.compact
   end
 
   private
 
   def prioritised_content
-    highest_prio=@subscriptions.select{|s| s.contents.length>0}.max_by{|s| s.weight}.weight
-    @subscriptions.select{|s| s.weight==highest_prio}.collect{|s| s.contents}.flatten.shuffle
+    highest_priority = @subscriptions.select { |s| s.contents.present? }.max_by(&:weight).weight
+    @subscriptions.select { |s| s.weight == highest_priority }.collect(&:contents).flatten.shuffle
   end
 end

lib/weighted_shuffle.rb

@@ -5,14 +5,13 @@
 # where content is added N times for the weight of each subscription
 # then jumbled up and served from a timeline.
 class WeightedShuffle < BaseShuffle
-
-  def next_contents()
+  def next_contents
     weighted_content.to_a.compact
   end
 
   private
 
   def weighted_content
-    @subscriptions.collect{|s| s.contents * (!s.weight.nil? ? s.weight : 1)}.flatten.shuffle!
+    @subscriptions.collect { |s| s.contents * (!s.weight.nil? ? s.weight : 1) }.flatten.shuffle!
   end
 end