Skip to content

Commit 3c4e3de

Browse files
authored
Merge pull request #166 from iamrajiv/readme
docs: Refactor yml and md files Merging this as it is not code :)
2 parents 88b334e + 61becd3 commit 3c4e3de

File tree

8 files changed

+253
-194
lines changed

8 files changed

+253
-194
lines changed

.github/pull_request_template.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,23 @@
22
was changed. Do not include the issue number in the title. -->
33

44
#### References to other Issues or PRs
5+
56
<!-- If this pull request fixes an issue, write "Fixes #NNNN" in that exact
67
format, e.g. "Fixes #1234". See
78
https://github.com/blog/1506-closing-issues-via-pull-requests . Please also
89
write a comment on that issue linking back to this pull request once it is
910
open. -->
1011

11-
1212
#### Brief description of what is fixed or changed
13+
1314
<!-- Description with demonstrating the changes with example(s). Attach screenshort for graph related changes. -->
1415

1516
#### Testcase / documentation
1617

1718
<!-- Make sure you have added the testcases for your code changes and documented (or updated the docs) with examples. -->
1819

1920
#### Other comments
21+
2022
<!-- Any pending work (TODO) -->
2123

2224
<!-- Contribution guide : https://github.com/SciRuby/daru-view/blob/master/CONTRIBUTING.md -->

.github/workflows/test.yml

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@ name: daru-view test
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [master]
66
pull_request:
7-
branches: [ master ]
7+
branches: [master]
88

99
jobs:
1010
test:
11-
1211
strategy:
1312
fail-fast: false
1413
matrix:
@@ -17,20 +16,20 @@ jobs:
1716
runs-on: ${{ matrix.os }}-latest
1817

1918
steps:
20-
- uses: actions/checkout@v2
21-
- name: Set up Ruby
22-
uses: ruby/setup-ruby@v1
23-
with:
24-
ruby-version: ${{ matrix.ruby }}
25-
bundler-cache: true
26-
- name: Install dependencies
27-
run: |
28-
gem install bundler
29-
gem install rainbow -v '2.2.1'
30-
bundle install
31-
- name: Run tests
32-
run: |
33-
bundle exec rspec
34-
bundle exec rubocop
35-
- name: Push coverage report
36-
run: bundle exec rake coveralls:push
19+
- uses: actions/checkout@v2
20+
- name: Set up Ruby
21+
uses: ruby/setup-ruby@v1
22+
with:
23+
ruby-version: ${{ matrix.ruby }}
24+
bundler-cache: true
25+
- name: Install dependencies
26+
run: |
27+
gem install bundler
28+
gem install rainbow -v '2.2.1'
29+
bundle install
30+
- name: Run tests
31+
run: |
32+
bundle exec rspec
33+
bundle exec rubocop
34+
- name: Push coverage report
35+
run: bundle exec rake coveralls:push

.travis.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
language:
2-
ruby
1+
language: ruby
32

43
rvm:
54
# - '2.0'
65
# - '2.1' NOTE: For ruby <2.3,rubocop Offense : adapters/*charts.rb:11:9: C: Style/ModuleFunction: Use module_function instead of extend self.
76
# - '2.2' - Not checking because of so many rubocop conflicts with
87
# new ruby versions
9-
- '2.3.0'
10-
- '2.4.0'
11-
- '2.5.3'
12-
- '2.6.0'
8+
- "2.3.0"
9+
- "2.4.0"
10+
- "2.5.3"
11+
- "2.6.0"
1312

1413
script:
1514
- bundle exec rspec
@@ -20,8 +19,8 @@ after_script:
2019

2120
install:
2221
- if [ $TRAVIS_RUBY_VERSION == '2.2' ] || [ $TRAVIS_RUBY_VERSION == '2.1' ] || [ $TRAVIS_RUBY_VERSION == '2.0' ];
23-
then gem install bundler -v '~> 1.6';
24-
else gem install bundler;
25-
fi
22+
then gem install bundler -v '~> 1.6';
23+
else gem install bundler;
24+
fi
2625
- gem install rainbow -v '2.2.1'
2726
- bundle install

CHANGELOG.md

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
**Fixes:**
44

55
- Fixed Rubocop offenses coming from version 0.60 #125 (by @Shekharrajak)
6-
- Updated README.md and Contribution Guide #129, #131, #133,
7-
#139, #141 (by @Shekharrajak)
8-
- Removed the duplicate highcharts.css #145 (by @[snpd25](/snpd25))
6+
- Updated README.md and Contribution Guide #129, #131, #133,
7+
#139, #141 (by @Shekharrajak)
8+
- Removed the duplicate highcharts.css #145 (by @[snpd25](/snpd25))
99
- [Majaor Fix] Windows installation error fix #147 (by @kojix2 & @Shekharrajak)
1010

1111
## 0.2.4 (2017-08-29)
@@ -15,25 +15,24 @@
1515
- Added Highstock feature of HighCharts plotting: #89 (by @Prakriti-nith)
1616
- Added HighMaps feature of HighCharts plotting: #92 (by @Prakriti-nith)
1717
- Added Custom Styling CSS feature of HighCharts plotting: #93
18-
(by @Prakriti-nith)
18+
(by @Prakriti-nith)
1919
- Exporting HighCharts to different formats: #94 (by @Prakriti-nith)
2020
- Added ChartWrapper feature of GoogleCharts: #95 (by @Prakriti-nith)
2121
- Import data from google spreadsheet: PR #88 (by @Prakriti-nith)
2222
- Added ChartEditor feature of GoogleCharts plotting: #96 (by @Prakriti-nith)
2323
- Multiple Charts having different (or same plotting library)
24-
in a single row(or in single cell in IRuby notebook): #97 (by @Prakriti-nith)
24+
in a single row(or in single cell in IRuby notebook): #97 (by @Prakriti-nith)
2525
- Different formatters feature of GoogleCharts: #110 (by @Prakriti-nith)
2626
- Require dependent JS for the plotting libraries
27-
GoogleCharts/HighCharts/DataTables in Rails application.js file: #115
28-
(by @Prakriti-nith)
29-
27+
GoogleCharts/HighCharts/DataTables in Rails application.js file: #115
28+
(by @Prakriti-nith)
3029

3130
**Minor Enhancements:**
3231

3332
- Exporting charts in PNG formate for GoogleCharts: #98 (by @Prakriti-nith)
3433
- Handling Events in GoogleCharts: #100 (by @Prakriti-nith)
3534
- Added a method to load dependent scripts for multiple adapters: #107
36-
(by @Prakriti-nith)
35+
(by @Prakriti-nith)
3736
- Rake Task to add new adapter templates: #112 (by @Prakriti-nith)
3837
- (by @Prakriti-nith)
3938
- export_html method, generate_html method is implemented and load large set of data piece by piece using datatables adaptor: #104 (by @Prakriti-nith)
@@ -47,26 +46,26 @@ GoogleCharts/HighCharts/DataTables in Rails application.js file: #115
4746

4847
**Note:**
4948

50-
* [GSoC 2018 project](https://github.com/SciRuby/daru-view/wiki/GSoC-2018---Progress-Report)
49+
- [GSoC 2018 project](https://github.com/SciRuby/daru-view/wiki/GSoC-2018---Progress-Report)
5150

5251
## 0.1.0 (2017-09-20)
5352

5453
**Features:**
5554

5655
- Generate Plot using [Nyaplot](https://github.com/SciRuby/nyaplot),
57-
[google_visualr](https://github.com/winston/google_visualr/),
58-
[lazy_high_charts](https://github.com/michelson/lazy_high_charts) gem with more features.
56+
[google_visualr](https://github.com/winston/google_visualr/),
57+
[lazy_high_charts](https://github.com/michelson/lazy_high_charts) gem with more features.
5958

6059
- Generate Tables using [Google Charts DataTable](https://developers.google.com/chart/interactive/docs/gallery/table) and [daru-data_tables](https://github.com/Shekharrajak/daru-data_tables) with features like pagination, sorting by column, option to choose number of rows to be displayed.
6160

6261
- Plotting can be done in IRuby notebook as well as any ruby web application
63-
framework.
62+
framework.
6463

6564
- Data can be in Daru::DataFrame, Daru::Vector, array of array data or
66-
according to the formate described in [Google Charts tool](https://developers.google.com/chart/interactive/docs/gallery), [Highcharts](https://www.highcharts.com/demo).
65+
according to the formate described in [Google Charts tool](https://developers.google.com/chart/interactive/docs/gallery), [Highcharts](https://www.highcharts.com/demo).
6766

6867
- User can use all the features already present in google_visualr,
69-
lazy_high_charts, nayplot by accessing the respective object using
70-
`#chart` and tables using `#table`.
68+
lazy_high_charts, nayplot by accessing the respective object using
69+
`#chart` and tables using `#table`.
7170

7271
- The article written about initial features briefly : https://github.com/shekharrajak/daru-view/wiki/All-about-daru-view

CODE_OF_CONDUCT.md

Lines changed: 109 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -2,73 +2,131 @@
22

33
## Our Pledge
44

5-
In the interest of fostering an open and welcoming environment, we as
6-
contributors and maintainers pledge to making participation in our project and
7-
our community a harassment-free experience for everyone, regardless of age, body
8-
size, disability, ethnicity, gender identity and expression, level of experience,
9-
nationality, personal appearance, race, religion, or sexual identity and
10-
orientation.
5+
We as members, contributors, and leaders pledge to make participation in our
6+
community a harassment-free experience for everyone, regardless of age, body
7+
size, visible or invisible disability, ethnicity, sex characteristics, gender
8+
identity and expression, level of experience, education, socio-economic status,
9+
nationality, personal appearance, race, caste, color, religion, or sexual
10+
identity and orientation.
1111

12-
## Our Standards
13-
14-
Examples of behavior that contributes to creating a positive environment
15-
include:
16-
17-
* Using welcoming and inclusive language
18-
* Being respectful of differing viewpoints and experiences
19-
* Gracefully accepting constructive criticism
20-
* Focusing on what is best for the community
21-
* Showing empathy towards other community members
12+
We pledge to act and interact in ways that contribute to an open, welcoming,
13+
diverse, inclusive, and healthy community.
2214

23-
Examples of unacceptable behavior by participants include:
15+
## Our Standards
2416

25-
* The use of sexualized language or imagery and unwelcome sexual attention or
26-
advances
27-
* Trolling, insulting/derogatory comments, and personal or political attacks
28-
* Public or private harassment
29-
* Publishing others' private information, such as a physical or electronic
30-
address, without explicit permission
31-
* Other conduct which could reasonably be considered inappropriate in a
17+
Examples of behavior that contributes to a positive environment for our
18+
community include:
19+
20+
- Demonstrating empathy and kindness toward other people
21+
- Being respectful of differing opinions, viewpoints, and experiences
22+
- Giving and gracefully accepting constructive feedback
23+
- Accepting responsibility and apologizing to those affected by our mistakes,
24+
and learning from the experience
25+
- Focusing on what is best not just for us as individuals, but for the overall
26+
community
27+
28+
Examples of unacceptable behavior include:
29+
30+
- The use of sexualized language or imagery, and sexual attention or advances of
31+
any kind
32+
- Trolling, insulting or derogatory comments, and personal or political attacks
33+
- Public or private harassment
34+
- Publishing others' private information, such as a physical or email address,
35+
without their explicit permission
36+
- Other conduct which could reasonably be considered inappropriate in a
3237
professional setting
3338

34-
## Our Responsibilities
39+
## Enforcement Responsibilities
3540

36-
Project maintainers are responsible for clarifying the standards of acceptable
37-
behavior and are expected to take appropriate and fair corrective action in
38-
response to any instances of unacceptable behavior.
41+
Community leaders are responsible for clarifying and enforcing our standards of
42+
acceptable behavior and will take appropriate and fair corrective action in
43+
response to any behavior that they deem inappropriate, threatening, offensive,
44+
or harmful.
3945

40-
Project maintainers have the right and responsibility to remove, edit, or
41-
reject comments, commits, code, wiki edits, issues, and other contributions
42-
that are not aligned to this Code of Conduct, or to ban temporarily or
43-
permanently any contributor for other behaviors that they deem inappropriate,
44-
threatening, offensive, or harmful.
46+
Community leaders have the right and responsibility to remove, edit, or reject
47+
comments, commits, code, wiki edits, issues, and other contributions that are
48+
not aligned to this Code of Conduct, and will communicate reasons for moderation
49+
decisions when appropriate.
4550

4651
## Scope
4752

48-
This Code of Conduct applies both within project spaces and in public spaces
49-
when an individual is representing the project or its community. Examples of
50-
representing a project or community include using an official project e-mail
51-
address, posting via an official social media account, or acting as an appointed
52-
representative at an online or offline event. Representation of a project may be
53-
further defined and clarified by project maintainers.
53+
This Code of Conduct applies within all community spaces, and also applies when
54+
an individual is officially representing the community in public spaces.
55+
Examples of representing our community include using an official e-mail address,
56+
posting via an official social media account, or acting as an appointed
57+
representative at an online or offline event.
5458

5559
## Enforcement
5660

5761
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58-
reported by contacting the project team at shekharstudy@ymail.com. All
59-
complaints will be reviewed and investigated and will result in a response that
60-
is deemed necessary and appropriate to the circumstances. The project team is
61-
obligated to maintain confidentiality with regard to the reporter of an incident.
62-
Further details of specific enforcement policies may be posted separately.
62+
reported to the community leaders responsible for enforcement at
63+
[INSERT CONTACT METHOD].
64+
All complaints will be reviewed and investigated promptly and fairly.
65+
66+
All community leaders are obligated to respect the privacy and security of the
67+
reporter of any incident.
68+
69+
## Enforcement Guidelines
70+
71+
Community leaders will follow these Community Impact Guidelines in determining
72+
the consequences for any action they deem in violation of this Code of Conduct:
73+
74+
### 1. Correction
75+
76+
**Community Impact**: Use of inappropriate language or other behavior deemed
77+
unprofessional or unwelcome in the community.
78+
79+
**Consequence**: A private, written warning from community leaders, providing
80+
clarity around the nature of the violation and an explanation of why the
81+
behavior was inappropriate. A public apology may be requested.
6382

64-
Project maintainers who do not follow or enforce the Code of Conduct in good
65-
faith may face temporary or permanent repercussions as determined by other
66-
members of the project's leadership.
83+
### 2. Warning
84+
85+
**Community Impact**: A violation through a single incident or series of
86+
actions.
87+
88+
**Consequence**: A warning with consequences for continued behavior. No
89+
interaction with the people involved, including unsolicited interaction with
90+
those enforcing the Code of Conduct, for a specified period of time. This
91+
includes avoiding interactions in community spaces as well as external channels
92+
like social media. Violating these terms may lead to a temporary or permanent
93+
ban.
94+
95+
### 3. Temporary Ban
96+
97+
**Community Impact**: A serious violation of community standards, including
98+
sustained inappropriate behavior.
99+
100+
**Consequence**: A temporary ban from any sort of interaction or public
101+
communication with the community for a specified period of time. No public or
102+
private interaction with the people involved, including unsolicited interaction
103+
with those enforcing the Code of Conduct, is allowed during this period.
104+
Violating these terms may lead to a permanent ban.
105+
106+
### 4. Permanent Ban
107+
108+
**Community Impact**: Demonstrating a pattern of violation of community
109+
standards, including sustained inappropriate behavior, harassment of an
110+
individual, or aggression toward or disparagement of classes of individuals.
111+
112+
**Consequence**: A permanent ban from any sort of public interaction within the
113+
community.
67114

68115
## Attribution
69116

70-
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
71-
available at [http://contributor-covenant.org/version/1/4][version]
117+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
118+
version 2.1, available at
119+
[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
120+
121+
Community Impact Guidelines were inspired by
122+
[Mozilla's code of conduct enforcement ladder][mozilla coc].
123+
124+
For answers to common questions about this code of conduct, see the FAQ at
125+
[https://www.contributor-covenant.org/faq][faq]. Translations are available at
126+
[https://www.contributor-covenant.org/translations][translations].
72127

73-
[homepage]: http://contributor-covenant.org
74-
[version]: http://contributor-covenant.org/version/1/4/
128+
[homepage]: https://www.contributor-covenant.org
129+
[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
130+
[mozilla coc]: https://github.com/mozilla/diversity
131+
[faq]: https://www.contributor-covenant.org/faq
132+
[translations]: https://www.contributor-covenant.org/translations

0 commit comments

Comments
 (0)