usda-nutrient-database 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96482305951055aefdd578c867660a91161857c8
-  data.tar.gz: 9fd2e0ae747263dd13b83c289d8438e7d30460bd
+  metadata.gz: 1cc2d851a28100a977e5f1c243bb70ba4c7dc691
+  data.tar.gz: 62f598910c7b1e57188d08fd93c1a81c8abe2efd
 SHA512:
-  metadata.gz: 1e3538708c3edda458fab78344858f947701d96df77aa5be766be7f16e900128ddb76b46a06134c5995340f23bb86afc58bd6686150f3c18ace1772402df1015
-  data.tar.gz: 41692f998af17c5cf8ca1a776893228f92a392da20253fd1dbb7242c6dd181db754eca55d1ad3e221ee30a9a718cbbc5acbdc87d138328865a43338cb77610d5
+  metadata.gz: 14aeaa16b9758200bc3fd3f6f245c4b24ff1a05ae1a8cf55bfaa43cc0b6e04157a85997b22d2c9f79d9273c5973615afa8c630c0dba3363a7936b686aa53cba9
+  data.tar.gz: edcf5e47cc2a01dc93b66c9913e9510aab336d7647b3b95f494222f815a6537baf10565560f83f15cafc101c33d30367ba7b1c4490ded6e673d022a3a2802574

data/db/migrate/8_add_timestamps_to_all_tables.rb

@@ -0,0 +1,12 @@
+class AddTimestampsToAllTables < ActiveRecord::Migration
+  def change
+    [
+      :usda_food_groups, :usda_foods, :usda_foods_nutrients,
+      :usda_weights, :usda_footnotes, :usda_source_codes,
+      :usda_nutrients
+    ].each do |table_name|
+      add_column table_name, :created_at, :datetime
+      add_column table_name, :updated_at, :datetime
+    end
+  end
+end

data/lib/usda_nutrient_database/import/base.rb

@@ -3,23 +3,45 @@ require 'csv'
 module UsdaNutrientDatabase
   module Import
     class Base
-      attr_reader :directory
-
       def initialize(directory)
         @directory = directory
       end
 
       def import
         log_import_started
-        CSV.open(
-          "#{directory}/#{filename}", 'r:iso-8859-1:utf-8', csv_options
-        ) do |csv|
+        CSV.open(file_location, 'r:iso-8859-1:utf-8', csv_options) do |csv|
           csv.each { |row| extract_row(row) }
         end
       end
 
       private
 
+      attr_reader :directory
+
+      def extract_row(row)
+        build_object(row).save
+      end
+
+      def build_object(row)
+        find_or_initialize(row).tap do |object|
+          columns.each_with_index do |column, index|
+            object.send("#{column}=", row[index])
+          end
+        end
+      end
+
+      def columns
+        raise NotImplementedError
+      end
+
+      def find_or_initialize(row)
+        raise NotImplementedError
+      end
+
+      def file_location
+        "#{directory}/#{filename}"
+      end
+
       def filename
         raise NotImplementedError
       end

data/lib/usda_nutrient_database/import/food_groups.rb

@@ -4,16 +4,8 @@ module UsdaNutrientDatabase
 
       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
+      def find_or_initialize(row)
+        UsdaNutrientDatabase::FoodGroup.find_or_initialize_by(code: row[0])
       end
 
       def columns

data/lib/usda_nutrient_database/import/foods.rb

@@ -6,16 +6,9 @@ module UsdaNutrientDatabase
 
       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
+      def find_or_initialize(row)
+        UsdaNutrientDatabase::Food.
+          find_or_initialize_by(nutrient_databank_number: row[0])
       end
 
       def log_import_started

data/lib/usda_nutrient_database/import/foods_nutrients.rb

@@ -14,16 +14,10 @@ module UsdaNutrientDatabase
         ]
       end
 
-      def extract_row(row)
-        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
+      def find_or_initialize(row)
+        UsdaNutrientDatabase::FoodsNutrient.find_or_initialize_by(
+          nutrient_databank_number: row[0], nutrient_number: row[1]
+        )
       end
 
       def filename

data/lib/usda_nutrient_database/import/footnotes.rb

@@ -4,16 +4,11 @@ module UsdaNutrientDatabase
 
       private
 
-      def extract_row(row)
-        build_footnote(row).save
-      end
-
-      def build_footnote(row)
-        UsdaNutrientDatabase::Footnote.new.tap do |footnote|
-          columns.each_with_index do |column, index|
-            footnote.send("#{column}=", row[index])
-          end
-        end
+      def find_or_initialize(row)
+        UsdaNutrientDatabase::Footnote.find_or_initialize_by(
+          nutrient_databank_number: row[0], footnote_number: row[1],
+          nutrient_number: row[2]
+        )
       end
 
       def filename

data/lib/usda_nutrient_database/import/nutrients.rb

@@ -4,16 +4,9 @@ module UsdaNutrientDatabase
 
       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
+      def find_or_initialize(row)
+        UsdaNutrientDatabase::Nutrient.
+          find_or_initialize_by(nutrient_number: row[0])
       end
 
       def columns

data/lib/usda_nutrient_database/import/source_codes.rb

@@ -4,16 +4,8 @@ module UsdaNutrientDatabase
 
       private
 
-      def extract_row(row)
-        build_source_code(row).save
-      end
-
-      def build_source_code(row)
-        UsdaNutrientDatabase::SourceCode.new.tap do |source_code|
-          columns.each_with_index do |column, index|
-            source_code.send("#{column}=", row[index])
-          end
-        end
+      def find_or_initialize(row)
+        UsdaNutrientDatabase::SourceCode.find_or_initialize_by(code: row[0])
       end
 
       def columns

data/lib/usda_nutrient_database/import/weights.rb

@@ -4,16 +4,11 @@ module UsdaNutrientDatabase
 
       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
+      def find_or_initialize(row)
+        UsdaNutrientDatabase::Weight.find_or_initialize_by(
+          nutrient_databank_number: row[0],
+          sequence_number: row[1]
+        )
       end
 
       def filename

data/lib/usda_nutrient_database/tasks/usda_nutrient_database.rake

@@ -1,7 +1,7 @@
 namespace :usda do
   desc 'Import the latest USDA nutrition data'
   task import: :environment do
-    UsdaNutrientDatabase::Importer.new('tmp/usda', 'sr25').import
+    UsdaNutrientDatabase::Importer.new('tmp/usda', 'sr26').import
   end
 
   [
@@ -15,7 +15,7 @@ namespace :usda do
   end
 
   def download_and_import(importer_name)
-    UsdaNutrientDatabase::Import::Downloader.new('tmp/usda', 'sr25').
+    UsdaNutrientDatabase::Import::Downloader.new('tmp/usda', 'sr26').
       tap do |downloader|
       downloader.download_and_unzip
       "UsdaNutrientDatabase::Import::#{importer_name}".constantize.

data/lib/usda_nutrient_database/version.rb

@@ -1,3 +1,3 @@
 module UsdaNutrientDatabase
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

data/spec/spec_helper.rb

@@ -25,6 +25,7 @@ end
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usda-nutrient-database
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Matt Beedle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-30 00:00:00.000000000 Z
+date: 2014-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -215,6 +215,7 @@ files:
 - db/migrate/5_create_usda_weights.rb
 - db/migrate/6_create_usda_footnotes.rb
 - db/migrate/7_create_usda_source_codes.rb
+- db/migrate/8_add_timestamps_to_all_tables.rb
 - lib/usda-nutrient-database.rb
 - lib/usda_nutrient_database/configuration.rb
 - lib/usda_nutrient_database/engine.rb
@@ -287,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0.rc.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A gem to include all the USDA nutrient data quickly into a ruby project