diff --git a/repository/Zinc-Character-Encoding-Core.package/ZnBase64Encoder.class/instance/isLegalCharacter..st b/repository/Zinc-Character-Encoding-Core.package/ZnBase64Encoder.class/instance/isLegalCharacter..st index cec8b007..c7f1aa60 100644 --- a/repository/Zinc-Character-Encoding-Core.package/ZnBase64Encoder.class/instance/isLegalCharacter..st +++ b/repository/Zinc-Character-Encoding-Core.package/ZnBase64Encoder.class/instance/isLegalCharacter..st @@ -4,4 +4,4 @@ isLegalCharacter: character | code | ^ (code := character asciiValue) < 128 - and: [ (inverse at: code + 1) notNil ] \ No newline at end of file + and: [ (inverse at: code + 1) isNotNil ] \ No newline at end of file diff --git a/repository/Zinc-Character-Encoding-Core.package/monticello.meta/categories.st b/repository/Zinc-Character-Encoding-Core.package/monticello.meta/categories.st index 2cb3537b..f2721d0c 100644 --- a/repository/Zinc-Character-Encoding-Core.package/monticello.meta/categories.st +++ b/repository/Zinc-Character-Encoding-Core.package/monticello.meta/categories.st @@ -1 +1 @@ -SystemOrganization addCategory: #'Zinc-Character-Encoding-Core'! +self packageOrganizer ensurePackage: #'Zinc-Character-Encoding-Core' withTags: #()! diff --git a/repository/Zinc-HTTP-Examples.package/ZnImageExampleDelegate.class/instance/handlePostRequest..st b/repository/Zinc-HTTP-Examples.package/ZnImageExampleDelegate.class/instance/handlePostRequest..st index f75adce8..1bb3cb6a 100644 --- a/repository/Zinc-HTTP-Examples.package/ZnImageExampleDelegate.class/instance/handlePostRequest..st +++ b/repository/Zinc-HTTP-Examples.package/ZnImageExampleDelegate.class/instance/handlePostRequest..st @@ -11,7 +11,7 @@ handlePostRequest: request partNamed: #file ifNone: badRequest. newImage := part entity. - (newImage notNil and: [ newImage contentType matches: 'image/*' asZnMimeType ]) + (newImage isNotNil and: [ newImage contentType matches: 'image/*' asZnMimeType ]) ifFalse: badRequest. [ self formForImageEntity: newImage ] on: Error do: badRequest. image := newImage. diff --git a/repository/Zinc-HTTP-Examples.package/ZnStaticFileServerDelegate.class/instance/handleRequest..st b/repository/Zinc-HTTP-Examples.package/ZnStaticFileServerDelegate.class/instance/handleRequest..st index 844623bc..8cefee0f 100644 --- a/repository/Zinc-HTTP-Examples.package/ZnStaticFileServerDelegate.class/instance/handleRequest..st +++ b/repository/Zinc-HTTP-Examples.package/ZnStaticFileServerDelegate.class/instance/handleRequest..st @@ -3,12 +3,15 @@ handleRequest: request "Server delegate entry point" | actualFilename | - (#(#GET #HEAD) includes: request method) - ifFalse: [ ^ ZnResponse methodNotAllowed: request ]. + (#( #GET #HEAD ) includes: request method) ifFalse: [ + ^ ZnResponse methodNotAllowed: request ]. actualFilename := self actualFilenameFor: request uri. - ^ actualFilename notNil - ifTrue: [ - (self redirectNeededFor: request uri actualFilename: actualFilename) - ifTrue: [ self directoryRedirectFor: request uri ] - ifFalse: [ self responseForFile: actualFilename fromRequest: request ] ] - ifFalse: [ ZnResponse notFound: request uri ] \ No newline at end of file + ^ actualFilename + ifNotNil: [ + (self + redirectNeededFor: request uri + actualFilename: actualFilename) + ifTrue: [ self directoryRedirectFor: request uri ] + ifFalse: [ + self responseForFile: actualFilename fromRequest: request ] ] + ifNil: [ ZnResponse notFound: request uri ] \ No newline at end of file diff --git a/repository/Zinc-HTTP-Examples.package/monticello.meta/categories.st b/repository/Zinc-HTTP-Examples.package/monticello.meta/categories.st index 416b867f..b47ee011 100644 --- a/repository/Zinc-HTTP-Examples.package/monticello.meta/categories.st +++ b/repository/Zinc-HTTP-Examples.package/monticello.meta/categories.st @@ -1 +1 @@ -SystemOrganization addCategory: #'Zinc-HTTP-Examples'! +self packageOrganizer ensurePackage: #'Zinc-HTTP-Examples' withTags: #()! diff --git a/repository/Zinc-HTTP.package/ZnBasicCredential.class/instance/isComplete.st b/repository/Zinc-HTTP.package/ZnBasicCredential.class/instance/isComplete.st index b1531462..21f30f13 100644 --- a/repository/Zinc-HTTP.package/ZnBasicCredential.class/instance/isComplete.st +++ b/repository/Zinc-HTTP.package/ZnBasicCredential.class/instance/isComplete.st @@ -1,3 +1,3 @@ testing isComplete - ^ username notNil & password notNil \ No newline at end of file + ^ username isNotNil & password isNotNil \ No newline at end of file diff --git a/repository/Zinc-HTTP.package/ZnByteArrayEntity.class/instance/printContentsOn..st b/repository/Zinc-HTTP.package/ZnByteArrayEntity.class/instance/printContentsOn..st index adc0cd86..ae76f250 100644 --- a/repository/Zinc-HTTP.package/ZnByteArrayEntity.class/instance/printContentsOn..st +++ b/repository/Zinc-HTTP.package/ZnByteArrayEntity.class/instance/printContentsOn..st @@ -1,5 +1,5 @@ printing printContentsOn: stream super printContentsOn: stream. - self bytes notNil ifTrue: [ + self bytes isNotNil ifTrue: [ stream space; print: self bytes ] \ No newline at end of file diff --git a/repository/Zinc-HTTP.package/ZnChunkedReadStream.class/instance/ensureChunkBufferOfSize..st b/repository/Zinc-HTTP.package/ZnChunkedReadStream.class/instance/ensureChunkBufferOfSize..st index 057039b7..36201806 100644 --- a/repository/Zinc-HTTP.package/ZnChunkedReadStream.class/instance/ensureChunkBufferOfSize..st +++ b/repository/Zinc-HTTP.package/ZnChunkedReadStream.class/instance/ensureChunkBufferOfSize..st @@ -1,4 +1,4 @@ private ensureChunkBufferOfSize: size - (chunk notNil and: [ size <= chunk size ]) ifTrue: [ ^ self ]. + (chunk isNotNil and: [ size <= chunk size ]) ifTrue: [ ^ self ]. chunk := self collectionSpecies new: size \ No newline at end of file diff --git a/repository/Zinc-HTTP.package/ZnClient.class/instance/cleanupConnection.st b/repository/Zinc-HTTP.package/ZnClient.class/instance/cleanupConnection.st index 8761ef2f..fba78638 100644 --- a/repository/Zinc-HTTP.package/ZnClient.class/instance/cleanupConnection.st +++ b/repository/Zinc-HTTP.package/ZnClient.class/instance/cleanupConnection.st @@ -4,7 +4,7 @@ cleanupConnection or: [ self streaming not and: [ - (request notNil and: [ request wantsConnectionClose ]) - or: [ response notNil and: [ response wantsConnectionClose ] ] ] ]) + (request isNotNil and: [ request wantsConnectionClose ]) + or: [ response isNotNil and: [ response wantsConnectionClose ] ] ] ]) ifTrue: [ self close ] \ No newline at end of file diff --git a/repository/Zinc-HTTP.package/ZnClient.class/instance/isConnected.st b/repository/Zinc-HTTP.package/ZnClient.class/instance/isConnected.st index 86111835..a9ad5a85 100644 --- a/repository/Zinc-HTTP.package/ZnClient.class/instance/isConnected.st +++ b/repository/Zinc-HTTP.package/ZnClient.class/instance/isConnected.st @@ -2,4 +2,4 @@ testing isConnected "Return true if I hold an open HTTP connection." - ^ connection notNil and: [ connection isConnected ] \ No newline at end of file + ^ connection isNotNil and: [ connection isConnected ] \ No newline at end of file diff --git a/repository/Zinc-HTTP.package/ZnClient.class/instance/newConnectionTo..st b/repository/Zinc-HTTP.package/ZnClient.class/instance/newConnectionTo..st index eba85bf0..d97db1cb 100644 --- a/repository/Zinc-HTTP.package/ZnClient.class/instance/newConnectionTo..st +++ b/repository/Zinc-HTTP.package/ZnClient.class/instance/newConnectionTo..st @@ -3,7 +3,7 @@ newConnectionTo: url | initialMilliseconds | self signalHTTPProgress: 'Connecting to ', url authority. initialMilliseconds := Time millisecondClockValue. - (connection notNil and: [ connection isConnected ]) + (connection isNotNil and: [ connection isConnected ]) ifTrue: [ connection close ]. connection := ZnNetworkingUtils socketStreamToUrl: url. url hasSecureScheme diff --git a/repository/Zinc-HTTP.package/ZnClient.class/instance/resetEntity.st b/repository/Zinc-HTTP.package/ZnClient.class/instance/resetEntity.st index be638608..c4360b88 100644 --- a/repository/Zinc-HTTP.package/ZnClient.class/instance/resetEntity.st +++ b/repository/Zinc-HTTP.package/ZnClient.class/instance/resetEntity.st @@ -4,5 +4,5 @@ resetEntity This is sometimes necessary after a POST or PUT. This method will be called automatically by #method: for certain requests." - (request notNil and: [ request hasEntity ]) + (request isNotNil and: [ request hasEntity ]) ifTrue: [ request resetEntity: nil ] \ No newline at end of file diff --git a/repository/Zinc-HTTP.package/ZnDigestCredential.class/instance/isComplete.st b/repository/Zinc-HTTP.package/ZnDigestCredential.class/instance/isComplete.st index 87f46fd9..71b8edf5 100644 --- a/repository/Zinc-HTTP.package/ZnDigestCredential.class/instance/isComplete.st +++ b/repository/Zinc-HTTP.package/ZnDigestCredential.class/instance/isComplete.st @@ -1,3 +1,3 @@ testing isComplete - ^ super isComplete & nonce notNil \ No newline at end of file + ^ super isComplete & nonce isNotNil \ No newline at end of file diff --git a/repository/Zinc-HTTP.package/ZnEntity.class/instance/hasContentLength.st b/repository/Zinc-HTTP.package/ZnEntity.class/instance/hasContentLength.st index 3c4ce752..56712096 100644 --- a/repository/Zinc-HTTP.package/ZnEntity.class/instance/hasContentLength.st +++ b/repository/Zinc-HTTP.package/ZnEntity.class/instance/hasContentLength.st @@ -1,3 +1,3 @@ testing hasContentLength - ^ contentLength notNil \ No newline at end of file + ^ contentLength isNotNil \ No newline at end of file diff --git a/repository/Zinc-HTTP.package/ZnEntity.class/instance/hasContentType.st b/repository/Zinc-HTTP.package/ZnEntity.class/instance/hasContentType.st index 5ff14de0..e14234ad 100644 --- a/repository/Zinc-HTTP.package/ZnEntity.class/instance/hasContentType.st +++ b/repository/Zinc-HTTP.package/ZnEntity.class/instance/hasContentType.st @@ -1,3 +1,3 @@ testing hasContentType - ^ contentType notNil \ No newline at end of file + ^ contentType isNotNil \ No newline at end of file diff --git a/repository/Zinc-HTTP.package/ZnEntityReader.class/instance/allowsReadingUpToEnd.st b/repository/Zinc-HTTP.package/ZnEntityReader.class/instance/allowsReadingUpToEnd.st index 7ff7ab1f..89779ee0 100644 --- a/repository/Zinc-HTTP.package/ZnEntityReader.class/instance/allowsReadingUpToEnd.st +++ b/repository/Zinc-HTTP.package/ZnEntityReader.class/instance/allowsReadingUpToEnd.st @@ -1,3 +1,3 @@ testing allowsReadingUpToEnd - ^ allowReadingUpToEnd notNil and: [ allowReadingUpToEnd ] \ No newline at end of file + ^ allowReadingUpToEnd isNotNil and: [ allowReadingUpToEnd ] \ No newline at end of file diff --git a/repository/Zinc-HTTP.package/ZnEntityReader.class/instance/isBinary.st b/repository/Zinc-HTTP.package/ZnEntityReader.class/instance/isBinary.st index 5e980bca..362673c3 100644 --- a/repository/Zinc-HTTP.package/ZnEntityReader.class/instance/isBinary.st +++ b/repository/Zinc-HTTP.package/ZnEntityReader.class/instance/isBinary.st @@ -1,3 +1,3 @@ testing isBinary - ^ binary notNil and: [ binary ] \ No newline at end of file + ^ binary isNotNil and: [ binary ] \ No newline at end of file diff --git a/repository/Zinc-HTTP.package/ZnEntityReader.class/instance/isStreaming.st b/repository/Zinc-HTTP.package/ZnEntityReader.class/instance/isStreaming.st index 509691ed..30038fd3 100644 --- a/repository/Zinc-HTTP.package/ZnEntityReader.class/instance/isStreaming.st +++ b/repository/Zinc-HTTP.package/ZnEntityReader.class/instance/isStreaming.st @@ -1,3 +1,3 @@ testing isStreaming - ^ streaming notNil and: [ streaming ] \ No newline at end of file + ^ streaming isNotNil and: [ streaming ] \ No newline at end of file diff --git a/repository/Zinc-HTTP.package/ZnLogEvent.class/instance/timeStamp.st b/repository/Zinc-HTTP.package/ZnLogEvent.class/instance/timestamp.st similarity index 100% rename from repository/Zinc-HTTP.package/ZnLogEvent.class/instance/timeStamp.st rename to repository/Zinc-HTTP.package/ZnLogEvent.class/instance/timestamp.st diff --git a/repository/Zinc-HTTP.package/ZnMessage.class/instance/hasEntity.st b/repository/Zinc-HTTP.package/ZnMessage.class/instance/hasEntity.st index cd93c312..96e840e4 100644 --- a/repository/Zinc-HTTP.package/ZnMessage.class/instance/hasEntity.st +++ b/repository/Zinc-HTTP.package/ZnMessage.class/instance/hasEntity.st @@ -1,3 +1,3 @@ testing hasEntity - ^ self entity notNil \ No newline at end of file + ^ self entity isNotNil \ No newline at end of file diff --git a/repository/Zinc-HTTP.package/ZnMessage.class/instance/hasHeaders.st b/repository/Zinc-HTTP.package/ZnMessage.class/instance/hasHeaders.st index 4385b6eb..da007e8e 100644 --- a/repository/Zinc-HTTP.package/ZnMessage.class/instance/hasHeaders.st +++ b/repository/Zinc-HTTP.package/ZnMessage.class/instance/hasHeaders.st @@ -1,3 +1,4 @@ testing hasHeaders - ^ headers notNil and: [ self headers isEmpty not ] \ No newline at end of file + + ^ headers isNotNil and: [ self headers isNotEmpty ] \ No newline at end of file diff --git a/repository/Zinc-HTTP.package/ZnMessage.class/instance/hasSession.st b/repository/Zinc-HTTP.package/ZnMessage.class/instance/hasSession.st index 9b0d4883..75dae1e2 100644 --- a/repository/Zinc-HTTP.package/ZnMessage.class/instance/hasSession.st +++ b/repository/Zinc-HTTP.package/ZnMessage.class/instance/hasSession.st @@ -3,4 +3,4 @@ hasSession "Return if there currently is a server session. This only returns a value during #handleRequest:" - ^ ZnCurrentServerSession value notNil \ No newline at end of file + ^ ZnCurrentServerSession value isNotNil \ No newline at end of file diff --git a/repository/Zinc-HTTP.package/ZnMessage.class/instance/resetEntity..st b/repository/Zinc-HTTP.package/ZnMessage.class/instance/resetEntity..st index fb929b8e..24819163 100644 --- a/repository/Zinc-HTTP.package/ZnMessage.class/instance/resetEntity..st +++ b/repository/Zinc-HTTP.package/ZnMessage.class/instance/resetEntity..st @@ -4,7 +4,7 @@ resetEntity: object even if I am already describing an entity using my content type and length. See also: #clearEntity" - (entity ~= object and: [ entity notNil ]) + (entity ~= object and: [ entity isNotNil ]) ifTrue: [ entity close ]. entity := object. self headers acceptEntityDescription: object \ No newline at end of file diff --git a/repository/Zinc-HTTP.package/ZnMimePart.class/instance/hasEntity.st b/repository/Zinc-HTTP.package/ZnMimePart.class/instance/hasEntity.st index cd93c312..96e840e4 100644 --- a/repository/Zinc-HTTP.package/ZnMimePart.class/instance/hasEntity.st +++ b/repository/Zinc-HTTP.package/ZnMimePart.class/instance/hasEntity.st @@ -1,3 +1,3 @@ testing hasEntity - ^ self entity notNil \ No newline at end of file + ^ self entity isNotNil \ No newline at end of file diff --git a/repository/Zinc-HTTP.package/ZnMimePart.class/instance/hasHeaders.st b/repository/Zinc-HTTP.package/ZnMimePart.class/instance/hasHeaders.st index 4385b6eb..59fa3d17 100644 --- a/repository/Zinc-HTTP.package/ZnMimePart.class/instance/hasHeaders.st +++ b/repository/Zinc-HTTP.package/ZnMimePart.class/instance/hasHeaders.st @@ -1,3 +1,3 @@ testing hasHeaders - ^ headers notNil and: [ self headers isEmpty not ] \ No newline at end of file + ^ headers isNotNil and: [ self headers isNotEmpty ] \ No newline at end of file diff --git a/repository/Zinc-HTTP.package/ZnOptions.class/instance/at.put..st b/repository/Zinc-HTTP.package/ZnOptions.class/instance/at.put..st index 2e5d3954..b29b5b1e 100644 --- a/repository/Zinc-HTTP.package/ZnOptions.class/instance/at.put..st +++ b/repository/Zinc-HTTP.package/ZnOptions.class/instance/at.put..st @@ -6,7 +6,7 @@ at: key put: value at: key with: value retrySelector: #at:put:) signal ]. - (parent notNil and: [ parent includesKey: key ]) + (parent isNotNil and: [ parent includesKey: key ]) ifFalse: [ KeyNotFound signalFor: key in: self ]. options ifNil: [ options := Dictionary new ]. ^ options at: key put: value \ No newline at end of file diff --git a/repository/Zinc-HTTP.package/ZnOptions.class/instance/includesKey..st b/repository/Zinc-HTTP.package/ZnOptions.class/instance/includesKey..st index f485da7e..59c7734e 100644 --- a/repository/Zinc-HTTP.package/ZnOptions.class/instance/includesKey..st +++ b/repository/Zinc-HTTP.package/ZnOptions.class/instance/includesKey..st @@ -1,4 +1,4 @@ testing includesKey: key - ^ (options notNil and: [ options includesKey: key ]) - or: [ parent notNil and: [ parent includesKey: key ] ] \ No newline at end of file + ^ (options isNotNil and: [ options includesKey: key ]) + or: [ parent isNotNil and: [ parent includesKey: key ] ] \ No newline at end of file diff --git a/repository/Zinc-HTTP.package/ZnRequestLine.class/instance/printMethodAndUriOn..st b/repository/Zinc-HTTP.package/ZnRequestLine.class/instance/printMethodAndUriOn..st index 1648ba92..898c674a 100644 --- a/repository/Zinc-HTTP.package/ZnRequestLine.class/instance/printMethodAndUriOn..st +++ b/repository/Zinc-HTTP.package/ZnRequestLine.class/instance/printMethodAndUriOn..st @@ -1,6 +1,6 @@ printing printMethodAndUriOn: stream - (self method notNil and: [ self uri notNil ]) + (self method isNotNil and: [ self uri isNotNil ]) ifFalse: [ ^ self ]. stream nextPutAll: self method; diff --git a/repository/Zinc-HTTP.package/ZnRequestLine.class/instance/printOn..st b/repository/Zinc-HTTP.package/ZnRequestLine.class/instance/printOn..st index d637be94..695c94e3 100644 --- a/repository/Zinc-HTTP.package/ZnRequestLine.class/instance/printOn..st +++ b/repository/Zinc-HTTP.package/ZnRequestLine.class/instance/printOn..st @@ -1,7 +1,7 @@ printing printOn: stream super printOn: stream. - (self method notNil and: [ self uri notNil ]) + (self method isNotNil and: [ self uri isNotNil ]) ifFalse: [ ^ self ]. stream nextPut: $(. self printMethodAndUriOn: stream. diff --git a/repository/Zinc-HTTP.package/ZnSingleThreadedServer.class/instance/isListening.st b/repository/Zinc-HTTP.package/ZnSingleThreadedServer.class/instance/isListening.st index 95e8d7d0..44c9fda2 100644 --- a/repository/Zinc-HTTP.package/ZnSingleThreadedServer.class/instance/isListening.st +++ b/repository/Zinc-HTTP.package/ZnSingleThreadedServer.class/instance/isListening.st @@ -2,5 +2,5 @@ testing isListening "Return true when I have a valid server socket listening at the correct port" - ^ self serverSocket notNil + ^ self serverSocket isNotNil and: [ self serverSocket isValid and: [ self serverSocket localPort = self port ] ] \ No newline at end of file diff --git a/repository/Zinc-HTTP.package/ZnSingleThreadedServer.class/instance/isRunning.st b/repository/Zinc-HTTP.package/ZnSingleThreadedServer.class/instance/isRunning.st index d181edef..6af2ca23 100644 --- a/repository/Zinc-HTTP.package/ZnSingleThreadedServer.class/instance/isRunning.st +++ b/repository/Zinc-HTTP.package/ZnSingleThreadedServer.class/instance/isRunning.st @@ -2,4 +2,4 @@ testing isRunning "Return true when I am running" - ^ self process notNil and: [ self serverSocket notNil ] \ No newline at end of file + ^ self process isNotNil and: [ self serverSocket isNotNil ] \ No newline at end of file diff --git a/repository/Zinc-HTTP.package/ZnStringEntity.class/instance/encoder..st b/repository/Zinc-HTTP.package/ZnStringEntity.class/instance/encoder..st index 1885e097..36fce084 100644 --- a/repository/Zinc-HTTP.package/ZnStringEntity.class/instance/encoder..st +++ b/repository/Zinc-HTTP.package/ZnStringEntity.class/instance/encoder..st @@ -1,4 +1,4 @@ accessing encoder: anEncoding - (encoder notNil and: [ anEncoding ~= encoder ]) ifTrue: [ self invalidateContentLength ]. + (encoder isNotNil and: [ anEncoding ~= encoder ]) ifTrue: [ self invalidateContentLength ]. encoder := anEncoding \ No newline at end of file diff --git a/repository/Zinc-HTTP.package/ZnStringEntity.class/instance/hasEncoder.st b/repository/Zinc-HTTP.package/ZnStringEntity.class/instance/hasEncoder.st index 894222c9..241fe959 100644 --- a/repository/Zinc-HTTP.package/ZnStringEntity.class/instance/hasEncoder.st +++ b/repository/Zinc-HTTP.package/ZnStringEntity.class/instance/hasEncoder.st @@ -1,3 +1,3 @@ private hasEncoder - ^ encoder notNil \ No newline at end of file + ^ encoder isNotNil \ No newline at end of file diff --git a/repository/Zinc-HTTP.package/ZnStringEntity.class/instance/printContentsOn..st b/repository/Zinc-HTTP.package/ZnStringEntity.class/instance/printContentsOn..st index 636bb848..35147f59 100644 --- a/repository/Zinc-HTTP.package/ZnStringEntity.class/instance/printContentsOn..st +++ b/repository/Zinc-HTTP.package/ZnStringEntity.class/instance/printContentsOn..st @@ -1,5 +1,8 @@ printing printContentsOn: stream + super printContentsOn: stream. - self string notNil ifTrue: [ - stream space; nextPutAll: self string ] \ No newline at end of file + self string ifNotNil: [ + stream + space; + nextPutAll: self string ] \ No newline at end of file diff --git a/repository/Zinc-HTTP.package/ZnStringEntity.class/instance/string..st b/repository/Zinc-HTTP.package/ZnStringEntity.class/instance/string..st index 61dfa991..5823328c 100644 --- a/repository/Zinc-HTTP.package/ZnStringEntity.class/instance/string..st +++ b/repository/Zinc-HTTP.package/ZnStringEntity.class/instance/string..st @@ -1,4 +1,4 @@ accessing string: aString - (string notNil and: [ aString ~= string ]) ifTrue: [ self invalidateContentLength ]. + (string isNotNil and: [ aString ~= string ]) ifTrue: [ self invalidateContentLength ]. string := aString \ No newline at end of file diff --git a/repository/Zinc-HTTP.package/ZnUtils.class/class/readUpToEnd.limit..st b/repository/Zinc-HTTP.package/ZnUtils.class/class/readUpToEnd.limit..st index 3ea89c12..2067c498 100644 --- a/repository/Zinc-HTTP.package/ZnUtils.class/class/readUpToEnd.limit..st +++ b/repository/Zinc-HTTP.package/ZnUtils.class/class/readUpToEnd.limit..st @@ -9,7 +9,7 @@ readUpToEnd: inputStream limit: limit [ inputStream atEnd ] whileFalse: [ | readCount | readCount := inputStream readInto: buffer startingAt: 1 count: bufferSize. totalRead := totalRead + readCount. - (limit notNil and: [ totalRead > limit ]) + (limit isNotNil and: [ totalRead > limit ]) ifTrue: [ ZnEntityTooLarge signal ]. outputStream ifNil: [ inputStream atEnd diff --git a/repository/Zinc-HTTP.package/monticello.meta/categories.st b/repository/Zinc-HTTP.package/monticello.meta/categories.st index f7e23f08..b4484d8a 100644 --- a/repository/Zinc-HTTP.package/monticello.meta/categories.st +++ b/repository/Zinc-HTTP.package/monticello.meta/categories.st @@ -1,8 +1 @@ -SystemOrganization addCategory: #'Zinc-HTTP'! -SystemOrganization addCategory: #'Zinc-HTTP-Client-Server'! -SystemOrganization addCategory: #'Zinc-HTTP-Core'! -SystemOrganization addCategory: #'Zinc-HTTP-Exceptions'! -SystemOrganization addCategory: #'Zinc-HTTP-Logging'! -SystemOrganization addCategory: #'Zinc-HTTP-Streaming'! -SystemOrganization addCategory: #'Zinc-HTTP-Support'! -SystemOrganization addCategory: #'Zinc-HTTP-Variables'! +self packageOrganizer ensurePackage: #'Zinc-HTTP' withTags: #(#'Client-Server' #Core #Exceptions #Logging #Streaming #Support #Variables)! diff --git a/repository/Zinc-Resource-Meta-Core.package/ZnMimeType.class/instance/hasParameters.st b/repository/Zinc-Resource-Meta-Core.package/ZnMimeType.class/instance/hasParameters.st index 10dd48f9..2ec1760c 100644 --- a/repository/Zinc-Resource-Meta-Core.package/ZnMimeType.class/instance/hasParameters.st +++ b/repository/Zinc-Resource-Meta-Core.package/ZnMimeType.class/instance/hasParameters.st @@ -1,3 +1,3 @@ testing hasParameters - ^ parameters notNil and: [ parameters isEmpty not ] \ No newline at end of file + ^ parameters isNotNil and: [ parameters isNotEmpty ] \ No newline at end of file diff --git a/repository/Zinc-Resource-Meta-Core.package/ZnMimeType.class/instance/isCharSetUTF8.st b/repository/Zinc-Resource-Meta-Core.package/ZnMimeType.class/instance/isCharSetUTF8.st index 82b789d6..fc1b8cca 100644 --- a/repository/Zinc-Resource-Meta-Core.package/ZnMimeType.class/instance/isCharSetUTF8.st +++ b/repository/Zinc-Resource-Meta-Core.package/ZnMimeType.class/instance/isCharSetUTF8.st @@ -1,3 +1,3 @@ testing isCharSetUTF8 - ^ self charSet notNil and: [ self charSet sameAs: 'utf-8' ] \ No newline at end of file + ^ self charSet isNotNil and: [ self charSet sameAs: 'utf-8' ] \ No newline at end of file diff --git a/repository/Zinc-Resource-Meta-Core.package/ZnMultiValueDictionary.class/instance/checkLimitForKey..st b/repository/Zinc-Resource-Meta-Core.package/ZnMultiValueDictionary.class/instance/checkLimitForKey..st index 1f20553b..4feec853 100644 --- a/repository/Zinc-Resource-Meta-Core.package/ZnMultiValueDictionary.class/instance/checkLimitForKey..st +++ b/repository/Zinc-Resource-Meta-Core.package/ZnMultiValueDictionary.class/instance/checkLimitForKey..st @@ -2,5 +2,5 @@ private checkLimitForKey: aKey "Signal an exception when the limit, if present, is exceeded." - (self limit notNil and: [ self size >= self limit and: [ (self includesKey: aKey) not ]]) + (self limit isNotNil and: [ self size >= self limit and: [ (self includesKey: aKey) not ]]) ifTrue: [ (ZnTooManyDictionaryEntries limit: self limit) signal ] \ No newline at end of file diff --git a/repository/Zinc-Resource-Meta-Core.package/ZnUrl.class/instance/hasFragment.st b/repository/Zinc-Resource-Meta-Core.package/ZnUrl.class/instance/hasFragment.st index 59ee36d0..5dee42ad 100644 --- a/repository/Zinc-Resource-Meta-Core.package/ZnUrl.class/instance/hasFragment.st +++ b/repository/Zinc-Resource-Meta-Core.package/ZnUrl.class/instance/hasFragment.st @@ -1,3 +1,3 @@ testing hasFragment - ^ fragment notNil \ No newline at end of file + ^ fragment isNotNil \ No newline at end of file diff --git a/repository/Zinc-Resource-Meta-Core.package/ZnUrl.class/instance/hasHost.st b/repository/Zinc-Resource-Meta-Core.package/ZnUrl.class/instance/hasHost.st index 90afbe74..efa19b25 100644 --- a/repository/Zinc-Resource-Meta-Core.package/ZnUrl.class/instance/hasHost.st +++ b/repository/Zinc-Resource-Meta-Core.package/ZnUrl.class/instance/hasHost.st @@ -1,3 +1,3 @@ testing hasHost - ^ host notNil \ No newline at end of file + ^ host isNotNil \ No newline at end of file diff --git a/repository/Zinc-Resource-Meta-Core.package/ZnUrl.class/instance/hasPassword.st b/repository/Zinc-Resource-Meta-Core.package/ZnUrl.class/instance/hasPassword.st index 6bd8c011..b097fdf2 100644 --- a/repository/Zinc-Resource-Meta-Core.package/ZnUrl.class/instance/hasPassword.st +++ b/repository/Zinc-Resource-Meta-Core.package/ZnUrl.class/instance/hasPassword.st @@ -1,3 +1,3 @@ testing hasPassword - ^ password notNil \ No newline at end of file + ^ password isNotNil \ No newline at end of file diff --git a/repository/Zinc-Resource-Meta-Core.package/ZnUrl.class/instance/hasPath.st b/repository/Zinc-Resource-Meta-Core.package/ZnUrl.class/instance/hasPath.st index 443f3ccc..d2f79c20 100644 --- a/repository/Zinc-Resource-Meta-Core.package/ZnUrl.class/instance/hasPath.st +++ b/repository/Zinc-Resource-Meta-Core.package/ZnUrl.class/instance/hasPath.st @@ -1,3 +1,3 @@ testing hasPath - ^ segments notNil and: [ segments isEmpty not ] \ No newline at end of file + ^ segments isNotNil and: [ segments isNotEmpty ] \ No newline at end of file diff --git a/repository/Zinc-Resource-Meta-Core.package/ZnUrl.class/instance/hasPort.st b/repository/Zinc-Resource-Meta-Core.package/ZnUrl.class/instance/hasPort.st index 7007844a..8dc71869 100644 --- a/repository/Zinc-Resource-Meta-Core.package/ZnUrl.class/instance/hasPort.st +++ b/repository/Zinc-Resource-Meta-Core.package/ZnUrl.class/instance/hasPort.st @@ -1,3 +1,3 @@ testing hasPort - ^ port notNil \ No newline at end of file + ^ port isNotNil \ No newline at end of file diff --git a/repository/Zinc-Resource-Meta-Core.package/ZnUrl.class/instance/hasQuery.st b/repository/Zinc-Resource-Meta-Core.package/ZnUrl.class/instance/hasQuery.st index 80578ae5..e8e42027 100644 --- a/repository/Zinc-Resource-Meta-Core.package/ZnUrl.class/instance/hasQuery.st +++ b/repository/Zinc-Resource-Meta-Core.package/ZnUrl.class/instance/hasQuery.st @@ -1,3 +1,3 @@ testing hasQuery - ^ query notNil and: [ query isEmpty not ] \ No newline at end of file + ^ query isNotNil and: [ query isEmpty not ] \ No newline at end of file diff --git a/repository/Zinc-Resource-Meta-Core.package/ZnUrl.class/instance/hasScheme.st b/repository/Zinc-Resource-Meta-Core.package/ZnUrl.class/instance/hasScheme.st index 07dd82c7..e4dd979c 100644 --- a/repository/Zinc-Resource-Meta-Core.package/ZnUrl.class/instance/hasScheme.st +++ b/repository/Zinc-Resource-Meta-Core.package/ZnUrl.class/instance/hasScheme.st @@ -1,3 +1,3 @@ testing hasScheme - ^ scheme notNil \ No newline at end of file + ^ scheme isNotNil \ No newline at end of file diff --git a/repository/Zinc-Resource-Meta-Core.package/ZnUrl.class/instance/hasUsername.st b/repository/Zinc-Resource-Meta-Core.package/ZnUrl.class/instance/hasUsername.st index 79d41f1f..a145d6e5 100644 --- a/repository/Zinc-Resource-Meta-Core.package/ZnUrl.class/instance/hasUsername.st +++ b/repository/Zinc-Resource-Meta-Core.package/ZnUrl.class/instance/hasUsername.st @@ -1,3 +1,3 @@ testing hasUsername - ^ username notNil \ No newline at end of file + ^ username isNotNil \ No newline at end of file diff --git a/repository/Zinc-Resource-Meta-Core.package/monticello.meta/categories.st b/repository/Zinc-Resource-Meta-Core.package/monticello.meta/categories.st index 7fc65f0e..87558a6a 100644 --- a/repository/Zinc-Resource-Meta-Core.package/monticello.meta/categories.st +++ b/repository/Zinc-Resource-Meta-Core.package/monticello.meta/categories.st @@ -1 +1 @@ -SystemOrganization addCategory: #'Zinc-Resource-Meta-Core'! +self packageOrganizer ensurePackage: #'Zinc-Resource-Meta-Core' withTags: #()! diff --git a/repository/Zinc-Tests.package/ZnClientTest.class/instance/testRedirectWithCookies.st b/repository/Zinc-Tests.package/ZnClientTest.class/instance/testRedirectWithCookies.st index 70d5bcd5..92218b3c 100644 --- a/repository/Zinc-Tests.package/ZnClientTest.class/instance/testRedirectWithCookies.st +++ b/repository/Zinc-Tests.package/ZnClientTest.class/instance/testRedirectWithCookies.st @@ -9,7 +9,7 @@ testRedirectWithCookies yourself ] ifFalse: [ cookie := request cookies detect: [ :each | each name = 'session' ] ifNone: [ nil ]. - (request uri firstPathSegment = 'two' and: [ cookie notNil and: [ cookie value = '123456' ] ]) + (request uri firstPathSegment = 'two' and: [ cookie isNotNil and: [ cookie value = '123456' ] ]) ifTrue: [ ZnResponse ok: (ZnEntity text: 'OK!') ] ifFalse: [ ZnResponse badRequest: request ] ] ]. (client := ZnClient new) diff --git a/repository/Zinc-Tests.package/ZnEntityTest.class/instance/testMultiPartFormDataWriteRead.st b/repository/Zinc-Tests.package/ZnEntityTest.class/instance/testMultiPartFormDataWriteRead.st index 0218d3c3..b206357d 100644 --- a/repository/Zinc-Tests.package/ZnEntityTest.class/instance/testMultiPartFormDataWriteRead.st +++ b/repository/Zinc-Tests.package/ZnEntityTest.class/instance/testMultiPartFormDataWriteRead.st @@ -6,7 +6,7 @@ testMultiPartFormDataWriteRead addPart: (ZnMimePart fieldName: 'info' value: 'my-info'); addPart: (ZnMimePart fieldName: 'file' fileName: 'foo.txt' entity: (ZnEntity text: 'Zinc HTTP Components')); yourself. - self assert: input contentLength notNil. + self assert: input contentLength isNotNil. self assert: input contentLength > 0. self assert: (input contentType matches: ZnMimeType multiPartFormData). bytes := ByteArray streamContents: [ :stream | input writeOn: stream ]. diff --git a/repository/Zinc-Tests.package/ZnEntityTest.class/instance/testMultiPartFormDataWriteReadBinary.st b/repository/Zinc-Tests.package/ZnEntityTest.class/instance/testMultiPartFormDataWriteReadBinary.st index a244a075..f79c94c2 100644 --- a/repository/Zinc-Tests.package/ZnEntityTest.class/instance/testMultiPartFormDataWriteReadBinary.st +++ b/repository/Zinc-Tests.package/ZnEntityTest.class/instance/testMultiPartFormDataWriteReadBinary.st @@ -6,7 +6,7 @@ testMultiPartFormDataWriteReadBinary addPart: (ZnMimePart fieldName: 'info' value: 'my-info'); addPart: (ZnMimePart fieldName: 'file' fileName: 'foo.txt' entity: (ZnEntity text: 'Zinc HTTP Components')); yourself. - self assert: input contentLength notNil. + self assert: input contentLength isNotNil. self assert: input contentLength > 0. self assert: (input contentType matches: ZnMimeType multiPartFormData). bytes := ByteArray streamContents: [ :stream | input writeOn: stream ]. diff --git a/repository/Zinc-Tests.package/ZnMagicCookieJarTest.class/instance/testCookieAtForUrl.st b/repository/Zinc-Tests.package/ZnMagicCookieJarTest.class/instance/testCookieAtForUrl.st index 4ac13e6d..64c4b670 100644 --- a/repository/Zinc-Tests.package/ZnMagicCookieJarTest.class/instance/testCookieAtForUrl.st +++ b/repository/Zinc-Tests.package/ZnMagicCookieJarTest.class/instance/testCookieAtForUrl.st @@ -5,5 +5,5 @@ testCookieAtForUrl c1 := ZnCookie fromString: self cookieString for: 'http://www.google.com' asZnUrl. c2 := ZnCookie fromString: self cookieStringAlt for: 'http://www.pharo-project.org' asZnUrl. jar add: c1; add: c2. - self assert: ((jar cookieAt: 'PREF' forUrl: 'http://www.google.com' asZnUrl) notNil). + self assert: ((jar cookieAt: 'PREF' forUrl: 'http://www.google.com' asZnUrl) isNotNil). self assert: ((jar cookieAt: 'foobar' forUrl: 'http://www.google.com' asZnUrl) isNil) \ No newline at end of file diff --git a/repository/Zinc-Tests.package/ZnMagicCookieTest.class/instance/testFromString.st b/repository/Zinc-Tests.package/ZnMagicCookieTest.class/instance/testFromString.st index 614369d6..a5ad163d 100644 --- a/repository/Zinc-Tests.package/ZnMagicCookieTest.class/instance/testFromString.st +++ b/repository/Zinc-Tests.package/ZnMagicCookieTest.class/instance/testFromString.st @@ -3,6 +3,6 @@ testFromString | cookie | cookie := ZnCookie fromString: self cookieString for: 'www.google.com' asZnUrl. self assert: cookie name equals: 'PREF'. - self assert: cookie path notNil. + self assert: cookie path isNotNil. self assert: cookie domain equals: '.google.com'. self assert: cookie isExpired not \ No newline at end of file diff --git a/repository/Zinc-Tests.package/ZnRequestTest.class/instance/testCookiesParsing.st b/repository/Zinc-Tests.package/ZnRequestTest.class/instance/testCookiesParsing.st index 52436292..7bb074ef 100644 --- a/repository/Zinc-Tests.package/ZnRequestTest.class/instance/testCookiesParsing.st +++ b/repository/Zinc-Tests.package/ZnRequestTest.class/instance/testCookiesParsing.st @@ -12,8 +12,8 @@ testCookiesParsing testCookie1 := cookies detect: [ :each | each name = 'testCookie1' ]. testCookie2 := cookies detect: [ :each | each name = 'testCookie2' ]. - self assert: testCookie1 notNil. + self assert: testCookie1 isNotNil. self assert: testCookie1 value equals: '123'. - self assert: testCookie2 notNil. + self assert: testCookie2 isNotNil. self assert: testCookie2 value equals: '321'. \ No newline at end of file diff --git a/repository/Zinc-Tests.package/ZnServerTest.class/instance/testDefault.st b/repository/Zinc-Tests.package/ZnServerTest.class/instance/testDefault.st index 879cf031..1e8f2a22 100644 --- a/repository/Zinc-Tests.package/ZnServerTest.class/instance/testDefault.st +++ b/repository/Zinc-Tests.package/ZnServerTest.class/instance/testDefault.st @@ -3,10 +3,10 @@ testDefault | port server initialDefaultServer wasRunning | wasRunning := ZnServer default ifNil: [ false ] ifNotNil: [ ZnServer default isRunning ]. initialDefaultServer := ZnServer stopDefault. - self assert: ZnServer default isNil. + self assert: ZnServer default isNotNil. port := self port. server := ZnServer startDefaultOn: port. - self assert: ZnServer default notNil. + self assert: ZnServer default isNotNil. self assert: ZnServer default identicalTo: server. self assert: ZnServer default port equals: port. self assert: ZnServer default isRunning. diff --git a/repository/Zinc-Tests.package/ZnUserAgentSessionTest.class/instance/testAccessors.st b/repository/Zinc-Tests.package/ZnUserAgentSessionTest.class/instance/testAccessors.st index 445616de..8236c6de 100644 --- a/repository/Zinc-Tests.package/ZnUserAgentSessionTest.class/instance/testAccessors.st +++ b/repository/Zinc-Tests.package/ZnUserAgentSessionTest.class/instance/testAccessors.st @@ -3,4 +3,4 @@ testAccessors | session | session := ZnUserAgentSession new. self assert: (session cookieJar isKindOf: ZnCookieJar). - self assert: (session credentials notNil) \ No newline at end of file + self assert: (session credentials isNotNil) \ No newline at end of file diff --git a/repository/Zinc-Tests.package/ZnUserAgentSessionTest.class/instance/testWithCookieJar.st b/repository/Zinc-Tests.package/ZnUserAgentSessionTest.class/instance/testWithCookieJar.st index 54eea08a..de99eecf 100644 --- a/repository/Zinc-Tests.package/ZnUserAgentSessionTest.class/instance/testWithCookieJar.st +++ b/repository/Zinc-Tests.package/ZnUserAgentSessionTest.class/instance/testWithCookieJar.st @@ -1,3 +1,3 @@ testing testWithCookieJar - self assert: ((ZnUserAgentSession withCookieJar: ZnCookieJar new) notNil) \ No newline at end of file + self assert: ((ZnUserAgentSession withCookieJar: ZnCookieJar new) isNotNil) \ No newline at end of file diff --git a/repository/Zinc-Tests.package/ZnUtilsTest.class/instance/testDefaultJSONReader.st b/repository/Zinc-Tests.package/ZnUtilsTest.class/instance/testDefaultJSONReader.st index 90f10cfd..781bc030 100644 --- a/repository/Zinc-Tests.package/ZnUtilsTest.class/instance/testDefaultJSONReader.st +++ b/repository/Zinc-Tests.package/ZnUtilsTest.class/instance/testDefaultJSONReader.st @@ -6,5 +6,5 @@ testDefaultJSONReader expectedParserClass := self class environment at: #NeoJSONObject ifAbsent: [ self class environment at: #STONJSON ifAbsent:[nil]]. - self assert: reader notNil. + self assert: reader isNotNil. self assert: reader equals: expectedParserClass \ No newline at end of file diff --git a/repository/Zinc-Tests.package/ZnUtilsTest.class/instance/testDefaultJSONWriter.st b/repository/Zinc-Tests.package/ZnUtilsTest.class/instance/testDefaultJSONWriter.st index d880a574..98d42449 100644 --- a/repository/Zinc-Tests.package/ZnUtilsTest.class/instance/testDefaultJSONWriter.st +++ b/repository/Zinc-Tests.package/ZnUtilsTest.class/instance/testDefaultJSONWriter.st @@ -6,5 +6,5 @@ testDefaultJSONWriter expectedParserClass := self class environment at: #NeoJSONWriter ifAbsent: [ self class environment at: #STONJSON ifAbsent:[nil]]. - self assert: writer notNil. + self assert: writer isNotNil. self assert: writer equals: expectedParserClass \ No newline at end of file diff --git a/repository/Zinc-Tests.package/monticello.meta/categories.st b/repository/Zinc-Tests.package/monticello.meta/categories.st index 69e3651f..04afdea3 100644 --- a/repository/Zinc-Tests.package/monticello.meta/categories.st +++ b/repository/Zinc-Tests.package/monticello.meta/categories.st @@ -1 +1 @@ -SystemOrganization addCategory: #'Zinc-Tests'! +self packageOrganizer ensurePackage: #'Zinc-Tests' withTags: #()! diff --git a/repository/Zinc-Zodiac-Tests.package/ZnHTTPSTest.class/instance/ensureSocketStreamFactory.st b/repository/Zinc-Zodiac-Tests.package/ZnHTTPSTest.class/instance/ensureSocketStreamFactory.st index 729a8f16..8ccd3bd6 100644 --- a/repository/Zinc-Zodiac-Tests.package/ZnHTTPSTest.class/instance/ensureSocketStreamFactory.st +++ b/repository/Zinc-Zodiac-Tests.package/ZnHTTPSTest.class/instance/ensureSocketStreamFactory.st @@ -1,5 +1,5 @@ private ensureSocketStreamFactory self - assert: ZnNetworkingUtils default secureSocketStreamClass notNil + assert: ZnNetworkingUtils default secureSocketStreamClass isNotNil description: 'Please set a secure socket stream class in ZnNetworkingUtils default or switch to the ZnZodiacNetworkingUtils socket stream factory' \ No newline at end of file diff --git a/repository/Zinc-Zodiac-Tests.package/monticello.meta/categories.st b/repository/Zinc-Zodiac-Tests.package/monticello.meta/categories.st index 9115d195..2288d2e8 100644 --- a/repository/Zinc-Zodiac-Tests.package/monticello.meta/categories.st +++ b/repository/Zinc-Zodiac-Tests.package/monticello.meta/categories.st @@ -1 +1 @@ -SystemOrganization addCategory: #'Zinc-Zodiac-Tests'! +self packageOrganizer ensurePackage: #'Zinc-Zodiac-Tests' withTags: #()!