usda-nutrient-database 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cc2d851a28100a977e5f1c243bb70ba4c7dc691
-  data.tar.gz: 62f598910c7b1e57188d08fd93c1a81c8abe2efd
+  metadata.gz: 7ce03922c74860e2745e15d03f6c272def82a4c5
+  data.tar.gz: 4fb9cf73acb5c2800f954c6a2c65ff9e431d5e5e
 SHA512:
-  metadata.gz: 14aeaa16b9758200bc3fd3f6f245c4b24ff1a05ae1a8cf55bfaa43cc0b6e04157a85997b22d2c9f79d9273c5973615afa8c630c0dba3363a7936b686aa53cba9
-  data.tar.gz: edcf5e47cc2a01dc93b66c9913e9510aab336d7647b3b95f494222f815a6537baf10565560f83f15cafc101c33d30367ba7b1c4490ded6e673d022a3a2802574
+  metadata.gz: 5e03b8800a02759e631d5222cf2cdf5316c18bc0969f05763915f91624aa7ae53b959635a15f4ec633edaf0307cf03455642649875198bca3d810900a346a141
+  data.tar.gz: 14a2a5e859edd9af69f602ede9706108a5f723ee5b76f44bcc7f0880633853d486c1a5b4b3cfe991d006c0b5963d21e938b9cf361e9ecfeac31c2271a31acccf

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 *.rbc
+*.sqlite3
 .bundle
 .config
 .yardoc

data/.travis.yml

@@ -2,10 +2,9 @@ language: ruby
 rvm:
   - 2.0.0
   - 1.9.3
-  - jruby-19mode
 before_install:
   - gem update --system
   - gem install bundler
   - gem install rake
 script:
-  - bundle exec rspec spec/
+  - DB=sqlite3 bundle exec rspec spec/

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.2.0
+
+- Upgrade to version SR27 USDA dataset.
+  [#5](https://github.com/mattbeedle/usda-nutrient-database/pull/5)
+- Require ActiveRecord so the gem can work outside of Rails.
+  [#5](https://github.com/mattbeedle/usda-nutrient-database/pull/5)
+
 ## 1.0.0
 
 - Update README

data/README.md

@@ -9,6 +9,8 @@ Status](https://coveralls.io/repos/mattbeedle/usda-nutrient-database/badge.png)]
 Status](https://gemnasium.com/mattbeedle/usda-nutrient-database.png)](https://gemnasium.com/mattbeedle/usda-nutrient-database)
 [![Gem
 Version](https://badge.fury.io/rb/usda-nutrient-database.png)](http://badge.fury.io/rb/usda-nutrient-database)
+[![Gitter
+chat](https://badges.gitter.im/mattbeedle/usda-nutrient-database.png)](https://gitter.im/mattbeedle/usda-nutrient-database)
 
 # USDA Nutrient Database
 
@@ -18,6 +20,14 @@ to be desired.
 
 This is a simple gem to import the database into your ruby application.
 
+## Using the USDA Nutrient Database REST API instead
+
+Even after importing this data, keeping it up to date and adding/maintaining
+additional logic such as full text search, weight conversion, etc is a pain. As
+an alternative I have put together a small RESTful web service to do this for you.
+You can find the docs at
+[http://docs.usdanutrientservice.apiary.io/](http://docs.usdanutrientservice.apiary.io/)
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -76,6 +86,12 @@ Any feature requests/ideas can also go in the issues list.
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
+## Contributors
+
+Many thanks to the following contributers:
+
+- [@benfalk](https://github.com/benfalk)
+
 ## Versioning
 
 This gem follows [Semantic Versioning](http://semver.org)

data/lib/usda-nutrient-database.rb

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

data/lib/usda_nutrient_database/import/base.rb

@@ -19,7 +19,7 @@ module UsdaNutrientDatabase
       attr_reader :directory
 
       def extract_row(row)
-        build_object(row).save
+        build_object(apply_typecasts(row)).save
       end
 
       def build_object(row)
@@ -38,6 +38,10 @@ module UsdaNutrientDatabase
         raise NotImplementedError
       end
 
+      def apply_typecasts(row)
+        row
+      end
+
       def file_location
         "#{directory}/#{filename}"
       end

data/lib/usda_nutrient_database/import/downloader.rb

@@ -23,7 +23,7 @@ module UsdaNutrientDatabase
       def path
         [
           'SP2UserFiles', 'Place', '12354500', 'Data', version.upcase,
-          'dnload', "#{version}.zip"
+          'dnload', "#{version_file}.zip"
         ].join('/')
       end
 
@@ -33,7 +33,7 @@ module UsdaNutrientDatabase
           FileUtils.mkdir_p("#{directory}/#{version}")
         end
         File.open("#{directory}/#{version}.zip", 'w+b') do |file|
-          file.write connection.get(path).body
+          file.write connection.get(final_path).body
         end
       end
 
@@ -49,7 +49,26 @@ module UsdaNutrientDatabase
       end
 
       def connection
-        @connection ||= Faraday.new(url: 'http://www.ars.usda.gov')
+        @connection ||= Faraday.new(url: 'https://www.ars.usda.gov')
+      end
+
+      def final_path
+        look_ahead = connection.head(path)
+        if look_ahead.status == 302
+          raise 'No location' unless look_ahead.headers['location'] 
+          URI.parse(look_ahead.headers['location']).path
+        else
+          path
+        end
+      end
+
+      def version_file
+        case @version
+        when 'sr27'
+          'sr27asc'
+        else
+          @version
+        end
       end
     end
   end

data/lib/usda_nutrient_database/import/foods.rb

@@ -6,6 +6,11 @@ module UsdaNutrientDatabase
 
       private
 
+      def apply_typecasts(row)
+        row[6] = row[6].present?
+        row
+      end
+
       def find_or_initialize(row)
         UsdaNutrientDatabase::Food.
           find_or_initialize_by(nutrient_databank_number: row[0])

data/lib/usda_nutrient_database/version.rb

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

data/spec/lib/usda_nutrient_database/import/downloader_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe UsdaNutrientDatabase::Import::Downloader do
-  let(:downloader) { described_class.new('tmp/usda') }
+  let(:downloader) { described_class.new(directory, version) }
   let(:extraction_path) { "#{directory}/#{version}" }
   let(:directory) { 'tmp/usda' }
   let(:version) { 'sr25' }
@@ -13,10 +13,23 @@ describe UsdaNutrientDatabase::Import::Downloader do
     ]
   end
 
+  describe '#version_file' do
+    subject { downloader.version_file }
+    context 'with version sr25' do
+      it { is_expected.to eq 'sr25' }
+    end
+    context 'with version sr27' do
+      let(:version) { 'sr27' }
+      it { is_expected.to eq 'sr27asc' }
+    end
+  end
+
   describe '#download_and_unzip' do
     before do
       stub_request(:get, /.*/).
         to_return(body: File.read('spec/support/sr25.zip'))
+      expect(downloader).to receive(:final_path)
+        .and_return('/sr25.zip')
       downloader.download_and_unzip
     end
 
@@ -33,6 +46,8 @@ describe UsdaNutrientDatabase::Import::Downloader do
     before do
       stub_request(:get, /.*/).
         to_return(body: File.read('spec/support/sr25.zip'))
+      expect(downloader).to receive(:final_path)
+        .and_return('/sr25.zip')
       downloader.download_and_unzip
       downloader.cleanup
     end

data/spec/lib/usda_nutrient_database/importer_spec.rb

@@ -3,29 +3,49 @@ require 'spec_helper'
 describe UsdaNutrientDatabase::Importer do
   let(:importer) { UsdaNutrientDatabase::Importer.new }
 
-  describe '#import' do
+  describe '#import (sr25)' do
+    let(:sr_file) { File.read('spec/support/sr25.zip') }
     before do
+      stub_request(:head, "https://www.ars.usda.gov/SP2UserFiles/Place/12354500/Data/SR25/dnload/sr25.zip").
+        with(:headers => {'Accept'=>'*/*', 'User-Agent'=>'Faraday v0.9.1'}).
+        to_return(:status => 200, :body => "", :headers => {})
       stub_request(:get, /.*/).
-        to_return(body: File.read('spec/support/sr25.zip'))
+        to_return(body: sr_file)
       importer.import
     end
 
-    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) }
+    it 'should import the right number of records' do
+      expect(UsdaNutrientDatabase::FoodGroup.count).to eql(25)
+      expect(UsdaNutrientDatabase::Food.count).to eql(16)
+      expect(UsdaNutrientDatabase::Nutrient.count).to eql(15)
+      expect(UsdaNutrientDatabase::FoodsNutrient.count).to eql(12)
+      expect(UsdaNutrientDatabase::Weight.count).to eql(11)
+      expect(UsdaNutrientDatabase::Footnote.count).to eql(7)
+    end
+
+    context 'with sr27' do
+      let(:sr_file) { File.read('spec/support/sr27.zip') }
+      it 'should import the right number of records' do
+        expect(UsdaNutrientDatabase::FoodGroup.count).to eql(25)
+        expect(UsdaNutrientDatabase::Food.count).to eql(5)
+        expect(UsdaNutrientDatabase::Nutrient.count).to eql(150)
+        expect(UsdaNutrientDatabase::FoodsNutrient.count).to eql(476)
+        expect(UsdaNutrientDatabase::Weight.count).to eql(18)
+        expect(UsdaNutrientDatabase::Footnote.count).to eql(362)
+      end
+    end
 
     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) }
+      it 'should import the right number of records' do
+        expect(UsdaNutrientDatabase::FoodGroup.count).to eql(25)
+        expect(UsdaNutrientDatabase::Food.count).to eql(16)
+        expect(UsdaNutrientDatabase::Nutrient.count).to eql(15)
+        expect(UsdaNutrientDatabase::FoodsNutrient.count).to eql(12)
+        expect(UsdaNutrientDatabase::Weight.count).to eql(11)
+        expect(UsdaNutrientDatabase::Footnote.count).to eql(7)
+      end
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -25,7 +25,6 @@ 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
 
@@ -47,7 +46,7 @@ RSpec.configure do |config|
   setup_database(db_name, db_config)
 
   begin
-    ActiveRecord::Base.establish_connection(db_name)
+    ActiveRecord::Base.establish_connection(db_name.to_sym)
     ActiveRecord::Base.connection
   rescue PG::ConnectionBad
     ActiveRecord::Base.establish_connection db_config.merge('database' => nil)

data/usda-nutrient-database.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'database_cleaner'
+  spec.add_development_dependency 'sqlite3' if RUBY_PLATFORM != 'java'
   spec.add_development_dependency 'guard'
   spec.add_development_dependency 'guard-rspec'
   spec.add_development_dependency 'pg' if RUBY_PLATFORM != 'java'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usda-nutrient-database
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Matt Beedle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-11 00:00:00.000000000 Z
+date: 2015-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -267,6 +281,7 @@ files:
 - spec/support/sr25/NUT_DATA.txt
 - spec/support/sr25/SRC_CD.txt
 - spec/support/sr25/WEIGHT.txt
+- spec/support/sr27.zip
 - usda-nutrient-database.gemspec
 homepage: https://github.com/mattbeedle/usda-nutrient-database
 licenses:
@@ -288,7 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A gem to include all the USDA nutrient data quickly into a ruby project
@@ -321,3 +336,4 @@ test_files:
 - spec/support/sr25/NUT_DATA.txt
 - spec/support/sr25/SRC_CD.txt
 - spec/support/sr25/WEIGHT.txt
+- spec/support/sr27.zip