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

request for integrating adman ad-server #2744

Merged
merged 1 commit into from
Apr 7, 2016

Conversation

anmarkom
Copy link
Contributor

This PR provides support for ADMAN, the most widely used Ad Server in Greece. It is also used by publishers, advertisers and agencies in various other countries and serves many dozens of billions impressions per month.

@googlebot
Copy link

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed, please reply here (e.g. I signed it!) and we'll verify. Thanks.


  • If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check your existing CLA data and verify that your email is set on your git commits.
  • If you signed the CLA as a corporation, please let us know the company's name.

@anmarkom
Copy link
Contributor Author

I signed it!

@anmarkom
Copy link
Contributor Author

@dvoytenko I have closed the previous PR #2411 due to wrong merging flow.

* @param {!Object} data
*/
export function adman(global, data) {
const script = document.createElement('script');
Copy link
Contributor

Choose a reason for hiding this comment

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

To confirm, are any of these data parameters required? If so, you may want to check them using validateDataExists.

Also, ideally you'd check the allowed set of data parameters using checkData. This would help your customers to avoid issues with misspellings, etc.

Copy link
Member

Choose a reason for hiding this comment

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

explicitly use global.document please

@anmarkom
Copy link
Contributor Author

@dvoytenko I've followed your suggestions and pushed an update

@dvoytenko dvoytenko self-assigned this Mar 30, 2016
const fields = ['ws', 'host', 's'];

checkData(data, fields);
validateDataExists(data, fields);
Copy link
Contributor

Choose a reason for hiding this comment

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

@anmarkom Just to confirm, all three data parameters are required, right? If so, could you please make a note about this in the adman.md docs.

@dvoytenko
Copy link
Contributor

@anmarkom Looks great. Just one more documentation request.

@anmarkom
Copy link
Contributor Author

@dvoytenko I've updated the documentation

@dvoytenko
Copy link
Contributor

Thanks @anmarkom! All looks good. The only thing is that it's now out of sync with master. Could you please rebase? I'll be able to merge then.

@@ -0,0 +1,38 @@
/**
* Copyright 2015 The AMP HTML Authors. All Rights Reserved.
Copy link
Member

Choose a reason for hiding this comment

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

2016 here and every other new file please

@anmarkom anmarkom force-pushed the adman branch 2 times, most recently from 1896383 to 913f04c Compare April 1, 2016 09:20
@anmarkom
Copy link
Contributor Author

anmarkom commented Apr 1, 2016

@dvoytenko I've changed the copyright dates and rebased. Thank you too!

@dvoytenko
Copy link
Contributor

@anmarkom Not sure what happened with rebase or it might be a new conflict. Also, in JS file you call document.create... - could you please instead do global.document.create...? Otherwise it won't allow it in tests. You can test it via gulp presubmit.

@anmarkom
Copy link
Contributor Author

anmarkom commented Apr 4, 2016

I have signed the CLA on behalf of Phaistos Networks.

@dvoytenko
Copy link
Contributor

@anmarkom tests look good now. But still couple of issues:

  1. Please rebased to the newest master as described in the https://help.github.com/articles/about-git-rebase/
  2. You account doesn't come back as signed CLA. If you use corp signin, did you use the **@phaistosnetowrks.com or such email for commit?

@anmarkom
Copy link
Contributor Author

anmarkom commented Apr 5, 2016

I have resubmitted the CLA, as it seems that last time it was rejected. On git log my email was already set to my corp mail, however I changed my primary email on GitHub in case it was needed.

@dvoytenko
Copy link
Contributor

@anmarkom Sounds good. This is just now needs to be rebased to the newest master. It looks like another conflict squeaked in.

add adman to builtins/amp-ad.md and check for required attributes

update adman.md documentation

adman.js use global
@googlebot
Copy link

CLAs look good, thanks!

@dvoytenko dvoytenko merged commit 8e744a4 into ampproject:master Apr 7, 2016
@dvoytenko
Copy link
Contributor

Merged! Thanks a lot.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants