Merge pull request #220 from mallowlabs/id/220

add quoted text push

app/models/message.rb

@@ -33,10 +33,17 @@ def to_hash
     }
   end
 
-  def html_body(room)
+  def html_body(room = nil)
     AsakusaSatellite::Filter.process self, room || self.room
   end
 
+  def inner_text
+    doc = REXML::Document.new(html_body || '')
+    doc.delete_element('//style')
+    doc.delete_element('//script')
+    REXML::XPath.match(doc, "//text()").join(" ").strip
+  end
+
   def prev(offset)
     return [] if offset <= 0
     Message.where(:room_id => self.room_id, :_id.lt => self._id).order_by(:_id.desc).limit(offset).to_a.reverse

plugins/as_iphone_notifier/lib/asakusa_satellite/apn_service/base.rb

@@ -25,8 +25,10 @@ def unregister(device); end
       def send_message(device_tokens, room, message); end
 
       def alert(message)
-        not_attached = message.attachments.empty?
-        body = not_attached ? message.body : message.attachments[0].filename
+        body = ''
+        body = message.attachments[0].filename unless message.attachments.empty?
+        body = message.inner_text if body.blank?
+        body = message.body if body.blank?
         strip("#{message.user.name} / #{body}", PAYLOAD_SIZE_LIMIT)
       end
 

spec/models/message_spec.rb

@@ -190,6 +190,33 @@
     end
   end
 
+  describe "inner_text" do
+    context 'simple' do
+      before {
+        @message = Message.new
+        allow(@message).to receive(:html_body).and_return('<div class="body">text</div>')
+      }
+      subject { @message }
+      its(:inner_text) { should == "text" }
+    end
+    context 'not html' do
+      before {
+        @message = Message.new
+        allow(@message).to receive(:html_body).and_return('text')
+      }
+      subject { @message }
+      its(:inner_text) { should == "text" }
+    end
+    context 'html with style' do
+      before {
+        @message = Message.new
+        allow(@message).to receive(:html_body).and_return('<div><style>html{color:red;}</style> <div>text</div></div>')
+      }
+      subject { @message }
+      its(:inner_text) { should == "text" }
+    end
+  end
+
   describe "添付ファイル" do
     before {
       expect(Setting).to receive(:[]).with(:attachment_max_size).and_return("1")