usda-nutrient-database 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dc24f124224152cf055861a60503e240240b2b3
-  data.tar.gz: 2674e5d9355cb19525a3321823b49035b425946a
+  metadata.gz: b8b9d0a98a2fda3048ddebf81c84ae5ed539f2f5
+  data.tar.gz: a1af06b2493267b44614bdcf29e1270e6c6626ad
 SHA512:
-  metadata.gz: f5e7b74648c9064ce431ac3d999b526a579909afb181d5ecf95f4d0840768c207fc5cf1243ef4cb1acfcb0698ab9203d2c1ea2b8b8f242092c5afc4143b752e8
-  data.tar.gz: 8e11ddda4441791585d01a1018bf7e89590ae6f6084bd2f48392f63ef7fa01efd3b4f613974bd060fdc813fb115760fb61a9e8f74d8e59e89c9eb31c8c7995eb
+  metadata.gz: efec3b2602fe153081ef36d5051f36a044d5a0a156686ce4598b7d7d3e0264ac6ea74c875abe6b95ece7c484a70d8a6155b975bfe08957d48245bc4383e5525e
+  data.tar.gz: 7e2c0a946e79f215a6c2bab31724bc7333bf549dc36a850d4f60bf4305f14dd1d34a11c590a3f908bbc4d287e647e2ee442394e7a1eb019d344368f95b95945f

data/README.md

@@ -31,7 +31,7 @@ Import the latest data with the import task:
 ```
 rake usda:import
 ```
-This is going to take a while. 20+ minutes on my 2.66 GHz i7 macbook pro
+This is going to take a while. 60+ minutes on my 2.66 GHz i7 macbook pro
 
 Use the models to query and profit:
 ```

data/db/migrate/5_create_usda_weights.rb

@@ -0,0 +1,13 @@
+class CreateUsdaWeights < ActiveRecord::Migration
+  def change
+    create_table :usda_weights do |t|
+      t.string  :nutrient_databank_number, null: false, index: true
+      t.string  :sequence_number, null: false
+      t.float   :amount, null: false
+      t.string  :measurement_description, null: false
+      t.float   :gram_weight, null: false
+      t.integer :num_data_points
+      t.float   :standard_deviation
+    end
+  end
+end

data/lib/usda-nutrient-database.rb

@@ -12,8 +12,10 @@ 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/nutrients'
+require 'usda_nutrient_database/import/weights'
 require 'usda_nutrient_database/railtie' if defined?(Rails)
 require 'usda_nutrient_database/version'
+require 'usda_nutrient_database/weight'
 
 module UsdaNutrientDatabase
   class << self

data/lib/usda_nutrient_database/import/weights.rb

@@ -0,0 +1,20 @@
+module UsdaNutrientDatabase
+  module Import
+    class Weights < Base
+      def import
+        CSV.open(
+          "#{directory}/WEIGHT.txt", 'r:iso-8859-1:utf-8', csv_options
+        ) do |csv|
+          csv.each do |row|
+            UsdaNutrientDatabase::Weight.create!(
+              nutrient_databank_number: row[0],
+              sequence_number: row[1], amount: row[2],
+              measurement_description: row[3], gram_weight: row[4],
+              num_data_points: row[5], standard_deviation: row[6]
+            )
+          end
+        end
+      end
+    end
+  end
+end

data/lib/usda_nutrient_database/importer.rb

@@ -13,6 +13,7 @@ module UsdaNutrientDatabase
       food_importer.import
       nutrient_importer.import
       foods_nutrient_importer.import
+      weights_importer.import
     ensure
       downloader.cleanup
     end
@@ -36,6 +37,10 @@ module UsdaNutrientDatabase
       UsdaNutrientDatabase::Import::FoodGroups.new("#{directory}/#{version}")
     end
 
+    def weights_importer
+      UsdaNutrientDatabase::Import::Weights.new("#{directory}/#{version}")
+    end
+
     def downloader
       UsdaNutrientDatabase::Import::Downloader.new(directory, version)
     end

data/lib/usda_nutrient_database/version.rb

@@ -1,3 +1,3 @@
 module UsdaNutrientDatabase
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/lib/usda_nutrient_database/weight.rb

@@ -0,0 +1,11 @@
+module UsdaNutrientDatabase
+  class Weight < ActiveRecord::Base
+    self.table_name = 'usda_weights'
+
+    validates :nutrient_databank_number, presence: true
+    validates :sequence_number, presence: true
+    validates :amount, presence: true
+    validates :measurement_description, presence: true
+    validates :gram_weight, presence: true
+  end
+end

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

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

data/spec/lib/usda_nutrient_database/importer_spec.rb

@@ -14,5 +14,6 @@ describe UsdaNutrientDatabase::Importer do
     it { expect(UsdaNutrientDatabase::Food.count).to eql(16) }
     it { expect(UsdaNutrientDatabase::Nutrient.count).to eql(15) }
     it { expect(UsdaNutrientDatabase::FoodsNutrient.count).to eql(12) }
+    it { expect(UsdaNutrientDatabase::Weight.count).to eql(11) }
   end
 end

data/spec/lib/usda_nutrient_database/weight_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe UsdaNutrientDatabase::Weight do
+  it { should validate_presence_of(:nutrient_databank_number) }
+  it { should validate_presence_of(:sequence_number) }
+  it { should validate_presence_of(:amount) }
+  it { should validate_presence_of(:measurement_description) }
+  it { should validate_presence_of(:gram_weight) }
+end

data/spec/schema.rb

@@ -49,4 +49,14 @@ ActiveRecord::Schema.define version: 0 do
     t.string  :add_mod_date
     t.string  :confidence_code
   end
+
+  create_table :usda_weights, force: true do |t|
+    t.string  :nutrient_databank_number, null: false, index: true
+    t.string  :sequence_number, null: false
+    t.float   :amount, null: false
+    t.string  :measurement_description, null: false
+    t.float   :gram_weight, null: false
+    t.integer :num_data_points
+    t.float   :standard_deviation
+  end
 end

data/spec/support/sr25/WEIGHT.txt

@@ -0,0 +1,3 @@
+~01001~^1^1^~cup~^227^^
+~01001~^2^1^~tbsp~^14.2^^
+~01001~^3^1^~pat (1" sq, 1/3" high)~^5.0^^

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: usda-nutrient-database
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Matt Beedle
@@ -196,6 +196,7 @@ files:
 - db/migrate/2_create_usda_foods.rb
 - db/migrate/3_create_usda_foods_nutrients.rb
 - db/migrate/4_create_usda_nutrients.rb
+- db/migrate/5_create_usda_weights.rb
 - lib/tasks/usda_nutrient_database.rake
 - lib/usda-nutrient-database.rb
 - lib/usda_nutrient_database/configuration.rb
@@ -209,10 +210,12 @@ files:
 - lib/usda_nutrient_database/import/foods.rb
 - lib/usda_nutrient_database/import/foods_nutrients.rb
 - lib/usda_nutrient_database/import/nutrients.rb
+- lib/usda_nutrient_database/import/weights.rb
 - lib/usda_nutrient_database/importer.rb
 - lib/usda_nutrient_database/nutrient.rb
 - lib/usda_nutrient_database/railtie.rb
 - lib/usda_nutrient_database/version.rb
+- lib/usda_nutrient_database/weight.rb
 - spec/database.yml
 - spec/lib/usda_nutrient_database/food_group_spec.rb
 - spec/lib/usda_nutrient_database/food_spec.rb
@@ -222,8 +225,10 @@ files:
 - 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/nutrients_spec.rb
+- spec/lib/usda_nutrient_database/import/weights_spec.rb
 - spec/lib/usda_nutrient_database/importer_spec.rb
 - spec/lib/usda_nutrient_database/nutrient_spec.rb
+- spec/lib/usda_nutrient_database/weight_spec.rb
 - spec/schema.rb
 - spec/spec_helper.rb
 - spec/support/sr25.zip
@@ -231,6 +236,7 @@ files:
 - spec/support/sr25/FOOD_DES.txt
 - spec/support/sr25/NUTR_DEF.txt
 - spec/support/sr25/NUT_DATA.txt
+- spec/support/sr25/WEIGHT.txt
 - usda-nutrient-database.gemspec
 homepage: https://github.com/mattbeedle/usda-nutrient-database
 licenses:
@@ -266,8 +272,10 @@ test_files:
 - 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/nutrients_spec.rb
+- spec/lib/usda_nutrient_database/import/weights_spec.rb
 - spec/lib/usda_nutrient_database/importer_spec.rb
 - spec/lib/usda_nutrient_database/nutrient_spec.rb
+- spec/lib/usda_nutrient_database/weight_spec.rb
 - spec/schema.rb
 - spec/spec_helper.rb
 - spec/support/sr25.zip
@@ -275,3 +283,4 @@ test_files:
 - spec/support/sr25/FOOD_DES.txt
 - spec/support/sr25/NUTR_DEF.txt
 - spec/support/sr25/NUT_DATA.txt
+- spec/support/sr25/WEIGHT.txt