scaffolding_extensions 1.5.2 → 1.5.3

data/README

@@ -21,14 +21,14 @@ to better suit your needs.
 Scaffolding Extensions currently supports:
 
 * Web Frameworks
-  * Rails 3.0.9
+  * Rails 3.1.0
   * Ramaze 2011.01.30
   * Camping 2.1
   * Sinatra 1.2.6
   * Rack 1.2.2
 * Object Relational Mappers
-  * ActiveRecord 3.0.9
-  * Sequel 3.25.0
+  * ActiveRecord 3.1.0
+  * Sequel 3.27.0
   * DataMapper 1.0.2 (see doc/datamapper.txt for details)
 * Javascript Libaries (used for Ajax/Autocompleting, default is now JQuery)
   * Prototype 1.6.0.3

data/lib/scaffolding_extensions/model/active_record.rb

@@ -78,7 +78,7 @@ module ScaffoldingExtensions::MetaActiveRecord
     fields = columns.reject{|c| c.primary || c.name =~ /(\A(created|updated)_at|_count)\z/ || c.name == inheritance_column}.collect{|c| c.name}
     scaffold_all_associations.each do |reflection|
       next if reflection.macro != :belongs_to || reflection.options.include?(:polymorphic)
-      fields.delete(reflection.primary_key_name)
+      fields.delete(reflection.foreign_key)
       fields.push(reflection.name.to_s)
     end
     @scaffold_fields = fields.sort.collect{|f| f.to_sym}
@@ -86,7 +86,7 @@ module ScaffoldingExtensions::MetaActiveRecord
   
   # The foreign key for the given reflection
   def scaffold_foreign_key(reflection)
-    reflection.primary_key_name
+    reflection.foreign_key
   end
   
   # Retrieve a single model object given an id
@@ -103,7 +103,7 @@ module ScaffoldingExtensions::MetaActiveRecord
   # Return the class, left foreign key, right foreign key, and join table for this habtm association
   def scaffold_habtm_reflection_options(association)
     reflection = reflect_on_association(association)
-    [reflection.klass, reflection.primary_key_name, reflection.association_foreign_key, reflection.options[:join_table]]
+    [reflection.klass, reflection.foreign_key, reflection.association_foreign_key, reflection.options[:join_table]]
   end
 
   # Returns a hash of values to be used as url parameters on the link to create a new
@@ -112,7 +112,7 @@ module ScaffoldingExtensions::MetaActiveRecord
   # the association's reflection's options.
   def scaffold_new_associated_object_values(association, record)
     reflection = reflect_on_association(association)
-    vals = {reflection.primary_key_name=>record.id}
+    vals = {reflection.foreign_key=>record.id}
     vals["#{reflection.options[:as]}_type"] = name if reflection.options.include?(:as)
     vals
   end
@@ -169,7 +169,7 @@ module ScaffoldingExtensions::MetaActiveRecord
     # Updates associated records for a given reflection and from record to point to the
     # to record
     def scaffold_reflection_merge(reflection, from, to)
-      foreign_key = reflection.primary_key_name
+      foreign_key = reflection.foreign_key
       sql = case reflection.macro
         when :has_one, :has_many
           return if reflection.options[:through]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scaffolding_extensions
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 1
   - 5
-  - 2
-  version: 1.5.2
+  - 3
+  version: 1.5.3
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-02 00:00:00 -07:00
+date: 2011-08-31 00:00:00 -07:00
 default_executable: 
 dependencies: []