make location generic

dylang · Oct 28, 2011 · 1e21553 · 1e21553
1 parent d4b80c6
commit 1e21553
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 86 deletions.
diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml
diff --git a/nodemon-ignore → .nodemonignore b/nodemon-ignore → .nodemonignore
@@ -5,5 +5,4 @@
 /data/*
 /views/*
 *.css
-*.js
-*.svn
+*.svn
diff --git a/lib/jobHandler.js b/lib/jobHandler.js
@@ -5,16 +5,12 @@
  */
 
 var log = require('logging').from(__filename),
-    Jobvite = require('jobvite'),
     jobDAO = require('./jobs/dao'),
-    Constants = require('./jobs/constants'),
     Util = require('./jobs/util'),
     team_pages = require('./jobs/team_pages'),
     ReferralHandler = require('./referralHandler'),
     Server;
 
-//<%= locals.job ? '- ' + locals.job.title + ' (' + Constants.short(locals.job.location) + ')' : '' %><%= locals.location ? Constants.long(locals.location) : '' %><%= locals.team && locals.all_teams[locals.team]  ? '- ' +  locals.all_teams[locals.team] : '' %>
-
 //app.get('/search/:query'
 function render_search(req, res, next) {
     var query = Util.unurl(req.params.query);
@@ -52,25 +48,6 @@ function search_json(req, res) {
 }
 
 
-function render_sf(req, res, next) {
-    var collection = jobDAO.location(Constants.LOCATIONS.sf.id);
-    res.render('locations/sf.ejs', {
-        collection: collection,
-        title: Constants.LOCATIONS.sf.name,
-        currentPageID: 'jobs'
-    });
-}
-
-function render_dc(req, res, next) {
-    var collection = jobDAO.location(Constants.LOCATIONS.va.id);
-    res.render('locations/dc.ejs',{
-        collection: collection,
-        title: Constants.LOCATIONS.va.name,
-        currentPageID: 'jobs'
-    });
-
-}
-
 function render_team(req, res, next) {
     var team_id = req.params.team_id,
         location_id = req.params.location_id;
@@ -218,8 +195,6 @@ function addHandlers(options) {
     Server.get('/search/:query', render_search);
 
     Server.get('/teams', render_teams);
-    Server.get('/san-francisco', render_sf);
-    Server.get('/dc-northern-virginia', render_dc);
 
     Server.get('/:team_id', render_team);
 
@@ -231,11 +206,7 @@ function addHandlers(options) {
 
     Server.get('/:location/:team', render_team);
 
-    Server.get('/all-reqs', all_reqs)
-
-    Server.locals({
-        Constants: Constants
-    });
+    Server.get('/all-reqs', all_reqs);
 
     jobDAO.init({ auto_update: Server.set('env') == 'production'}, function() {
         log('jobs ready');

diff --git a/lib/jobs/constants.js b/lib/jobs/constants.js
@@ -6,27 +6,9 @@
 
 var log = require('logging').from(__filename);
 
-module.exports.LOCATIONS = {
-    va:                 { id: 'va',     short_name: 'DC/VA',   name: 'DC/Northern Virginia',   url: 'dc-northern-virginia'},
-    sf:                 { id: 'sf',     short_name: 'SF',      name: 'San Francisco',          url: 'san-francisco'}
-};
 
 module.exports.MILLISECONDS_PER_MINUTE = 1000*60;
 module.exports.MILLISECONDS_PER_HOUR = 1000*60*60;
 module.exports.MILLISECONDS_PER_DAY = 1000*60*60*24;
 module.exports.UPDATE_INTERVAL_MINUTES = 20;
 
-var _id = {
-    'arlington, va, united states': 'va',
-    'dc-northern-virginia': 'va',
-
-    'san-francisco': 'sf',
-    'san francisco, ca, united states': 'sf'
-};
-
-function id(id_) {
-    return _id[id_.toLowerCase()];
-}
-
-
-module.exports.id = id;
diff --git a/lib/jobs/dao.js b/lib/jobs/dao.js
@@ -90,13 +90,10 @@ function location(location_id) {
 
 function team_jobs(team_id) {
     //render just one team
-    var jobs_sf = query({team_id: team_id, location_id: Constants.LOCATIONS.sf.id }).toArray();
-    var jobs_dc = query({team_id: team_id, location_id: Constants.LOCATIONS.va.id }).toArray();
 
     return {
         name:       team(team_id).name,
-        jobs_sf:    jobs_sf,
-        jobs_dc:    jobs_dc
+        jobs:       query({team_id: team_id }).toArray()
     };
 }
 

diff --git a/lib/jobs/update.js b/lib/jobs/update.js
@@ -7,7 +7,6 @@
 var log = require('logging').from(__filename),
     Jobs = require('jobvite').Jobs,
     Lean = require('lean'),
-    Constants = require('./constants'),
     Sort = require('./sort'),
     Util = require('./util');
 
@@ -49,16 +48,13 @@ function format_description(desc) {
 }
 
 function create_urls(job) {
-    if (!Constants.LOCATIONS[job.location_id]) {
-        log ('UNKNOWN LOCATION', job);
-    }
-
+
     var team        = job.team,
         team_url    = Util.url(team),
 
         title_url   = Util.url(job.title),
 
-        full_url    = ['', Constants.LOCATIONS[job.location_id].url, team_url, title_url ].join('/'),
+        full_url    = ['', Util.url(job.location), team_url, title_url ].join('/'),
         apply_url   = '/apply' + full_url;
 
     return {
@@ -88,25 +84,14 @@ function process(err, jobs_array, callback) {
     jobs_array.forEach(function(job) {
 
         // location
-        job.location_id = Constants.id(job.location);
+        job.location_id = Util.url(job.location);
         job.team_id = Util.url(job.team);
 
         job.description = format_description(job.description);
         if (!DB_Teams.get(job.team_id)) {
             DB_Teams.set(job.team_id, { id: job.team_id, name: job.team});
         }
 
-        if (!Constants.LOCATIONS[job.location_id]) {
-
-            //super lazy clone
-            var clone = JSON.parse(JSON.stringify(job));
-
-            job.location_id = 'va';
-            clone.date = job.date;
-            clone.location_id = 'sf';
-            clone.id = job.id + '-sf';
-            jobs_array.push(clone);
-        }
     });
 
     jobs_array.forEach(function(job) {

diff --git a/lib/jobs/util.js b/lib/jobs/util.js
@@ -1,6 +1,11 @@
 function url(s) {
     s = s || '';
-    s = s.replace(/[^a-zA-Z0-9\s]/g, '').trim().replace(/\s+/g, '-').toLowerCase();
+    s = s
+        .toLowerCase()
+        .replace(/[^a-z0-9\s]/g, '')
+        .replace(/united states/, '')
+        .trim()
+        .replace(/\s+/g, '-');
     return s;
 }
 
@@ -31,6 +36,7 @@ function search_string(job) {
 }
 
 
+
 module.exports.url = url;
 module.exports.unurl = unurl;
 module.exports.toArray = toArray;

diff --git a/server.js b/server.js
@@ -112,7 +112,7 @@ Server.error(function(err, req, res, next){
             err.arguments && log(err.arguments);
             err.stack && log(err.stack);
             log('*************************************');
-            next();
+            //next();
         }
         if (Server.get('env') == 'production') {
             res.redirect('/');

diff --git a/views/job-pages/atom.ejs b/views/job-pages/atom.ejs
@@ -14,7 +14,7 @@
   <id>tag:opower.com,2010:jobs</id>
   <% jobs.forEach(function(job) { %>
   <entry>
-    <title><%= job.title %><%- job.location_id == Constants.LOCATIONS.sf.id ? ' (SF)' : '' %></title>
+    <title><%= job.title + ' ' + job.location %></title>
     <link href="<%= url %><%= job.urls.full_url %>"/>
     <id>tag:opowerjobs.com,2010:job_<%= job.id %></id>
     <updated><%= job.date.toISOString() %></updated>

diff --git a/views/job-pages/job.ejs b/views/job-pages/job.ejs
@@ -14,7 +14,7 @@
         <div class="span-17 first last flag clearfix">
             <div class="span-11 first">
                 <h5>Find other jobs in:</h5>
-                <a href="<%- href(Constants.LOCATIONS[job.location_id].url) %>" class="button blue-button button-small button-left"><%- Constants.LOCATIONS[job.location_id].short_name %></a><a href="<%- href(job.urls.team) %>" class="button blue-button button-small button-right"><%= job.team_id %></a>
+                <a href="<%- href(job.urls.team) %>" class="button blue-button button-small"><%= job.team_id %></a>
             </div>
             <div class="span-6 last">
                 <h5>Share this job:</h5>
@@ -25,7 +25,7 @@
             <div class="company">
                 <strong>About the Company</strong>
                 <p>Opower is an energy efficiency and smart-grid software company. Our products encourage energy efficiency by empowering people to make better decisions about the ways they use energy every day. With industry-leading data analytics and a unique approach to customer engagement, we're changing the way the world understands personal energy consumption, and helping more than 40 utilities---including 8 of the US’s 10 largest—achieve unprecedented, sustainable energy savings in tens of millions of households.</p>
-                <p>In April 2010, President Obama gave his national policy speech on green-job creation from our office in the Washington, DC area. In September of 2010, we were named a Technology Pioneer by the World Economic Forum in Davos, Switzerland, for creating "innovations that will have a critical impact on the future of business and society.” In January, the Washington Post called us one of "5 Companies that will Lead in 2011," and in March, the Wall Street Journal named us a Top 10 Cleantech company. By the end of this year, the energy we save will equal a third of the power produced by the entire US solar industry, and have the impact of effectively removing 50,000 homes from the grid.</p>
+                <p>In March 2010, President Obama gave his national policy speech on green-job creation from our office in the Washington, DC area. In September of 2010, we were named a Technology Pioneer by the World Economic Forum in Davos, Switzerland, for creating "innovations that will have a critical impact on the future of business and society.” In January, the Washington Post called us one of "5 Companies that will Lead in 2011," and in March, the Wall Street Journal named us a Top 10 Cleantech company. By the end of this year, the energy we save will equal a third of the power produced by the entire US solar industry, and have the impact of effectively removing 50,000 homes from the grid.</p>
                 <p>Founded in 2007, Opower has offices in Arlington, Virginia, and San Francisco, California. Our rapidly expanding team includes software engineers, product specialists, behavioral scientists, statisticians, marketing experts, infographic designers, and efficiency advocates.</p>
             </div>
         </div>

diff --git a/views/jobs/job.ejs b/views/jobs/job.ejs
@@ -3,12 +3,11 @@
 */ %>
 <li>
     <a href="<%= job.urls ? href(job.urls.full_url) : '' %>">
-        <%= job.title + (job.urls ? '' : "!!!!!!!!!") %>
-
+        <%= job.title %>
         <% if (locals.show_location) { %>
-            <% if (job.location_id == Constants.LOCATIONS.sf.id) { %>
-                (SF)
-            <% } else {} %>
+            <span class="location">
+                <%= job.location %>
+            </span>
         <% } %>
     </a>
 </li>
diff --git a/views/jobs/req.ejs b/views/jobs/req.ejs
@@ -2,9 +2,10 @@
     <div class="banner">
         <h2 class="title strong span-17 last">
             <%= job.title %>
-
-            <%- '(' + Constants.LOCATIONS[job.location_id].short_name + ')' %>
         </h2>
+        <h3>
+            <%- job.location %>
+        </h3>
         <div class="location">
             <a href="<%- href(job.urls.team) %>">&laquo; Back to <%- job.team %> jobs</a>
         </div>

diff --git a/views/teams/team.ejs b/views/teams/team.ejs
@@ -11,7 +11,11 @@
 
     <div class="clear" style="padding-top:40px;"></div>
     <% if (collection) { %>
-        <%- partial('../jobs/jobs-grouped-by-location.ejs', {  collection: [collection] }) %>
+
+            <ul>
+                <%- partial('../jobs/job', { collection: collection.jobs, as: 'job', show_location: true } ) %>
+            </ul>
+
     <% } else { %>
         New opportunities for this team will be posted here.  Check back soon.
     <% } %>