From eb93591ad15cb6ae4942f08b225fcb0cf3b5613e Mon Sep 17 00:00:00 2001
From: pikesley <github@orgraphone.org>
Date: Fri, 29 Jan 2016 22:09:54 +0000
Subject: [PATCH] Added carbs

Now I have another problem :/
---
 .../javascripts/carbohydrate_intake.coffee    |   3 +
 .../stylesheets/carbohydrate_intake.scss      |   3 +
 .../carbohydrate_intakes_controller.rb        |  11 ++
 app/helpers/carbohydrate_intake_helper.rb     |   2 +
 app/views/carbohydrate_intakes/_form.html.erb |  45 +++++++
 app/views/carbohydrate_intakes/edit.html.erb  |  12 ++
 app/views/carbohydrate_intakes/index.html.erb |   3 +
 app/views/carbohydrate_intakes/new.html.erb   |   5 +
 app/views/carbohydrate_intakes/show.html.erb  |   4 +
 app/views/shared/_nav.html.erb                |   1 +
 app/views/welcome/index.html.erb              |   1 +
 .../carbohydrate_intake_controller_spec.rb    | 122 ++++++++++++++++++
 spec/controllers/generic_controller_spec.rb   |   4 +-
 .../glucose_measurements_controller_spec.rb   |   2 +-
 .../medication_events_controller_spec.rb      |   2 +-
 spec/factories/carbohydrate_intakes.rb        |   4 +
 .../carbohydrate_intake_helper_spec.rb        |   2 +
 17 files changed, 221 insertions(+), 5 deletions(-)
 create mode 100644 app/assets/javascripts/carbohydrate_intake.coffee
 create mode 100644 app/assets/stylesheets/carbohydrate_intake.scss
 create mode 100644 app/controllers/carbohydrate_intakes_controller.rb
 create mode 100644 app/helpers/carbohydrate_intake_helper.rb
 create mode 100644 app/views/carbohydrate_intakes/_form.html.erb
 create mode 100644 app/views/carbohydrate_intakes/edit.html.erb
 create mode 100644 app/views/carbohydrate_intakes/index.html.erb
 create mode 100644 app/views/carbohydrate_intakes/new.html.erb
 create mode 100644 app/views/carbohydrate_intakes/show.html.erb
 create mode 100644 spec/controllers/carbohydrate_intake_controller_spec.rb
 create mode 100644 spec/helpers/carbohydrate_intake_helper_spec.rb

diff --git a/app/assets/javascripts/carbohydrate_intake.coffee b/app/assets/javascripts/carbohydrate_intake.coffee
new file mode 100644
index 0000000..24f83d1
--- /dev/null
+++ b/app/assets/javascripts/carbohydrate_intake.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/stylesheets/carbohydrate_intake.scss b/app/assets/stylesheets/carbohydrate_intake.scss
new file mode 100644
index 0000000..873a786
--- /dev/null
+++ b/app/assets/stylesheets/carbohydrate_intake.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the CarbohydrateIntake controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/controllers/carbohydrate_intakes_controller.rb b/app/controllers/carbohydrate_intakes_controller.rb
new file mode 100644
index 0000000..c922cbe
--- /dev/null
+++ b/app/controllers/carbohydrate_intakes_controller.rb
@@ -0,0 +1,11 @@
+class CarbohydrateIntakesController < GenericController
+  private
+
+  def metrics_path
+    carbohydrate_intakes_path
+  end
+
+  def acceptable_params
+    params.require(:carbohydrate_intake).permit(:datetime, :weight, :description)
+  end
+end
diff --git a/app/helpers/carbohydrate_intake_helper.rb b/app/helpers/carbohydrate_intake_helper.rb
new file mode 100644
index 0000000..954b108
--- /dev/null
+++ b/app/helpers/carbohydrate_intake_helper.rb
@@ -0,0 +1,2 @@
+module CarbohydrateIntakeHelper
+end
diff --git a/app/views/carbohydrate_intakes/_form.html.erb b/app/views/carbohydrate_intakes/_form.html.erb
new file mode 100644
index 0000000..cdbfbaf
--- /dev/null
+++ b/app/views/carbohydrate_intakes/_form.html.erb
@@ -0,0 +1,45 @@
+<%= form_for @metric do |f| %>
+
+  <% if @metric.errors.any? %>
+    <div id="error_explanation">
+      <h2>
+        <%= pluralize(@metric.errors.count, "error") %> prohibited
+        this measurement from being saved:
+      </h2>
+      <ul>
+        <% @metric.errors.full_messages.each do |msg| %>
+          <li><%= msg %></li>
+        <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <p>
+    <%= f.label :datetime, 'Date and time' %><br>
+    <%= f.text_field :datetime, id: 'carbohydrate_intake_datetime', class: 'form-control' %>
+  </p>
+
+  <p>
+    <%= f.label :weight %><br>
+    <%= f.text_field :weight, class: 'form-control' %>
+  </p>
+
+  <p>
+    <%= f.label :description %><br>
+    <%= f.text_field :description, class: 'form-control' %>
+  </p>
+
+  <p>
+    <%= f.submit class: 'btn btn-success' %>
+
+  </p>
+<% end %>
+
+<script type="text/javascript">
+  $(function () {
+    $('#carbohydrate_intake_datetime').datetimepicker({
+      format: 'YYYY-MM-DD HH:mm',
+      defaultDate: moment()
+    });
+  });
+</script>
diff --git a/app/views/carbohydrate_intakes/edit.html.erb b/app/views/carbohydrate_intakes/edit.html.erb
new file mode 100644
index 0000000..29e6bb7
--- /dev/null
+++ b/app/views/carbohydrate_intakes/edit.html.erb
@@ -0,0 +1,12 @@
+<h1>Carbs Intake</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Delete', carbohydrate_intake_path(@metric),
+                              class: 'btn btn-warning',
+                              method: :delete,
+                              data: {
+                                confirm: 'Are you sure?'
+                              } %>
+
+<%= link_to 'Back', carbohydrate_intakes_path, class: 'btn btn-default' %>
diff --git a/app/views/carbohydrate_intakes/index.html.erb b/app/views/carbohydrate_intakes/index.html.erb
new file mode 100644
index 0000000..44cb4b6
--- /dev/null
+++ b/app/views/carbohydrate_intakes/index.html.erb
@@ -0,0 +1,3 @@
+<%= render partial: 'shared/index', locals: {
+  title: 'carbs'
+} %>
diff --git a/app/views/carbohydrate_intakes/new.html.erb b/app/views/carbohydrate_intakes/new.html.erb
new file mode 100644
index 0000000..825db4b
--- /dev/null
+++ b/app/views/carbohydrate_intakes/new.html.erb
@@ -0,0 +1,5 @@
+<h1>New Carbohydrate Intake</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', carbohydrate_intakes_path, class: 'btn btn-default' %>
diff --git a/app/views/carbohydrate_intakes/show.html.erb b/app/views/carbohydrate_intakes/show.html.erb
new file mode 100644
index 0000000..098307e
--- /dev/null
+++ b/app/views/carbohydrate_intakes/show.html.erb
@@ -0,0 +1,4 @@
+<h1>Datetime: <%= @metric.datetime %></h1>
+<h2>Weight: <%= @metric.value %></h2>
+
+<%= link_to 'Back', carbohydrate_intakes_path %>
diff --git a/app/views/shared/_nav.html.erb b/app/views/shared/_nav.html.erb
index 57a02fd..e03d123 100644
--- a/app/views/shared/_nav.html.erb
+++ b/app/views/shared/_nav.html.erb
@@ -16,6 +16,7 @@
       <ul class='nav navbar-nav' role='tablist'>
         <% {
           'Glucose' => '/glucose',
+          'Carbs' => '/carbs',
           'Meds' => '/meds'
         }.each_pair do |label, url| %>
           <li>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 4563741..9821d84 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -1,2 +1,3 @@
 <%= link_to 'Glucose', glucose_measurements_path, class: 'btn btn-success' %>
+<%= link_to 'Carbs', carbohydrate_intakes_path, class: 'btn btn-success' %>
 <%= link_to 'Meds', medication_events_path, class: 'btn btn-success' %>
diff --git a/spec/controllers/carbohydrate_intake_controller_spec.rb b/spec/controllers/carbohydrate_intake_controller_spec.rb
new file mode 100644
index 0000000..ae0dfb5
--- /dev/null
+++ b/spec/controllers/carbohydrate_intake_controller_spec.rb
@@ -0,0 +1,122 @@
+describe CarbohydrateIntakesController, type: :controller do
+  before :each do
+    sign_in
+  end
+
+  describe 'GET #index' do
+    it 'populates an array of measurements' do
+      carbohydrate_intake = create(:carbohydrate_intake)
+      get :index
+      expect(assigns(:metrics)).to eq [carbohydrate_intake]
+    end
+
+    it 'renders the #index view' do
+      get :index
+      expect(response).to render_template :index
+    end
+  end
+
+  describe 'GET #show' do
+    it 'assigns the requested measurement to @metric' do
+      carbohydrate_intake = create(:carbohydrate_intake)
+      get :show, id: carbohydrate_intake
+      expect(assigns(:metric)).to eq carbohydrate_intake
+    end
+
+    it 'renders the #show view' do
+      get :show, id: create(:carbohydrate_intake)
+      expect(response).to render_template :show
+    end
+  end
+
+  describe 'POST #create' do
+    context 'with valid attributes' do
+      it 'creates a new measurement' do
+        expect {
+          post :create, carbohydrate_intake: attributes_for(:carbohydrate_intake)
+        }.to change(CarbohydrateIntake, :count).by 1
+      end
+
+      it 'redirects to the index page' do
+        post :create, carbohydrate_intake: attributes_for(:carbohydrate_intake)
+        expect(response).to redirect_to carbohydrate_intakes_url
+      end
+    end
+
+    context 'with invalid attributes' do
+      it 'does not save the new contact' do
+        expect {
+          post :create, carbohydrate_intake: attributes_for(:invalid_carbohydrate_intake)
+        }.to_not change(CarbohydrateIntake, :count)
+      end
+
+      it 're-renders the #new view' do
+        post :create, carbohydrate_intake: attributes_for(:invalid_carbohydrate_intake)
+        expect(response).to render_template :new
+      end
+    end
+  end
+
+  describe 'PUT #update' do
+    let (:test_carbs) { create :carbohydrate_intake, datetime: '1974-06-15 12:00:00', weight: 50.0 }
+
+    context 'valid attributes' do
+      it 'locates the requested measurement' do
+        put :update, id: test_carbs, carbohydrate_intake: attributes_for(:carbohydrate_intake)
+        expect(assigns :metric).to eq test_carbs
+      end
+
+      it 'changes test_carbs` attributes' do
+        put :update, id: test_carbs,
+                     carbohydrate_intake: attributes_for(:carbohydrate_intake,
+                                                         datetime: '1975-06-15 13:00:00',
+                                                         weight: 65)
+        test_carbs.reload
+        expect(test_carbs.datetime).to eq '1975-06-15 13:00:00'
+        expect(test_carbs.weight).to eq 65
+      end
+
+      it 'redirects to the index page' do
+        put :update, id: test_carbs, carbohydrate_intake: attributes_for(:glucose_measurement)
+        expect(assigns :metric).to eq test_carbs
+        expect(response).to redirect_to carbohydrate_intakes_url
+      end
+    end
+
+    context 'invalid attributes' do
+      it 'locates the requested measurement' do
+        put :update, id: test_carbs, carbohydrate_intake: attributes_for(:invalid_carbohydrate_intake)
+        expect(assigns(:metric)).to eq test_carbs
+      end
+
+      it 'does not change the test_carbs attributes' do
+        put :update, id: test_carbs,
+                     carbohydrate_intake: attributes_for(:carbohydrate_intake,
+                                                         datetime: nil,
+                                                         weight: 40)
+        test_carbs.reload
+        expect(test_carbs.weight).to_not eq 40
+        expect(test_carbs.datetime).to eq '1974-06-15 12:00:00'
+      end
+
+      it 're-renders the #edit view' do
+        put :update, id: test_carbs, carbohydrate_intake: attributes_for(:invalid_carbohydrate_intake)
+        expect(response).to render_template :edit
+      end
+    end
+  end
+
+  describe 'DELETE #destroy' do
+    let! (:test_carbs) { create :carbohydrate_intake }
+    it 'deletes the carbs' do
+      expect {
+        delete :destroy, id: test_carbs
+      }.to change(CarbohydrateIntake, :count).by -1
+    end
+
+    it 'redirects to #index' do
+      delete :destroy, id: test_carbs
+      expect(response).to redirect_to carbohydrate_intakes_url
+    end
+  end
+end
diff --git a/spec/controllers/generic_controller_spec.rb b/spec/controllers/generic_controller_spec.rb
index b516dee..f71f427 100644
--- a/spec/controllers/generic_controller_spec.rb
+++ b/spec/controllers/generic_controller_spec.rb
@@ -1,5 +1,3 @@
-require 'rails_helper'
-
-RSpec.describe GenericController, type: :controller do
+describe GenericController, type: :controller do
 
 end
diff --git a/spec/controllers/glucose_measurements_controller_spec.rb b/spec/controllers/glucose_measurements_controller_spec.rb
index 668a6ce..842650e 100644
--- a/spec/controllers/glucose_measurements_controller_spec.rb
+++ b/spec/controllers/glucose_measurements_controller_spec.rb
@@ -76,7 +76,7 @@
         expect(test_measurement.value).to eq 12.0
       end
 
-      it 'redirects to the updated measurement' do
+      it 'redirects to the index page' do
         put :update, id: test_measurement, glucose_measurement: attributes_for(:glucose_measurement)
         expect(assigns :metric).to eq test_measurement
         expect(response).to redirect_to glucose_measurements_url
diff --git a/spec/controllers/medication_events_controller_spec.rb b/spec/controllers/medication_events_controller_spec.rb
index 88ed417..4155fed 100644
--- a/spec/controllers/medication_events_controller_spec.rb
+++ b/spec/controllers/medication_events_controller_spec.rb
@@ -77,7 +77,7 @@
         expect(test_meds.amount).to eq 16.0
       end
 
-      it 'redirects to the updated measurement' do
+      it 'redirects to the index page' do
         put :update, id: test_meds, medication_event: attributes_for(:medication_event)
         expect(assigns :metric).to eq test_meds
         expect(response).to redirect_to medication_events_url
diff --git a/spec/factories/carbohydrate_intakes.rb b/spec/factories/carbohydrate_intakes.rb
index 7e1393c..872bab5 100644
--- a/spec/factories/carbohydrate_intakes.rb
+++ b/spec/factories/carbohydrate_intakes.rb
@@ -4,4 +4,8 @@
     f.weight 70
     f.description 'pasta bolognese'
   end
+
+  factory :invalid_carbohydrate_intake, parent: :carbohydrate_intake do |f|
+    f.weight -10
+  end
 end
diff --git a/spec/helpers/carbohydrate_intake_helper_spec.rb b/spec/helpers/carbohydrate_intake_helper_spec.rb
new file mode 100644
index 0000000..1fb22e1
--- /dev/null
+++ b/spec/helpers/carbohydrate_intake_helper_spec.rb
@@ -0,0 +1,2 @@
+describe CarbohydrateIntakeHelper, type: :helper do
+end