Squeak-dev July 2015

squeak-dev@lists.squeakfoundation.org

34 participants
192 discussions

The Trunk: Tools-eem.628.mcz
by commits＠source.squeak.org 02 Jul '15

02 Jul '15

Eliot Miranda uploaded a new version of Tools to project The Trunk: http://source.squeak.org/trunk/Tools-eem.628.mcz ==================== Summary ==================== Name: Tools-eem.628 Author: eem Time: 1 July 2015, 4:40:15.806 pm UUID: 9f27ada3-52e9-4acb-83fe-2c117840e385 Ancestors: Tools-eem.627 Debugger: Extract the exception notification handler into its own method and use it for Through support also. =============== Diff against Tools-eem.627 =============== Item was changed: ----- Method: Debugger>>doStep (in category 'context stack menu') ----- doStep "Send the selected message in the accessed method, and regain control after the invoked method returns." | currentContext newContext | self okToChange ifFalse: [^ self]. self checkContextSelection. currentContext := self selectedContext. + newContext := self handleLabelUpdatesIn: [interruptedProcess completeStep: currentContext] + whenExecuting: currentContext. - newContext := [interruptedProcess completeStep: currentContext] - on: Notification - do: [:ex| - (ex tag isArray - and: [ex tag size = 2 - and: [(ex tag first == currentContext or: [ex tag first hasSender: currentContext])]]) - ifTrue: - [self labelString: ex tag second description. - ex resume] - ifFalse: - [ex pass]]. newContext == currentContext ifTrue: [newContext := interruptedProcess stepToSendOrReturn]. self contextStackIndex > 1 ifTrue: [self resetContext: newContext] ifFalse: [newContext == currentContext ifTrue: [self changed: #contentsSelection. self updateInspectors] ifFalse: [self resetContext: newContext]]. ! Item was added: + ----- Method: Debugger>>handleLabelUpdatesIn:whenExecuting: (in category 'context stack menu') ----- + handleLabelUpdatesIn: aBlock whenExecuting: aContext + "Send the selected message in the accessed method, and regain control + after the invoked method returns." + + ^aBlock + on: Notification + do: [:ex| + (ex tag isArray + and: [ex tag size = 2 + and: [(ex tag first == aContext or: [ex tag first hasSender: aContext])]]) + ifTrue: + [self labelString: ex tag second description. + ex resume] + ifFalse: + [ex pass]]! Item was changed: ----- Method: Debugger>>stepIntoBlock (in category 'context stack menu') ----- stepIntoBlock "Send messages until you return to the present method context. Used to step into a block in the method." + self handleLabelUpdatesIn: + [interruptedProcess stepToHome: self selectedContext] + whenExecuting: self selectedContext. + self resetContext: interruptedProcess stepToSendOrReturn! - interruptedProcess stepToHome: self selectedContext. - self resetContext: interruptedProcess stepToSendOrReturn.!

1 0

The Trunk: Kernel-eem.932.mcz
by commits＠source.squeak.org 02 Jul '15

02 Jul '15

Eliot Miranda uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-eem.932.mcz ==================== Summary ==================== Name: Kernel-eem.932 Author: eem Time: 1 July 2015, 4:38:42.065 pm UUID: 12b4ce38-269d-4f6f-9b12-eae61d403a03 Ancestors: Kernel-eem.931 Provide the same Debugger label support as complete: for the step into block support. =============== Diff against Kernel-eem.931 =============== Item was changed: ----- Method: Process>>stepToHome: (in category 'changing suspended state') ----- stepToHome: aContext "Resume self until the home of top context is aContext. Top context may be a block context. Catch any UnhandledErrors that are created while stepping, answering the relevant signalerContext if so. Note that this will cause weird effects if using through to step through UnhandledError code, but as the doctor ordered, don't do that; use over or into instead." ^Processor activeProcess evaluate: [| home anError | home := aContext home. [suspendedContext := suspendedContext step. home == suspendedContext home or: [home isDead]] whileFalse: [(suspendedContext selector == #signalForException: and: [suspendedContext receiver == UnhandledError and: [anError := suspendedContext tempAt: 1. ((suspendedContext objectClass: anError) includesBehavior: Exception) and: [anError canSearchForSignalerContext]]]) ifTrue: [anError signalerContext ifNotNil: [:unhandledErrorSignalerContext| [unhandledErrorSignalerContext == suspendedContext] whileFalse: [self completeStep: suspendedContext]. + "Give a debugger a chance to update its title to reflect the new exception" + Notification new + tag: {unhandledErrorSignalerContext. anError}; + signal. ^unhandledErrorSignalerContext]]]. suspendedContext] onBehalfOf: self!

1 0

The Trunk: Tools-eem.627.mcz
by commits＠source.squeak.org 02 Jul '15

02 Jul '15

Eliot Miranda uploaded a new version of Tools to project The Trunk: http://source.squeak.org/trunk/Tools-eem.627.mcz ==================== Summary ==================== Name: Tools-eem.627 Author: eem Time: 1 July 2015, 4:24:25.556 pm UUID: ef07ef13-aa42-4e9c-baf8-3b6ccbfa1f92 Ancestors: Tools-eem.626 Use Kernel-eem.931 to have the debugger update its label to the description of an exception raised while debugging. =============== Diff against Tools-eem.626 =============== Item was changed: ----- Method: Debugger>>doStep (in category 'context stack menu') ----- doStep "Send the selected message in the accessed method, and regain control after the invoked method returns." | currentContext newContext | self okToChange ifFalse: [^ self]. self checkContextSelection. currentContext := self selectedContext. + newContext := [interruptedProcess completeStep: currentContext] + on: Notification + do: [:ex| + (ex tag isArray + and: [ex tag size = 2 + and: [(ex tag first == currentContext or: [ex tag first hasSender: currentContext])]]) + ifTrue: + [self labelString: ex tag second description. + ex resume] + ifFalse: + [ex pass]]. + newContext == currentContext ifTrue: + [newContext := interruptedProcess stepToSendOrReturn]. - newContext := interruptedProcess completeStep: currentContext. - newContext == currentContext ifTrue: [ - newContext := interruptedProcess stepToSendOrReturn]. self contextStackIndex > 1 ifTrue: [self resetContext: newContext] + ifFalse: + [newContext == currentContext - ifFalse: [newContext == currentContext ifTrue: [self changed: #contentsSelection. self updateInspectors] ifFalse: [self resetContext: newContext]]. !

1 0

The Trunk: Kernel-eem.931.mcz
by commits＠source.squeak.org 02 Jul '15

02 Jul '15

Eliot Miranda uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-eem.931.mcz ==================== Summary ==================== Name: Kernel-eem.931 Author: eem Time: 1 July 2015, 4:22:19.817 pm UUID: edffee09-d6f1-4ae8-b10b-59fe640b5dfe Ancestors: Kernel-eem.930 When an error occurs during complete:, which is used by the Debugger, raise a Notification to allow the Debugger to learn of the error's description. =============== Diff against Kernel-eem.930 =============== Item was changed: ----- Method: Process>>complete: (in category 'changing suspended state') ----- complete: aContext "Run self until aContext is popped or an unhandled error is raised. Return self's new top context, unless an unhandled error was raised then return the signaler context (rather than open a debugger)." | ctxt pair error | ctxt := suspendedContext. suspendedContext := nil. "disable this process while running its stack in active process below" pair := Processor activeProcess evaluate: [ctxt runUntilErrorOrReturnFrom: aContext] onBehalfOf: self. suspendedContext := pair first. error := pair second. + error ifNotNil: + ["Give a debugger a chance to update its title to reflect the new exception" + Notification new + tag: {aContext. error}; + signal. + ^error signalerContext]. - error ifNotNil: [^ error signalerContext]. ^ suspendedContext!

1 0

The Trunk: System-eem.750.mcz
by commits＠source.squeak.org 02 Jul '15

02 Jul '15

Eliot Miranda uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-eem.750.mcz ==================== Summary ==================== Name: System-eem.750 Author: eem Time: 1 July 2015, 4:20:21.905 pm UUID: dde31c47-a8ec-451a-a343-5820a048c91c Ancestors: System-eem.749 Provide a defaultAction for Warning that gives the user the option of debugging, ignoring or terminating when a Warning is raised in normal execution, or allows the Debugger to handle it if a Warning is raised during debugging. =============== Diff against System-eem.749 =============== Item was changed: ----- Method: Warning>>defaultAction (in category '*System-exceptionDescription') ----- defaultAction + "Inform the user of a Warning, giving them the choice of ignoring the warning (proceeding), debugging, + or terminating the compuation. If in the context of a debugger, instead allow the debugger to display + the wasrning in context." + | inDebugger | + inDebugger := [UnhandledError signal] + on: UnhandledError + do: [:uhe| uhe isNested]. + inDebugger ifTrue: + [^UnhandledError signalForException: self]. + (UIManager default + chooseFrom: #(proceed debug close) + values: #(proceed debug close) + title: 'Warning: ', self messageText) + caseOf: { + [#proceed] -> [self resume]. + [#debug] -> [UnhandledError signalForException: self]. + [#close] -> [| condemned | + condemned := Processor activeProcess. + Project current spawnNewProcessIfThisIsUI: condemned. + condemned terminate] }! - "The user should be notified of the occurrence of an exceptional occurrence and given an option of continuing or aborting the computation. The description of the occurrence should include any text specified as the argument of the #signal: message." - ToolSet - debugContext: thisContext - label: 'Warning' - contents: self messageText, '\\Select Proceed to continue, or close this window to cancel the operation.' withCRs. - self resume. - !

1 0

The Trunk: Kernel-eem.930.mcz
by commits＠source.squeak.org 02 Jul '15

02 Jul '15

Eliot Miranda uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-eem.930.mcz ==================== Summary ==================== Name: Kernel-eem.930 Author: eem Time: 1 July 2015, 3:25:55.097 pm UUID: f2ef6b5c-be8c-4bce-ab1b-dff14bb8ab0e Ancestors: Kernel-eem.929 Fix the bug with the Debugger's through such that the Debugger would appear to freeze when encountering an MNU. The example is Debug It on: Object flushDependents do: [ : e | ] followed by Over, Through. But in fact one can see the same issue doing Debug It and then Through on nil zork What was happening is that Through was stepping through the uncaught and looping MNUs (of do: or zork in the above examples) since the Debugger did not catch unhandled errors during Through, and sicne doesNotUnderstand:'s default if uncaught is to resend. The fix is merely to catch unhandled errors when doing Through to the same effect as runUntilErrorOrReturnFrom: caching errors for Over. Also speed up Through. The changes made in Kernel-eem.857 through Kernel-eem.896 to provide process-faithful debugging slowed down Process>>step a lot. These changes restore the performance by using evaluate:onBehalfOf: once for each Through, rather than once for each step within Through. =============== Diff against Kernel-eem.929 =============== Item was added: + ----- Method: Exception>>canSearchForSignalerContext (in category 'debug support') ----- + canSearchForSignalerContext + "This method is /only/ to support the debugger's catching of exceptions in stepIntoBlock." + ^signalContext isContext! Item was changed: + ----- Method: Exception>>signalerContext (in category 'handling') ----- - ----- Method: Exception>>signalerContext (in category 'printing') ----- signalerContext "Find the first sender of signal(:)" ^ signalContext findContextSuchThat: [:ctxt | (ctxt receiver == self or: [ctxt receiver == self class]) not]! Item was changed: ----- Method: Process>>stepToHome: (in category 'changing suspended state') ----- stepToHome: aContext + "Resume self until the home of top context is aContext. Top context may be a block context. + Catch any UnhandledErrors that are created while stepping, answering the relevant signalerContext + if so. Note that this will cause weird effects if using through to step through UnhandledError + code, but as the doctor ordered, don't do that; use over or into instead." - "Resume self until the home of top context is aContext. Top context may be a block context." + ^Processor activeProcess + evaluate: + [| home anError | + home := aContext home. + [suspendedContext := suspendedContext step. + home == suspendedContext home or: [home isDead]] whileFalse: + [(suspendedContext selector == #signalForException: + and: [suspendedContext receiver == UnhandledError + and: [anError := suspendedContext tempAt: 1. + ((suspendedContext objectClass: anError) includesBehavior: Exception) + and: [anError canSearchForSignalerContext]]]) ifTrue: + [anError signalerContext ifNotNil: + [:unhandledErrorSignalerContext| + [unhandledErrorSignalerContext == suspendedContext] whileFalse: + [self completeStep: suspendedContext]. + ^unhandledErrorSignalerContext]]]. + suspendedContext] + onBehalfOf: self! - | home ctxt | - home := aContext home. - [ ctxt := self step. - home == ctxt home. - ] whileFalse: [ - home isDead ifTrue: [^ self suspendedContext]. - ]. - ^ self suspendedContext!

1 0

The Trunk: Morphic-eem.990.mcz
by commits＠source.squeak.org 02 Jul '15

02 Jul '15

Eliot Miranda uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-eem.990.mcz ==================== Summary ==================== Name: Morphic-eem.990 Author: eem Time: 1 July 2015, 3:14:20.524 pm UUID: 0fb6f2b8-b89e-48e4-bf73-ab547b7b0d49 Ancestors: Morphic-cmm.989 Update the CurvierMorph's drawCurvier preference to the recommended style., eliminating the only send of addPreference:category:default:balloonHelp: in trunk outside of Preferences. =============== Diff against Morphic-cmm.989 =============== Item was removed: - ----- Method: CurvierMorph class>>Curvier (in category 'class initialization') ----- - Curvier - <preference: 'Curvier' - category: 'morphic' - description: 'If true, closed CurvierMorphs will be smoother and more symmetrical all about. If false they will mimic the old curve shapes with the one sharp bend.' - type: #Boolean> - ^ self drawCurvier.! Item was changed: ----- Method: CurvierMorph class>>drawCurvier (in category 'class initialization') ----- drawCurvier + <preference: 'Curvier' + category: 'morphic' + description: 'If true, closed CurvierMorphs will be smoother and more symmetrical all about. If false they will mimic the old curve shapes with the one sharp bend.' + type: #Boolean> + ^DrawCurvier ifNil: [true]! - ^ DrawCurvier.! Item was changed: ----- Method: CurvierMorph class>>initialize (in category 'class initialization') ----- initialize "CurvierMorph initialize" - Preferences - preferenceAt: #Curvier - ifAbsent: [Preferences - addPreference: #Curvier - category: #morphic - default: true - balloonHelp: 'if true, closed CurvierMorphs will be smoother and more symmetrical all about. If false they will mimic the old curve shapes with the one sharp bend.']. self registerInFlapsRegistry!

1 0

Daily Commit Log
by commits＠source.squeak.org 01 Jul '15

01 Jul '15

Changes to Trunk (http://source.squeak.org/trunk.html) in the last 24 hours: http://lists.squeakfoundation.org/pipermail/packages/2015-June/008761.html Name: Tools-eem.626 Ancestors: Tools-mt.625 Upgrade MessageSet class>>parse:toClassAndSelector: to allow one to construct text links in modern syntax, e.g. BitBlt class>>#subPixelRenderColorFonts ============================================= http://lists.squeakfoundation.org/pipermail/packages/2015-July/008762.html Name: ReleaseBuilder-mt.125 Ancestors: ReleaseBuilder-cmm.124 Restore setting the background in release builder's #setPreferences46 so that our build server produces trunk images with correct preferences again. #prepareNewBuild: is agnostic to the current release version. Note: We should find out why #prepareNewBuild: requires another try to set the background and where that background gets overridden. It is not good to put version-specific code into a version-agnostic method. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2015-July/008763.html Name: System-eem.745 Ancestors: System-cmm.744 Rewrite Preferences to eliminate the AccessProtect. Use a copy, update copy, assign scheme to update the preferences dictionary atomically. Change Preferences access method compilation to use Object>>#value to eliminate a block creation. Change Preference initialization to eliminate the isKindOf: Symbol. This is step 1. Given SystemPreferences it is clear that the preferences dictionary should be stored in a class inst var, so that SystemPreferences and Preferences can share methods but access different dictionaries. The dictionaryOfProferences[:] accessors are dubious as they break encapsulatiopn. For example, the reportPreferences: method, which is the only external access, could insateaqd be moved into Preferences class. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2015-July/008764.html Name: System-eem.746 Ancestors: System-eem.745 First part of Preferences putsch to move preferences dictionary from class var to inst var. Also update class comment to describe preference pragmas. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2015-July/008765.html Name: System-eem.747 Ancestors: System-eem.746 Second part of putsch. Move preferences dictionary from class var to inst var. Remove the setter, and makde the getter, currently used only by SystemReporter, answer a copy. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2015-July/008766.html Name: System-ul.748 Ancestors: System-eem.747 - Iterate over pragmas once per method instead of once per pragma in Preferences class>>prefEvent:. - There's no need to copy preferencesDictionary in Preferences class>>storePreferencesIn:, because it's a read-only data structure. - Ensure the durability of the changes of preferencesDictionary in Preferences class>>atomicUpdatePreferences: by checking for changes before overwriting it. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2015-July/008767.html Name: Services-Base-eem.56 Ancestors: Services-Base-mt.55 ServicePreferences as per System-eem.747. Move preferences dictionary from class var to inst var. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2015-July/008768.html Name: System-eem.749 Ancestors: System-ul.748 Revert storePreferencesIn: to work with a copy, which accords with the old code. Go for brevity in prefEvent:. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2015-July/008769.html Name: Network-cmm.161 Ancestors: Network-ul.160 Remove the methods overridden by WebClient, since that has now been folded into base Squeak. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2015-July/008770.html Name: Help-Squeak-Project-cmm.25 Ancestors: Help-Squeak-Project-kfr.24 - Update internal release notes in the Help Browser. (no need to use a release-specific method). - Release Notes has duplication with the one in TheWorldMainDockingBar which will be addressed later. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2015-July/008771.html Name: WebClient-HTTP-cmm.3 Ancestors: WebClient-HTTP-topa.2 Recategorize methods so they are no longer overrides. WebClient is now part of Squeak. =============================================

1 0

Squeak 4.6: Services-Base-eem.56.mcz
by commits＠source.squeak.org 01 Jul '15

01 Jul '15

Chris Muller uploaded a new version of Services-Base to project Squeak 4.6: http://source.squeak.org/squeak46/Services-Base-eem.56.mcz ==================== Summary ==================== Name: Services-Base-eem.56 Author: eem Time: 30 June 2015, 3:34:50.838 pm UUID: 2e8b9c56-6312-4a69-b65c-164ab583f617 Ancestors: Services-Base-mt.55 ServicePreferences as per System-eem.747. Move preferences dictionary from class var to inst var. =============== Diff against Services-Base-mt.55 =============== Item was added: + (PackageInfo named: 'Services-Base') preamble: '(Smalltalk classNamed: #ServicePreferences) ifNotNil: + [:sp| + (sp instVarNamed: ''preferencesDictionary'') ifNil: + [(sp classPool at: #ServiceDictionaryOfPreferences) ifNotNil: + [:dictionary| + sp + instVarNamed: ''preferencesDictionary'' + put: dictionary]]]'! Item was changed: Preferences subclass: #ServicePreferences instanceVariableNames: '' + classVariableNames: '' - classVariableNames: 'ServiceDictionaryOfPreferences' poolDictionaries: '' category: 'Services-Base-GUI'! !ServicePreferences commentStamp: 'rr 7/10/2006 15:36' prior: 0! I store the preferences related to the servicse framework. The preferences are editable via the Services Browser, based on Hernan Tylim's Preference Browser. The main preference categories for services are: -- keyboard shortcuts -- : several text preferences, one per keyboard shortcuts. To edit them, enter a service identifier (equal to the method name under which it is defined in its ServiceProvider), and accept with alt-s or enter -- menu contents -- : All the service categories in the image have a text preference under here. To edit it, enter the services identifiers you wish to put in this category, separating them with a single space character. The order is important: it defines the order of the items in menus. -- settings -- : general boolean preferences. Then there is a preference category for each provider in the image. Under each, you will find: A boolean preference for each service in the image. If it is false, the service will not appear in menus. The text preference for each service category defined by the service provider. This is the same as the one appearing in the menu contents preference category.! Item was removed: - ----- Method: ServicePreferences class>>dictionaryOfPreferences (in category 'accessing') ----- - dictionaryOfPreferences - ServiceDictionaryOfPreferences - ifNil: [ServiceDictionaryOfPreferences := IdentityDictionary new]. - ^ ServiceDictionaryOfPreferences ! Item was removed: - ----- Method: ServicePreferences class>>dictionaryOfPreferences: (in category 'accessing') ----- - dictionaryOfPreferences: aDictionary - ServiceDictionaryOfPreferences := aDictionary! Item was changed: ----- Method: ServicePreferences class>>wipe (in category 'accessing') ----- wipe + preferencesDictionary := nil! - self dictionaryOfPreferences: nil!

1 0

Squeak 4.6: WebClient-HTTP-cmm.3.mcz
by commits＠source.squeak.org 01 Jul '15

01 Jul '15

Chris Muller uploaded a new version of WebClient-HTTP to project Squeak 4.6: http://source.squeak.org/squeak46/WebClient-HTTP-cmm.3.mcz ==================== Summary ==================== Name: WebClient-HTTP-cmm.3 Author: cmm Time: 1 July 2015, 4:18:01.916 pm UUID: 6f6573bd-7d5b-425f-9fcb-632b4a59b792 Ancestors: WebClient-HTTP-topa.2 Recategorize methods so they are no longer overrides. WebClient is now part of Squeak. =============== Diff against WebClient-HTTP-topa.2 =============== Item was changed: + ----- Method: HTTPSocket class>>httpGet:args:user:passwd: (in category '*webclient-http') ----- - ----- Method: HTTPSocket class>>httpGet:args:user:passwd: (in category '*WebClient-HTTP-override') ----- httpGet: url args: args user: user passwd: passwd "Upload the contents of the stream to a file on the server. WARNING: This method will send a basic auth header proactively. This is necessary to avoid breaking MC and SqueakSource since SS does not return a 401 when accessing a private (global no access) repository." | urlString xhdrs client resp progress | "Normalize the url" urlString := (Url absoluteFromText: url) asString. "Some raw extra headers which historically have been added" xhdrs := HTTPProxyCredentials, HTTPBlabEmail. "may be empty" client := WebClient new. client username: user; password: passwd. ^[resp := client httpGet: urlString do:[:req| "HACK: Proactively send a basic auth header. See comment above." req headerAt: 'Authorization' put: 'Basic ', (user, ':', passwd) base64Encoded. "Accept anything" req addHeader: 'Accept' value: '*/*'. "Add the additional headers" (WebUtils readHeadersFrom: xhdrs readStream) do:[:assoc| req addHeader: assoc key value: assoc value]]. progress := [:total :amount| (HTTPProgress new) total: total; amount: amount; signal: 'Downloading...' ]. "Simulate old HTTPSocket return behavior" (resp code between: 200 and: 299) ifTrue:[^(RWBinaryOrTextStream with: (resp contentWithProgress: progress)) reset] ifFalse:[resp asString, resp content]. ] ensure:[client destroy]. ! Item was changed: + ----- Method: HTTPSocket class>>httpGetDocument:args:accept:request: (in category '*webclient-http') ----- - ----- Method: HTTPSocket class>>httpGetDocument:args:accept:request: (in category '*WebClient-HTTP-override') ----- httpGetDocument: url args: args accept: mimeType request: requestString "Return the exact contents of a web object. Asks for the given MIME type. If mimeType is nil, use 'text/html'. An extra requestString may be submitted and must end with crlf. The parsed header is saved. Use a proxy server if one has been registered. tk 7/23/97 17:12" "Note: To fetch raw data, you can use the MIME type 'application/octet-stream'." | client xhdrs resp urlString progress | "Normalize the url" urlString := (Url absoluteFromText: url) asString. args ifNotNil: [ urlString := urlString, (self argString: args) ]. "Some raw extra headers which historically have been added" xhdrs := HTTPProxyCredentials, HTTPBlabEmail, "may be empty" requestString. "extra user request. Authorization" client := WebClient new. ^[resp := client httpGet: urlString do:[:req| "Add ACCEPT header" mimeType ifNotNil:[req headerAt: 'Accept' put: mimeType]. "Always accept plain text" req addHeader: 'Accept' value: 'text/html'. "Add the additional headers" (WebUtils readHeadersFrom: xhdrs readStream) do:[:assoc| req addHeader: assoc key value: assoc value]]. progress := [:total :amount| (HTTPProgress new) total: total; amount: amount; signal: 'Downloading...' ]. "Simulate old HTTPSocket return behavior" (resp code between: 200 and: 299) ifTrue:[MIMEDocument contentType: resp contentType content: (resp contentWithProgress: progress) url: url] ifFalse:[resp asString, resp content]. ] ensure:[client destroy]. ! Item was changed: + ----- Method: HTTPSocket class>>httpPost:args:user:passwd: (in category '*webclient-http') ----- - ----- Method: HTTPSocket class>>httpPost:args:user:passwd: (in category '*WebClient-HTTP-override') ----- httpPost: url args: args user: user passwd: passwd "WARNING: This method will send a basic auth header proactively. This is necessary to avoid breaking MC and SqueakSource since SS does not return a 401 when accessing a private (global no access) repository." | argString xhdrs client resp urlString | "Normalize the url" urlString := (Url absoluteFromText: url) asString. args ifNotNil: [ argString := self argString: args. argString first = $? ifTrue: [argString := argString allButFirst]. ]. "Some raw extra headers which historically have been added" xhdrs := HTTPProxyCredentials, HTTPBlabEmail. "may be empty" client := WebClient new. client username: (user ifEmpty:[nil]); password: (passwd ifEmpty:[nil]). ^[resp := client httpPost: urlString content: (argString ifNil:['']) type: 'application/x-www-form-urlencoded' do:[:req| "HACK: Proactively send a basic auth header. See comment above." req headerAt: 'Authorization' put: 'Basic ', (user, ':', passwd) base64Encoded. "Accept anything" req addHeader: 'Accept' value: '*/*'. "Add the additional headers" (WebUtils readHeadersFrom: xhdrs readStream) do:[:assoc| req addHeader: assoc key value: assoc value]]. "Simulate old HTTPSocket return behavior" (resp code between: 200 and: 299) ifTrue:[MIMEDocument contentType: resp contentType content: resp content url: url] ifFalse:[resp asString, resp content]. ] ensure:[client destroy]. ! Item was changed: + ----- Method: HTTPSocket class>>httpPost:content:type:accept:request: (in category '*webclient-http') ----- - ----- Method: HTTPSocket class>>httpPost:content:type:accept:request: (in category '*WebClient-HTTP-override') ----- httpPost: url content: postData type: contentType accept: mimeType request: requestString "like httpGET, except it does a POST instead of a GET. POST allows data to be uploaded" | urlString xhdrs client resp | "Normalize the url" urlString := (Url absoluteFromText: url) asString. "Some raw extra headers which historically have been added" xhdrs := HTTPProxyCredentials, HTTPBlabEmail, "may be empty" requestString. "extra user request. Authorization" client := WebClient new. ^[resp := client httpPost: urlString content: (postData ifNil:['']) type: contentType do:[:req| "Add ACCEPT header" mimeType ifNotNil:[req headerAt: 'Accept' put: mimeType]. "Always accept plain text" req addHeader: 'Accept' value: 'text/html'. "Add the additional headers" (WebUtils readHeadersFrom: xhdrs readStream) do:[:assoc| req addHeader: assoc key value: assoc value]]. "Simulate old HTTPSocket return behavior" (resp code between: 200 and: 299) ifTrue:[MIMEDocument contentType: resp contentType content: resp content url: url] ifFalse:[resp asString, resp content]. ] ensure:[client destroy]. ! Item was changed: + ----- Method: HTTPSocket class>>httpPostDocument:args:accept:request: (in category '*webclient-http') ----- - ----- Method: HTTPSocket class>>httpPostDocument:args:accept:request: (in category '*WebClient-HTTP-override') ----- httpPostDocument: url args: args accept: mimeType request: requestString "like httpGET, except it does a POST instead of a GET. POST allows data to be uploaded" | argString | args ifNotNil: [ argString := self argString: args. argString first = $? ifTrue: [argString := argString allButFirst]. ]. ^self httpPost: url content: argString type: 'application/x-www-form-urlencoded' accept: mimeType request: requestString! Item was changed: + ----- Method: HTTPSocket class>>httpPostMultipart:args:accept:request: (in category '*webclient-http') ----- - ----- Method: HTTPSocket class>>httpPostMultipart:args:accept:request: (in category '*WebClient-HTTP-override') ----- httpPostMultipart: url args: argsDict accept: mimeType request: requestString " do multipart/form-data encoding rather than x-www-urlencoded " | mimeBorder argsStream | mimeBorder := '----squeak-georgia-tech-', Time millisecondClockValue printString, '-csl-cool-stuff-----'. "encode the arguments dictionary" argsStream := WriteStream on: String new. argsDict associationsDo: [:assoc | assoc value do: [ :value | | fieldValue | "print the boundary" argsStream nextPutAll: '--', mimeBorder; crlf. " check if it's a non-text field " argsStream nextPutAll: 'Content-disposition: multipart/form-data; name="', assoc key, '"'. (value isKindOf: MIMEDocument) ifFalse: [fieldValue := value] ifTrue: [ argsStream nextPutAll: ' filename="'; nextPutAll: value url pathForFile; nextPut: $"; crlf; nextPutAll: 'Content-Type: '; nextPutAll: value contentType. fieldValue := (value content ifNil: [(FileStream fileNamed: value url pathForFile) contentsOfEntireFile] ifNotNil: [value content]) asString]. " Transcript show: 'field=', key, '; value=', fieldValue; cr. " argsStream crlf; crlf; nextPutAll: fieldValue; crlf ]]. argsStream nextPutAll: '--', mimeBorder, '--'. ^self httpPost: url content: argsStream contents type: 'multipart/form-data; boundary=', mimeBorder accept: mimeType request: requestString ! Item was changed: + ----- Method: HTTPSocket class>>httpPostToSuperSwiki:args:accept:request: (in category '*webclient-http') ----- - ----- Method: HTTPSocket class>>httpPostToSuperSwiki:args:accept:request: (in category '*WebClient-HTTP-override') ----- httpPostToSuperSwiki: url args: argsDict accept: mimeType request: requestString | mimeBorder argString | mimeBorder := '---------SuperSwiki',Time millisecondClockValue printString,'-----'. argString := String streamContents: [ :strm | strm nextPutAll: mimeBorder; crlf. argsDict associationsDo: [:assoc | assoc value do: [ :value | strm nextPutAll: 'Content-disposition: form-data; name="', assoc key, '"'; crlf; crlf; nextPutAll: value; crlf; crlf; nextPutAll: mimeBorder; crlf. ] ]. ]. ^self httpPost: url content: argString type: 'multipart/form-data; boundary=', mimeBorder accept: mimeType request: requestString ! Item was changed: + ----- Method: HTTPSocket class>>httpPut:to:user:passwd: (in category '*webclient-http') ----- - ----- Method: HTTPSocket class>>httpPut:to:user:passwd: (in category '*WebClient-HTTP-override') ----- httpPut: contents to: url user: user passwd: passwd "Upload the contents of the stream to a file on the server WARNING: This method will send a basic auth header proactively. This is necessary to avoid breaking MC and SqueakSource since SS does not return a 401 when accessing a private (global no access) repository." | urlString xhdrs client resp | "Normalize the url" urlString := (Url absoluteFromText: url) asString. "Some raw extra headers which historically have been added" xhdrs := HTTPProxyCredentials, HTTPBlabEmail. "may be empty" client := WebClient new. client username: (user ifEmpty:[nil]); password: (passwd ifEmpty:[nil]). ^[resp := client httpPut: urlString content: contents type: nil do:[:req| "HACK: Proactively send a basic auth header. See comment above." req headerAt: 'Authorization' put: 'Basic ', (user, ':', passwd) base64Encoded. "Accept anything" req addHeader: 'Accept' value: '*/*'. "Add the additional headers" (WebUtils readHeadersFrom: xhdrs readStream) do:[:assoc| req addHeader: assoc key value: assoc value]]. "Simulate old HTTPSocket return behavior" resp asString, resp content ] ensure:[client destroy]. !

1 0

Jump to page: