active_nutrition 0.5.1 → 0.6.0

data/lib/active_nutrition/models/data_src.rb

@@ -3,8 +3,8 @@
 module ActiveNutrition
   module Models
     class DataSrc < ActiveRecord::Base
-      set_table_name "data_src"
-      set_primary_key :DataSrc_ID
+      self.table_name = "data_src"
+      self.primary_key = :DataSrc_ID
     end
   end
 end

data/lib/active_nutrition/models/datsrcln.rb

@@ -3,8 +3,8 @@
 module ActiveNutrition
   module Models
     class Datsrcln < ActiveRecord::Base
-      set_table_name "datsrcln"
-      set_primary_key :NDB_No
+      self.table_name = "datsrcln"
+      self.primary_key = :NDB_No
 
       validates :NDB_No, :uniqueness => { :scope => [:Nutr_No, :DataSrc_ID] }
       validates :Nutr_No, :uniqueness => { :scope => [:NDB_No, :DataSrc_ID] }

data/lib/active_nutrition/models/deriv_cd.rb

@@ -3,8 +3,8 @@
 module ActiveNutrition
   module Models
     class DerivCd < ActiveRecord::Base
-      set_table_name "deriv_cd"
-      set_primary_key :Deriv_CD
+      self.table_name = "deriv_cd"
+      self.primary_key = :Deriv_CD
     end
   end
 end

data/lib/active_nutrition/models/fd_group.rb

@@ -3,8 +3,8 @@
 module ActiveNutrition
   module Models
     class FdGroup < ActiveRecord::Base
-      set_table_name "fd_group"
-      set_primary_key :FdGrp_CD
+      self.table_name = "fd_group"
+      self.primary_key = :FdGrp_CD
     end
   end
 end

data/lib/active_nutrition/models/food_des.rb

@@ -3,8 +3,8 @@
 module ActiveNutrition
   module Models
     class FoodDes < ActiveRecord::Base
-      set_table_name "food_des"
-      set_primary_key :NDB_No
+      self.table_name = "food_des"
+      self.primary_key = :NDB_No
 
       alias_attribute :description, :Long_Desc
       alias_attribute :common_name, :ComName

data/lib/active_nutrition/models/footnote.rb

@@ -3,8 +3,8 @@
 module ActiveNutrition
   module Models
     class Footnote < ActiveRecord::Base
-      set_table_name "footnote"
-      set_primary_key :Footnt_No
+      self.table_name = "footnote"
+      self.primary_key = :Footnt_No
     end
   end
 end

data/lib/active_nutrition/models/langdesc.rb

@@ -3,8 +3,8 @@
 module ActiveNutrition
   module Models
     class Langdesc < ActiveRecord::Base
-      set_table_name "langdesc"
-      set_primary_key :Factor_Code
+      self.table_name = "langdesc"
+      self.primary_key = :Factor_Code
     end
   end
 end

data/lib/active_nutrition/models/langual.rb

@@ -3,8 +3,8 @@
 module ActiveNutrition
   module Models
     class Langual < ActiveRecord::Base
-      set_table_name "langual"
-      set_primary_key :NDB_No
+      self.table_name = "langual"
+      self.primary_key = :NDB_No
 
       validates :NDB_No, :uniqueness => { :scope => [:Factor_Code] }
       validates :Factor_Code, :uniqueness => { :scope => [:NDB_No] }

data/lib/active_nutrition/models/migration.rb

@@ -3,7 +3,7 @@
 module ActiveNutrition
   module Models
     class Migration < ActiveRecord::Base
-      set_table_name "active_nutrition_migrations"
+      self.table_name = "active_nutrition_migrations"
     end
   end
 end

data/lib/active_nutrition/models/nut_data.rb

@@ -3,8 +3,8 @@
 module ActiveNutrition
   module Models
     class NutData < ActiveRecord::Base
-      set_table_name "nut_data"
-      set_primary_key :NDB_No
+      self.table_name = "nut_data"
+      self.primary_key = :NDB_No
 
       alias_attribute :value, :Nutr_Val
 

data/lib/active_nutrition/models/nutr_def.rb

@@ -3,8 +3,8 @@
 module ActiveNutrition
   module Models
     class NutrDef < ActiveRecord::Base
-      set_table_name "nutr_def"
-      set_primary_key :Nutr_No
+      self.table_name = "nutr_def"
+      self.primary_key = :Nutr_No
 
       alias_attribute :units, :Units
       alias_attribute :name, :NutrDesc

data/lib/active_nutrition/models/src_cd.rb

@@ -3,8 +3,8 @@
 module ActiveNutrition
   module Models
     class SrcCd < ActiveRecord::Base
-      set_table_name "src_cd"
-      set_primary_key :Src_Cd
+      self.table_name = "src_cd"
+      self.primary_key = :Src_Cd
     end
   end
 end

data/lib/active_nutrition/models/weight.rb

@@ -3,8 +3,8 @@
 module ActiveNutrition
   module Models
     class Weight < ActiveRecord::Base
-      set_table_name "weight"
-      set_primary_key :NDB_No
+      self.table_name = "weight"
+      self.primary_key = :NDB_No
 
       validates :NDB_No, :uniqueness => { :scope => [:Seq] }
       validates :Seq, :uniqueness => { :scope => [:NDB_No] }

data/lib/active_nutrition/utilities/update.rb

@@ -35,7 +35,7 @@ module ActiveNutrition
               data["attribute_order"].each_with_index do |field, index|
                 # update each attribute by explicitly calling the attr= method, just in case
                 # there are custom methods in the model class
-                new_record.send(:"#{field}=", values[index])
+                new_record.write_attribute(field.to_sym, values[index])
               end
 
               new_record.save!

data/lib/active_nutrition/version.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
 module ActiveNutrition
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
   USDA_VERSION = "24"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_nutrition
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-03 00:00:00.000000000 Z
+date: 2013-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: 5.0.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: 5.0.12
 description: An ActiveRecord-backed collection of models for storing and retrieving
   nutritional information from the USDA's Nutrient Database.
 email:
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: active_nutrition
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: USDA nutrition data