Skip to content

Commit 6a9f996

Browse files
FreeApophisFreeApophis
authored
Merge pull request #43 from messerli-informatik-ag/funcky-2
Release Funcky 2.0.0-rc.1
2 parents 0eb85ba + 32f2ce1 commit 6a9f996

14 files changed

+51
-463
lines changed

‎Funcky.Test/EnumerableExtensionTest.cs

+14-14
Original file line numberDiff line numberDiff line change
@@ -12,47 +12,47 @@ namespace Funcky.Test
1212
public class EnumerableExtensionTest
1313
{
1414
[Fact]
15-
public void GivenAnObjectWeCreateAnIEnumerableWithYield()
15+
public void GivenAnObjectWeCreateAnIEnumerableWithToEnumerable()
1616
{
17-
AcceptIntegers(42.Yield());
17+
AcceptIntegers(42.ToEnumerable());
1818

1919
Unit unit;
20-
AcceptUnits(unit.Yield());
20+
AcceptUnits(unit.ToEnumerable());
2121
}
2222

2323
[Fact]
24-
public void YieldReturnsEmptyEnumerableWhenReferenceIsNull()
24+
public void ToEnumerableReturnsEmptyEnumerableWhenReferenceIsNull()
2525
{
2626
string? value = null;
27-
Assert.Empty(value.Yield());
27+
Assert.Empty(value.ToEnumerable());
2828
}
2929

3030
[Fact]
31-
public void YieldReturnsEnumerableWithOneValueWhenReferenceIsNotNull()
31+
public void ToEnumerableReturnsEnumerableWithOneValueWhenReferenceIsNotNull()
3232
{
3333
const string value = "foo";
34-
Assert.Single(value.Yield(), value);
34+
Assert.Single(value.ToEnumerable(), value);
3535
}
3636

3737
[Fact]
38-
public void YieldReturnsEmptyEnumerableWhenNullableValueTypeIsNull()
38+
public void ToEnumerableReturnsEmptyEnumerableWhenNullableValueTypeIsNull()
3939
{
4040
int? value = null;
41-
Assert.Empty(value.Yield());
41+
Assert.Empty(value.ToEnumerable());
4242
}
4343

4444
[Fact]
45-
public void YieldReturnsEnumerableWithOneValueWhenNullableValueTypeIsNotNull()
45+
public void ToEnumerableReturnsEnumerableWithOneValueWhenNullableValueTypeIsNotNull()
4646
{
4747
int? value = 10;
48-
Assert.Single(value.Yield(), value);
48+
Assert.Single(value.ToEnumerable(), value);
4949
}
5050

5151
[Fact]
52-
public void YieldReturnsEnumerableWithOneValueWhenValueTypeIsNotNull()
52+
public void ToEnumerableReturnsEnumerableWithOneValueWhenValueTypeIsNotNull()
5353
{
5454
const int value = 10;
55-
Assert.Single(value.Yield(), value);
55+
Assert.Single(value.ToEnumerable(), value);
5656
}
5757

5858
[Fact]
@@ -66,7 +66,7 @@ public void GivenAnEnumerableAndInjectWeCanApplySideffectsToEnumberables()
6666

6767
Assert.Equal(0, sideEffect);
6868

69-
numbersWithSideEffect.Each(n => { });
69+
numbersWithSideEffect.ForEach(NoOperation);
7070

7171
Assert.Equal(numbers.Count, sideEffect);
7272
}

‎Funcky.Test/Funcky.Test.csproj

-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
<Nullable>enable</Nullable>
77
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
88
<IsPackable>false</IsPackable>
9-
<AssemblyVersion>1.8.1.0</AssemblyVersion>
10-
<FileVersion>1.8.1.0</FileVersion>
119
</PropertyGroup>
1210

1311
<ItemGroup>

‎Funcky.Test/OptionTest.cs

+4-10
Original file line numberDiff line numberDiff line change
@@ -328,21 +328,15 @@ public void ToEnumerableReturnsEnumerableWithOneElementWhenOptionHasValue()
328328
[Fact]
329329
public void OptionCanBeCreatedFromReferenceType()
330330
{
331-
Assert.Equal(Option.Some("foo"), Option.From("foo"));
332-
Assert.Equal(Option<string>.None(), Option.From<string>(null));
331+
Assert.Equal(Option.Some("foo"), Option.FromNullable("foo"));
332+
Assert.Equal(Option<string>.None(), Option.FromNullable<string>(null));
333333
}
334334

335335
[Fact]
336336
public void OptionCanBeCreatedFromNullableValueType()
337337
{
338-
Assert.Equal(Option.Some(10), Option.From((int?)10));
339-
Assert.Equal(Option<int>.None(), Option.From<int>(null));
340-
}
341-
342-
[Fact]
343-
public void OptionCanBeCreatedFromValueType()
344-
{
345-
Assert.Equal(Option.Some(10), Option.From(10));
338+
Assert.Equal(Option.Some(10), Option.FromNullable((int?)10));
339+
Assert.Equal(Option<int>.None(), Option.FromNullable((int?)null));
346340
}
347341

348342
[Theory]

‎Funcky.Test/PredicateCompositionTest.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ public void AllReturnsTrueWhenAllOfThePredicatesReturnsFalse()
3636
}
3737

3838
[Fact]
39-
public void AnyReturnsTrueWhenNoPredicatesAreGiven()
39+
public void AnyReturnsFalseWhenNoPredicatesAreGiven()
4040
{
4141
var predicate = Any<string>();
42-
Assert.True(predicate(DummyString));
42+
Assert.False(predicate(DummyString));
4343
}
4444

4545
[Fact]

‎Funcky.Test/ReaderServiceProviderTest.cs

-53
This file was deleted.

‎Funcky.Test/ReaderSimpleTest.cs

-31
This file was deleted.

‎Funcky.Test/ReaderTest.cs

-111
This file was deleted.

‎Funcky/Extensions/EnumerableExtensions.cs

+8-8
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public static class EnumerableExtensions
1414
/// </summary>
1515
/// <typeparam name="T">Type of the object.</typeparam>
1616
/// <returns>An <see cref="IEnumerable{T}" /> consisting of a single item or zero items.</returns>
17-
public static IEnumerable<T> Yield<T>(this T? item, RequireClass<T>? ω = null)
17+
public static IEnumerable<T> ToEnumerable<T>(this T? item, RequireClass<T>? ω = null)
1818
where T : class
1919
{
2020
if (item is { })
@@ -23,15 +23,15 @@ public static IEnumerable<T> Yield<T>(this T? item, RequireClass<T>? ω = null)
2323
}
2424
}
2525

26-
/// <inheritdoc cref="Yield{T}(T, RequireClass{T})"/>
27-
public static IEnumerable<T> Yield<T>(this T item, RequireStruct<T>? ω = null)
26+
/// <inheritdoc cref="ToEnumerable{T}(T, RequireClass{T})"/>
27+
public static IEnumerable<T> ToEnumerable<T>(this T item, RequireStruct<T>? ω = null)
2828
where T : struct
2929
{
3030
yield return item;
3131
}
3232

33-
/// <inheritdoc cref="Yield{T}(T, RequireClass{T})"/>
34-
public static IEnumerable<T> Yield<T>(this T? item)
33+
/// <inheritdoc cref="ToEnumerable{T}(T, RequireClass{T})"/>
34+
public static IEnumerable<T> ToEnumerable<T>(this T? item)
3535
where T : struct
3636
{
3737
if (item.HasValue)
@@ -67,7 +67,7 @@ public static IEnumerable<T> Inspect<T>(this IEnumerable<T> elements, Action<T>
6767
/// The IEnumerable version of foreach. You can apply an action to each element. This is only useful when you have side effects.
6868
/// </summary>
6969
/// <typeparam name="T">the inner type of the enumerable.</typeparam>
70-
public static void Each<T>(this IEnumerable<T> elements, Action<T> action)
70+
public static void ForEach<T>(this IEnumerable<T> elements, Action<T> action)
7171
{
7272
foreach (var element in elements)
7373
{
@@ -140,10 +140,10 @@ public static Option<TSource> SingleOrNone<TSource>(this IEnumerable<TSource> so
140140

141141
public static IEnumerable<TSource> WhereNotNull<TSource>(this IEnumerable<TSource?> source)
142142
where TSource : class
143-
=> source.WhereSelect(value => Option.From(value));
143+
=> source.WhereSelect(Option.FromNullable);
144144

145145
public static IEnumerable<TSource> WhereNotNull<TSource>(this IEnumerable<TSource?> source)
146146
where TSource : struct
147-
=> source.WhereSelect(Option.From);
147+
=> source.WhereSelect(Option.FromNullable);
148148
}
149149
}

‎Funcky/Funcky.csproj

+4-9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
@@ -16,9 +16,9 @@
1616
<PackageProjectUrl>https://github.com/messerli-informatik-ag/funcky</PackageProjectUrl>
1717
<RepositoryUrl>https://github.com/messerli-informatik-ag/funcky</RepositoryUrl>
1818
<PackageTags>Functional Monad</PackageTags>
19-
<Version>1.8.1</Version>
20-
<FileVersion>1.8.1.0</FileVersion>
21-
<AssemblyVersion>1.8.1.0</AssemblyVersion>
19+
<Version>2.0.0-rc.1</Version>
20+
<FileVersion>2.0.0.0</FileVersion>
21+
<AssemblyVersion>2.0.0.0</AssemblyVersion>
2222
<IncludeSymbols>true</IncludeSymbols>
2323
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
2424
</PropertyGroup>
@@ -30,9 +30,4 @@
3030
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
3131
<NoWarn>$(NoWarn);1701;1702</NoWarn>
3232
</PropertyGroup>
33-
34-
<ItemGroup>
35-
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.3.0" />
36-
</ItemGroup>
37-
3833
</Project>

0 commit comments

Comments
 (0)