Browse Source

Trapped-Frontend => Trapped

Herbert Vojčík 6 years ago
parent
commit
093271d83d
4 changed files with 51 additions and 51 deletions
  1. 1 1
      example-todo/src/Trapped-Todo.js
  2. 1 1
      src/Trapped-Processors.js
  3. 28 28
      src/Trapped.js
  4. 21 21
      src/Trapped.st

+ 1 - 1
example-todo/src/Trapped-Todo.js

@@ -2,7 +2,7 @@ define(["amber/boot"
 //>>excludeStart("imports", pragmas.excludeImports);
 , "trapped/Trapped-Processors"
 //>>excludeEnd("imports");
-, "amber_core/Kernel-Objects", "trapped/Trapped-Frontend"], function($boot
+, "amber_core/Kernel-Objects", "trapped/Trapped"], function($boot
 //>>excludeStart("imports", pragmas.excludeImports);
 
 //>>excludeEnd("imports");

+ 1 - 1
src/Trapped-Processors.js

@@ -2,7 +2,7 @@ define(["amber/boot"
 //>>excludeStart("imports", pragmas.excludeImports);
 , "amber/jquery/Wrappers-JQuery", "jquery.xontent"
 //>>excludeEnd("imports");
-, "trapped/Trapped-Frontend"], function($boot
+, "trapped/Trapped"], function($boot
 //>>excludeStart("imports", pragmas.excludeImports);
 
 //>>excludeEnd("imports");

+ 28 - 28
src/Trapped-Frontend.js → src/Trapped.js

@@ -11,12 +11,12 @@ if(!$boot.nilAsReceiver)$boot.nilAsReceiver=$boot.nil;
 if(!("nilAsValue" in $boot))$boot.nilAsValue=$boot.nilAsReceiver;
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 if(!$boot.nilAsClass)$boot.nilAsClass=$boot.dnu;
-$core.addPackage("Trapped-Frontend");
-$core.packages["Trapped-Frontend"].innerEval = function (expr) { return eval(expr); };
-$core.packages["Trapped-Frontend"].imports = ["amber/web/Web", "axxord/Axxord"];
-$core.packages["Trapped-Frontend"].transport = {"type":"amd","amdNamespace":"trapped"};
+$core.addPackage("Trapped");
+$core.packages["Trapped"].innerEval = function (expr) { return eval(expr); };
+$core.packages["Trapped"].imports = ["amber/web/Web", "axxord/Axxord"];
+$core.packages["Trapped"].transport = {"type":"amd","amdNamespace":"trapped"};
 
-$core.addClass("TrappedDataCarrier", $globals.Object, ["target", "model", "chain"], "Trapped-Frontend");
+$core.addClass("TrappedDataCarrier", $globals.Object, ["target", "model", "chain"], "Trapped");
 $core.addMethod(
 $core.method({
 selector: "chain:",
@@ -231,7 +231,7 @@ messageSends: ["chain:", "new", "target:", "yourself"]
 $globals.TrappedDataCarrier.a$cls);
 
 
-$core.addClass("TrappedDataCarrierToModel", $globals.TrappedDataCarrier, ["index"], "Trapped-Frontend");
+$core.addClass("TrappedDataCarrierToModel", $globals.TrappedDataCarrier, ["index"], "Trapped");
 $core.addMethod(
 $core.method({
 selector: "proceed",
@@ -265,7 +265,7 @@ $globals.TrappedDataCarrierToModel);
 
 
 
-$core.addClass("TrappedDataCarrierToView", $globals.TrappedDataCarrier, ["index"], "Trapped-Frontend");
+$core.addClass("TrappedDataCarrierToView", $globals.TrappedDataCarrier, ["index"], "Trapped");
 $core.addMethod(
 $core.method({
 selector: "proceed",
@@ -299,7 +299,7 @@ $globals.TrappedDataCarrierToView);
 
 
 
-$core.addClass("TrappedPosition", $globals.Object, ["path", "model"], "Trapped-Frontend");
+$core.addClass("TrappedPosition", $globals.Object, ["path", "model"], "Trapped");
 $core.addMethod(
 $core.method({
 selector: "model",
@@ -484,7 +484,7 @@ messageSends: ["ifTrue:ifFalse:", "and:", "notEmpty", "isNil", "last", "aspect:b
 $globals.TrappedPosition.a$cls);
 
 
-$core.addClass("TrappedSnapshot", $globals.TrappedPosition, ["prefix"], "Trapped-Frontend");
+$core.addClass("TrappedSnapshot", $globals.TrappedPosition, ["prefix"], "Trapped");
 $core.addMethod(
 $core.method({
 selector: "do:",
@@ -556,7 +556,7 @@ $globals.TrappedSnapshot);
 
 
 
-$core.addClass("TrappedProcessingChain", $globals.Object, ["processors"], "Trapped-Frontend");
+$core.addClass("TrappedProcessingChain", $globals.Object, ["processors"], "Trapped");
 $core.addMethod(
 $core.method({
 selector: "firstProcessorNo",
@@ -805,7 +805,7 @@ messageSends: ["new:", "collect:", "ifEmpty:", "asTrapProcSendTo:"]
 $globals.TrappedProcessingChain.a$cls);
 
 
-$core.addClass("TrappedProcessor", $globals.Object, [], "Trapped-Frontend");
+$core.addClass("TrappedProcessor", $globals.Object, [], "Trapped");
 //>>excludeStart("ide", pragmas.excludeIdeData);
 $globals.TrappedProcessor.comment="I am a processing step in TrappedProcessingChain.\x0aI am stateless flyweight (aka servant)\x0aand will get all necessary data as arguments in API calls.\x0a\x0aMy public API is:\x0a - installToView:toModel:\x0a   This gets two TrappedDataCarriers set up without actual data\x0a   and at the beginning of their chains. It should do one-time\x0a   installation task needed (install event handlers etc.).\x0a   To start a chain, do: dataCarrier copy value: data; proceed.\x0a - toView:\x0a   This performs transformation of TrappedDataCarrier on its way from model to view.\x0a   Should call aDataCarrier proceed to proceed to subsequent step.\x0a - toModel:\x0a   This performs transformation of TrappedDataCarrier on its way from view to model.\x0a   Should call aDataCarrier proceed to proceed to subsequent step.";
 //>>excludeEnd("ide");
@@ -918,7 +918,7 @@ messageSends: ["new"]
 $globals.TrappedProcessor.a$cls);
 
 
-$core.addClass("TrappedDataExpectingProcessor", $globals.TrappedProcessor, [], "Trapped-Frontend");
+$core.addClass("TrappedDataExpectingProcessor", $globals.TrappedProcessor, [], "Trapped");
 //>>excludeStart("ide", pragmas.excludeIdeData);
 $globals.TrappedDataExpectingProcessor.comment="I answer true to isExpectingModelData and serve as a base class\x0afor processor that present / change model data.\x0a\x0aWhen at least one of my instances is present in the chain,\x0aautomatic databinding processor is added at the beginning\x0a(the data-binding scenario); otherwise, the chain\x0ais run immediately with true as data (run-once scenario).";
 //>>excludeEnd("ide");
@@ -942,7 +942,7 @@ $globals.TrappedDataExpectingProcessor);
 
 
 
-$core.addClass("TrappedProcessorContents", $globals.TrappedDataExpectingProcessor, [], "Trapped-Frontend");
+$core.addClass("TrappedProcessorContents", $globals.TrappedDataExpectingProcessor, [], "Trapped");
 //>>excludeStart("ide", pragmas.excludeIdeData);
 $globals.TrappedProcessorContents.comment="I put data into target via contents: in toView:";
 //>>excludeEnd("ide");
@@ -972,7 +972,7 @@ $globals.TrappedProcessorContents);
 
 
 
-$core.addClass("TrappedProcessorBlackboard", $globals.TrappedProcessor, [], "Trapped-Frontend");
+$core.addClass("TrappedProcessorBlackboard", $globals.TrappedProcessor, [], "Trapped");
 //>>excludeStart("ide", pragmas.excludeIdeData);
 $globals.TrappedProcessorBlackboard.comment="I am used internally to fetch data from blackboard\x0aor write it back.\x0a\x0aI am added to the beginning of the chain\x0awhen the chain contains at least one element\x0athat isExpectingModelData (see TrappedDataExpectingProcessor).";
 //>>excludeEnd("ide");
@@ -1058,7 +1058,7 @@ $globals.TrappedProcessorBlackboard);
 
 
 
-$core.addClass("TrappedProcessorTerminator", $globals.TrappedProcessor, [], "Trapped-Frontend");
+$core.addClass("TrappedProcessorTerminator", $globals.TrappedProcessor, [], "Trapped");
 //>>excludeStart("ide", pragmas.excludeIdeData);
 $globals.TrappedProcessorTerminator.comment="I do not proceed in toView:.\x0a\x0aI am added automatically to end of chain when it does not contain\x0aany element that isExpectingModelData (see TrappedDataExpectingProcessor).";
 //>>excludeEnd("ide");
@@ -1082,7 +1082,7 @@ $globals.TrappedProcessorTerminator);
 
 
 
-$core.addClass("TrappedSingleton", $globals.Object, [], "Trapped-Frontend");
+$core.addClass("TrappedSingleton", $globals.Object, [], "Trapped");
 $core.addMethod(
 $core.method({
 selector: "start:",
@@ -1163,7 +1163,7 @@ messageSends: ["start:", "current"]
 $globals.TrappedSingleton.a$cls);
 
 
-$core.addClass("Trapped", $globals.TrappedSingleton, ["registry"], "Trapped-Frontend");
+$core.addClass("Trapped", $globals.TrappedSingleton, ["registry"], "Trapped");
 $core.addMethod(
 $core.method({
 selector: "byName:",
@@ -1641,7 +1641,7 @@ messageSends: ["collect:", "tokenize:", "parse:"]
 $globals.Trapped.a$cls);
 
 
-$core.addClass("TrappedPathStack", $globals.TrappedSingleton, ["elements"], "Trapped-Frontend");
+$core.addClass("TrappedPathStack", $globals.TrappedSingleton, ["elements"], "Trapped");
 $core.addMethod(
 $core.method({
 selector: "append:do:",
@@ -1760,7 +1760,7 @@ $globals.TrappedPathStack);
 $core.addMethod(
 $core.method({
 selector: "asTrapProcSendTo:",
-protocol: "*Trapped-Frontend",
+protocol: "*Trapped",
 fn: function (anObject){
 var self=this,$self=this;
 var selector,args;
@@ -1807,7 +1807,7 @@ $globals.Array);
 $core.addMethod(
 $core.method({
 selector: "trapDescend:",
-protocol: "*Trapped-Frontend",
+protocol: "*Trapped",
 fn: function (aBlock){
 var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -1831,7 +1831,7 @@ $globals.Array);
 $core.addMethod(
 $core.method({
 selector: "trapIter:do:",
-protocol: "*Trapped-Frontend",
+protocol: "*Trapped",
 fn: function (path,aBlock){
 var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -1866,7 +1866,7 @@ $globals.HTMLCanvas);
 $core.addMethod(
 $core.method({
 selector: "asTrapProcSendTo:",
-protocol: "*Trapped-Frontend",
+protocol: "*Trapped",
 fn: function (anObject){
 var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -1895,7 +1895,7 @@ $globals.Object);
 $core.addMethod(
 $core.method({
 selector: "asTrapProcSendTo:",
-protocol: "*Trapped-Frontend",
+protocol: "*Trapped",
 fn: function (anObject){
 var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -1918,7 +1918,7 @@ $globals.String);
 $core.addMethod(
 $core.method({
 selector: "trap:",
-protocol: "*Trapped-Frontend",
+protocol: "*Trapped",
 fn: function (path){
 var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -1942,7 +1942,7 @@ $globals.TagBrush);
 $core.addMethod(
 $core.method({
 selector: "trap:processors:",
-protocol: "*Trapped-Frontend",
+protocol: "*Trapped",
 fn: function (path,anArray){
 var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -1974,7 +1974,7 @@ $globals.TagBrush);
 $core.addMethod(
 $core.method({
 selector: "trap:read:",
-protocol: "*Trapped-Frontend",
+protocol: "*Trapped",
 fn: function (path,aBlock){
 var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -2035,7 +2035,7 @@ $globals.TagBrush);
 $core.addMethod(
 $core.method({
 selector: "trapGuard:contents:",
-protocol: "*Trapped-Frontend",
+protocol: "*Trapped",
 fn: function (anArray,aBlock){
 var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -2111,7 +2111,7 @@ $globals.TagBrush);
 $core.addMethod(
 $core.method({
 selector: "trapIter:after:",
-protocol: "*Trapped-Frontend",
+protocol: "*Trapped",
 fn: function (path,aBlock){
 var self=this,$self=this;
 var end;

+ 21 - 21
src/Trapped-Frontend.st → src/Trapped.st

@@ -1,8 +1,8 @@
-Smalltalk createPackage: 'Trapped-Frontend'!
-(Smalltalk packageAt: 'Trapped-Frontend') imports: {'amber/web/Web'. 'axxord/Axxord'}!
+Smalltalk createPackage: 'Trapped'!
+(Smalltalk packageAt: 'Trapped') imports: {'amber/web/Web'. 'axxord/Axxord'}!
 Object subclass: #TrappedDataCarrier
 	instanceVariableNames: 'target model chain'
-	package: 'Trapped-Frontend'!
+	package: 'Trapped'!
 
 !TrappedDataCarrier methodsFor: 'accessing'!
 
@@ -56,7 +56,7 @@ on: aProcessingChain target: anObject
 
 TrappedDataCarrier subclass: #TrappedDataCarrierToModel
 	instanceVariableNames: 'index'
-	package: 'Trapped-Frontend'!
+	package: 'Trapped'!
 
 !TrappedDataCarrierToModel methodsFor: 'not yet classified'!
 
@@ -67,7 +67,7 @@ proceed
 
 TrappedDataCarrier subclass: #TrappedDataCarrierToView
 	instanceVariableNames: 'index'
-	package: 'Trapped-Frontend'!
+	package: 'Trapped'!
 
 !TrappedDataCarrierToView methodsFor: 'not yet classified'!
 
@@ -78,7 +78,7 @@ proceed
 
 Object subclass: #TrappedPosition
 	instanceVariableNames: 'path model'
-	package: 'Trapped-Frontend'!
+	package: 'Trapped'!
 
 !TrappedPosition methodsFor: 'accessing'!
 
@@ -121,7 +121,7 @@ interestOn: anAspect block: aBlock
 
 TrappedPosition subclass: #TrappedSnapshot
 	instanceVariableNames: 'prefix'
-	package: 'Trapped-Frontend'!
+	package: 'Trapped'!
 
 !TrappedSnapshot methodsFor: 'accessing'!
 
@@ -141,7 +141,7 @@ do: aBlock
 
 Object subclass: #TrappedProcessingChain
 	instanceVariableNames: 'processors'
-	package: 'Trapped-Frontend'!
+	package: 'Trapped'!
 
 !TrappedProcessingChain methodsFor: 'accessing'!
 
@@ -198,7 +198,7 @@ dataTerminator
 
 Object subclass: #TrappedProcessor
 	instanceVariableNames: ''
-	package: 'Trapped-Frontend'!
+	package: 'Trapped'!
 !TrappedProcessor commentStamp!
 I am a processing step in TrappedProcessingChain.
 I am stateless flyweight (aka servant)
@@ -249,7 +249,7 @@ contents
 
 TrappedProcessor subclass: #TrappedDataExpectingProcessor
 	instanceVariableNames: ''
-	package: 'Trapped-Frontend'!
+	package: 'Trapped'!
 !TrappedDataExpectingProcessor commentStamp!
 I answer true to isExpectingModelData and serve as a base class
 for processor that present / change model data.
@@ -267,7 +267,7 @@ isExpectingModelData
 
 TrappedDataExpectingProcessor subclass: #TrappedProcessorContents
 	instanceVariableNames: ''
-	package: 'Trapped-Frontend'!
+	package: 'Trapped'!
 !TrappedProcessorContents commentStamp!
 I put data into target via contents: in toView:!
 
@@ -279,7 +279,7 @@ toView: aDataCarrier
 
 TrappedProcessor subclass: #TrappedProcessorBlackboard
 	instanceVariableNames: ''
-	package: 'Trapped-Frontend'!
+	package: 'Trapped'!
 !TrappedProcessorBlackboard commentStamp!
 I am used internally to fetch data from blackboard
 or write it back.
@@ -307,7 +307,7 @@ installToView: aDataCarrier toModel: anotherDataCarrier
 
 TrappedProcessor subclass: #TrappedProcessorTerminator
 	instanceVariableNames: ''
-	package: 'Trapped-Frontend'!
+	package: 'Trapped'!
 !TrappedProcessorTerminator commentStamp!
 I do not proceed in toView:.
 
@@ -322,7 +322,7 @@ toView: aDataCarrier
 
 Object subclass: #TrappedSingleton
 	instanceVariableNames: ''
-	package: 'Trapped-Frontend'!
+	package: 'Trapped'!
 
 !TrappedSingleton methodsFor: 'action'!
 
@@ -346,7 +346,7 @@ start: args
 
 TrappedSingleton subclass: #Trapped
 	instanceVariableNames: 'registry'
-	package: 'Trapped-Frontend'!
+	package: 'Trapped'!
 
 !Trapped methodsFor: 'accessing'!
 
@@ -448,7 +448,7 @@ loop: aSequenceableCollection between: aTagBrush and: anotherTagBrush do: aBlock
 
 TrappedSingleton subclass: #TrappedPathStack
 	instanceVariableNames: 'elements'
-	package: 'Trapped-Frontend'!
+	package: 'Trapped'!
 
 !TrappedPathStack methodsFor: 'accessing'!
 
@@ -476,7 +476,7 @@ initialize
 	elements := #().
 ! !
 
-!Array methodsFor: '*Trapped-Frontend'!
+!Array methodsFor: '*Trapped'!
 
 asTrapProcSendTo: anObject
 	| selector args |
@@ -492,25 +492,25 @@ trapDescend: aBlock
 	Trapped current descend: self snapshotDo: aBlock
 ! !
 
-!HTMLCanvas methodsFor: '*Trapped-Frontend'!
+!HTMLCanvas methodsFor: '*Trapped'!
 
 trapIter: path do: aBlock
     self with: [ :html | (html tag: 'script') at: 'type' put: 'application/x-beacon'; trapIter: path after: aBlock ]
 ! !
 
-!Object methodsFor: '*Trapped-Frontend'!
+!Object methodsFor: '*Trapped'!
 
 asTrapProcSendTo: anObject
 	self error: 'Trapped cannot use processor descriptor of ', self class name, ' type.'
 ! !
 
-!String methodsFor: '*Trapped-Frontend'!
+!String methodsFor: '*Trapped'!
 
 asTrapProcSendTo: anObject
 	^anObject perform: self
 ! !
 
-!TagBrush methodsFor: '*Trapped-Frontend'!
+!TagBrush methodsFor: '*Trapped'!
 
 trap: path
 	self trap: path processors: #()