usda-nutrient-database 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a1a20a7ca11fed27457609ba81d0247479c4b90
-  data.tar.gz: 1e7911deeb66f62d4e5c36cc669d73b8b1f1b340
+  metadata.gz: fd3a9157bd4c59d9a33a7b0d360fbd09558904b4
+  data.tar.gz: 3222844968dbf95a113c76a480870ae0cdb77cb1
 SHA512:
-  metadata.gz: 9ea25431873fbaaedab58f4f24ae48c8c8f8962cb86d8b4853e6ced769c7f4e64517416a8680fc636f977dad04038dcdf256ca2db487c68691fd998f0a9bdd74
-  data.tar.gz: 6e4715beb8efd19a3cbe94a5f3387cda8f78924d06fe8980eb260a00e2ad1b999197a315f2451d879b6d87e1210590ac14cd408cf08d06f30949ba91dbde49af
+  metadata.gz: 439158006e6be1b8a20dafee9d5994a33e6d470dbab00dfbb1cc3a12fb583e181484c9b8cbdec5670cd92696420470ba03fdce0796fd3bb687725de8689688a0
+  data.tar.gz: 199f3b62e2d32de1b3803b5cd60b96a8c9cae44a09860ea7261e4e12d6bf7dc3937a2ea1c8b633021be49f939cd80503ab6404c6086bfd51aa4e093769d49f23

data/lib/usda-nutrient-database.rb

@@ -24,7 +24,9 @@ module UsdaNutrientDatabase
     attr_writer :configuration
 
     def log(message, level = :debug)
-      configuration.logger.send(level, message)
+      if configuration.perform_logging?
+        configuration.logger.send(level, message)
+      end
     end
 
     def configuration

data/lib/usda_nutrient_database/configuration.rb

@@ -1,9 +1,14 @@
 module UsdaNutrientDatabase
   class Configuration
     attr_accessor :logger
+    attr_writer   :perform_logging
 
     def logger
       @logger ||= Logger.new(STDOUT)
     end
+
+    def perform_logging?
+      @perform_logging ||= false
+    end
   end
 end

data/lib/usda_nutrient_database/footnote.rb

@@ -2,7 +2,8 @@ module UsdaNutrientDatabase
   class Footnote < ActiveRecord::Base
     self.table_name = 'usda_footnotes'
 
-    validates :nutrient_databank_number, presence: true
+    validates :nutrient_databank_number, presence: true,
+      uniqueness: { allow_blank: true }
     validates :footnote_number, presence: true
     validates :footnote_type, presence: true
     validates :footnote_text, presence: true

data/lib/usda_nutrient_database/import/base.rb

@@ -1,3 +1,5 @@
+require 'csv'
+
 module UsdaNutrientDatabase
   module Import
     class Base
@@ -7,8 +9,21 @@ module UsdaNutrientDatabase
         @directory = directory
       end
 
+      def import
+        log_import_started
+        CSV.open(
+          "#{directory}/#{filename}", 'r:iso-8859-1:utf-8', csv_options
+        ) do |csv|
+          csv.each { |row| extract_row(row) }
+        end
+      end
+
       private
 
+      def filename
+        raise NotImplementedError
+      end
+
       def csv_options
         { col_sep: '^', quote_char: '~' }
       end

data/lib/usda_nutrient_database/import/downloader.rb

@@ -49,10 +49,7 @@ module UsdaNutrientDatabase
       end
 
       def connection
-        @connection ||= Faraday.new(url: 'http://www.ars.usda.gov') do |faraday|
-          faraday.response :logger
-          faraday.adapter Faraday.default_adapter
-        end
+        @connection ||= Faraday.new(url: 'http://www.ars.usda.gov')
       end
     end
   end

data/lib/usda_nutrient_database/import/food_groups.rb

@@ -1,19 +1,32 @@
-require 'csv'
-
 module UsdaNutrientDatabase
   module Import
-    class FoodGroups < UsdaNutrientDatabase::Import::Base
-      def import
-        UsdaNutrientDatabase.log 'Importing food groups'
-        CSV.open(
-          "#{directory}/FD_GROUP.txt", 'r:iso-8859-1:utf-8', csv_options
-        ) do |csv|
-          csv.each do |row|
-            UsdaNutrientDatabase::FoodGroup.create! code: row[0],
-              description: row[1]
+    class FoodGroups < Base
+
+      private
+
+      def extract_row(row)
+        build_food_group(row).save
+      end
+
+      def build_food_group(row)
+        UsdaNutrientDatabase::FoodGroup.new.tap do |food_group|
+          columns.each_with_index do |column, index|
+            food_group.send("#{column}=", row[index])
           end
         end
       end
+
+      def columns
+        @columns ||= %w(code description)
+      end
+
+      def filename
+        'FD_GROUP.txt'
+      end
+
+      def log_import_started
+        UsdaNutrientDatabase.log 'Importing food groups'
+      end
     end
   end
 end

data/lib/usda_nutrient_database/import/foods.rb

@@ -3,28 +3,37 @@
 module UsdaNutrientDatabase
   module Import
     class Foods < Base
-      def import
-        UsdaNutrientDatabase.log 'Importing foods'
-        CSV.open("#{directory}/FOOD_DES.txt", 'r:iso-8859-1:utf-8', csv_options) do |csv|
-          csv.each do |row|
-            UsdaNutrientDatabase::Food.create!(
-              nutrient_databank_number: row[0],
-              food_group_code: row[1],
-              long_description: row[2],
-              short_description: row[3],
-              common_names: row[4],
-              manufacturer_name: row[5],
-              survey: row[6],
-              refuse_description: row[7],
-              percentage_refuse: row[8],
-              nitrogen_factor: row[9],
-              protein_factor: row[10],
-              fat_factor: row[11],
-              carbohydrate_factor: row[12]
-            )
+
+      private
+
+      def extract_row(row)
+        build_food(row).save
+      end
+
+      def build_food(row)
+        UsdaNutrientDatabase::Food.new.tap do |food|
+          columns.each_with_index do |column, index|
+            food.send("#{column}=", row[index])
           end
         end
       end
+
+      def log_import_started
+        UsdaNutrientDatabase.log 'Importing foods'
+      end
+
+      def filename
+        'FOOD_DES.txt'
+      end
+
+      def columns
+        [
+          :nutrient_databank_number, :food_group_code, :long_description,
+          :short_description, :common_names, :manufacturer_name, :survey,
+          :refuse_description, :percentage_refuse, :nitrogen_factor,
+          :protein_factor, :fat_factor, :carbohydrate_factor
+        ]
+      end
     end
   end
 end

data/lib/usda_nutrient_database/import/foods_nutrients.rb

@@ -1,14 +1,6 @@
 module UsdaNutrientDatabase
   module Import
     class FoodsNutrients < Base
-      def import
-        UsdaNutrientDatabase.log 'Importing foods_nutrients'
-        CSV.open(
-          "#{directory}/NUT_DATA.txt", 'r:iso-8859-1:utf-8', csv_options
-        ) do |csv|
-          csv.each { |row| extract_row(row) }
-        end
-      end
 
       private
 
@@ -23,11 +15,23 @@ module UsdaNutrientDatabase
       end
 
       def extract_row(row)
-        attrs = {}
-        columns.each_with_index do |column, index|
-          attrs.merge!(column => row[index])
+        build_foods_nutrient(row).save
+      end
+
+      def build_foods_nutrient(row)
+        UsdaNutrientDatabase::FoodsNutrient.new.tap do |foods_nutrient|
+          columns.each_with_index do |column, index|
+            foods_nutrient.send("#{column}=", row[index])
+          end
         end
-        UsdaNutrientDatabase::FoodsNutrient.create!(attrs)
+      end
+
+      def filename
+        'NUT_DATA.txt'
+      end
+
+      def log_import_started
+        UsdaNutrientDatabase.log 'Importing foods_nutrients'
       end
     end
   end

data/lib/usda_nutrient_database/import/footnotes.rb

@@ -1,34 +1,35 @@
 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)
+        build_footnote(row).save
       end
 
-      def extract_row_data(row)
-        {}.tap do |attrs|
-          columns.each_with_index do |col, index|
-            attrs.merge!(col => row[index])
+      def build_footnote(row)
+        UsdaNutrientDatabase::Footnote.new.tap do |footnote|
+          columns.each_with_index do |column, index|
+            footnote.send("#{column}=", row[index])
           end
         end
       end
 
+      def filename
+        'FOOTNOTE.txt'
+      end
+
       def columns
-        [
+        @columns ||= [
           :nutrient_databank_number, :footnote_number, :footnote_type,
           :nutrient_number, :footnote_text
         ]
       end
+
+      def log_import_started
+        UsdaNutrientDatabase.log 'Importing footnotes'
+      end
     end
   end
 end

data/lib/usda_nutrient_database/import/nutrients.rb

@@ -1,20 +1,35 @@
 module UsdaNutrientDatabase
   module Import
     class Nutrients < Base
-      def import
-        UsdaNutrientDatabase.log 'Importing nutrients'
-        CSV.open(
-          "#{directory}/NUTR_DEF.txt", 'r:iso-8859-1:utf-8', csv_options
-        ) do |csv|
-          csv.each do |row|
-            UsdaNutrientDatabase::Nutrient.create!(
-              nutrient_number: row[0], units: row[1], tagname: row[2],
-              nutrient_description: row[3], number_decimal_places: row[4],
-              sort_record_order: row[5]
-            )
+
+      private
+
+      def extract_row(row)
+        build_nutrient(row).save
+      end
+
+      def build_nutrient(row)
+        UsdaNutrientDatabase::Nutrient.new.tap do |nutrient|
+          columns.each_with_index do |column, index|
+            nutrient.send("#{column}=", row[index])
           end
         end
       end
+
+      def columns
+        @columns ||= [
+          :nutrient_number, :units, :tagname, :nutrient_description,
+          :number_decimal_places, :sort_record_order
+        ]
+      end
+
+      def filename
+        'NUTR_DEF.txt'
+      end
+
+      def log_import_started
+        UsdaNutrientDatabase.log 'Importing nutrients'
+      end
     end
   end
 end

data/lib/usda_nutrient_database/import/weights.rb

@@ -1,20 +1,36 @@
 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]
-            )
+
+      private
+
+      def extract_row(row)
+        build_weight(row).save
+      end
+
+      def build_weight(row)
+        UsdaNutrientDatabase::Weight.new.tap do |weight|
+          columns.each_with_index do |column, index|
+            weight.send("#{column}=", row[index])
           end
         end
       end
+
+      def filename
+        'WEIGHT.txt'
+      end
+
+      def columns
+        @columns ||= [
+          :nutrient_databank_number, :sequence_number, :amount,
+          :measurement_description, :gram_weight, :num_data_points,
+          :standard_deviation
+        ]
+      end
+
+      def log_import_started
+        UsdaNutrientDatabase.log 'Importing weights'
+      end
     end
   end
 end

data/lib/usda_nutrient_database/importer.rb

@@ -9,38 +9,25 @@ module UsdaNutrientDatabase
 
     def import
       downloader.download_and_unzip
-      food_group_importer.import
-      food_importer.import
-      nutrient_importer.import
-      foods_nutrient_importer.import
-      weights_importer.import
+      importer_names.each { |importer_name| importer_for(importer_name).import }
     ensure
       downloader.cleanup
     end
 
     private
 
-    def food_importer
-      UsdaNutrientDatabase::Import::Foods.new("#{directory}/#{version}")
+    def importer_names
+      [
+        'Foods', 'Nutrients', 'FoodsNutrients', 'FoodGroups', 'Weights',
+        'Footnotes'
+      ]
     end
 
-    def nutrient_importer
-      UsdaNutrientDatabase::Import::Nutrients.new("#{directory}/#{version}")
-    end
-
-    def foods_nutrient_importer
-      UsdaNutrientDatabase::Import::FoodsNutrients.
+    def importer_for(importer_name)
+      "UsdaNutrientDatabase::Import::#{importer_name}".constantize.
         new("#{directory}/#{version}")
     end
 
-    def food_group_importer
-      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.4.0"
+  VERSION = "0.5.0"
 end

data/lib/usda_nutrient_database/weight.rb

@@ -2,8 +2,10 @@ module UsdaNutrientDatabase
   class Weight < ActiveRecord::Base
     self.table_name = 'usda_weights'
 
-    validates :nutrient_databank_number, presence: true
-    validates :sequence_number, presence: true
+    validates :nutrient_databank_number, presence: true,
+      uniqueness: { scope: :sequence_number }
+    validates :sequence_number, presence: true,
+      uniqueness: { scope: :nutrient_databank_number }
     validates :amount, presence: true
     validates :measurement_description, presence: true
     validates :gram_weight, presence: true

data/spec/lib/usda_nutrient_database/importer_spec.rb

@@ -15,5 +15,17 @@ describe UsdaNutrientDatabase::Importer do
     it { expect(UsdaNutrientDatabase::Nutrient.count).to eql(15) }
     it { expect(UsdaNutrientDatabase::FoodsNutrient.count).to eql(12) }
     it { expect(UsdaNutrientDatabase::Weight.count).to eql(11) }
+    it { expect(UsdaNutrientDatabase::Footnote.count).to eql(7) }
+
+    context 'importing twice' do
+      before { importer.import }
+
+      it { expect(UsdaNutrientDatabase::FoodGroup.count).to eql(25) }
+      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) }
+      it { expect(UsdaNutrientDatabase::Footnote.count).to eql(7) }
+    end
   end
 end

data/spec/spec_helper.rb

@@ -10,6 +10,10 @@ require 'usda-nutrient-database'
 require 'shoulda-matchers'
 require 'webmock/rspec'
 
+UsdaNutrientDatabase.configure do |config|
+  config.perform_logging = false
+end
+
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # Require this file using `require "spec_helper"` to ensure that it is only

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: usda-nutrient-database
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Matt Beedle