Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added merge strategy to en PastTime and Weekday rules #20

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added merge strategy to en PastTime and Weekday rules #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1dbb043
Added merge strategy to en PastTime and Weekday rules
LeonB Mar 27, 2019
1f232b3
Don't reference original import path
pieterbaecke May 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rules/br/br.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package br

import "github.com/olebedev/when/rules"
import "github.com/omniboost/when/rules"

var All = []rules.Rule{
Weekday(rules.Override),
Expand Down
4 changes: 2 additions & 2 deletions rules/br/br_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"testing"
"time"

"github.com/olebedev/when"
"github.com/olebedev/when/rules/br"
"github.com/omniboost/when"
"github.com/omniboost/when/rules/br"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion rules/br/casual_date.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"time"

"github.com/AlekSi/pointer"
"github.com/olebedev/when/rules"
"github.com/omniboost/when/rules"
)

func CasualDate(s rules.Strategy) rules.Rule {
Expand Down
6 changes: 3 additions & 3 deletions rules/br/casual_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"testing"
"time"

"github.com/olebedev/when"
"github.com/olebedev/when/rules"
"github.com/olebedev/when/rules/br"
"github.com/omniboost/when"
"github.com/omniboost/when/rules"
"github.com/omniboost/when/rules/br"
)

func TestCasualDate(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion rules/br/casual_time.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"time"

"github.com/AlekSi/pointer"
"github.com/olebedev/when/rules"
"github.com/omniboost/when/rules"
)

func CasualTime(s rules.Strategy) rules.Rule {
Expand Down
2 changes: 1 addition & 1 deletion rules/br/deadline.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"time"

"github.com/AlekSi/pointer"
"github.com/olebedev/when/rules"
"github.com/omniboost/when/rules"
"github.com/pkg/errors"
)

Expand Down
6 changes: 3 additions & 3 deletions rules/br/deadline_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"testing"
"time"

"github.com/olebedev/when"
"github.com/olebedev/when/rules"
"github.com/olebedev/when/rules/br"
"github.com/omniboost/when"
"github.com/omniboost/when/rules"
"github.com/omniboost/when/rules/br"
)

func TestDeadline(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion rules/br/exact_month_date.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"
"time"

"github.com/olebedev/when/rules"
"github.com/omniboost/when/rules"
)

func ExactMonthDate(s rules.Strategy) rules.Rule {
Expand Down
6 changes: 3 additions & 3 deletions rules/br/exact_month_date_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"testing"
"time"

"github.com/olebedev/when"
"github.com/olebedev/when/rules"
"github.com/olebedev/when/rules/br"
"github.com/omniboost/when"
"github.com/omniboost/when/rules"
"github.com/omniboost/when/rules/br"
)

func TestExactMonthDate(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion rules/br/hour.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/pkg/errors"

"github.com/olebedev/when/rules"
"github.com/omniboost/when/rules"
)

/*
Expand Down
2 changes: 1 addition & 1 deletion rules/br/hour_minute.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"strconv"
"time"

"github.com/olebedev/when/rules"
"github.com/omniboost/when/rules"
"github.com/pkg/errors"
)

Expand Down
6 changes: 3 additions & 3 deletions rules/br/hour_minute_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"testing"
"time"

"github.com/olebedev/when"
"github.com/olebedev/when/rules"
"github.com/olebedev/when/rules/br"
"github.com/omniboost/when"
"github.com/omniboost/when/rules"
"github.com/omniboost/when/rules/br"
)

func TestHourMinute(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions rules/br/hour_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"testing"
"time"

"github.com/olebedev/when"
"github.com/olebedev/when/rules"
"github.com/olebedev/when/rules/br"
"github.com/omniboost/when"
"github.com/omniboost/when/rules"
"github.com/omniboost/when/rules/br"
)

func TestHour(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion rules/br/past_time.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"time"

"github.com/AlekSi/pointer"
"github.com/olebedev/when/rules"
"github.com/omniboost/when/rules"
"github.com/pkg/errors"
)

Expand Down
6 changes: 3 additions & 3 deletions rules/br/past_time_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"testing"
"time"

"github.com/olebedev/when"
"github.com/olebedev/when/rules"
"github.com/olebedev/when/rules/br"
"github.com/omniboost/when"
"github.com/omniboost/when/rules"
"github.com/omniboost/when/rules/br"
)

func TestPastTime(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion rules/br/weekday.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"strings"
"time"

"github.com/olebedev/when/rules"
"github.com/omniboost/when/rules"
)

func Weekday(s rules.Strategy) rules.Rule {
Expand Down
6 changes: 3 additions & 3 deletions rules/br/weekday_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"testing"
"time"

"github.com/olebedev/when"
"github.com/olebedev/when/rules"
"github.com/olebedev/when/rules/br"
"github.com/omniboost/when"
"github.com/omniboost/when/rules"
"github.com/omniboost/when/rules/br"
)

func TestWeekday(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion rules/common/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package common

import "github.com/olebedev/when/rules"
import "github.com/omniboost/when/rules"

var All = []rules.Rule{
SlashDMY(rules.Override),
Expand Down
4 changes: 2 additions & 2 deletions rules/common/common_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"testing"
"time"

"github.com/olebedev/when"
"github.com/olebedev/when/rules/common"
"github.com/omniboost/when"
"github.com/omniboost/when/rules/common"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion rules/common/slash_dmy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"strconv"
"time"

"github.com/olebedev/when/rules"
"github.com/omniboost/when/rules"
)

/*
Expand Down
6 changes: 3 additions & 3 deletions rules/common/slash_dmy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"testing"
"time"

"github.com/olebedev/when"
"github.com/olebedev/when/rules"
"github.com/olebedev/when/rules/common"
"github.com/omniboost/when"
"github.com/omniboost/when/rules"
"github.com/omniboost/when/rules/common"
)

func TestSlashDMY(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion rules/en/casual_date.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"time"

"github.com/AlekSi/pointer"
"github.com/olebedev/when/rules"
"github.com/omniboost/when/rules"
)

func CasualDate(s rules.Strategy) rules.Rule {
Expand Down
6 changes: 3 additions & 3 deletions rules/en/casual_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"testing"
"time"

"github.com/olebedev/when"
"github.com/olebedev/when/rules"
"github.com/olebedev/when/rules/en"
"github.com/omniboost/when"
"github.com/omniboost/when/rules"
"github.com/omniboost/when/rules/en"
)

func TestCasualDate(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion rules/en/casual_time.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"time"

"github.com/AlekSi/pointer"
"github.com/olebedev/when/rules"
"github.com/omniboost/when/rules"
)

func CasualTime(s rules.Strategy) rules.Rule {
Expand Down
2 changes: 1 addition & 1 deletion rules/en/deadline.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"time"

"github.com/AlekSi/pointer"
"github.com/olebedev/when/rules"
"github.com/omniboost/when/rules"
"github.com/pkg/errors"
)

Expand Down
6 changes: 3 additions & 3 deletions rules/en/deadline_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"testing"
"time"

"github.com/olebedev/when"
"github.com/olebedev/when/rules"
"github.com/olebedev/when/rules/en"
"github.com/omniboost/when"
"github.com/omniboost/when/rules"
"github.com/omniboost/when/rules/en"
)

func TestDeadline(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion rules/en/en.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package en

import "github.com/olebedev/when/rules"
import "github.com/omniboost/when/rules"

var All = []rules.Rule{
Weekday(rules.Override),
Expand Down
28 changes: 26 additions & 2 deletions rules/en/en_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ import (
"testing"
"time"

"github.com/olebedev/when"
"github.com/olebedev/when/rules/en"
"github.com/omniboost/when"
"github.com/omniboost/when/rules"
"github.com/omniboost/when/rules/en"
"github.com/stretchr/testify/require"
)

Expand Down Expand Up @@ -61,3 +62,26 @@ func TestAll(t *testing.T) {

ApplyFixtures(t, "en.All...", w, fixt)
}

func TestAllMerge(t *testing.T) {
w := when.New(nil)
w.Add(
en.Weekday(rules.Merge),
en.CasualDate(rules.Merge),
en.CasualTime(rules.Merge),
en.Hour(rules.Override),
en.HourMinute(rules.Override),
en.HourMinuteSecond(rules.Override),
en.Deadline(rules.Override),
en.PastTime(rules.Merge),
en.ExactMonthDate(rules.Override),
)

// current is Friday
fixt := []Fixture{
{"this monday one week ago", 0, "this monday one week ago", -9 * 24 * time.Hour},
{"next monday one week ago", 0, "next monday one week ago", -2 * 24 * time.Hour},
}

ApplyFixtures(t, "en.All...", w, fixt)
}
2 changes: 1 addition & 1 deletion rules/en/exact_month_date.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"
"time"

"github.com/olebedev/when/rules"
"github.com/omniboost/when/rules"
)

// <[]string{"third of march", "third", "", "march", "", ""}>
Expand Down
6 changes: 3 additions & 3 deletions rules/en/exact_month_date_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"testing"
"time"

"github.com/olebedev/when"
"github.com/olebedev/when/rules"
"github.com/olebedev/when/rules/en"
"github.com/omniboost/when"
"github.com/omniboost/when/rules"
"github.com/omniboost/when/rules/en"
)

func TestExactMonthDate(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion rules/en/hour.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/pkg/errors"

"github.com/olebedev/when/rules"
"github.com/omniboost/when/rules"
)

/*
Expand Down
2 changes: 1 addition & 1 deletion rules/en/hour_minute.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"strconv"
"time"

"github.com/olebedev/when/rules"
"github.com/omniboost/when/rules"
"github.com/pkg/errors"
)

Expand Down
6 changes: 3 additions & 3 deletions rules/en/hour_minute_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"testing"
"time"

"github.com/olebedev/when"
"github.com/olebedev/when/rules"
"github.com/olebedev/when/rules/en"
"github.com/omniboost/when"
"github.com/omniboost/when/rules"
"github.com/omniboost/when/rules/en"
)

func TestHourMinute(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions rules/en/hour_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"testing"
"time"

"github.com/olebedev/when"
"github.com/olebedev/when/rules"
"github.com/olebedev/when/rules/en"
"github.com/omniboost/when"
"github.com/omniboost/when/rules"
"github.com/omniboost/when/rules/en"
)

func TestHour(t *testing.T) {
Expand Down
Loading