-
Notifications
You must be signed in to change notification settings - Fork 79
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #79 from wookietreiber/wip-interval-to-collection
fixes #78
- Loading branch information
Showing
3 changed files
with
60 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 39 additions & 0 deletions
39
src/main/scala/com/github/nscala_time/time/RichInterval.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
package com.github.nscala_time.time | ||
|
||
import JodaImplicits._ | ||
import com.github.nscala_time.PimpedType | ||
import org.joda.time._ | ||
import scala.collection.generic.CanBuildFrom | ||
|
||
class RichInterval(val underlying: Interval) extends Super with PimpedType[Interval] { | ||
|
||
/** Returns a collection containing every instance between the interval, `period` time apart. | ||
* | ||
* {{{ | ||
* scala> val start = DateTime.now | ||
* start: org.joda.time.DateTime = 2014-11-27T00:24:54.714+01:00 | ||
* | ||
* scala> val end = start + 1.day | ||
* end: org.joda.time.DateTime = 2014-11-28T00:24:54.714+01:00 | ||
* | ||
* scala> start to end by 1.minute | ||
* res0: scala.collection.immutable.IndexedSeq[org.joda.time.DateTime] = Vector(2014-11-27T00:24:54.714+01:00, ...) | ||
* | ||
* scala> val coll: Iterator[DateTime] = start to end by 1.minute | ||
* coll: Iterator[com.github.nscala_time.time.Imports.DateTime] = non-empty iterator | ||
* }}} | ||
*/ | ||
def by[CC[_]](period: ReadablePeriod)(implicit cbf: CanBuildFrom[Nothing, DateTime, CC[DateTime]]): CC[DateTime] = { | ||
val builder = cbf() | ||
|
||
var x = underlying.getStart | ||
|
||
while (x < underlying.getEnd) { | ||
builder += x | ||
x += period | ||
} | ||
|
||
builder.result | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
package com.github.nscala_time.time | ||
|
||
import org.scalacheck._ | ||
import org.scalacheck.Prop._ | ||
|
||
object RichIntervalSpec extends Properties("RichInterval") with Imports { | ||
|
||
property("by") = forAll(Gen.choose(1,1440)) { n => | ||
val start = DateTime.now | ||
val end = start + 1.day | ||
|
||
val coll = start to end by n.minute | ||
|
||
coll forall { date => | ||
start <= date && | ||
date <= end | ||
} | ||
} | ||
|
||
} |