Skip to content

Commit

Permalink
Intridea -> ruby-grape.
Browse files Browse the repository at this point in the history
  • Loading branch information
dblock committed Aug 4, 2015
1 parent 52fadb7 commit 483ec76
Show file tree
Hide file tree
Showing 7 changed files with 268 additions and 268 deletions.
450 changes: 225 additions & 225 deletions CHANGELOG.md

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
Contributing to Grape
=====================

Grape is work of [hundreds of contributors](https://github.com/intridea/grape/graphs/contributors). You're encouraged to submit [pull requests](https://github.com/intridea/grape/pulls), [propose features and discuss issues](https://github.com/intridea/grape/issues). When in doubt, ask a question in the [Grape Google Group](http://groups.google.com/group/ruby-grape).
Grape is work of [hundreds of contributors](https://github.com/ruby-grape/grape/graphs/contributors). You're encouraged to submit [pull requests](https://github.com/ruby-grape/grape/pulls), [propose features and discuss issues](https://github.com/ruby-grape/grape/issues). When in doubt, ask a question in the [Grape Google Group](http://groups.google.com/group/ruby-grape).

#### Fork the Project

Fork the [project on Github](https://github.com/intridea/grape) and check out your copy.
Fork the [project on Github](https://github.com/ruby-grape/grape) and check out your copy.

```
git clone https://github.com/contributor/grape.git
cd grape
git remote add upstream https://github.com/intridea/grape.git
git remote add upstream https://github.com/ruby-grape/grape.git
```

#### Create a Topic Branch
Expand Down Expand Up @@ -102,7 +102,7 @@ git push origin my-feature-branch -f
Update the [CHANGELOG](CHANGELOG.md) with the pull request number. A typical entry looks as follows.

```
* [#123](https://github.com/intridea/grape/pull/123): Reticulated splines - [@contributor](https://github.com/contributor).
* [#123](https://github.com/ruby-grape/grape/pull/123): Reticulated splines - [@contributor](https://github.com/contributor).
```

Amend your previous commit and force push the changes.
Expand Down
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
![grape logo](grape.png)

[![Gem Version](http://img.shields.io/gem/v/grape.svg)](http://badge.fury.io/rb/grape)
[![Build Status](http://img.shields.io/travis/intridea/grape.svg)](https://travis-ci.org/intridea/grape)
[![Dependency Status](https://gemnasium.com/intridea/grape.svg)](https://gemnasium.com/intridea/grape)
[![Code Climate](https://codeclimate.com/github/intridea/grape.svg)](https://codeclimate.com/github/intridea/grape)
[![Inline docs](http://inch-ci.org/github/intridea/grape.svg)](http://inch-ci.org/github/intridea/grape)
[![Build Status](http://img.shields.io/travis/ruby-grape/grape.svg)](https://travis-ci.org/ruby-grape/grape)
[![Dependency Status](https://gemnasium.com/ruby-grape/grape.svg)](https://gemnasium.com/ruby-grape/grape)
[![Code Climate](https://codeclimate.com/github/ruby-grape/grape.svg)](https://codeclimate.com/github/ruby-grape/grape)
[![Inline docs](http://inch-ci.org/github/ruby-grape/grape.svg)](http://inch-ci.org/github/ruby-grape/grape)

## Table of Contents

Expand Down Expand Up @@ -96,12 +96,12 @@ content negotiation, versioning and much more.

You're reading the documentation for the next release of Grape, which should be 0.12.1.
Please read [UPGRADING](UPGRADING.md) when upgrading from a previous version.
The current stable release is [0.12.0](https://github.com/intridea/grape/blob/v0.12.0/README.md).
The current stable release is [0.12.0](https://github.com/ruby-grape/grape/blob/v0.12.0/README.md).

## Project Resources

* Need help? [Grape Google Group](http://groups.google.com/group/ruby-grape)
* [Grape Wiki](https://github.com/intridea/grape/wiki)
* [Grape Wiki](https://github.com/ruby-grape/grape/wiki)

## Installation

Expand Down Expand Up @@ -1421,7 +1421,7 @@ instead of a message.
error!({ error: "unexpected error", detail: "missing widget" }, 500)
```

You can present documented errors with a Grape entity using the the [grape-entity](https://github.com/intridea/grape-entity) gem.
You can present documented errors with a Grape entity using the the [grape-entity](https://github.com/ruby-grape/grape-entity) gem.

```ruby
module API
Expand Down Expand Up @@ -1942,8 +1942,8 @@ hash may include `:with`, which defines the entity to expose.

### Grape Entities

Add the [grape-entity](https://github.com/intridea/grape-entity) gem to your Gemfile.
Please refer to the [grape-entity documentation](https://github.com/intridea/grape-entity/blob/master/README.md)
Add the [grape-entity](https://github.com/ruby-grape/grape-entity) gem to your Gemfile.
Please refer to the [grape-entity documentation](https://github.com/ruby-grape/grape-entity/blob/master/README.md)
for more details.

The following example exposes statuses.
Expand Down Expand Up @@ -2644,7 +2644,7 @@ See [CONTRIBUTING](CONTRIBUTING.md).
You can start hacking on Grape on
[Nitrous.IO](https://www.nitrous.io/?utm_source=github.com&utm_campaign=grape&utm_medium=hackonnitrous) in a matter of seconds:

[![Hack intridea/grape on Nitrous.IO](https://d3o0mnbgv6k92a.cloudfront.net/assets/hack-l-v1-3cc067e71372f6045e1949af9d96095b.png)](https://www.nitrous.io/hack_button?source=embed&runtime=rails&repo=intridea%2Fgrape&file_to_open=README.md)
[![Hack ruby-grape/grape on Nitrous.IO](https://d3o0mnbgv6k92a.cloudfront.net/assets/hack-l-v1-3cc067e71372f6045e1949af9d96095b.png)](https://www.nitrous.io/hack_button?source=embed&runtime=rails&repo=intridea%2Fgrape&file_to_open=README.md)

## License

Expand Down
8 changes: 4 additions & 4 deletions RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ bundle install
rake
```

Check that the last build succeeded in [Travis CI](https://travis-ci.org/intridea/grape) for all supported platforms.
Check that the last build succeeded in [Travis CI](https://travis-ci.org/ruby-grape/grape) for all supported platforms.

Those with r/w permissions to the [master Intridea repository](https://github.com/intridea/grape) generally have large Grape-based projects. Point one to Grape HEAD and run all your API tests to catch any obvious regressions.
Those with r/w permissions to the [master Intridea repository](https://github.com/ruby-grape/grape) generally have large Grape-based projects. Point one to Grape HEAD and run all your API tests to catch any obvious regressions.

```
gem grape, github: 'intridea/grape'
gem grape, github: 'ruby-grape/grape'
```

Increment the version, modify [lib/grape/version.rb](lib/grape/version.rb).
Expand Down Expand Up @@ -69,7 +69,7 @@ Modify the "Stable Release" section in [README.md](README.md). Change the text t
## Stable Release
You're reading the documentation for the next release of Grape, which should be 0.6.1.
The current stable release is [0.6.0](https://github.com/intridea/grape/blob/v0.6.0/README.md).
The current stable release is [0.6.0](https://github.com/ruby-grape/grape/blob/v0.6.0/README.md).
```

Add the next release to [CHANGELOG.md](CHANGELOG.md).
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ begin
Dir.mkdir(dir)
Dir.chdir(dir) do
system('git init')
system('git remote add origin git@github.com:intridea/grape.git')
system('git remote add origin git@github.com:ruby-grape/grape.git')
system('git pull')
system('git checkout gh-pages')
end
Expand Down
46 changes: 23 additions & 23 deletions UPGRADING.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ class CacheBusterMiddleware < Grape::Middleware::Base
end
```

See [#1029](https://github.com/intridea/grape/pull/1029) for more information.
See [#1029](https://github.com/ruby-grape/grape/pull/1029) for more information.

#### Changes in present

Using `present` with objects that responded to `merge` would cause early evaluation of the represented object, with unexpected side-effects, such as missing parameters or environment within rendering code. Grape now only merges represented objects with a previously rendered body, usually when multiple `present` calls are made in the same route.

See [grape-with-roar#5](https://github.com/dblock/grape-with-roar/issues/5) and [#1023](https://github.com/intridea/grape/issues/1023).
See [grape-with-roar#5](https://github.com/dblock/grape-with-roar/issues/5) and [#1023](https://github.com/ruby-grape/grape/issues/1023).

#### Changes to regexp validator

Expand All @@ -47,7 +47,7 @@ params do
end
```

See [#957](https://github.com/intridea/grape/pull/957) for more information.
See [#957](https://github.com/ruby-grape/grape/pull/957) for more information.

#### Replace error_response with error! in rescue_from blocks

Expand Down Expand Up @@ -88,11 +88,11 @@ Rack::Response.new([ e.message ], 500, { "Content-type" => "text/error" }).finis
error!(e)
```

See [#889](https://github.com/intridea/grape/issues/889) for more information.
See [#889](https://github.com/ruby-grape/grape/issues/889) for more information.

#### Changes to routes when using `format`

Version 0.10.0 has introduced a change via [#809](https://github.com/intridea/grape/pull/809) whereas routes no longer got file-type suffixes added if you declared a single API `format`. This has been reverted, it's now again possible to call API with proper suffix when single `format` is defined:
Version 0.10.0 has introduced a change via [#809](https://github.com/ruby-grape/grape/pull/809) whereas routes no longer got file-type suffixes added if you declared a single API `format`. This has been reverted, it's now again possible to call API with proper suffix when single `format` is defined:

```ruby
class API < Grape::API
Expand All @@ -108,7 +108,7 @@ Will respond with JSON to `/hello` **and** `/hello.json`.

Will respond with 404 to `/hello.xml`, `/hello.txt` etc.

See the [#1001](https://github.com/intridea/grape/pull/1001) and [#914](https://github.com/intridea/grape/issues/914) for more info.
See the [#1001](https://github.com/ruby-grape/grape/pull/1001) and [#914](https://github.com/ruby-grape/grape/issues/914) for more info.

### Upgrading to >= 0.11.0

Expand All @@ -120,36 +120,36 @@ Grape now supports, but doesn't require Rack 1.6.0. If you encounter an issue wi
gem 'rack', '~> 1.6.0'
```

See [#559](https://github.com/intridea/grape/issues/559) for more information.
See [#559](https://github.com/ruby-grape/grape/issues/559) for more information.

#### Removed route_info

Key route_info is excluded from params.

See [#879](https://github.com/intridea/grape/pull/879) for more information.
See [#879](https://github.com/ruby-grape/grape/pull/879) for more information.


#### Fix callbacks within a version block

Callbacks defined in a version block are only called for the routes defined in that block. This was a regression introduced in Grape 0.10.0, and is fixed in this version.

See [#901](https://github.com/intridea/grape/pull/901) for more information.
See [#901](https://github.com/ruby-grape/grape/pull/901) for more information.


#### Make type of group of parameters required

Groups of parameters now require their type to be set explicitly as Array or Hash.
Not setting the type now results in MissingGroupTypeError, unsupported type will raise UnsupportedTypeError.

See [#886](https://github.com/intridea/grape/pull/886) for more information.
See [#886](https://github.com/ruby-grape/grape/pull/886) for more information.

### Upgrading to >= 0.10.1

#### Changes to `declared(params, include_missing: false)`

Attributes with `nil` values or with values that evaluate to `false` are no longer considered *missing* and will be returned when `include_missing` is set to `false`.

See [#864](https://github.com/intridea/grape/pull/864) for more information.
See [#864](https://github.com/ruby-grape/grape/pull/864) for more information.

### Upgrading to >= 0.10.0

Expand Down Expand Up @@ -284,13 +284,13 @@ get do
end
```

For more information see [#836](https://github.com/intridea/grape/issues/836).
For more information see [#836](https://github.com/ruby-grape/grape/issues/836).

#### Changes to Custom Validators

To implement a custom validator, you need to inherit from `Grape::Validations::Base` instead of `Grape::Validations::Validator`.

For more information see [Custom Validators](https://github.com/intridea/grape#custom-validators) in the documentation.
For more information see [Custom Validators](https://github.com/ruby-grape/grape#custom-validators) in the documentation.

#### Changes to Raising Grape::Exceptions::Validation

Expand Down Expand Up @@ -337,7 +337,7 @@ class API < Grape::API
end
```

See the [the updated API Formats documentation](https://github.com/intridea/grape#api-formats) and [#809](https://github.com/intridea/grape/pull/809) for more info.
See the [the updated API Formats documentation](https://github.com/ruby-grape/grape#api-formats) and [#809](https://github.com/ruby-grape/grape/pull/809) for more info.

#### Changes to Evaluation of Permitted Parameter Values

Expand All @@ -357,7 +357,7 @@ params do
end
```

See [#801](https://github.com/intridea/grape/issues/801) for more information.
See [#801](https://github.com/ruby-grape/grape/issues/801) for more information.

#### Changes to version

Expand Down Expand Up @@ -389,7 +389,7 @@ end

when making a API call `GET /foo/v2/1`, the API would set instance variable `@output` to `hello1-v2`

See [#898](https://github.com/intridea/grape/issues/898) for more information.
See [#898](https://github.com/ruby-grape/grape/issues/898) for more information.


### Upgrading to >= 0.9.0
Expand Down Expand Up @@ -422,10 +422,10 @@ As replacement can be used
* `Grape::Middleware::Auth::Digest` => [`Rack::Auth::Digest::MD5`](https://github.com/rack/rack/blob/master/lib/rack/auth/digest/md5.rb)
* `Grape::Middleware::Auth::OAuth2` => [warden-oauth2](https://github.com/opperator/warden-oauth2) or [rack-oauth2](https://github.com/nov/rack-oauth2)

If this is not possible you can extract the middleware files from [grape v0.7.0](https://github.com/intridea/grape/tree/v0.7.0/lib/grape/middleware/auth)
If this is not possible you can extract the middleware files from [grape v0.7.0](https://github.com/ruby-grape/grape/tree/v0.7.0/lib/grape/middleware/auth)
and host these files within your application

See [#703](https://github.com/intridea/Grape/pull/703) for more information.
See [#703](https://github.com/ruby-grape/Grape/pull/703) for more information.

### Upgrading to >= 0.7.0

Expand Down Expand Up @@ -462,7 +462,7 @@ rescue_from ParentError, rescue_subclasses: false do |e|
end
```

See [#544](https://github.com/intridea/grape/pull/544) for more information.
See [#544](https://github.com/ruby-grape/grape/pull/544) for more information.


#### Changes in the Default HTTP Status Code
Expand All @@ -485,7 +485,7 @@ You may also use `default_error_status` to change the global default.
default_error_status 400
```

See [#525](https://github.com/intridea/Grape/pull/525) for more information.
See [#525](https://github.com/ruby-grape/Grape/pull/525) for more information.


#### Changes in Parameter Declaration and Validation
Expand All @@ -502,7 +502,7 @@ params do
end
```

This caused the ambiguity and unexpected errors described in [#543](https://github.com/intridea/Grape/issues/543).
This caused the ambiguity and unexpected errors described in [#543](https://github.com/ruby-grape/Grape/issues/543).

In Grape 0.7.0, the `group`, `optional` and `requires` keywords take an additional `type` attribute which defaults to `Array`. This means that without a `type` attribute, these nested parameters will no longer accept a single hash, only an array (of hashes).

Expand Down Expand Up @@ -530,7 +530,7 @@ params do
end
```

See [#545](https://github.com/intridea/Grape/pull/545) for more information.
See [#545](https://github.com/ruby-grape/Grape/pull/545) for more information.


### Upgrading to 0.6.0
Expand All @@ -547,4 +547,4 @@ rescue_from Grape::Exceptions::Validations do |e|
end
```

For more information see [#462](https://github.com/intridea/grape/issues/462).
For more information see [#462](https://github.com/ruby-grape/grape/issues/462).
2 changes: 1 addition & 1 deletion grape.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Gem::Specification.new do |s|
s.platform = Gem::Platform::RUBY
s.authors = ['Michael Bleigh']
s.email = ['michael@intridea.com']
s.homepage = 'https://github.com/intridea/grape'
s.homepage = 'https://github.com/ruby-grape/grape'
s.summary = 'A simple Ruby framework for building REST-like APIs.'
s.description = 'A Ruby framework for rapid API development with great conventions.'
s.license = 'MIT'
Expand Down

0 comments on commit 483ec76

Please sign in to comment.