usda-nutrient-database 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35f7dffdf433c3c075779ed74ffc85775784d873
-  data.tar.gz: 1290cbc6ab3f2abedf992dd1605e44132fe308a0
+  metadata.gz: 9fac9ef436246590f59dc2719c028959c9c81fc7
+  data.tar.gz: 315c836faed4a4de15416ad32a277db245dca755
 SHA512:
-  metadata.gz: 0e2db9e3b9a216a9d0c3f1bebc8f0f9a642f1c9d7bbe0c970a70a2a6481159b14e465f39d1861966eed9e7420c909519e7b8b08e24f4b1fd87b70c2d2bb5f5be
-  data.tar.gz: f9319fd8b497e4df8b827d51bf2a69b0ffafb37b6e41ac24ac239dc540828830791bfc8edbd07b1fceeca610d91a826b053abd727c2541a98f9b4a7c67a7ac92
+  metadata.gz: ad4c52cd1647742d73fd2a1a73d2d5c70d484807c73bdd191ac233a0d135261610efb20ac36ae4ec20e2e92176f3b8854f97b84cceca579bb73d2866243c391c
+  data.tar.gz: 5abb1d5df808e868d2b43dad2f593983898883f898578bca716019dafc452c8ba66d685192c3dc68d3691fdc7cb6822be90c85621382d0a75a3087003f4c12aa

data/lib/usda-nutrient-database.rb

@@ -1,5 +1,6 @@
 require 'faraday'
 require 'active_record'
+require 'composite_primary_keys'
 require 'usda_nutrient_database/configuration'
 require 'usda_nutrient_database/engine' if defined?(Rails)
 require 'usda_nutrient_database/food_group'

data/lib/usda_nutrient_database/food.rb

@@ -29,5 +29,11 @@ module UsdaNutrientDatabase
     scope :by_food_group_code, ->(food_group_code) {
       where(food_group_code: food_group_code)
     }
+    scope :search, ->(text) {
+      where(
+        arel_table[:long_description].matches("%#{text.gsub(' ', '%')}%")
+        .or(arel_table[:long_description].matches("%#{text.split(' ').reverse.join('%')}%"))
+      )
+    }
   end
 end

data/lib/usda_nutrient_database/foods_nutrient.rb

@@ -1,6 +1,7 @@
 module UsdaNutrientDatabase
   class FoodsNutrient < ActiveRecord::Base
     self.table_name = 'usda_foods_nutrients'
+    self.primary_keys = %i(nutrient_databank_number nutrient_number)
 
     validates :nutrient_databank_number, presence: true,
       uniqueness: { scope: :nutrient_number, allow_blank: true }

data/lib/usda_nutrient_database/footnote.rb

@@ -1,6 +1,11 @@
 module UsdaNutrientDatabase
   class Footnote < ActiveRecord::Base
     self.table_name = 'usda_footnotes'
+    self.primary_keys = [
+      :nutrient_databank_number,
+      :footnote_number,
+      :nutrient_number
+    ]
 
     validates :nutrient_databank_number,
       presence: true,

data/lib/usda_nutrient_database/version.rb

@@ -1,3 +1,3 @@
 module UsdaNutrientDatabase
-  VERSION = '2.1.0'
+  VERSION = '2.1.1'
 end

data/lib/usda_nutrient_database/weight.rb

@@ -1,6 +1,7 @@
 module UsdaNutrientDatabase
   class Weight < ActiveRecord::Base
     self.table_name = 'usda_weights'
+    self.primary_keys = %i(nutrient_databank_number sequence_number)
 
     validates :nutrient_databank_number, presence: true,
       uniqueness: { scope: :sequence_number }

data/usda-nutrient-database.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'activerecord', '>= 3.0.0'
+  spec.add_runtime_dependency 'composite_primary_keys'
   spec.add_runtime_dependency 'faraday'
   spec.add_runtime_dependency 'rubyzip'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usda-nutrient-database
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Matt Beedle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: composite_primary_keys
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement