Merge pull request #55 from mumez/feature/stream-objectify

Added RsStream>>#iterator and #reverseIteraror for supporting easiler iteration

repository/RediStick-Stream-Objects-Tests.package/RsRedisStreamIteratorTest.class/instance/testDoWithoutFrom.st

@@ -0,0 +1,26 @@
+tests
+testDoWithoutFrom
+	| strm one two three four five ite1 entries1 ite2 entries2 |
+	strm := self newStreamNamed: 'testDoWithoutFrom'.
+	strm trimTo: 0.
+	self assert: strm length equals: 0.
+	one := 'one' -> '1'.
+	two := 'two' -> '2'.
+	three := 'three' -> '3'.
+	four := 'four' -> '4'.
+	five := 'five' -> '5'.
+	strm << one << two << three << four << five.
+	ite1 := strm iterator.
+	entries1 := OrderedCollection new.
+	ite1 do: [ :each | entries1 add: each ].
+	self assert: entries1 size equals: 5.
+	self assert: entries1 first content equals: one.
+	self assert: entries1 second content equals: two.
+	self assert: entries1 last content equals: five.
+	ite2 := strm iterator.
+	entries2 := ite2 collect: [ :each | each ].
+	self assert: entries2 size equals: 5.
+	self assert: entries2 first content equals: one.
+	self assert: entries2 last content equals: five.
+	strm trimTo: 0.
+	self assert: strm length equals: 0.

repository/RediStick-Stream-Objects-Tests.package/RsRedisStreamIteratorTest.class/instance/testReverseDoWithoutFrom.st

@@ -0,0 +1,26 @@
+tests
+testReverseDoWithoutFrom
+	| strm one two three four five ite1 entries1 ite2 entries2 |
+	strm := self newStreamNamed: 'testReverseDoWithoutFrom'.
+	strm trimTo: 0.
+	self assert: strm length equals: 0.
+	one := 'one' -> '1'.
+	two := 'two' -> '2'.
+	three := 'three' -> '3'.
+	four := 'four' -> '4'.
+	five := 'five' -> '5'.
+	strm << one << two << three << four << five.
+	ite1 := strm reverseIterator.
+	entries1 := OrderedCollection new.
+	ite1 do: [ :each | entries1 add: each ].
+	self assert: entries1 size equals: 5.
+	self assert: entries1 first content equals: five.
+	self assert: entries1 second content equals: four.
+	self assert: entries1 last content equals: one.
+	ite2 := strm reverseIterator.
+	entries2 := ite2 collect: [ :each | each ].
+	self assert: entries2 size equals: 5.
+	self assert: entries2 first content equals: five.
+	self assert: entries2 last content equals: one.
+	strm trimTo: 0.
+	self assert: strm length equals: 0.

repository/RediStick-Stream-Objects.package/RsStream.class/instance/iterator.st

@@ -0,0 +1,3 @@
+iterating
+iterator
+	^ self iteratorClass on: self

repository/RediStick-Stream-Objects.package/RsStream.class/instance/reverseIterator.st

@@ -0,0 +1,3 @@
+iterating
+reverseIterator
+	^ self iterator reversed

repository/RediStick-Stream-Objects.package/RsStreamIterator.class/class/on.from..st

@@ -0,0 +1,5 @@
+instance creation
+on: aRsStream from: fromId
+	^ (self on: aRsStream)
+		  initFromId: fromId;
+		  yourself

repository/RediStick-Stream-Objects.package/RsStreamIterator.class/class/on.nextFrom..st

@@ -1,3 +1,6 @@
 instance creation
 on: aRsStream nextFrom: fromId
-	^ (self on: aRsStream) initFromId: fromId 
+	^ (self on: aRsStream)
+		  initFromId: fromId;
+		  initCurrentId: fromId;
+		  yourself

repository/RediStick-Stream-Objects.package/RsStreamIterator.class/instance/basicCurrentId.st

@@ -0,0 +1,3 @@
+accessing
+basicCurrentId
+	^ currentId 

repository/RediStick-Stream-Objects.package/RsStreamIterator.class/instance/by.do.whileFalse..st

@@ -1,7 +1,7 @@
 actions
 by: step do: aBlock whileFalse: endConditionBlock
 	| entries |
-	entries := self contentsNextFrom: self currentId count: step.
+	entries := self entriesFrom: self currentId count: step.
 	entries do: [ :each |
 		aBlock value: each.
 		self currentId: each id ].

repository/RediStick-Stream-Objects.package/RsStreamIterator.class/instance/contentsFrom.count..st

@@ -0,0 +1,3 @@
+private
+contentsFrom: entryId count: step
+	^ self stream contentsFrom: entryId count: step

repository/RediStick-Stream-Objects.package/RsStreamIterator.class/instance/currentId.st

@@ -1,4 +1,4 @@
 accessing
 currentId
-
-	^ currentId
+	currentId ifNil: [ ^ self fallbackId ].
+	^ currentId 

repository/RediStick-Stream-Objects.package/RsStreamIterator.class/instance/entriesFrom.count..st

@@ -0,0 +1,4 @@
+private
+entriesFrom: entryId count: step
+	self isInclusive ifTrue: [ ^ self contentsFrom: entryId count: step ].
+	^ self contentsNextFrom: entryId count: step

repository/RediStick-Stream-Objects.package/RsStreamIterator.class/instance/fallbackId.st

@@ -0,0 +1,3 @@
+private
+fallbackId
+	^ self stream first id

repository/RediStick-Stream-Objects.package/RsStreamIterator.class/instance/initCurrentId..st

@@ -0,0 +1,3 @@
+initialization
+initCurrentId: fromIdLikeThing
+	currentId := fromIdLikeThing ifNotNil: [ fromIdLikeThing asStreamMessageId ].

repository/RediStick-Stream-Objects.package/RsStreamIterator.class/instance/initFromId..st

@@ -1,6 +1,3 @@
 initialization
 initFromId: fromIdLikeThing
-	fromId := fromIdLikeThing
-		          ifNil: [ RsStreamMessageId zero ]
-		          ifNotNil: [ fromIdLikeThing asStreamMessageId ].
-	currentId := fromId
+	fromId := fromIdLikeThing ifNotNil: [ fromIdLikeThing asStreamMessageId ].

repository/RediStick-Stream-Objects.package/RsStreamIterator.class/instance/isInclusive..st

@@ -0,0 +1,3 @@
+accessing
+isInclusive: aBoolean
+	isInclusive := aBoolean

repository/RediStick-Stream-Objects.package/RsStreamIterator.class/instance/isInclusive.st

@@ -0,0 +1,4 @@
+testing
+isInclusive
+	isInclusive ifNil: [ ^ currentId isNil ].
+	^ isInclusive 

repository/RediStick-Stream-Objects.package/RsStreamIterator.class/instance/reversed.st

@@ -1,3 +1,3 @@
 converting
 reversed
-	^ RsStreamReverseIterator on: self stream nextFrom: self currentId 
+	^ RsStreamReverseIterator on: self stream nextFrom: self basicCurrentId 

repository/RediStick-Stream-Objects.package/RsStreamIterator.class/properties.json

@@ -9,7 +9,8 @@
 		"name",
 		"stream",
 		"fromId",
-		"currentId"
+		"currentId",
+		"isInclusive"
 	],
 	"name" : "RsStreamIterator",
 	"type" : "normal"

repository/RediStick-Stream-Objects.package/RsStreamReverseIterator.class/instance/contentsFrom.count..st

@@ -0,0 +1,3 @@
+private
+contentsFrom: entryId count: step
+	^ self stream contentsReversedFrom: entryId count: step

repository/RediStick-Stream-Objects.package/RsStreamReverseIterator.class/instance/fallbackId.st

@@ -0,0 +1,3 @@
+private
+fallbackId
+	^ self stream last id

repository/RediStick-Stream-Objects.package/RsStreamReverseIterator.class/instance/reversed.st

@@ -1,3 +1,3 @@
 converting
 reversed
-	^ RsStreamIterator on: self stream nextFrom: self currentId 
+	^ RsStreamIterator on: self stream nextFrom: self basicCurrentId