tatango · danmcclain · Sep 23, 2015
diff --git a/README.md b/README.md
@@ -66,23 +66,6 @@ As an 'a' tag:
 {{/facebook-share}}
 ```
 
-#### Facepile
-
-Current URL:
-
-`{{facebook-facepile}}`
-
-Specified URL:
-
-`{{facebook-facepile url='http://plyfe.github.io/ember-social'}}`
-
-##### Themes
-
-`light`
-`dark`
-
-`{{facebook-facepile fb-colorscheme='dark'}}`
-
 ### Twitter
 
 #### Share
@@ -236,7 +219,6 @@ For more information on using ember-cli, visit [http://www.ember-cli.com/](http:
 ### TODO
 
 * Implement click/share tracking for `{{facebook-like}}`
-* Implement click/share tracking for `{{facebook-facepile}}`
 
 ### Contributors
 

diff --git a/addon/components/facebook-facepile.js b/addon/components/facebook-facepile.js
diff --git a/addon/components/facebook-like.js b/addon/components/facebook-like.js
@@ -1,15 +1,15 @@
 import Ember from 'ember';
 
 export default Ember.Component.extend({
-  socialApiClient: null, // injected
+  socialApiClient: Ember.inject.service('facebook-api-client'),
 
   url: null, // Defaults to current url
   'fb-layout': 'standard', // Valid options: 'standard', 'button_count', 'button', or 'box_count'
   'fb-action': 'like', // Valid options: 'like' or 'recommend'
 
   createFacebookLikeButton: Ember.on('didInsertElement', function() {
     var self = this;
-    this.socialApiClient.load().then(function(FB) {
+    this.get('socialApiClient').load().then(function(FB) {
       if (self._state !== 'inDOM') { return; }
       var attrs = [];
       var url = self.get('url');
@@ -28,5 +28,4 @@ export default Ember.Component.extend({
       FB.XFBML.parse(self.get('element'));
     });
   })
-
 });
diff --git a/addon/components/facebook-share.js b/addon/components/facebook-share.js
@@ -9,7 +9,7 @@ import Ember from 'ember';
  * tracking is not supported due to restrictions of the Facebook SDK.
  */
 export default Ember.Component.extend({
-  socialApiClient: null, // injected
+  socialApiClient: Ember.inject.service('facebook-api-client'),
 
   tagName: 'div', // set tagName to 'a' in handlebars to use your own css/content
                   // instead of the standard Facebook share button UI
@@ -21,7 +21,7 @@ export default Ember.Component.extend({
 
   createFacebookShareButton: Ember.on('didInsertElement', function() {
     var self = this;
-    this.socialApiClient.load().then(function(FB) {
+    this.get('socialApiClient').load().then(function(FB) {
       self.FB = FB;
       if (self._state !== 'inDOM') { return; }
       if (self.get('useFacebookUi')) {
@@ -43,7 +43,7 @@ export default Ember.Component.extend({
   }),
 
   showShareDialog: Ember.on('click', function(e){
-    this.socialApiClient.clicked({
+    this.get('socialApiClient').clicked({
       url: this.get('url'),
       componentName: 'facebook-share'
     });
@@ -57,7 +57,7 @@ export default Ember.Component.extend({
         },
         function(response) {
           if (response && !response.error_code) {
-            self.socialApiClient.shared('facebook', response);
+            self.get('socialApiClient').shared('facebook', response);
           } else {
             Ember.Logger.error('Error while posting.');
           }
@@ -67,7 +67,7 @@ export default Ember.Component.extend({
     if (this.FB) {
       showDialog(this.FB);
     } else {
-      this.socialApiClient.load().then(function(FB) {
+      this.get('socialApiClient').load().then(function(FB) {
         showDialog(FB);
       });
     }

diff --git a/addon/components/linkedin-share.js b/addon/components/linkedin-share.js
@@ -1,7 +1,7 @@
 import Ember from 'ember';
 
 export default Ember.Component.extend({
-  socialApiClient: null, // injected
+  socialApiClient: Ember.inject.service('linkedin-api-client'),
   tagName: 'div', // set tagName to 'a' in handlebars to use your own css/content
                   // instead of the standard Linkedin share button UI
   isCustomLink: Ember.computed.equal('tagName','a'),
@@ -11,7 +11,7 @@ export default Ember.Component.extend({
   url: null, // Defaults to current url
   createLinkedinShareButton: Ember.on('didInsertElement', function() {
     var self = this;
-    this.socialApiClient.load().then(function(IN) {
+    this.get('socialApiClient').load().then(function(IN) {
       self.IN = IN;
       self.shareHandlerName = IN.shareHandlerName;
       if (self._state !== 'inDOM') { return; }
@@ -36,7 +36,7 @@ export default Ember.Component.extend({
 
   showShareDialog: Ember.on('click', function(e){
     var self = this;
-    this.socialApiClient.clicked(this.get('url') || window.location.href);
+    this.get('socialApiClient').clicked(this.get('url') || window.location.href);
     if (this.get('useLinkedinUi')) { return; }
     function showDialog(IN) {
       IN.UI.Share().params({
@@ -46,7 +46,7 @@ export default Ember.Component.extend({
     if (this.IN) {
       showDialog(this.IN);
     } else {
-      this.socialApiClient.load().then(function(IN) {
+      this.get('socialApiClient').load().then(function(IN) {
         showDialog(IN);
       });
     }

diff --git a/addon/components/social-widget.js b/addon/components/social-widget.js
@@ -4,7 +4,7 @@ import layout from '../templates/components/social-widget';
 export default Ember.Component.extend({
   classNames: ['social-widget'],
   layout: layout,
-  
+
   url: null,
 
   like: true,

diff --git a/addon/components/twitter-card.js b/addon/components/twitter-card.js
@@ -1,7 +1,7 @@
 import Ember from 'ember';
 
 export default Ember.Component.extend({
-  socialApiClient: null, // injected
+  socialApiClient: Ember.inject.service('twitter-api-client'),
 
   "tweet-id": null, // required - id of the tweet that you want to embed
   cards: "hidden", // When set to hidden, links in a Tweet are not expanded to photo, video, or link previews.
@@ -15,7 +15,7 @@ export default Ember.Component.extend({
 
   loadTwitterClient: Ember.on('didInsertElement', function() {
     var self = this;
-    this.socialApiClient.load().then(function(twttr) {
+    this.get('socialApiClient').load().then(function(twttr) {
       if (self._state !== 'inDOM') { return; }
       self.twttr = twttr;
       self.trigger('twitterLoaded');

diff --git a/addon/components/twitter-share.js b/addon/components/twitter-share.js
@@ -1,7 +1,7 @@
 import Ember from 'ember';
 
 export default Ember.Component.extend({
-  socialApiClient: null, // injected
+  socialApiClient: Ember.inject.service('twitter-api-client'),
 
   tagName: 'div', // set tagName to 'a' in handlebars to use your own css/content
                   // instead of the standard Twitter share button UI
@@ -40,7 +40,7 @@ export default Ember.Component.extend({
 
   loadTwitterClient: Ember.on('didInsertElement', function() {
     var self = this;
-    this.socialApiClient.load().then(function(twttr) {
+    this.get('socialApiClient').load().then(function(twttr) {
       if (self._state !== 'inDOM') { return; }
       self.twttr = twttr;
       self.trigger('twitterLoaded');

diff --git a/addon/initializers/ember-social-services.js b/addon/initializers/ember-social-services.js
diff --git a/addon/services/facebook-api-client.js b/addon/services/facebook-api-client.js
@@ -4,7 +4,7 @@ import Ember from 'ember';
 
 var facebookScriptPromise;
 
-export default Ember.Object.extend({
+export default Ember.Service.extend({
   /*
    * A tracking object implementing `shared(serviceName, payload)` and/or
    * `clicked(serviceName, payload)` can be set on this object, and will

diff --git a/addon/services/linkedin-api-client.js b/addon/services/linkedin-api-client.js
@@ -4,7 +4,7 @@ import Ember from 'ember';
 
 var linkedinScriptPromise;
 
-export default Ember.Object.extend({
+export default Ember.Service.extend({
   /*
    * A tracking object implementing `shared(serviceName, payload)` and/or
    * `clicked(serviceName, payload)` can be set on this object, and will

diff --git a/addon/services/twitter-api-client.js b/addon/services/twitter-api-client.js
@@ -4,7 +4,7 @@ import Ember from 'ember';
 
 var twitterScriptPromise;
 
-export default Ember.Object.extend({
+export default Ember.Service.extend({
   /*
    * A tracking object implementing `shared(serviceName, payload)` and/or
    * `clicked(serviceName, payload)` can be set on this object, and will

diff --git a/addon/templates/components/social-widget.hbs b/addon/templates/components/social-widget.hbs
@@ -1,21 +1,25 @@
-{{#if facebookLike}}
-  {{facebook-like url=url fb-layout='button'}}
-{{/if}}
+{{#if hasBlock}}
+  {{yield}}
+{{else}}
+  {{#if facebookLike}}
+    {{facebook-like url=url fb-layout='button'}}
+  {{/if}}
 
-{{#if facebookShare}}
-  {{facebook-share url=url}}
-{{/if}}
+  {{#if facebookShare}}
+    {{facebook-share url=url}}
+  {{/if}}
 
-{{#if twitterShare}}
-  {{twitter-share url=url}}
-{{/if}}
+  {{#if twitterShare}}
+    {{twitter-share url=url}}
+  {{/if}}
 
-{{#if linkedinShare}}
-  {{linkedin-share url=url}}
-{{/if}}
+  {{#if linkedinShare}}
+    {{linkedin-share url=url}}
+  {{/if}}
 
-{{#if emailShare}}
-  {{#email-share subject=emailSubject url=url body=emailBody}}
-      {{emailLinkText}}
-  {{/email-share}}
-{{/if}}
+  {{#if emailShare}}
+    {{#email-share subject=emailSubject url=url body=emailBody}}
+        {{emailLinkText}}
+    {{/email-share}}
+  {{/if}}
+{{/if}}
diff --git a/app/components/facebook-facepile.js b/app/components/facebook-facepile.js
diff --git a/app/initializers/ember-social-services.js b/app/initializers/ember-social-services.js
diff --git a/tests/acceptance/facebook-test.js b/tests/acceptance/facebook-test.js
@@ -1,5 +1,6 @@
 import Ember from 'ember';
 import startApp from '../helpers/start-app';
+import { module, test } from 'qunit';
 
 var App;
 
@@ -12,11 +13,11 @@ module('Acceptance: Facebook', {
   }
 });
 
-test('share', function() {
+test('share', function(assert) {
   visit('/facebook/share');
 
   andThen(function() {
-    equal(currentPath(), 'facebook.share');
+    assert.equal(currentPath(), 'facebook.share');
 
     var exampleElementIds = [
       'no-parameters',
@@ -31,19 +32,19 @@ test('share', function() {
 
     Ember.run.later(function() {
       exampleElementIds.forEach(function(exampleId) {
-        equal(find('#' + exampleId + ' iframe').length, 1, 'Renders ' + exampleId);
+        assert.equal(find('#' + exampleId + ' iframe').length, 1, 'Renders ' + exampleId);
       });
 
-      equal(find('#tag-name-a a').length, 1, 'Renders anchor tag');
+      assert.equal(find('#tag-name-a a').length, 1, 'Renders anchor tag');
     }, 2500);
   });
 });
 
-test('like', function() {
+test('like', function(assert) {
   visit('/facebook/like');
 
   andThen(function() {
-    equal(currentPath(), 'facebook.like');
+    assert.equal(currentPath(), 'facebook.like');
 
     var exampleElementIds = [
       'no-parameters',
@@ -57,27 +58,7 @@ test('like', function() {
 
     Ember.run.later(function() {
       exampleElementIds.forEach(function(exampleId) {
-        equal(find('#' + exampleId + ' iframe').length, 1, 'Renders ' + exampleId);
-      });
-    }, 2500);
-  });
-});
-
-test('facepile', function() {
-  visit('/facebook/facepile');
-
-  andThen(function() {
-    equal(currentPath(), 'facebook.facepile');
-
-    var exampleElementIds = [
-      'no-parameters',
-      'custom-url',
-      'custom-colorscheme'
-    ];
-
-    Ember.run.later(function() {
-      exampleElementIds.forEach(function(exampleId) {
-        equal(find('#' + exampleId + ' iframe').length, 1, 'Renders ' + exampleId);
+        assert.equal(find('#' + exampleId + ' iframe').length, 1, 'Renders ' + exampleId);
       });
     }, 2500);
   });