brewer-server 0.0.2 → 0.0.03

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4bf3147a086fdf3d4860d1b7fcb1065e01d412b
-  data.tar.gz: 18308cd46cb5373c6535efd36b5ffbb12ba398aa
+  metadata.gz: 8d7d1bb3292478ee9b1f0dcc5b1b9d394795b626
+  data.tar.gz: 5e94bd3f0072cd0fe7def07cb493916c4ce1e583
 SHA512:
-  metadata.gz: 76c4cb9aac7e26c44efcb855fb1e3394a7a107a22d9ce4715956d613b131c61984831a76966967eb033d465fd438a2ec05c9c330dbbb8a5f7a26b43f21640ee6
-  data.tar.gz: 6ab838e2a4ca214aefd8a87d56884ac1c4b944be95e01023a1011cf2af92f585fe683a4ad984e3f0a3b87974141e395137f17e3378fdb536f074e67bd0b8c982
+  metadata.gz: 6b720643b287530ef63d6f78ea9538a0421739905cbb86cde87680386bf90681fd12664e39ba64725f30b82d64d1be7f1b2af56bf10ec72ddd3a4ee3ad71a37d
+  data.tar.gz: c354d6dff6262918e97ca8a50824f96af45fe6c8dc8cbca881133a8cb2e025ffc1f055ccb659d99a94fd08bea0609365495455fb621b41f86dbc1ed92d5808f7

data/lib/brewer/server.rb

@@ -1,45 +1,14 @@
 require 'sinatra/base'
-require "sinatra/sse"
-require 'rack/flash'
 require 'brewer'
-require 'wannabe_bool'
 
 module Brewer
   class Server < Sinatra::Base
-    # SSE Mixin
-    include Sinatra::SSE
-
     configure do
-
-      use Rack::Flash
-
       set :sessions, true
       set :bind, "0.0.0.0"
       set :port, 8080
-      set :views, Proc.new { File.join(File.expand_path("../..", __dir__), "views") }
-      enable :sessions
-
-      $controller = Brewer::Controller.new
-    end
-
-    get '/' do
-      erb :index
-    end
-
-    get '/pid' do
-      sse_stream do |out|
-        EM.add_periodic_timer(2) do
-          out.push :event => "pid_status", :data => $controller.pid_to_web.to_json
-        end
-      end
-    end
 
-    get '/relays' do
-      sse_stream do |out|
-        EM.add_periodic_timer(2) do
-          out.push :event => "relays_status", :data => $controller.relays_status_to_web.to_json
-        end
-      end
+      $brewer = Brewer.new
     end
 
     get '/rspec-testing' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brewer-server
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.03
 platform: ruby
 authors:
 - Luke Sweeney
@@ -25,20 +25,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: brewer-stats
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: wannabe_bool
   requirement: !ruby/object:Gem::Requirement
@@ -67,20 +53,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: thin
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -95,20 +67,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sinatra-sse
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-flash3
   requirement: !ruby/object:Gem::Requirement
@@ -256,7 +214,6 @@ files:
 - lib/brewer/server.rb
 - spec/server_spec.rb
 - spec/spec_helper.rb
-- views/index.erb
 homepage: https://rubygems.org/gems/brewer-server
 licenses:
 - MIT
@@ -278,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A web interface for llamicron/brewer

data/views/index.erb

@@ -1,152 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>Test Homepage</title>
-  <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
-  <link rel="stylesheet" href="https://code.getmdl.io/1.3.0/material.indigo-pink.min.css">
-  <script defer src="https://code.getmdl.io/1.3.0/material.min.js"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.6.0/Chart.bundle.js"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.18.1/moment.min.js"></script>
-</head>
-<style>
-  body {
-    text-align: center;
-  }
-
-  .mdl_card {
-    max-width: 500px;
-    text-align: center;
-    margin: auto;
-  }
-
-  #result {
-    text-align: center;
-  }
-
-  .mdl-card__supporting-text {
-    color: #333;
-  }
-</style>
-
-<body>
-  <div class="mdl-grid">
-
-    <div id="result" class="mdl-cell mdl-cell--6-col">
-      <div class="mdl_card mdl-shadow--4dp">
-        <div class="mdl-card__supporting-text">
-          <div id="pidSpinner" class="mdl-spinner mdl-js-spinner is-active"></div>
-          <div id="pidInfo">
-            <h3 id="pid">PID STATUS: Loading...</h3>
-            <h3 id="sv">SV: Loading...</h3>
-            <h3 id="pv">PV: Loading...</h3>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <div id="result" class="mdl-cell mdl-cell--6-col">
-      <div class="mdl_card mdl-shadow--4dp">
-        <div class="mdl-card__supporting-text">
-          <div id="relaySpinner" class="mdl-spinner mdl-js-spinner is-active"></div>
-          <div id="relayInfo">
-            <h3 id="hltToMash">hltToMash: Loading...</h3>
-            <h3 id="hlt">hlt: Loading...</h3>
-            <h3 id="rimsToMash">rimsToMash: Loading...</h3>
-            <h3 id="pump">pump: Loading...</h3>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <div class="mdl-cell mdl-cell--12-col" style="height: 500px;">
-      <canvas id="pvChart"></canvas>
-    </div>
-
-  </div>
-</body>
-<script type="text/javascript">
-  var labels = [];
-  var data = [];
-
-  pidInfo.style.display = "none";
-  relayInfo.style.display = "none";
-
-
-  var pidsource = new EventSource("/pid");
-  pidsource.addEventListener('pid_status', function (event) {
-    var result = JSON.parse(event.data);
-    console.log(data);
-    pid.innerText = "PID: " + (result.pid_running ? 'on' : 'off');
-    sv.innerText = "SV: " + result.sv + ' \u00B0F';
-    pv.innerText = "PV: " + result.pv + ' \u00B0F';
-    data.push(result.pv);
-    labels.push(moment().format());
-    if (data.length > 20) {
-      data.shift();
-      labels.shift();
-    }
-    myChart.update();
-    pidSpinner.style.display = "none";
-    pidInfo.style.display = "initial";
-  }, false);
-
-  var relaysource = new EventSource("/relays");
-  relaysource.addEventListener('relays_status', function (event) {
-    var data = JSON.parse(event.data);
-    console.log(data);
-    hltToMash.innerText = "HLT → " + (Boolean(data.hltToMash) ? 'mash' : 'boil');
-    hlt.innerText = "HLT: " + (Boolean(data.hlt) ? 'open' : 'closed');
-    rimsToMash.innerText = "RIMS → " + (Boolean(data.rimsToMash) ? 'mash' : 'boil');
-    pump.innerText = "PUMP: " + (Boolean(data.pump) ? 'on' : 'off');
-    relaySpinner.style.display = "none";
-    relayInfo.style.display = "initial";
-  }, false);
-
-  var ctx = document.getElementById("pvChart").getContext('2d');
-  var myChart = new Chart(ctx, {
-    type: 'line',
-    data: {
-      labels: labels,
-      datasets: [{
-        label: "PV",
-        tension: 0,
-        fill: true,
-        backgroundColor: "rgba(0, 0, 0, 0.5)",
-        borderColor: "#333",
-        data: data,
-      }]
-    },
-    options: {
-      maintainAspectRatio: false,
-      scales: {
-        xAxes: [{
-          type: "time",
-          time: {
-            format: 'HH:mm:ss',
-            tooltipFormat: 'HH:mm:ss'
-          },
-          ticks: {
-            autoSkip: true,
-            maxTicksLimit: 10
-          },
-          scaleLabel: {
-            display: true,
-            labelString: 'Time'
-          }
-        },],
-        yAxes: [{
-          scaleLabel: {
-            display: true,
-            labelString: 'PV Value'
-          }
-        }]
-      }
-    }
-  });
-
-</script>
-
-</html>