usda-nutrient-database 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ca876c3b4ec8508dd27dbc60a016c0e2ce56e7b
-  data.tar.gz: f7d7ba3c4c77d2a25cdcaf282c635f23e786358a
+  metadata.gz: 96482305951055aefdd578c867660a91161857c8
+  data.tar.gz: 9fd2e0ae747263dd13b83c289d8438e7d30460bd
 SHA512:
-  metadata.gz: f9df68143bd1cba24a4f4e81a990c3c6942921fb6360c71f47f4aaf4d11c935e37f77a1f8d1109364ac23c314a87b6ad7477a9683f6786775153be6242502ac7
-  data.tar.gz: 59d438d54e7e9952030b416edd1e36fc48e618f012ffc47c7efac1a8b7d7ee5c9955a41b13f95e5cbee9a119bbf168ca3ea7448385cebac186ffb63610164d6d
+  metadata.gz: 1e3538708c3edda458fab78344858f947701d96df77aa5be766be7f16e900128ddb76b46a06134c5995340f23bb86afc58bd6686150f3c18ace1772402df1015
+  data.tar.gz: 41692f998af17c5cf8ca1a776893228f92a392da20253fd1dbb7242c6dd181db754eca55d1ad3e221ee30a9a718cbbc5acbdc87d138328865a43338cb77610d5

data/.travis.yml

@@ -0,0 +1,11 @@
+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/

data/README.md

@@ -1,3 +1,15 @@
+[![Stories in Ready](https://badge.waffle.io/mattbeedle/usda-nutrient-database.png?label=ready)](https://waffle.io/mattbeedle/usda-nutrient-database)
+[![Code
+Climate](https://codeclimate.com/github/mattbeedle/usda-nutrient-database.png)](https://codeclimate.com/github/mattbeedle/usda-nutrient-database)
+[![Build
+Status](https://travis-ci.org/mattbeedle/usda-nutrient-database.png?branch=master)](https://travis-ci.org/mattbeedle/usda-nutrient-database)
+[![Coverage
+Status](https://coveralls.io/repos/mattbeedle/usda-nutrient-database/badge.png)](https://coveralls.io/r/mattbeedle/usda-nutrient-database)
+[![Dependency
+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)
+
 # USDA Nutrient Database
 
 The USDA nutrition database is a great source of nutrition information. However,

data/lib/usda_nutrient_database/food.rb

@@ -9,7 +9,15 @@ module UsdaNutrientDatabase
     validates :long_description, presence: true
     validates :short_description, presence: true
 
-    has_many :footnotes, class_name: 'UsdaNutrientDatabase::Footnote'
+    has_many :footnotes, class_name: 'UsdaNutrientDatabase::Footnote',
+      foreign_key: :nutrient_databank_number
+    has_many :weights, class_name: 'UsdaNutrientDatabase::Weight',
+      foreign_key: :nutrient_databank_number
+    has_many :foods_nutrients,
+      class_name: 'UsdaNutrientDatabase::FoodsNutrient',
+      foreign_key: :nutrient_databank_number, dependent: :nullify
+    has_many :nutrients, class_name: 'UsdaNutrientDatabase::Nutrient',
+      through: :foods_nutrients
 
     belongs_to :food_group, class_name: 'UsdaNutrientDatabase::FoodGroup',
       foreign_key: :food_group_code

data/lib/usda_nutrient_database/food_group.rb

@@ -7,6 +7,6 @@ module UsdaNutrientDatabase
     validates :description, presence: true
 
     has_many :foods, class_name: 'UsdaNutrientDatabase::Food',
-      dependent: :destroy
+      dependent: :destroy, foreign_key: :food_group_code
   end
 end

data/lib/usda_nutrient_database/nutrient.rb

@@ -13,8 +13,11 @@ module UsdaNutrientDatabase
 
     has_many :foods_nutrients,
       class_name: 'UsdaNutrientDatabase::FoodsNutrient',
-      dependent: :destroy
-
-    has_many :footnotes, class_name: 'UsdaNutrientDatabase::Footnote'
+      dependent: :destroy, 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
   end
 end

data/lib/usda_nutrient_database/version.rb

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

data/lib/usda_nutrient_database/weight.rb

@@ -9,5 +9,8 @@ module UsdaNutrientDatabase
     validates :amount, presence: true
     validates :measurement_description, presence: true
     validates :gram_weight, presence: true
+
+    belongs_to :food, class_name: 'UsdaNutrientDatabase::Food',
+      foreign_key: :nutrient_databank_number
   end
 end

data/spec/spec_helper.rb

@@ -4,11 +4,15 @@ require 'logger'
 
 Bundler.setup
 
+require 'coveralls'
+Coveralls.wear!
+
 require 'active_record'
 require 'database_cleaner'
 require 'usda-nutrient-database'
 require 'shoulda-matchers'
 require 'webmock/rspec'
+require_relative 'support/database'
 
 UsdaNutrientDatabase.configure do |config|
   config.perform_logging = false
@@ -24,6 +28,8 @@ RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 
+  include Database
+
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.
@@ -37,6 +43,8 @@ RSpec.configure do |config|
   ActiveRecord::Base.configurations = YAML.load_file(database_yml)
   db_config = ActiveRecord::Base.configurations[db_name]
 
+  setup_database(db_name, db_config)
+
   begin
     ActiveRecord::Base.establish_connection(db_name)
     ActiveRecord::Base.connection

data/spec/support/database.rb

@@ -0,0 +1,28 @@
+module Database
+  def setup_database(db_name, db_config)
+    setup_pg(db_name, db_config) if RUBY_PLATFORM == 'ruby'
+    setup_jdbc(db_name, db_config) if RUBY_PLATFORM == 'java'
+  end
+
+  def setup_pg(db_name, db_config)
+    begin
+      ActiveRecord::Base.establish_connection(db_name)
+      ActiveRecord::Base.connection
+    rescue PG::ConnectionBad
+      ActiveRecord::Base.establish_connection db_config.merge('database' => nil)
+      ActiveRecord::Base.connection.create_database db_config['database']
+      ActiveRecord::Base.establish_connection db_config
+    end
+  end
+
+  def setup_jdbc(db_name, db_config)
+    begin
+      ActiveRecord::Base.establish_connection(db_name)
+      ActiveRecord::Base.connection
+    rescue ActiveRecord::JDBCError
+      ActiveRecord::Base.establish_connection db_config.merge('database' => nil)
+      ActiveRecord::Base.connection.create_database db_config['database']
+      ActiveRecord::Base.establish_connection db_config
+    end
+  end
+end

data/usda-nutrient-database.gemspec

@@ -22,11 +22,15 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'faraday'
   spec.add_runtime_dependency 'rubyzip'
 
+  if RUBY_PLATFORM == 'java'
+    spec.add_development_dependency 'activerecord-jdbcpostgresql-adapter'
+  end
   spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'database_cleaner'
   spec.add_development_dependency 'guard'
   spec.add_development_dependency 'guard-rspec'
-  spec.add_development_dependency 'pg'
+  spec.add_development_dependency 'pg' if RUBY_PLATFORM != 'java'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'shoulda-matchers'

metadata

@@ -1,181 +1,195 @@
 --- !ruby/object:Gem::Specification
 name: usda-nutrient-database
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Matt Beedle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-27 00:00:00.000000000 Z
+date: 2013-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: faraday
   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: rubyzip
   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: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  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: database_cleaner
   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
     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-rspec
   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: pg
   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: rake
   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: rspec
   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: shoulda-matchers
   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: webmock
   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'
 description: A gem to include all the USDA nutrient data quickly into a ruby project
@@ -185,8 +199,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -242,6 +257,7 @@ files:
 - spec/lib/usda_nutrient_database/weight_spec.rb
 - spec/schema.rb
 - spec/spec_helper.rb
+- spec/support/database.rb
 - spec/support/sr25.zip
 - spec/support/sr25/FD_GROUP.txt
 - spec/support/sr25/FOOD_DES.txt
@@ -261,17 +277,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0.rc.1
 signing_key: 
 specification_version: 4
 summary: A gem to include all the USDA nutrient data quickly into a ruby project
@@ -295,6 +311,7 @@ test_files:
 - spec/lib/usda_nutrient_database/weight_spec.rb
 - spec/schema.rb
 - spec/spec_helper.rb
+- spec/support/database.rb
 - spec/support/sr25.zip
 - spec/support/sr25/FD_GROUP.txt
 - spec/support/sr25/FOOD_DES.txt