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

Jump to bottom

feat: add updatePolicy() #234

Merged
merged 15 commits into from
Feb 6, 2021
Merged

feat: add updatePolicy() #234

merged 15 commits into from
Feb 6, 2021

Conversation

Zxilly
Copy link
Contributor

@Zxilly Zxilly commented Feb 4, 2021 •
edited
Loading

Signed-off-by: Zxilly zhouxinyu1001@gmail.com
Fix: #229

@Zxilly
Copy link
Contributor Author

Zxilly commented Feb 4, 2021

@fgblomqvist @nodece
plz review this

hsluoyz
hsluoyz requested changes Feb 4, 2021
View reviewed changes
src/persist/batchAdapter.ts Outdated Show resolved Hide resolved
@hsluoyz hsluoyz requested a review from nodece February 4, 2021 15:32
@Zxilly Zxilly requested a review from hsluoyz February 4, 2021 15:58
hsluoyz
hsluoyz requested changes Feb 4, 2021
View reviewed changes
src/persist/watcherUpdatable.ts Outdated Show resolved Hide resolved
src/persist/updatableAdapter.ts Outdated Show resolved Hide resolved
@Zxilly Zxilly requested a review from hsluoyz February 5, 2021 11:12
hsluoyz
hsluoyz requested changes Feb 5, 2021
View reviewed changes
src/persist/batchFileAdapter.ts Outdated Show resolved Hide resolved
src/persist/stringAdapter.ts Outdated Show resolved Hide resolved
src/persist/updatableAdapter.ts Outdated Show resolved Hide resolved
src/persist/updatableFileAdapter.ts Outdated Show resolved Hide resolved
src/persist/updatableFileAdapter.ts Outdated Show resolved Hide resolved
hsluoyz
hsluoyz requested changes Feb 6, 2021
View reviewed changes
src/persist/updatableAdapter.ts Outdated Show resolved Hide resolved
src/persist/updatableFileAdapter.ts Outdated Show resolved Hide resolved
nodece
nodece reviewed Feb 6, 2021
View reviewed changes
src/model/model.ts Outdated Show resolved Hide resolved
@hsluoyz hsluoyz mentioned this pull request Feb 6, 2021
Closed
@hsluoyz
Copy link
Member

hsluoyz commented Feb 6, 2021

@Zxilly I think you can work on: #235 first, then we can come back to this PR later.

@Zxilly
Copy link
Contributor Author

Zxilly commented Feb 6, 2021 •
edited
Loading

@Zxilly I think you can work on: #235 first, then we can come back to this PR later.

I think we could merge this PR before that, or we may face some conflicts

@hsluoyz
Copy link
Member

hsluoyz commented Feb 6, 2021 •
edited
Loading

I think we could merge this PR before that, or we may face some conflicts

This PR contains UpdatableFileAdapter, which is finally unwanted, so we will not merge the UpdatableFileAdapter code.

Git conflicts can be resolved elegantly, you can learn how to work with multiple branches simultaneously.

@Zxilly Zxilly requested review from hsluoyz and nodece February 6, 2021 08:15
@hsluoyz
Copy link
Member

hsluoyz commented Feb 6, 2021

@Zxilly plz rebase your PR onto the master HEAD, instead of creating merge commits here:

image

Zxilly added 14 commits February 6, 2021 23:14
@Zxilly
feat: add updatePolicy()
525231c 
Signed-off-by: Zxilly <zhouxinyu1001@gmail.com>
@Zxilly
feat: add unittest for updatePolicy()
ce1280d 
Signed-off-by: Zxilly <zhouxinyu1001@gmail.com>
@Zxilly
feat: add updateForUpdatePolicy()
e774c4f 
Signed-off-by: Zxilly <zhouxinyu1001@gmail.com>
@Zxilly
feat: add updatePolicy()
b69110d 
Signed-off-by: Zxilly <zhouxinyu1001@gmail.com>
@Zxilly
refactor: rename interface
b27f1f8 
Signed-off-by: Zxilly <zhouxinyu1001@gmail.com>
@Zxilly
docs: fix comment
d411730 
Signed-off-by: Zxilly <zhouxinyu1001@gmail.com>
@Zxilly
fix: fix adapter error
b0b25dd 
Signed-off-by: Zxilly <zhouxinyu1001@gmail.com>
@Zxilly
feat: add updatableFileAdapter
7678214 
Signed-off-by: Zxilly <zhouxinyu1001@gmail.com>
@Zxilly
fix: remove incorrect claim and fix comment
f32b1a9 
Signed-off-by: Zxilly <zhouxinyu1001@gmail.com>
@Zxilly
fix: fix comment
2ba646f 
Signed-off-by: Zxilly <zhouxinyu1001@gmail.com>
@Zxilly
perf: refactor updatePolicy
71b0c58 
Signed-off-by: Zxilly <zhouxinyu1001@gmail.com>
@Zxilly
fix: fix index
7a57548 
Signed-off-by: Zxilly <zhouxinyu1001@gmail.com>
@Zxilly
style: prevent conflict
4b22546 
Signed-off-by: Zxilly <zhouxinyu1001@gmail.com>
@Zxilly
fix: remove UpdatableFileAdapter
a065092 
Signed-off-by: Zxilly <zhouxinyu1001@gmail.com>
@Zxilly
fix: fix unittest()
1cb9b17 
In fact,this makes unittest cannot pass.The fix will refer to issue #235

Signed-off-by: Zxilly <zhouxinyu1001@gmail.com>
@coveralls
Copy link

coveralls commented Feb 6, 2021 •
edited
Loading

Pull Request Test Coverage Report for Build 543350138

  • 21 of 29 (72.41%) changed or added relevant lines in 4 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage decreased (-0.3%) to 77.412%
Changes Missing Coverage Covered Lines Changed/Added Lines %
src/model/model.ts 7 9 77.78%
src/internalEnforcer.ts 10 16 62.5%
Totals Coverage Status
Change from base Build 543247420: -0.3%
Covered Lines: 1103
Relevant Lines: 1368
💛 - Coveralls

hsluoyz
hsluoyz approved these changes Feb 6, 2021
View reviewed changes
Copy link
Member

@hsluoyz hsluoyz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

well done!

@hsluoyz hsluoyz merged commit a3218f1 into casbin:master Feb 6, 2021
github-actions bot pushed a commit that referenced this pull request Feb 6, 2021
@semantic-release-bot
chore(release): 5.4.0 [skip ci]
c76edf3 
# [5.4.0](v5.3.1...v5.4.0) (2021-02-06)

### Features

* add updatePolicy() ([#234](#234)) ([a3218f1](a3218f1)), closes [#235](#235)
@github-actions
Copy link

github-actions bot commented Feb 6, 2021

🎉 This PR is included in version 5.4.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hsluoyz hsluoyz hsluoyz approved these changes

@nodece nodece Awaiting requested review from nodece

Assignees
No one assigned
Labels
released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add UpdatableAdapter interface to Node-Casbin
4 participants
@Zxilly @hsluoyz @coveralls @nodece