usda-nutrient-database 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ce03922c74860e2745e15d03f6c272def82a4c5
-  data.tar.gz: 4fb9cf73acb5c2800f954c6a2c65ff9e431d5e5e
+  metadata.gz: 4a67031ae417bd3650d714457de22314526d35c7
+  data.tar.gz: 2d335dcbf0e77e332a09e6571caedba77b9f2033
 SHA512:
-  metadata.gz: 5e03b8800a02759e631d5222cf2cdf5316c18bc0969f05763915f91624aa7ae53b959635a15f4ec633edaf0307cf03455642649875198bca3d810900a346a141
-  data.tar.gz: 14a2a5e859edd9af69f602ede9706108a5f723ee5b76f44bcc7f0880633853d486c1a5b4b3cfe991d006c0b5963d21e938b9cf361e9ecfeac31c2271a31acccf
+  metadata.gz: f3216c2ea4d030e6713ffca4fc4c3f80b11d57ddf367f3e0c259c512168d8e03659e972416c72827779cbafbecac855680ba35897dd0d46d8762d1b84af98642
+  data.tar.gz: 8d3f28d89b7b60a080bb4944b599309aada5cfdb4c10ab23f5bfa18d0f251eda8a54b6d206e9138f8400f05f61c7d13dfcce562f74eca32af7bca0159fec0c8c

data/lib/usda_nutrient_database/food.rb

@@ -21,5 +21,13 @@ module UsdaNutrientDatabase
 
     belongs_to :food_group, class_name: 'UsdaNutrientDatabase::FoodGroup',
       foreign_key: :food_group_code
+
+    scope :by_nutrient_number, ->(nutrient_number) {
+      joins(:nutrients)
+        .where(nutrients: { nutrient_number: nutrient_number })
+    }
+    scope :by_food_group_code, ->(food_group_code) {
+      where(food_group_code: food_group_code)
+    }
   end
 end

data/lib/usda_nutrient_database/foods_nutrient.rb

@@ -14,5 +14,12 @@ module UsdaNutrientDatabase
       foreign_key: :nutrient_databank_number
     belongs_to :nutrient, class_name: 'UsdaNutrientDatabase::Nutrient',
       foreign_key: :nutrient_number
+
+    scope :by_nutrient_databank_number, ->(nutrient_databank_number) {
+      where(nutrient_databank_number: nutrient_databank_number)
+    }
+    scope :by_nutrient_number, ->(nutrient_number) {
+      where(nutrient_number: nutrient_number)
+    }
   end
 end

data/lib/usda_nutrient_database/footnote.rb

@@ -12,5 +12,9 @@ module UsdaNutrientDatabase
       foreign_key: :nutrient_databank_number
     belongs_to :nutrient, class_name: 'UsdaNutrientDatabase::Nutrient',
       foreign_key: :nutrient_number
+
+    scope :by_nutrient_number, ->(nutrient_number) {
+      where(nutrient_number: nutrient_number)
+    }
   end
 end

data/lib/usda_nutrient_database/import/downloader.rb

@@ -6,7 +6,7 @@ module UsdaNutrientDatabase
 
       attr_reader :directory, :version
 
-      def initialize(directory = 'tmp/usda', version = 'sr25')
+      def initialize(directory = 'tmp/usda', version = 'sr27')
         @directory = directory
         @version = version
       end
@@ -55,7 +55,7 @@ module UsdaNutrientDatabase
       def final_path
         look_ahead = connection.head(path)
         if look_ahead.status == 302
-          raise 'No location' unless look_ahead.headers['location'] 
+          raise 'No location' unless look_ahead.headers['location']
           URI.parse(look_ahead.headers['location']).path
         else
           path

data/lib/usda_nutrient_database/nutrient.rb

@@ -13,11 +13,17 @@ module UsdaNutrientDatabase
 
     has_many :foods_nutrients,
       class_name: 'UsdaNutrientDatabase::FoodsNutrient',
-      dependent: :destroy, foreign_key: :nutrient_number,
+      foreign_key: :nutrient_number,
       dependent: :nullify
     has_many :foods, class_name: 'UsdaNutrientDatabase::Food',
       through: :foods_nutrients
     has_many :footnotes, class_name: 'UsdaNutrientDatabase::Footnote',
       foreign_key: :nutrient_number
+
+    scope :by_nutrient_databank_number, ->(nutrient_databank_number) {
+      joins(:foods).where(
+        usda_foods: { nutrient_databank_number: nutrient_databank_number }
+      )
+    }
   end
 end

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', 'sr26').import
+    UsdaNutrientDatabase::Importer.new('tmp/usda', 'sr27').import
   end
 
   [
@@ -15,11 +15,11 @@ namespace :usda do
   end
 
   def download_and_import(importer_name)
-    UsdaNutrientDatabase::Import::Downloader.new('tmp/usda', 'sr26').
+    UsdaNutrientDatabase::Import::Downloader.new('tmp/usda', 'sr27').
       tap do |downloader|
       downloader.download_and_unzip
       "UsdaNutrientDatabase::Import::#{importer_name}".constantize.
-        new('tmp/usda/sr25').import
+        new('tmp/usda/sr27').import
       downloader.cleanup
     end
   end

data/lib/usda_nutrient_database/version.rb

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

data/lib/usda_nutrient_database/weight.rb

@@ -12,5 +12,9 @@ module UsdaNutrientDatabase
 
     belongs_to :food, class_name: 'UsdaNutrientDatabase::Food',
       foreign_key: :nutrient_databank_number
+
+    scope :by_nutrient_databank_number, ->(nutrient_databank_number) {
+      where(nutrient_databank_number: nutrient_databank_number)
+    }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usda-nutrient-database
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Matt Beedle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-21 00:00:00.000000000 Z
+date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord