From 70e7a8b415e55dbf21dd4f819c24087d697ed02d Mon Sep 17 00:00:00 2001 From: Dan Elbert Date: Thu, 28 Jan 2016 14:19:51 -0600 Subject: [PATCH] Ingredient editor --- app/assets/javascripts/ingredients.js | 68 +++++++++-- app/assets/javascripts/typeahead_search.js | 107 ++++++++++++++++++ app/controllers/ingredients_controller.rb | 35 ++++-- app/models/concerns/tokenized_like.rb | 26 +++++ app/models/ingredient.rb | 13 +++ app/models/usda_food.rb | 11 ++ app/views/ingredients/_form.html.erb | 56 +++++---- app/views/ingredients/select_ndbn.js.erb | 2 + .../ingredients/usda_food_search.html.erb | 20 ++++ config/routes.rb | 7 +- db/migrate/20160124212254_create_usda_food.rb | 4 +- db/schema.rb | 1 + db/seeds.rb | 4 +- lib/tasks/usda.rake | 8 ++ spec/factories/usda_foods.rb | 25 ++++ spec/models/usda_food_spec.rb | 41 +++++++ 16 files changed, 382 insertions(+), 46 deletions(-) create mode 100644 app/assets/javascripts/typeahead_search.js create mode 100644 app/models/concerns/tokenized_like.rb create mode 100644 app/views/ingredients/select_ndbn.js.erb create mode 100644 app/views/ingredients/usda_food_search.html.erb create mode 100644 spec/factories/usda_foods.rb create mode 100644 spec/models/usda_food_spec.rb diff --git a/app/assets/javascripts/ingredients.js b/app/assets/javascripts/ingredients.js index aa49ca3..14afb46 100644 --- a/app/assets/javascripts/ingredients.js +++ b/app/assets/javascripts/ingredients.js @@ -1,9 +1,63 @@ (function($) { + function initializeEditor($ingredientForm) { + usdaFoodSearchEngine.initialize(false); + + var $typeahead = $ingredientForm.find(".ndbn_typeahead"); + var $usdaModal = $("#link_ndbn_modal"); + var $name = $ingredientForm.find(".name"); + var $ndbn = $ingredientForm.find("input.ndbn"); + var $ndbn_group = $ingredientForm.find(".ndbn_group"); + + if ($ndbn.val()) { + } + + $typeahead.typeahead_search({ + searchUrl: '/ingredients/usda_food_search.html', + resultsContainer: '#link_ndbn_modal .results' + },{ + name: 'usdaFoods', + source: usdaFoodSearchEngine, + display: function(datum) { + return datum.name; + } + }); + + $typeahead.on("typeahead_search:selected", function(evt, item) { + selectNdbn(item.ndbn); + }); + + $usdaModal.on("shown.bs.modal", function() { + var $this = $(this); + $typeahead.typeahead("val", $name.val()); + $typeahead.focus(); + $typeahead.select(); + }); + + $ingredientForm.on("click", "#link_ndbn_modal .results .food_result", function(evt) { + var $item = $(evt.target); + var ndbn = $item.data("ndbn"); + selectNdbn(ndbn); + }); + } + + function selectNdbn(ndbn) { + var $ingredientForm = $("#ingredient_form"); + var id = $ingredientForm.find("input.id").val(); + + $ingredientForm.find("input.ndbn").val(ndbn); + $ingredientForm.attr("action", "/ingredients/" + id + "/select_ndbn").attr("data-remote", "true"); + + $("#link_ndbn_modal").modal('hide').on('hidden.bs.modal', function() { + $ingredientForm.submit(); + }); + } + var usdaFoodSearchEngine = new Bloodhound({ initialize: false, datumTokenizer: function(datum) { - return Bloodhound.tokenizers.whitespace(datum.name); + var str = datum ? datum.name : null; + return str ? str.split(/[\s,]+/) : []; }, queryTokenizer: Bloodhound.tokenizers.whitespace, identify: function(datum) { return datum.ndbn; }, @@ -26,18 +80,8 @@ var $ingredientForm = $("#ingredient_form"); if ($ingredientForm.length) { - usdaFoodSearchEngine.initialize(false); + initializeEditor($ingredientForm); } - - $ingredientForm.find(".ndbn_typeahead").typeahead_selector({ - - },{ - name: 'usdaFoods', - source: usdaFoodSearchEngine, - display: function(datum) { - return datum.name; - } - }); }); })(jQuery); \ No newline at end of file diff --git a/app/assets/javascripts/typeahead_search.js b/app/assets/javascripts/typeahead_search.js new file mode 100644 index 0000000..c52b822 --- /dev/null +++ b/app/assets/javascripts/typeahead_search.js @@ -0,0 +1,107 @@ +(function($) { + + var pluginName = "typeahead_search"; + + var defaultOptions = { + }; + + var methods = { + initialize: function (opts, sources) { + + return this.each(function() { + var options = $.extend({}, defaultOptions, opts); + var $this = $(this); + $this.data(pluginName, {options: options}); + + var $inputGroup = $('
'); + var $btnSpan = $(""); + var $btn = $(" +
+

<%= @ingredient.ndbn ? UsdaFood.find_by_ndbn(@ingredient.ndbn).short_description : '' %>

+
- <%= f.label :ndbn, "Nutrient Databank Number", class: 'control-label' %> - + <%= f.label :density, class: 'control-label' %> + <%= f.text_field :density, class: 'form-control', disabled: has_ndbn %> +
+ +
+ <%= f.label :notes, class: 'control-label' %> + <%= f.text_area :notes, class: 'form-control' %>
@@ -21,45 +40,35 @@
<%= f.label :water, "Grams of Water", class: 'control-label' %> - <%= f.text_field :water, class: 'form-control' %> + <%= f.text_field :water, class: 'form-control', disabled: has_ndbn %>
<%= f.label :protein, "Grams of Protein", class: 'control-label' %> - <%= f.text_field :protein, class: 'form-control' %> + <%= f.text_field :protein, class: 'form-control', disabled: has_ndbn %>
<%= f.label :lipids, "Grams of Fat", class: 'control-label' %> - <%= f.text_field :lipids, class: 'form-control' %> + <%= f.text_field :lipids, class: 'form-control', disabled: has_ndbn %>
<%= f.label :kcal, "Calories", class: 'control-label' %> - <%= f.text_field :kcal, class: 'form-control' %> + <%= f.text_field :kcal, class: 'form-control', disabled: has_ndbn %>
<%= f.label :fiber, "Grams of Fiber", class: 'control-label' %> - <%= f.text_field :fiber, class: 'form-control' %> + <%= f.text_field :fiber, class: 'form-control', disabled: has_ndbn %>
<%= f.label :sugar, "Grams of Sugar", class: 'control-label' %> - <%= f.text_field :sugar, class: 'form-control' %> + <%= f.text_field :sugar, class: 'form-control', disabled: has_ndbn %>
-
- <%= f.label :density, class: 'control-label' %> - <%= f.text_field :density, class: 'form-control' %> -
- -
- <%= f.label :notes, class: 'control-label' %> - <%= f.text_area :notes, class: 'form-control' %> -
-
<%= f.submit class: 'btn btn-primary' %>
@@ -75,10 +84,13 @@
<%= f.label :ndbn, "", class: 'control-label' %> - <%= f.hidden_field :ndbn %>
+
+ +
+
diff --git a/app/views/ingredients/select_ndbn.js.erb b/app/views/ingredients/select_ndbn.js.erb new file mode 100644 index 0000000..8826196 --- /dev/null +++ b/app/views/ingredients/select_ndbn.js.erb @@ -0,0 +1,2 @@ + +$("#ingredient_form").replaceWith($("<%= escape_javascript(render(partial: 'ingredients/form')) %>")); \ No newline at end of file diff --git a/app/views/ingredients/usda_food_search.html.erb b/app/views/ingredients/usda_food_search.html.erb new file mode 100644 index 0000000..94396c3 --- /dev/null +++ b/app/views/ingredients/usda_food_search.html.erb @@ -0,0 +1,20 @@ + + + + + + + + + + +<% @foods.each do |f| %> + + + + + + +<% end %> + +
NDBNName
<%= f.ndbn %><%= link_to f.short_description, '#', class: 'food_result', data: {ndbn: f.ndbn} %>
\ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 74c902c..1defd96 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,13 +8,18 @@ Rails.application.routes.draw do resources :ingredients, except: [:show] do collection do + get :usda_food_search + constraints format: 'json' do get :search get :prefetch get :convert - get :usda_food_search end end + + member do + match :select_ndbn, via: [:post, :patch, :put] + end end resource :user, only: [:new, :create, :edit, :update] diff --git a/db/migrate/20160124212254_create_usda_food.rb b/db/migrate/20160124212254_create_usda_food.rb index a09925c..6d7ec6f 100644 --- a/db/migrate/20160124212254_create_usda_food.rb +++ b/db/migrate/20160124212254_create_usda_food.rb @@ -2,9 +2,9 @@ class CreateUsdaFood < ActiveRecord::Migration def change create_table :usda_foods do |t| - t.string :ndbn, limit: 5, index: true, null: false + t.string :ndbn, limit: 5, index: :unique, null: false - t.string :short_description + t.string :short_description, index: true t.decimal :water, precision: 10, scale: 2 t.integer :kcal t.decimal :protein, precision: 10, scale: 2 diff --git a/db/schema.rb b/db/schema.rb index 3410d98..eedbba9 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -88,6 +88,7 @@ ActiveRecord::Schema.define(version: 20160124231837) do end add_index "usda_foods", ["ndbn"], name: "index_usda_foods_on_ndbn" + add_index "usda_foods", ["short_description"], name: "index_usda_foods_on_short_description" create_table "users", force: :cascade do |t| t.string "username" diff --git a/db/seeds.rb b/db/seeds.rb index 0504176..f2dfde5 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -31,8 +31,10 @@ Ingredient.create!([ {name: 'Milk, 2%', density: '1.03 gram/ml'} ]) +User.create!({username: 'dan', full_name: 'Dan', email: 'dan.elbert@gmail.com', password: 'qwerty', password_confirmation: 'qwerty'}) + importer = UsdaImporter.new(Rails.root.join('vendor', 'data', 'usda', 'ABBREV.txt')) importer.import -puts "Seeds planted." \ No newline at end of file +puts "Seeds planted." diff --git a/lib/tasks/usda.rake b/lib/tasks/usda.rake index e69de29..067e91e 100644 --- a/lib/tasks/usda.rake +++ b/lib/tasks/usda.rake @@ -0,0 +1,8 @@ +namespace :usda do + + desc 'Empties usda_foods table, imports all data, and then updates any linked ingredients' + task import: :environment do + importer = UsdaImporter.new(Rails.root.join('vendor', 'data', 'usda', 'ABBREV.txt')) + importer.import + end +end \ No newline at end of file diff --git a/spec/factories/usda_foods.rb b/spec/factories/usda_foods.rb new file mode 100644 index 0000000..adcf1fe --- /dev/null +++ b/spec/factories/usda_foods.rb @@ -0,0 +1,25 @@ +FactoryGirl.define do + + sequence :unique_ndbn do |n| + n.to_s.rjust(5, '0') + end + + factory :usda_food do + short_description 'Food' + ndbn '01234' + water 1.0 + kcal 101 + protein 1.2 + lipid 3.4 + ash 0 + carbohydrates 3.3 + fiber 1.2 + sugar 10 + gram_weight_1 200 + gram_weight_2 100 + gram_weight_desc_1 '1 cup' + gram_weight_desc_2 '1/2 cup' + refuse_percent 3 + end + +end diff --git a/spec/models/usda_food_spec.rb b/spec/models/usda_food_spec.rb new file mode 100644 index 0000000..3d490a7 --- /dev/null +++ b/spec/models/usda_food_spec.rb @@ -0,0 +1,41 @@ +require 'rails_helper' + +RSpec.describe UsdaFood do + + let!(:data) do + { + salted_butter: create(:usda_food, short_description: 'Salted Butter'), + unsalted_butter: create(:usda_food, short_description: 'Unsalted Butter'), + flour: create(:usda_food, short_description: 'Flour'), + bread_flour: create(:usda_food, short_description: 'Bread Flour'), + sugar: create(:usda_food, short_description: 'Sugar,Granulated') + } + end + + def items(*syms) + Array.wrap(syms).map { |s| data[s] } + end + + it 'can be found by single tokens' do + r = UsdaFood.matches_tokens(:short_description, ['sal']) + expect(r.length).to eq 1 + expect(r).to contain_exactly *items(:salted_butter) + + r = UsdaFood.matches_tokens(:short_description, ['flour']) + expect(r.length).to eq 2 + expect(r).to contain_exactly *items(:flour, :bread_flour) + end + + it 'can be found by multiple tokens' do + r = UsdaFood.matches_tokens(:short_description, ['sal', 'butter']) + expect(r.length).to eq 1 + expect(r).to contain_exactly *items(:salted_butter) + end + + it 'treats commas like spaces' do + r = UsdaFood.matches_tokens(:short_description, ['gran', 'sugar']) + expect(r.length).to eq 1 + expect(r).to contain_exactly *items(:sugar) + end + +end \ No newline at end of file