From 297a31addc3b1aa23ce465831f97657aea4be5ca Mon Sep 17 00:00:00 2001
From: manonthemat <empower@manonthemat.com>
Date: Sat, 6 Sep 2014 14:32:15 -0700
Subject: [PATCH 1/2] Gemfile cleanup

---
 .gitignore   | 5 +++++
 Gemfile      | 4 +---
 Gemfile.lock | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1ced3eb..4dbc9df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,8 @@
 /tmp
 .DS_Store
 .env
+
+*.swp
+/vendor
+
+Gemfile.lock
diff --git a/Gemfile b/Gemfile
index a6b7b5e..14f1ab9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.0.4'
+gem 'rails'
 
 # Use postgresql as the database for Active Record
 gem 'pg'
@@ -49,5 +49,3 @@ gem "font-awesome-rails"
 # for heroku deployment
 gem 'rails_12factor', group: :production
 gem 'unicorn'
-
-ruby '2.1.1'
\ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
index 4409b98..2e44499 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -130,7 +130,7 @@ DEPENDENCIES
   jbuilder (~> 1.2)
   jquery-rails
   pg
-  rails (= 4.0.4)
+  rails
   rails_12factor
   sass-rails (~> 4.0.2)
   sdoc

From 3bdd41347b2045621fddbd14b0a0158519177750 Mon Sep 17 00:00:00 2001
From: George Torres <georgetorres86@gmail.com>
Date: Sat, 6 Sep 2014 17:58:28 -0700
Subject: [PATCH 2/2] add node, and packages, plus server to connect to fridge

---
 .gitignore             |  3 +++
 _node_srv/README.md    |  7 +++++++
 _node_srv/package.json |  5 +++++
 _node_srv/server.js    | 42 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 57 insertions(+)
 create mode 100644 _node_srv/README.md
 create mode 100644 _node_srv/package.json
 create mode 100644 _node_srv/server.js

diff --git a/.gitignore b/.gitignore
index 4dbc9df..3598004 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,6 @@
 /vendor
 
 Gemfile.lock
+
+* Ignore node modules
+/_node_srv/node_modules
\ No newline at end of file
diff --git a/_node_srv/README.md b/_node_srv/README.md
new file mode 100644
index 0000000..0bed6b8
--- /dev/null
+++ b/_node_srv/README.md
@@ -0,0 +1,7 @@
+REQUIRE -
+
+install node (http://nodejs.org)
+
+cd to this folder (_node_srv)
+
+run 'npm install'
diff --git a/_node_srv/package.json b/_node_srv/package.json
new file mode 100644
index 0000000..cb8b131
--- /dev/null
+++ b/_node_srv/package.json
@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "green-bean": "^0.1.1"
+  }
+}
diff --git a/_node_srv/server.js b/_node_srv/server.js
new file mode 100644
index 0000000..6c99ef6
--- /dev/null
+++ b/_node_srv/server.js
@@ -0,0 +1,42 @@
+var http = require('http');
+var greenBean = require('green-bean');
+var url = require('url');
+
+var FRIDGE;
+
+greenBean.connect('refrigerator', function(fridge){
+  console.log('connected to fridge');
+  FRIDGE = fridge;
+});
+
+http.createServer(function (request, response) {
+
+  var url_parts = url.parse(request.url, true);
+  var query = url_parts.query;
+  console.log(query);
+
+  var objToJson = {};
+
+  response.writeHead(200, {
+      'Content-Type': 'JSON',
+      'Access-Control-Allow-Origin' : '*'
+  });
+
+  if(query.action === 'getTemp'){
+    if(FRIDGE){
+      objToJson = {
+        freshDisplay: FRIDGE.displayTemperature.freshFoodTemperature,
+        freezerDisplay: FRIDGE.displayTemperature.freezerTemperature,
+        freshWanted: FRIDGE.setpointTemperature.freshFoodTemperature,
+        freezerWanted: FRIDGE.setpointTemperature.freezerTemperature
+      }      
+    } else {
+      objToJson = {
+        error: 'no fridge to connect to'
+      }
+    }
+  }
+
+  response.end(JSON.stringify(objToJson));
+
+}).listen(9876);
\ No newline at end of file