From 559c0a3d9f0b89201020403b2badf9eca52d9fe5 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <mrdillon@alaska.edu>
Date: Thu, 11 Jun 2015 13:37:26 -0800
Subject: [PATCH] Global injection

---
 app/initializers/global-variables.js          |  19 +++++++++++++++
 app/pods/application/adapter.js               |   9 ++++---
 app/pods/application/template.hbs             |   4 +--
 app/pods/components/genus-name/component.js   |   5 ++--
 app/pods/components/site-name/template.hbs    |   1 +
 app/pods/user/adapter.js                      |   5 ++--
 public/img/logo.png                           | Bin 1465 -> 0 bytes
 .../initializers/global-variables-test.js     |  23 ++++++++++++++++++
 .../components/site-name/component-test.js    |  19 +++++++++++++++
 9 files changed, 76 insertions(+), 9 deletions(-)
 create mode 100644 app/initializers/global-variables.js
 create mode 100644 app/pods/components/site-name/template.hbs
 delete mode 100755 public/img/logo.png
 create mode 100644 tests/unit/initializers/global-variables-test.js
 create mode 100644 tests/unit/pods/components/site-name/component-test.js

diff --git a/app/initializers/global-variables.js b/app/initializers/global-variables.js
new file mode 100644
index 0000000..c16d17e
--- /dev/null
+++ b/app/initializers/global-variables.js
@@ -0,0 +1,19 @@
+import Ember from 'ember';
+import config from '../config/environment';
+
+var globals = Ember.Object.extend({
+  genus: config.genus,
+  apiURL: config.apiURL,
+});
+
+export function initialize(container, application) {
+  application.register('global:variables', globals, {singleton: true});
+  application.inject('controller', 'globals', 'global:variables');
+  application.inject('component', 'globals', 'global:variables');
+  application.inject('adapter', 'globals', 'global:variables');
+}
+
+export default {
+  name: 'global-variables',
+  initialize: initialize
+};
diff --git a/app/pods/application/adapter.js b/app/pods/application/adapter.js
index 2037ee8..e979dec 100644
--- a/app/pods/application/adapter.js
+++ b/app/pods/application/adapter.js
@@ -1,10 +1,13 @@
 import DS from 'ember-data';
 import Ember from 'ember';
-import config from '../../config/environment';
 
 export default DS.RESTAdapter.extend({
-  namespace: 'api/' + config.genus,
-  host: config.apiURL,
+  namespace: function() {
+    return 'api/' + this.get('globals.genus');
+  }.property(),
+  host: function() {
+    return this.get('globals.apiURL');
+  }.property(),
   coalesceFindRequests: true,
   ajaxError: function(jqXHR) {
     // http://stackoverflow.com/a/24027443
diff --git a/app/pods/application/template.hbs b/app/pods/application/template.hbs
index 3d14835..486ad74 100644
--- a/app/pods/application/template.hbs
+++ b/app/pods/application/template.hbs
@@ -1,6 +1,6 @@
   <div class="flakes-navigation">
     {{#link-to 'index' class='logo'}}
-      <img src="img/logo.png" width="120">
+      {{site-name}}
     {{/link-to}}
     {{#if session.isAuthenticated}}
       <ul>
@@ -36,7 +36,7 @@
   <div class="flakes-content">
     <div class="flakes-mobile-top-bar">
       <a href="" class="logo-wrap">
-        <img src="img/logo.png" height="30px">
+        {{site-name}}
       </a>
       <a href="" class="navigation-expand-target">
         <img src="img/navigation-expand-target.png" height="26px">
diff --git a/app/pods/components/genus-name/component.js b/app/pods/components/genus-name/component.js
index 1fb4f1f..bae8cb9 100644
--- a/app/pods/components/genus-name/component.js
+++ b/app/pods/components/genus-name/component.js
@@ -1,7 +1,8 @@
 import Ember from 'ember';
-import config from '../../../config/environment';
 
 export default Ember.Component.extend({
   tagName: 'em',
-  genus: config.genus.capitalize(),
+  genus: function() {
+    return this.get('globals.genus').capitalize();
+  }.property(),
 });
diff --git a/app/pods/components/site-name/template.hbs b/app/pods/components/site-name/template.hbs
new file mode 100644
index 0000000..a166fb9
--- /dev/null
+++ b/app/pods/components/site-name/template.hbs
@@ -0,0 +1 @@
+{{globals.genus}}.info
diff --git a/app/pods/user/adapter.js b/app/pods/user/adapter.js
index e4e2bd1..9e430e9 100644
--- a/app/pods/user/adapter.js
+++ b/app/pods/user/adapter.js
@@ -1,8 +1,9 @@
 import DS from 'ember-data';
-import config from '../../config/environment';
 
 export default DS.RESTAdapter.extend({
   namespace: 'api',
-  host: config.apiURL,
+  host: function() {
+    return this.get('globals.apiURL');
+  }.property(),
   coalesceFindRequests: true,
 });
diff --git a/public/img/logo.png b/public/img/logo.png
deleted file mode 100755
index f0eece7bdfc1bd570b0e5d8e759d4c1cd9a59cf6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1465
zcmV;q1xEUbP)<h;3K|Lk000e1NJLTq004LZ002A)1^@s6t*w5j000GmNkl<Zc-rlo
zKTb0-5XEx@j=&AL0Vm)BT!0I30D5|AYFb)KN;*0!8Y&73BqSvM1ih7h(PLz1olUYK
zVV-1#Z`W&&{l+t6d%npuvD2936ePikBsh@-Cz9Yq5}Zha6G?CqoJfKbNpK<wPHd9k
z@9*#FWHOl^931TYL|k8AcVoS{xEQU^=jZ3?%gaj=JO)Ip#(I8!K1zR2PfuNcdwYAE
zCwPB<KM7vL>K$Y8G_T;>+uKgtApG(1v3q}bc-R#Q>^M0&>7Kv7zD`e1Pp8Mn$DP)y
zEj0K3{=R!gyZXJkx%t(OOqklydlj|w@$oT}Pwy@-FN^ZU2|YSGnzbW2)PE%S?Ch*-
zk9ul9no+f_=iXnGTjO%M^*1u9F7v=U)n`naFPGEDqHk4SE(MvFCb(AK-`{6~N+=*w
zOLbZc6N(utm9MX_uJp+VA+<VJS69CXt`&``PbS)WczCGRku0(j@wpVMBc$@(-Q8VP
z&Xo|1>C&X}OaoEJu_J`giV+}KziLwj?Wd0Sg~n2cz(;jlp<3kgcIZp+NtQ+MiIX*;
zExwiI5JUv4&R3Poz&Eb+`rh3gO5pAf8T3rbE4Vd@1ZzBfL0U7x`WrCGnCTiZOt9CF
zZJ?O~rb+cQ=}r_8r%ytQe7?$A(X+u@`?MQ<qRe;<hTh)Zx)rS=`7!+>*cHrW(s-l@
zxCJbM_op$@j>f7nyY=z$w+3f}f~-gw#OPOpk1Ki}!Tt>4^=zJ5rF?#V_R2>)r9jc^
z(RbV?xq|3#ky>*(B8L9@f+q-ex%yn0D`IOfIB1&`$sr<?Rw=l0pE8tS_v4xj^+C~l
zJ!_HAEdgdPt{5lS%{W1xuSj<{`c5krbE`>rxqSso@%0|_Us}PmEwjuDX1rLVjS%c+
znc`9P5Q5!=x*5mciHKJDXvbHl#||RJeH#(2`%dDAQk|&O)KR1x-46;>TEUol{C$im
z)c?i^Rs@M4(LW3&I0h8H%@IMZ@^MN<U2jL^l%i8Tcaw>dvFfSg|Bhx9xqZ8YOdgH1
zW%Sjrc73~qVvIsCTJ7YxDU^wEFhF0`wBaiu5?tFBVCEK)&q<D36IW2R6@8(P$4#~q
z9ow8IcU-YfSSj{E2|cQAJyKoSWrJ&Ej8<0x`7jPRmVsnbasOC?`cj{@dV25Ulz&wH
zQh%lAaUl(rbL|9cRk{g^K}urFuM49|S;y*4Y>;4%COOJW>>$C3Bsh@-C;kk<oHs9e
zS*@*vqVB$J!?t5+`j56mzBl$Wf>8;ccYr?+T+#Uf!!CkxE}9+USA%{BJvzZ$E-Xs$
zqNgz13a!K;hce91D$|CV2<DQTgA4?5f;A}B^Yk0PsMmL#+v?X3)OQV@R^$KHym_L5
z=0I+%G(TLX@V%dT>$_Gr*GsUU%f=fcd~i(d@p`ILORb65ce{dkAuul;Xx{w9{H$6U
z(O`o8e3^rCnI6|P_c`9FpK$Rl^*oj3zY)v@h~^|JdYm7>T_UMZb(#N`W8q1Qpq_su
z#C#$;^!rZ%?Ta@oW2L74HG=(C$gLg($M0~3akoMY6q5=D6C76@m(X;K8INIoRD}Od
zum_hd1lQ7tI^r7L+@vL{bImIe2f?0aTvCw#POy)A5rSht>UnQV5$rzL9Xi*85FArN
z@fEe)<0QC^V4wd|vP8=^wKt0Ph&ZOGV4_{4Jn=622@l4|aY};g1jk*BZ>2mfc`1Sw
zHOCYd2z2K!4J&P<{C?OKVVAc_r2pVMO9woqoNfq?!73}Z^gkU|c9KO3OCKq!M@g&>
zn)jF{w6>$l#P%QwPJ$Cja3Tp#B*BR!IFSS=lHepbkpw4_;6xIfNP-hdaH5VMYD637
TB6|<100000NkvXXu0mjfe+RxG

diff --git a/tests/unit/initializers/global-variables-test.js b/tests/unit/initializers/global-variables-test.js
new file mode 100644
index 0000000..e2aaa52
--- /dev/null
+++ b/tests/unit/initializers/global-variables-test.js
@@ -0,0 +1,23 @@
+import Ember from 'ember';
+import { initialize } from '../../../initializers/global-variables';
+import { module, test } from 'qunit';
+
+var container, application;
+
+module('Unit | Initializer | global variables', {
+  beforeEach: function() {
+    Ember.run(function() {
+      application = Ember.Application.create();
+      container = application.__container__;
+      application.deferReadiness();
+    });
+  }
+});
+
+// Replace this with your real tests.
+test('it works', function(assert) {
+  initialize(container, application);
+
+  // you would normally confirm the results of the initializer here
+  assert.ok(true);
+});
diff --git a/tests/unit/pods/components/site-name/component-test.js b/tests/unit/pods/components/site-name/component-test.js
new file mode 100644
index 0000000..2c5861f
--- /dev/null
+++ b/tests/unit/pods/components/site-name/component-test.js
@@ -0,0 +1,19 @@
+import { moduleForComponent, test } from 'ember-qunit';
+
+moduleForComponent('site-name', 'Unit | Component | site name', {
+  // Specify the other units that are required for this test
+  // needs: ['component:foo', 'helper:bar'],
+  unit: true
+});
+
+test('it renders', function(assert) {
+  assert.expect(2);
+
+  // Creates the component instance
+  var component = this.subject();
+  assert.equal(component._state, 'preRender');
+
+  // Renders the component to the page
+  this.render();
+  assert.equal(component._state, 'inDOM');
+});