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.

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

Pre-rendered header -> accept application/vnd.oc.prerendered+json #37

Merged
merged 2 commits into from
Feb 24, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 README.md
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ Just place the html result anywhere and it will just work.

In case you would like to do the rendering yourself, try:
```sh
curl http://my-components-registry.mydomain.com/hello-world/~1.0.5 -H render-mode:pre-rendered
curl http://my-components-registry.mydomain.com/hello-world/~1.0.5 -H Accept:application/vnd.oc.prerendered+json

{
"href": "https://my-components-registry.mydomain.com/hello-world/~1.0.5",
Expand Down
2 changes: 1 addition & 1 deletion client/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ var Client = function(conf){

var self = this;

request(href, { 'render-mode': 'pre-rendered' }, function(err, apiResponse){
request(href, { 'Accept': 'application/vnd.oc.prerendered+json' }, function(err, apiResponse){

if(err){
var errorDescription = settings.messages.serverSideRenderingFail;
Expand Down
2 changes: 1 addition & 1 deletion client/oc-client.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "oc-client",
"version": "0.0.3",
"version": "0.0.4",
"description": "Node.js oc client",
"main": "index.js",
"repository": {
Expand Down
4 changes: 2 additions & 2 deletions components/oc-client/_package/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "oc-client",
"description": "",
"version": "0.9.2",
"version": "0.10.0",
"dependencies": {},
"repository": "",
"oc": {
Expand All @@ -21,6 +21,6 @@
"src": "server.js"
}
},
"version": "0.9.2"
"version": "0.10.0"
}
}
2 changes: 1 addition & 1 deletion components/oc-client/_package/src/oc-client.js
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ var oc = oc || {};
if(href !== ''){
$.ajax({
url: href,
headers: { 'render-mode': 'pre-rendered' },
headers: { 'Accept': 'application/vnd.oc.prerendered+json' },
contentType: 'application/json',
crossDomain: true,
async: true,
Expand Down
2 changes: 1 addition & 1 deletion components/oc-client/_package/src/oc-client.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion components/oc-client/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "oc-client",
"description": "",
"version": "0.9.2",
"version": "0.10.0",
"dependencies": {},
"repository": "",
"oc": {
Expand Down
2 changes: 1 addition & 1 deletion components/oc-client/src/oc-client.js
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ var oc = oc || {};
if(href !== ''){
$.ajax({
url: href,
headers: { 'render-mode': 'pre-rendered' },
headers: { 'Accept': 'application/vnd.oc.prerendered+json' },
contentType: 'application/json',
crossDomain: true,
async: true,
Expand Down
2 changes: 1 addition & 1 deletion components/oc-client/src/oc-client.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "oc",
"version": "0.9.2",
"version": "0.10.0",
"description": "An experimental framework to develop and distribute html components",
"main": "index.js",
"bin": {
Expand Down
2 changes: 1 addition & 1 deletion registry/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ module.exports = function(options){
res.removeHeader('X-Powered-By');
res.header('Access-Control-Allow-Credentials', 'true');
res.header('Access-Control-Allow-Origin', '*');
res.header('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept, render-mode');
res.header('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept');
res.header('Access-Control-Allow-Methods', 'GET, OPTIONS, PUT');

if(_.isFunction(options.baseUrl)){
Expand Down
4 changes: 2 additions & 2 deletions registry/routes/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ exports.component = function(req, res){
version: component.version,
requestVersion: requestedComponent.version
};

if(req.headers['render-mode'] === 'pre-rendered'){
if(req.headers.accept === 'application/vnd.oc.prerendered+json'){
res.json(200, _.extend(response, {
data: data,
template: {
Expand Down
6 changes: 3 additions & 3 deletions test/acceptance/registry.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ describe('registry', function(){

describe('GET /hello-world', function(){

describe('when render-mode header not specified', function(){
describe('when Accept header not specified', function(){

var url = 'http://localhost:3030/hello-world',
result;
Expand All @@ -88,13 +88,13 @@ describe('registry', function(){
});
});

describe('when render-mode header set to pre-rendered', function(){
describe('when Accept header set to application/vnd.oc.prerendered+json', function(){

var url = 'http://localhost:3030/hello-world',
result;

before(function(done){
request(url, { headers: {'render-mode': 'pre-rendered'}}, function(err, res){
request(url, { headers: {'Accept': 'application/vnd.oc.prerendered+json'}}, function(err, res){
result = JSON.parse(res);
done();
});
Expand Down