message_train 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d757134cad1d008553e317a501152cff6883c0c
-  data.tar.gz: c16084eff35f58f678b14b3499fe13ccc2a04da6
+  metadata.gz: 0dbc07d9cd29fdc66246023ddf25af18350bc82a
+  data.tar.gz: 4289514a7a1336956773e868e26ac96772a0d055
 SHA512:
-  metadata.gz: f4c7d4c51747f5ac698b3d202a06f9579cfad32d3ab34e855fb9dc5f97ae82189c04664585d76abf7dccb4963e78dac9d67993700553f92984488ff8d06c8921
-  data.tar.gz: 2086118ead92034bbb176954109ad36b48c6e39e83a50856442a1888f1ab13081ab4eea7cf979e7c4f2d238372e46f27ce6c0a0d93e1083c6d54139e32ba6e11
+  metadata.gz: 030e104e9a76af6d4f458ca89216c8536204c5912459fc22266a6f435a1beeb1d7e948cfae05a520ee95ddbe1e6d35f81a80a9761246494e58b8c2810a664af0
+  data.tar.gz: 683bb0788585eff1229621b33cabfb1775cea6939536191636505764e0f6795a49ee4d8eabb993f9311b5b640588952541a129d6157385360f858f04015956b9

data/VERSION

@@ -1 +1 @@
-0.6.7
+0.6.8

data/app/helpers/message_train/boxes_helper.rb

@@ -35,6 +35,13 @@ module MessageTrain
       )
     end
 
+    def box_title_with_badge(box_user)
+      render(
+        partial: 'message_train/boxes/dropdown_list',
+        locals: { boxes: box_user.all_boxes }
+      )
+    end
+
     def box_participant_name(participant)
       participant.send(
         MessageTrain.configuration.name_columns[
@@ -65,16 +72,11 @@ module MessageTrain
         @box_user
       ]
       updated_at = boxes.collect do |x|
-        x.conversations && [
-          x.conversations.maximum(:updated_at),
-          x.conversations.maximum(:created_at)
-        ].max
-      end.compact
-      logger.debug("updated_at #{updated_at.inspect}")
-      updated_at.any? && parts << [
-        updated_at.max
+        x.conversations && x.conversations.maximum(:updated_at)
+      end.compact.max
+      updated_at && parts << [
+        updated_at
       ]
-      logger.debug("parts #{parts.inspect}")
       parts
     end
 

data/app/views/message_train/boxes/_dropdown_list.html.haml

@@ -1,5 +1,5 @@
 - unless boxes.empty?
-  - cache boxes_dropdown_cache_key(boxes), 'message-train' do
+  - cache ['message-train', boxes_dropdown_cache_key(boxes)] do
     = dropdown_nav_item "#{:box_title_in.l} #{badge(boxes.first.unread_count.to_s) unless boxes.first.unread_count == 0}".html_safe, '#' do
       - boxes.each do |box|
         = box_nav_item box

data/app/views/message_train/boxes/_widget.html.haml

@@ -1,5 +1,5 @@
 - unless boxes.empty?
-  - cache boxes_widget_cache_key(boxes), 'message-train' do
+  - cache ['message-train', boxes_widget_cache_key(boxes)] do
     .hidden-print
       %h3= :messages.l
       .text-center= link_to :compose.l, message_train.new_box_message_path(:in), class: 'btn btn-lg btn-primary btn-compose'

data/app/views/message_train/collectives/_dropdown_list.html.haml

@@ -1,4 +1,4 @@
-- cache collectives_cache_key(collective_boxes, box_user), 'message-train' do
+- cache ['message-train', collectives_cache_key(collective_boxes, box_user)] do
   - unless collective_boxes.empty?
     - collective_boxes.each do |key, boxes|
       - if show[key]

data/message_train.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: message_train 0.6.7 ruby lib
+# stub: message_train 0.6.8 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "message_train"
-  s.version = "0.6.7"
+  s.version = "0.6.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: message_train
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors:
 - Karen Lundgren