Merge pull request #6816 from cmrd-senya/publisher-refactor

A minor refactor of the Publisher

app/helpers/interim_stream_hackiness_helper.rb

@@ -39,27 +39,19 @@ module InterimStreamHackinessHelper
     end
   end
 
+  def publisher_method(method)
+    @stream.try(:publisher).try(method) == true
+  end
+
   def publisher_open
-    if defined?(@stream)
+    publisher_method(:open)
-      @stream.publisher.open?
-    else
-      false
-    end
   end
 
   def publisher_public
-    if defined?(@stream)
+    publisher_method(:public)
-      @stream.publisher.public?
-    else
-      false
-    end
   end
 
   def publisher_explain
-    if defined?(@stream)
+    publisher_method(:explain)
-      @stream.publisher.public?
-    else
-      false
-    end
   end
 end

lib/publisher.rb

@@ -10,26 +10,10 @@ class Publisher
   end
 
   def text
-    formatted_message
+    return unless prefill.present?
-  end
+    Diaspora::MessageRenderer.new(
-
+      prefill,
-  def open?
+      mentioned_people: Diaspora::Mentionable.people_from_string(prefill)
-    self.open
+    ).plain_text
-  end
-
-  def public?
-    self.public
-  end
-
-  def explain?
-    self.explain
-  end
-
-  private
-  def formatted_message
-    if self.prefill.present?
-      sm = StatusMessage.new(:text => self.prefill)
-      Diaspora::Mentionable.format(sm.raw_message, sm.mentioned_people, plain_text: true)
-    end
   end
 end

lib/stream/multi.rb

@@ -25,7 +25,7 @@ class Stream::Multi < Stream::Base
   private
   def publisher_opts
     if welcome?
-      {:open => true, :prefill => publisher_prefill, :public => true}
+      {open: true, prefill: publisher_prefill, public: true, explain: true}
     else
       super
     end

spec/lib/publisher_spec.rb

@@ -24,13 +24,13 @@ describe Publisher do
   end
 
   ["open", "public", "explain"].each do |property|
-    describe "##{property}?" do
+    describe "##{property}" do
       it 'defaults to closed' do
-        expect(@publisher.send("#{property}?".to_sym)).to be_falsey
+        expect(@publisher.send("#{property}".to_sym)).to be_falsey
       end
 
       it 'listens to the opts' do
-        expect(Publisher.new(alice, {property.to_sym => true}).send("#{property}?".to_sym)).to be true
+        expect(Publisher.new(alice, property.to_sym => true).send("#{property}".to_sym)).to be true
       end
     end
   end

spec/lib/stream/multi_spec.rb

@@ -26,9 +26,7 @@ describe Stream::Multi do
       prefill_text = "sup?"
       allow(@stream).to receive(:welcome?).and_return(true)
       allow(@stream).to receive(:publisher_prefill).and_return(prefill_text)
-      expect(@stream.send(:publisher_opts)).to eq({:open => true,
+      expect(@stream.send(:publisher_opts)).to eq(open: true, prefill: prefill_text, public: true, explain: true)
-                                               :prefill => prefill_text,
-                                               :public => true})
     end
 
     it 'provides no opts if welcome? is not set' do