From 3b1a9246fd0905a2598d68fa0e48674f84471dc8 Mon Sep 17 00:00:00 2001
From: Dan Elbert <dan.elbert@gmail.com>
Date: Sun, 1 Apr 2018 22:32:13 -0500
Subject: [PATCH] recipe editing

---
 LICENSE                                         |  2 +-
 app/javascript/components/AppAutocomplete.vue   |  5 +++++
 .../components/RecipeEditIngredientItem.vue     |  7 +++++++
 app/javascript/components/TheAboutPage.vue      | 17 +++++++++++++++++
 app/javascript/components/TheRecipe.vue         |  4 ++--
 app/javascript/components/TheRecipeCreator.vue  | 14 ++++++++++++++
 app/javascript/lib/Api.js                       | 13 ++++++++++---
 app/javascript/styles/index.scss                |  5 +++++
 app/models/recipe.rb                            |  2 +-
 lib/unit_conversion/parsed_number.rb            |  1 +
 10 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/LICENSE b/LICENSE
index 3d88d01..115e637 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Dan Elbert
+Copyright (c) 2018 Dan Elbert
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/app/javascript/components/AppAutocomplete.vue b/app/javascript/components/AppAutocomplete.vue
index 25e3b60..7a9919e 100644
--- a/app/javascript/components/AppAutocomplete.vue
+++ b/app/javascript/components/AppAutocomplete.vue
@@ -11,6 +11,7 @@
         :value="rawValue"
         :class="finalInputClass"
 
+        @click="clickHandler"
         @blur="blurHandler"
         @input="inputHandler"
         @keydown="keydownHandler"
@@ -129,6 +130,10 @@
         this.activeListIndex = idx;
       },
 
+      clickHandler(evt) {
+        this.$emit("inputClick", evt);
+      },
+
       blurHandler(evt) {
         // blur fires before click.  If the blur was fired because the user clicked a list item, immediately hiding the list here
         // would prevent the click event from firing
diff --git a/app/javascript/components/RecipeEditIngredientItem.vue b/app/javascript/components/RecipeEditIngredientItem.vue
index cb7c788..3b04797 100644
--- a/app/javascript/components/RecipeEditIngredientItem.vue
+++ b/app/javascript/components/RecipeEditIngredientItem.vue
@@ -22,6 +22,7 @@
               valueAttribute="name"
               labelAttribute="name"
               placeholder=""
+              @inputClick="nameClick"
               @optionSelected="searchItemSelected"
               :onGetOptions="updateSearchItems"
           >
@@ -72,6 +73,12 @@
         this.ingredient.ingredient_id = ingredient.id;
         this.ingredient.ingredient = ingredient;
         this.ingredient.name = ingredient.name;
+      },
+
+      nameClick() {
+        if (this.ingredient.ingredient_id === null && this.ingredient.name !== null && this.ingredient.name.length > 2) {
+          this.$refs.autocomplete.updateOptions(this.ingredient.name);
+        }
       }
     },
 
diff --git a/app/javascript/components/TheAboutPage.vue b/app/javascript/components/TheAboutPage.vue
index b49d99e..0488ece 100644
--- a/app/javascript/components/TheAboutPage.vue
+++ b/app/javascript/components/TheAboutPage.vue
@@ -1,5 +1,22 @@
 <template>
+  <div class="content">
+    <h1 class="title">About</h1>
 
+    <p>
+      A Recipe manager.  Source available from my Git repository at <a href="https://source.elbert.us/dan/parsley">https://source.elbert.us</a>.
+    </p>
+
+    <p>
+      Parsley is released under the MIT License.  All code &copy; Dan Elbert 2018.
+    </p>
+
+    <p>
+      Food data provided by:<br/>
+      <cite>
+        US Department of Agriculture, Agricultural Research Service, Nutrient Data Laboratory. USDA National Nutrient Database for Standard Reference, Release 28. Version Current:  September 2015.  Internet:  <a href="http://www.ars.usda.gov/nea/bhnrc/ndl">http://www.ars.usda.gov/nea/bhnrc/ndl</a>
+      </cite>
+    </p>
+  </div>
 </template>
 
 <script>
diff --git a/app/javascript/components/TheRecipe.vue b/app/javascript/components/TheRecipe.vue
index 1750e04..3e00e91 100644
--- a/app/javascript/components/TheRecipe.vue
+++ b/app/javascript/components/TheRecipe.vue
@@ -7,8 +7,8 @@
       <recipe-show :recipe="recipe"></recipe-show>
     </div>
 
-    <router-link :to="{name: 'edit_recipe', params: { id: recipeId }}">Edit</router-link>
-    <router-link to="/">Back</router-link>
+    <router-link class="button" :to="{name: 'edit_recipe', params: { id: recipeId }}">Edit</router-link>
+    <router-link class="button" to="/">Back</router-link>
   </div>
 </template>
 
diff --git a/app/javascript/components/TheRecipeCreator.vue b/app/javascript/components/TheRecipeCreator.vue
index f43ee0c..5bfb58a 100644
--- a/app/javascript/components/TheRecipeCreator.vue
+++ b/app/javascript/components/TheRecipeCreator.vue
@@ -3,6 +3,9 @@
 
     <recipe-edit :recipe="recipe" action="Creating"></recipe-edit>
 
+    <button type="button" class="button is-primary" @click="save">Save</button>
+    <router-link class="button is-secondary" to="/">Cancel</router-link>
+
   </div>
 </template>
 
@@ -11,6 +14,7 @@
   import RecipeEdit from "./RecipeEdit";
   import { mapState } from "vuex";
   import api from "../lib/Api";
+  import * as Errors from '../lib/Errors';
 
   export default {
     data() {
@@ -35,6 +39,16 @@
       })
     },
 
+    methods: {
+      save() {
+        this.loadResource(
+          api.postRecipe(this.recipe)
+            .then(() => this.$router.push('/'))
+            .catch(Errors.onlyFor(Errors.ApiValidationError, err => this.validationErrors = err.validationErrors()))
+        );
+      }
+    },
+
     components: {
       RecipeEdit
     }
diff --git a/app/javascript/lib/Api.js b/app/javascript/lib/Api.js
index c19b05c..6773ac3 100644
--- a/app/javascript/lib/Api.js
+++ b/app/javascript/lib/Api.js
@@ -103,7 +103,7 @@ class Api {
     return this.get("/recipes/" + id);
   }
 
-  patchRecipe(recipe) {
+  buildRecipeParams(recipe) {
     const params = {
       recipe: {
         name: recipe.name,
@@ -124,7 +124,7 @@ class Api {
             return {
               id: i.id,
               name: i.name,
-              ingredient_id: null,
+              ingredient_id: i.ingredient_id,
               quantity: i.quantity,
               units: i.units,
               preparation: i.preparation,
@@ -134,8 +134,15 @@ class Api {
         })
       }
     };
+    return params;
+  }
 
-    return this.patch("/recipes/" + recipe.id, params);
+  patchRecipe(recipe) {
+    return this.patch("/recipes/" + recipe.id, this.buildRecipeParams(recipe));
+  }
+
+  postRecipe(recipe) {
+    return this.post("/recipes/", this.buildRecipeParams(recipe));
   }
 
   postPreviewSteps(step_text) {
diff --git a/app/javascript/styles/index.scss b/app/javascript/styles/index.scss
index 850678a..b844b9e 100644
--- a/app/javascript/styles/index.scss
+++ b/app/javascript/styles/index.scss
@@ -12,8 +12,13 @@
 
 @import "./responsive_controls";
 
+html, body {
+  min-height: 100%;
+}
+
 body {
   background-color: $grey-dark;
+  padding-bottom: 2rem;
 }
 
 #app {
diff --git a/app/models/recipe.rb b/app/models/recipe.rb
index e54f21d..5e6aeac 100644
--- a/app/models/recipe.rb
+++ b/app/models/recipe.rb
@@ -103,7 +103,7 @@ class Recipe < ApplicationRecord
     query = active.order(criteria.sort_column => criteria.sort_direction).page(criteria.page).per(criteria.per)
 
     if criteria.name.present?
-      query = query.matches_token(:name, criteria.name)
+      query = query.matches_tokens(:name, criteria.name.split(' '))
     end
 
     if criteria.tags.present?
diff --git a/lib/unit_conversion/parsed_number.rb b/lib/unit_conversion/parsed_number.rb
index 2225c1d..1924f2c 100644
--- a/lib/unit_conversion/parsed_number.rb
+++ b/lib/unit_conversion/parsed_number.rb
@@ -17,6 +17,7 @@ module UnitConversion
     end
 
     def parse_value(str)
+      str = str.to_s.strip
       if str =~ /^#{INTEGER_REGEX}$/
         str.to_i
       elsif str =~ /^#{RATIONAL_REGEX}$/