collapse months if hiding times

.gitignore

@@ -4,6 +4,7 @@ test/coverage.html
 *.bak
 npm-debug.log
 .DS_Store
+.#*
 
 #Jetbrains IDE files
 .idea

.travis.yml

@@ -4,7 +4,7 @@ language: node_js
 node_js:
   - 0.12
   - 4.2.4
-  - 5.3.0
+  - 5.9.0
 
 before_install:
   - make configure

src/twix.coffee

@@ -248,6 +248,8 @@ makeTwix = (moment) ->
       needDate = !options.hideDate &&
         (!options.implicitDate || @start().startOf('d').valueOf() != moment().startOf('d').valueOf() || !(@isSame('d') || goesIntoTheMorning))
 
+        atomicMonthDate = !(@allDay || options.hideTime)
+
       if @allDay && @isSame('d') && (options.implicitDate || options.explicitAllDay)
         fs.push
           name: 'all day simple'
@@ -262,22 +264,22 @@ makeTwix = (moment) ->
           pre: ', '
           slot: 4
 
-      if !@allDay && needDate
+      if atomicMonthDate && needDate
         fs.push
-          name: 'all day month'
+          name: 'month-date'
           fn: (date) -> date.format "#{options.monthFormat} #{options.dayFormat}"
           ignoreEnd: -> goesIntoTheMorning
           pre: ' '
           slot: 2
 
-      if @allDay && needDate
+      if !atomicMonthDate && needDate
         fs.push
           name: 'month'
           fn: (date) -> date.format options.monthFormat
           pre: ' '
           slot: 2
 
-      if @allDay && needDate
+      if !atomicMonthDate && needDate
         fs.push
           name: 'date'
           fn: (date) -> date.format options.dayFormat
@@ -331,6 +333,9 @@ makeTwix = (moment) ->
 
         start_group = {format: format, value: -> start_str}
 
+        if @_start.month() == 9 && @_start.date() == 6
+          console.log "Format: #{JSON.stringify(format)}"
+
         if end_str == start_str && together
           common_bucket.push start_group
         else

test/twix.spec.coffee

@@ -1357,7 +1357,7 @@ test = (moment, Twix) ->
         start: thisYear '05-25', '05:30'
         end: thisYear '05-27', '06:30'
         options: {hideTime: true}
-        result: 'May 25 - May 27'
+        result: 'May 25 - 27'
 
       test 'hide times even for a single day',
         start: thisYear '05-25', '05:30'