usda-nutrient-database 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a67031ae417bd3650d714457de22314526d35c7
-  data.tar.gz: 2d335dcbf0e77e332a09e6571caedba77b9f2033
+  metadata.gz: a1e7f2d97c62a659ed44c93cbaf15975196107cd
+  data.tar.gz: 4ce234c30e8b5fc058fdd8960d2fd3dcfe416707
 SHA512:
-  metadata.gz: f3216c2ea4d030e6713ffca4fc4c3f80b11d57ddf367f3e0c259c512168d8e03659e972416c72827779cbafbecac855680ba35897dd0d46d8762d1b84af98642
-  data.tar.gz: 8d3f28d89b7b60a080bb4944b599309aada5cfdb4c10ab23f5bfa18d0f251eda8a54b6d206e9138f8400f05f61c7d13dfcce562f74eca32af7bca0159fec0c8c
+  metadata.gz: 7d3104e79ce945684f7550a77f8edada72dc5159460aaaeccc972fdb2c306d4438f275cac30a9906ac75b0b5aa32562bbc68794cec1bcb670c1bad0dd34974e4
+  data.tar.gz: 55c2bc53e7260685b3a6352ad904ca516760afa188c67fc5bdd7d9bb1b0bfee2a7fc71b9bb4b21e89ac444043686f42cec46681dc2a0c2846c1410fa3ef1379c

data/.travis.yml

@@ -1,5 +1,8 @@
 language: ruby
 rvm:
+  - 2.3.0
+  - 2.2.0
+  - 2.1.0
   - 2.0.0
   - 1.9.3
 before_install:

data/README.md

@@ -64,7 +64,7 @@ Use the models to query and profit:
 ```
 UsdaNutrientDatabase::FoodGroup
 UsdaNutrientDatabase::Food
-UsedNutrientDatabase::Nutrient
+UsdaNutrientDatabase::Nutrient
 UsdaNutrientDatabase::FoodsNutrient
 UsdaNutrientDatabase::Weight
 UsdaNutrientDatabase::SourceCode

data/db/migrate/9_add_referential_integrity.rb

@@ -0,0 +1,82 @@
+class AddReferentialIntegrity < ActiveRecord::Migration
+  def change
+    remove_index :usda_nutrients, :nutrient_number
+    add_index :usda_nutrients, :nutrient_number, unique: true
+
+    remove_index :usda_source_codes, :code
+    add_index :usda_source_codes, :code, unique: true
+
+    remove_index :usda_food_groups, :code
+    add_index :usda_food_groups, :code, unique: true
+
+    remove_index :usda_foods, :nutrient_databank_number
+    add_index :usda_foods, :nutrient_databank_number, unique: true
+
+    add_index :usda_foods_nutrients, [
+      :nutrient_databank_number,
+      :nutrient_number
+    ],
+    unique: true,
+    name: "index_usda_foods_nutrients_on_databank_number_and_number"
+
+    add_foreign_key :usda_foods,
+      :usda_food_groups,
+      column: :food_group_code,
+      primary_key: :code
+
+    add_foreign_key :usda_foods_nutrients,
+      :usda_foods,
+      column: :nutrient_databank_number,
+      primary_key: :nutrient_databank_number
+
+    add_foreign_key :usda_foods_nutrients,
+      :usda_nutrients,
+      column: :nutrient_number,
+      primary_key: :nutrient_number
+
+    add_foreign_key :usda_foods_nutrients,
+      :usda_source_codes,
+      column: :src_code,
+      primary_key: :code
+
+    add_foreign_key :usda_footnotes,
+      :usda_foods,
+      column: :nutrient_databank_number,
+      primary_key: :nutrient_databank_number
+
+    add_foreign_key :usda_weights,
+      :usda_foods,
+      column: :nutrient_databank_number,
+      primary_key: :nutrient_databank_number
+
+    add_foreign_key :usda_foods,
+      :usda_food_groups,
+      column: :food_group_code,
+      primary_key: :code
+
+    add_foreign_key :usda_foods_nutrients,
+      :usda_foods,
+      column: :nutrient_databank_number,
+      primary_key: :nutrient_databank_number
+
+    add_foreign_key :usda_foods_nutrients,
+      :usda_nutrients,
+      column: :nutrient_number,
+      primary_key: :nutrient_number
+
+    add_foreign_key :usda_foods_nutrients,
+      :usda_source_codes,
+      column: :src_code,
+      primary_key: :code
+
+    add_foreign_key :usda_footnotes,
+      :usda_foods,
+      column: :nutrient_databank_number,
+      primary_key: :nutrient_databank_number
+
+    add_foreign_key :usda_weights,
+      :usda_foods,
+      column: :nutrient_databank_number,
+      primary_key: :nutrient_databank_number
+  end
+end

data/lib/usda-nutrient-database.rb

@@ -35,6 +35,10 @@ module UsdaNutrientDatabase
     def configuration
       @configuration ||= UsdaNutrientDatabase::Configuration.new
     end
+
+    def usda_version
+      @usda_version ||= configuration.usda_version
+    end
   end
 
   def self.configure

data/lib/usda_nutrient_database/configuration.rb

@@ -1,7 +1,8 @@
 module UsdaNutrientDatabase
   class Configuration
     attr_accessor :logger
-    attr_writer   :perform_logging
+    attr_writer   :perform_logging,
+      :usda_version
 
     def logger
       @logger ||= Logger.new(STDOUT)
@@ -10,5 +11,9 @@ module UsdaNutrientDatabase
     def perform_logging?
       @perform_logging ||= false
     end
+
+    def usda_version
+      @usda_version || 'sr28'
+    end
   end
 end

data/lib/usda_nutrient_database/import/base.rb

@@ -19,7 +19,7 @@ module UsdaNutrientDatabase
       attr_reader :directory
 
       def extract_row(row)
-        build_object(apply_typecasts(row)).save
+        build_object(apply_typecasts(row)).save!
       end
 
       def build_object(row)

data/lib/usda_nutrient_database/import/downloader.rb

@@ -6,7 +6,7 @@ module UsdaNutrientDatabase
 
       attr_reader :directory, :version
 
-      def initialize(directory = 'tmp/usda', version = 'sr27')
+      def initialize(directory = 'tmp/usda', version = UsdaNutrientDatabase.usda_version)
         @directory = directory
         @version = version
       end
@@ -22,9 +22,15 @@ module UsdaNutrientDatabase
 
       def path
         [
-          'SP2UserFiles', 'Place', '12354500', 'Data', version.upcase,
-          'dnload', "#{version_file}.zip"
-        ].join('/')
+          'SP2UserFiles',
+          'Place',
+          '12354500',
+          'Data',
+          version == 'sr28' ? 'SR' : nil,
+          version.upcase,
+          'dnload',
+          "#{version_file}.zip"
+        ].compact.join('/')
       end
 
       def download
@@ -66,6 +72,8 @@ module UsdaNutrientDatabase
         case @version
         when 'sr27'
           'sr27asc'
+        when 'sr28'
+          'sr28asc'
         else
           @version
         end

data/lib/usda_nutrient_database/importer.rb

@@ -2,7 +2,7 @@ module UsdaNutrientDatabase
   class Importer
     attr_reader :directory, :version
 
-    def initialize(directory = 'tmp/usda', version = 'sr25')
+    def initialize(directory = 'tmp/usda', version = UsdaNutrientDatabase.usda_version)
       @directory = directory
       @version = version
     end
@@ -18,8 +18,13 @@ module UsdaNutrientDatabase
 
     def importer_names
       [
-        'Foods', 'Nutrients', 'FoodsNutrients', 'FoodGroups', 'Weights',
-        'Footnotes', 'SourceCodes'
+        'FoodGroups',
+        'SourceCodes',
+        'Nutrients',
+        'Foods',
+        'FoodsNutrients',
+        'Weights',
+        'Footnotes'
       ]
     end
 

data/lib/usda_nutrient_database/tasks/usda_nutrient_database.rake

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

data/lib/usda_nutrient_database/version.rb

@@ -1,3 +1,3 @@
 module UsdaNutrientDatabase
-  VERSION = '1.3.0'
+  VERSION = '1.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usda-nutrient-database
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Matt Beedle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -230,6 +230,7 @@ files:
 - db/migrate/6_create_usda_footnotes.rb
 - db/migrate/7_create_usda_source_codes.rb
 - db/migrate/8_add_timestamps_to_all_tables.rb
+- db/migrate/9_add_referential_integrity.rb
 - lib/usda-nutrient-database.rb
 - lib/usda_nutrient_database/configuration.rb
 - lib/usda_nutrient_database/engine.rb
@@ -303,7 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A gem to include all the USDA nutrient data quickly into a ruby project