Skip to content

sharedInstance should not be a computed property. It prevents custom … #16

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

sharedInstance should not be a computed property. It prevents custom … #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions Pluralize/Pluralize.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,7 @@ public class Pluralize {
sharedInstance.unchanging(word: word)
}

class var sharedInstance : Pluralize {
return Pluralize()
}
static var sharedInstance = Pluralize()

private class func regexReplace(input: String, pattern: String, template: String) -> String {
let regex = try! NSRegularExpression(pattern: pattern, options: .caseInsensitive)
Expand Down
12 changes: 12 additions & 0 deletions PluralizeTests/PluralizeTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,4 +183,16 @@ class PluralizeTests: XCTestCase {
XCTAssertEqual(singular.pluralize(), plural, "Plural of \(singular) should be \(plural)")
}
}

func testAddingRules() {
let singular = "word"
let plural = "words"
Pluralize.add(rule: singular, with: plural)
XCTAssertEqual(singular.pluralize(), plural, "Plural of \(singular) should be \(plural)")

// Override rule with another rule
let overridingPlural = "wordies"
Pluralize.add(rule: singular, with: overridingPlural)
XCTAssertEqual(singular.pluralize(), overridingPlural, "Plural of \(singular) should be \(overridingPlural)")
}
}