refactor: use atoms 0.26.0

Meerow · web-flow · commit 2799daa32b60 · 2019-05-02T18:39:15.000+02:00
diff --git a/src/Yaapii.Zip/Yaapii.Zip.csproj b/src/Yaapii.Zip/Yaapii.Zip.csproj
@@ -9,7 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Yaapii.Atoms" Version="0.24.0" />
+    <PackageReference Include="Yaapii.Atoms" Version="0.26.0" />
+    <PackageReference Include="Yaapii.Xml" Version="0.16.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Yaapii.Zip/ZipFiles.cs b/src/Yaapii.Zip/ZipFiles.cs
@@ -26,7 +26,7 @@ public sealed class ZipFiles : IEnumerable<string>
         public ZipFiles(IInput input, bool leaveOpen = true)
         {
             this.files =
-                new SolidScalar<IEnumerable<string>>(()=>
+                new Solid<IEnumerable<string>>(()=>
                     new Filtered<string>(path => 
                         !path.EndsWith("/"), 
                         new ZipPaths(input)
diff --git a/src/Yaapii.Zip/ZipMapped.cs b/src/Yaapii.Zip/ZipMapped.cs
@@ -23,7 +23,7 @@ public sealed class ZipMapped : IInput
         public ZipMapped(Func<string, string> mapPath, IInput zip, bool leaveOpen = true)
         {
             this.input =
-                new StickyScalar<Stream>(() =>
+                new Sticky<Stream>(() =>
                 {
                     lock (zip)
                     {
diff --git a/src/Yaapii.Zip/ZipPaths.cs b/src/Yaapii.Zip/ZipPaths.cs
@@ -24,7 +24,7 @@ public sealed class ZipPaths : IEnumerable<string>
         public ZipPaths(IInput input, bool leaveOpen = true)
         {
             this.files =
-                new SolidScalar<IEnumerable<string>>(() =>
+                new Solid<IEnumerable<string>>(() =>
                 {
                     lock (input.Stream())
                     {
diff --git a/src/Yaapii.Zip/ZipUpdated.cs b/src/Yaapii.Zip/ZipUpdated.cs
@@ -32,7 +32,7 @@ public ZipUpdated(IInput input, string pathToUpdate, IInput update, bool leaveOp
         /// </summary>
         public ZipUpdated(IScalar<Stream> zip, string pathToUpdate, IInput update, bool leaveOpen)
         {
-            this.zip = new SolidScalar<Stream>(() =>
+            this.zip = new Solid<Stream>(() =>
             {
                 lock (zip.Value())
                 {
diff --git a/src/Yaapii.Zip/ZipWithout.cs b/src/Yaapii.Zip/ZipWithout.cs
@@ -31,7 +31,7 @@ public ZipWithout(string pathToRemove, IInput input, bool leaveOpen = true) : th
         /// </summary>
         public ZipWithout(string pathToRemove, IScalar<Stream> zip, bool leaveOpen)
         {
-            this.zip = new StickyScalar<Stream>(() =>
+            this.zip = new Sticky<Stream>(() =>
             {
                 lock (zip.Value())
                 {
diff --git a/tests/Test.Yaapii.Zip/Test.Yaapii.Zip.csproj b/tests/Test.Yaapii.Zip/Test.Yaapii.Zip.csproj
@@ -30,8 +30,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Yaapii.Atoms" Version="0.24.0" />
-    <PackageReference Include="Yaapii.Xml" Version="0.14.0" />
+    <PackageReference Include="Yaapii.Atoms" Version="0.26.0" />
+    <PackageReference Include="Yaapii.Xml" Version="0.16.0" />
   </ItemGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public sealed class ZipFiles : IEnumerable<string>`
`26`	`26`	`public ZipFiles(IInput input, bool leaveOpen = true)`
`27`	`27`	`{`
`28`	`28`	`this.files =`
`29`		`- new SolidScalar<IEnumerable<string>>(()=>`
	`29`	`+ new Solid<IEnumerable<string>>(()=>`
`30`	`30`	`new Filtered<string>(path =>`
`31`	`31`	`!path.EndsWith("/"),`
`32`	`32`	`new ZipPaths(input)`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public sealed class ZipMapped : IInput`
`23`	`23`	`public ZipMapped(Func<string, string> mapPath, IInput zip, bool leaveOpen = true)`
`24`	`24`	`{`
`25`	`25`	`this.input =`
`26`		`- new StickyScalar<Stream>(() =>`
	`26`	`+ new Sticky<Stream>(() =>`
`27`	`27`	`{`
`28`	`28`	`lock (zip)`
`29`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public sealed class ZipPaths : IEnumerable<string>`
`24`	`24`	`public ZipPaths(IInput input, bool leaveOpen = true)`
`25`	`25`	`{`
`26`	`26`	`this.files =`
`27`		`- new SolidScalar<IEnumerable<string>>(() =>`
	`27`	`+ new Solid<IEnumerable<string>>(() =>`
`28`	`28`	`{`
`29`	`29`	`lock (input.Stream())`
`30`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public ZipUpdated(IInput input, string pathToUpdate, IInput update, bool leaveOp`
`32`	`32`	`/// </summary>`
`33`	`33`	`public ZipUpdated(IScalar<Stream> zip, string pathToUpdate, IInput update, bool leaveOpen)`
`34`	`34`	`{`
`35`		`- this.zip = new SolidScalar<Stream>(() =>`
	`35`	`+ this.zip = new Solid<Stream>(() =>`
`36`	`36`	`{`
`37`	`37`	`lock (zip.Value())`
`38`	`38`	`{`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public ZipWithout(string pathToRemove, IInput input, bool leaveOpen = true) : th`
`31`	`31`	`/// </summary>`
`32`	`32`	`public ZipWithout(string pathToRemove, IScalar<Stream> zip, bool leaveOpen)`
`33`	`33`	`{`
`34`		`- this.zip = new StickyScalar<Stream>(() =>`
	`34`	`+ this.zip = new Sticky<Stream>(() =>`
`35`	`35`	`{`
`36`	`36`	`lock (zip.Value())`
`37`	`37`	`{`