usda-nutrient-database 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 831e4c2f89dfafdc47775cc8dec3cebdbcd1914c
-  data.tar.gz: 785a041f065074cdc8dd8b66167821f01767cf71
+  metadata.gz: 4a1a20a7ca11fed27457609ba81d0247479c4b90
+  data.tar.gz: 1e7911deeb66f62d4e5c36cc669d73b8b1f1b340
 SHA512:
-  metadata.gz: 2cd55cae7aaa1fd439d8ae4e94753ade9517b923c39cc8122edd8e7630159130469c35862668609f1150d6359669b33cc37d150f5b6a02bbd7376e42c1ab0fa7
-  data.tar.gz: 6dee23c9fa9c7090ff540fa80e5e5570a8306539146c530c569bbfa0c09b66e217180e98fe93afd03e01ee4c1fecac0ce7fce7fd84f515a48563d3b3376b3538
+  metadata.gz: 9ea25431873fbaaedab58f4f24ae48c8c8f8962cb86d8b4853e6ced769c7f4e64517416a8680fc636f977dad04038dcdf256ca2db487c68691fd998f0a9bdd74
+  data.tar.gz: 6e4715beb8efd19a3cbe94a5f3387cda8f78924d06fe8980eb260a00e2ad1b999197a315f2451d879b6d87e1210590ac14cd408cf08d06f30949ba91dbde49af

data/db/migrate/6_create_footnotes.rb

@@ -0,0 +1,11 @@
+class CreateFootnotes < ActiveRecord::Migration
+  def change
+    create_table :usda_footnotes do |t|
+      t.string :nutrient_databank_number, null: false, index: true
+      t.string :footnote_number, null: false, index: true
+      t.string :footnote_type, null: false, index: true
+      t.string :nutrient_number, index: true
+      t.string :footnote_text, null: false
+    end
+  end
+end

data/lib/usda-nutrient-database.rb

@@ -3,6 +3,7 @@ require 'usda_nutrient_database/configuration'
 require 'usda_nutrient_database/engine' if defined?(Rails)
 require 'usda_nutrient_database/food_group'
 require 'usda_nutrient_database/food'
+require 'usda_nutrient_database/footnote'
 require 'usda_nutrient_database/nutrient'
 require 'usda_nutrient_database/foods_nutrient'
 require 'usda_nutrient_database/importer'
@@ -11,6 +12,7 @@ require 'usda_nutrient_database/import/downloader'
 require 'usda_nutrient_database/import/food_groups'
 require 'usda_nutrient_database/import/foods'
 require 'usda_nutrient_database/import/foods_nutrients'
+require 'usda_nutrient_database/import/footnotes'
 require 'usda_nutrient_database/import/nutrients'
 require 'usda_nutrient_database/import/weights'
 require 'usda_nutrient_database/railtie' if defined?(Rails)

data/lib/usda_nutrient_database/food.rb

@@ -9,6 +9,8 @@ module UsdaNutrientDatabase
     validates :long_description, presence: true
     validates :short_description, presence: true
 
+    has_many :footnotes, class_name: 'UsdaNutrientDatabase::Footnote'
+
     belongs_to :food_group, class_name: 'UsdaNutrientDatabase::FoodGroup',
       foreign_key: :food_group_code
   end

data/lib/usda_nutrient_database/footnote.rb

@@ -0,0 +1,15 @@
+module UsdaNutrientDatabase
+  class Footnote < ActiveRecord::Base
+    self.table_name = 'usda_footnotes'
+
+    validates :nutrient_databank_number, presence: true
+    validates :footnote_number, presence: true
+    validates :footnote_type, presence: true
+    validates :footnote_text, presence: true
+
+    belongs_to :food, class_name: 'UsdaNutrientDatabase::Food',
+      foreign_key: :nutrient_databank_number
+    belongs_to :nutrient, class_name: 'UsdaNutrientDatabase::Nutrient',
+      foreign_key: :nutrient_number
+  end
+end

data/lib/usda_nutrient_database/import/footnotes.rb

@@ -0,0 +1,34 @@
+module UsdaNutrientDatabase
+  module Import
+    class Footnotes < Base
+      def import
+        CSV.open(
+          "#{directory}/FOOTNOTE.txt", 'r:iso-8859-1:utf-8', csv_options
+        ) do |csv|
+          csv.each { |row| extract_row(row) }
+        end
+      end
+
+      private
+
+      def extract_row(row)
+        UsdaNutrientDatabase::Footnote.create! extract_row_data(row)
+      end
+
+      def extract_row_data(row)
+        {}.tap do |attrs|
+          columns.each_with_index do |col, index|
+            attrs.merge!(col => row[index])
+          end
+        end
+      end
+
+      def columns
+        [
+          :nutrient_databank_number, :footnote_number, :footnote_type,
+          :nutrient_number, :footnote_text
+        ]
+      end
+    end
+  end
+end

data/lib/usda_nutrient_database/nutrient.rb

@@ -14,5 +14,7 @@ module UsdaNutrientDatabase
     has_many :foods_nutrients,
       class_name: 'UsdaNutrientDatabase::FoodsNutrient',
       dependent: :destroy
+
+    has_many :footnotes, class_name: 'UsdaNutrientDatabase::Footnote'
   end
 end

data/lib/usda_nutrient_database/version.rb

@@ -1,3 +1,3 @@
 module UsdaNutrientDatabase
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/spec/lib/usda_nutrient_database/footnote_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+describe UsdaNutrientDatabase::Footnote do
+  it { should validate_presence_of(:nutrient_databank_number) }
+  it { should validate_presence_of(:footnote_number) }
+  it { should validate_presence_of(:footnote_type) }
+  it { should validate_presence_of(:footnote_text) }
+end

data/spec/lib/usda_nutrient_database/import/footnotes_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe UsdaNutrientDatabase::Import::Footnotes do
+  let(:importer) { described_class.new('spec/support/sr25') }
+
+  describe '#import' do
+    before { importer.import }
+
+    it { expect(UsdaNutrientDatabase::Footnote.count).to eql(4) }
+  end
+end

data/spec/schema.rb

@@ -59,4 +59,12 @@ ActiveRecord::Schema.define version: 0 do
     t.integer :num_data_points
     t.float   :standard_deviation
   end
+
+  create_table :usda_footnotes, force: true do |t|
+    t.string :nutrient_databank_number, null: false, index: true
+    t.string :footnote_number, null: false, index: true
+    t.string :footnote_type, null: false, index: true
+    t.string :nutrient_number, index: true
+    t.string :footnote_text, null: false
+  end
 end

data/spec/support/sr25/FOOTNOTE.txt

@@ -0,0 +1,4 @@
+~02009~^~01~^~D~^~~^~Mix of chili pepper, other spices and salt~
+~02030~^~01~^~N~^~204~^~Total proximates do not equal 100% because piperine was subtracted from lipid value.~
+~02032~^~01~^~N~^~204~^~Total proximates do not equal 100% because piperine was subtracted from lipid value.~
+~02033~^~01~^~D~^~~^~Other phytosterols = 38.4 mg/100g; these include delta 5-avenasterol (17.7), campestanol (2.6), and other minor phytosterols (18.1 mg).~

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usda-nutrient-database
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Matt Beedle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-24 00:00:00.000000000 Z
+date: 2013-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -197,6 +197,7 @@ files:
 - db/migrate/3_create_usda_foods_nutrients.rb
 - db/migrate/4_create_usda_nutrients.rb
 - db/migrate/5_create_usda_weights.rb
+- db/migrate/6_create_footnotes.rb
 - lib/tasks/usda_nutrient_database.rake
 - lib/usda-nutrient-database.rb
 - lib/usda_nutrient_database/configuration.rb
@@ -204,11 +205,13 @@ files:
 - lib/usda_nutrient_database/food.rb
 - lib/usda_nutrient_database/food_group.rb
 - lib/usda_nutrient_database/foods_nutrient.rb
+- lib/usda_nutrient_database/footnote.rb
 - lib/usda_nutrient_database/import/base.rb
 - lib/usda_nutrient_database/import/downloader.rb
 - lib/usda_nutrient_database/import/food_groups.rb
 - lib/usda_nutrient_database/import/foods.rb
 - lib/usda_nutrient_database/import/foods_nutrients.rb
+- lib/usda_nutrient_database/import/footnotes.rb
 - lib/usda_nutrient_database/import/nutrients.rb
 - lib/usda_nutrient_database/import/weights.rb
 - lib/usda_nutrient_database/importer.rb
@@ -220,10 +223,12 @@ files:
 - spec/lib/usda_nutrient_database/food_group_spec.rb
 - spec/lib/usda_nutrient_database/food_spec.rb
 - spec/lib/usda_nutrient_database/foods_nutrient_spec.rb
+- spec/lib/usda_nutrient_database/footnote_spec.rb
 - spec/lib/usda_nutrient_database/import/downloader_spec.rb
 - spec/lib/usda_nutrient_database/import/food_groups_spec.rb
 - spec/lib/usda_nutrient_database/import/foods_nutrients_spec.rb
 - spec/lib/usda_nutrient_database/import/foods_spec.rb
+- spec/lib/usda_nutrient_database/import/footnotes_spec.rb
 - spec/lib/usda_nutrient_database/import/nutrients_spec.rb
 - spec/lib/usda_nutrient_database/import/weights_spec.rb
 - spec/lib/usda_nutrient_database/importer_spec.rb
@@ -234,6 +239,7 @@ files:
 - spec/support/sr25.zip
 - spec/support/sr25/FD_GROUP.txt
 - spec/support/sr25/FOOD_DES.txt
+- spec/support/sr25/FOOTNOTE.txt
 - spec/support/sr25/NUTR_DEF.txt
 - spec/support/sr25/NUT_DATA.txt
 - spec/support/sr25/WEIGHT.txt
@@ -258,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A gem to include all the USDA nutrient data quickly into a ruby project
@@ -267,10 +273,12 @@ test_files:
 - spec/lib/usda_nutrient_database/food_group_spec.rb
 - spec/lib/usda_nutrient_database/food_spec.rb
 - spec/lib/usda_nutrient_database/foods_nutrient_spec.rb
+- spec/lib/usda_nutrient_database/footnote_spec.rb
 - spec/lib/usda_nutrient_database/import/downloader_spec.rb
 - spec/lib/usda_nutrient_database/import/food_groups_spec.rb
 - spec/lib/usda_nutrient_database/import/foods_nutrients_spec.rb
 - spec/lib/usda_nutrient_database/import/foods_spec.rb
+- spec/lib/usda_nutrient_database/import/footnotes_spec.rb
 - spec/lib/usda_nutrient_database/import/nutrients_spec.rb
 - spec/lib/usda_nutrient_database/import/weights_spec.rb
 - spec/lib/usda_nutrient_database/importer_spec.rb
@@ -281,6 +289,7 @@ test_files:
 - spec/support/sr25.zip
 - spec/support/sr25/FD_GROUP.txt
 - spec/support/sr25/FOOD_DES.txt
+- spec/support/sr25/FOOTNOTE.txt
 - spec/support/sr25/NUTR_DEF.txt
 - spec/support/sr25/NUT_DATA.txt
 - spec/support/sr25/WEIGHT.txt