scaffolding_extensions 1.1.2 → 1.1.3

data/README

@@ -24,11 +24,11 @@ Scaffolding Extensions currently supports:
   * Rails 2.0
   * Ramaze 0.3.9.5
   * Camping 1.5
-  * Sinatra 0.2.0
+  * Sinatra 0.2.2
 * Object/Relational Mappers
   * ActiveRecord 2.0
-  * DataMapper 0.3.0
-  * Sequel 1.4.0
+  * DataMapper 0.3.1
+  * Sequel 1.5.0
 * Javascript Libaries (used for Ajax/Autocompleting)
   * Prototype 1.6.0.1
   * JQuery 1.2.3
@@ -48,7 +48,7 @@ You can get Scaffolding Extensions via git or as a gem:
 * git: git://github.com/jeremyevans/scaffolding_extensions.git
 * gem: sudo gem install scaffolding_extensions
 * demo: http://scaffolding-extensions.jeremyevans.net
-* github: http://github.com/jeremyevans/scaffolding_extensions/tree/master
+* github: http://github.com/jeremyevans/scaffolding_extensions
 * RDoc: http://code.jeremyevans.net/doc/scaffolding_extensions
 * Bug Tracker: http://rubyforge.org/tracker/?atid=22169&group_id=5726&func=browse
 * Forum: http://rubyforge.org/forum/forum.php?forum_id=22403

data/lib/scaffolding_extensions/controller/sinatra.rb

@@ -153,12 +153,6 @@ class Sinatra::EventContext
   include ScaffoldingExtensions::TextRenderer
 end
 
-class NilClass
-  def from_param
-    nil
-  end
-end
-
 def scaffold(root, model, options = {})
   scaffold_setup(root).send(:scaffold, model, options)
 end

data/lib/scaffolding_extensions/meta_model.rb

@@ -286,6 +286,12 @@ module ScaffoldingExtensions::MetaModel
     @scaffold_human_name ||= scaffold_name.humanize
   end
 
+  # Which associations to include when querying for multiple objects.
+  # Can be set with an instance variable.
+  def scaffold_include(action = :default)
+    @scaffold_include
+  end
+
   # The name string to use in urls, defaults to name.underscore.  Can be set with an 
   # instance variable.
   def scaffold_name
@@ -537,6 +543,11 @@ module ScaffoldingExtensions::MetaModel
       attributes.reject{|k,v| !allowed_attributes.include?(k.to_s.split('(')[0])}
     end
     
+    # The associations to include when loading the association
+    def scaffold_include_association(association)
+      scaffold_associated_class(association).scaffold_include(:association)
+    end
+
     # Condition to ensure field is not NULL
     def scaffold_notnull_condition(field)
       ["#{scaffold_table_name}.#{field} IS NOT NULL"]

data/lib/scaffolding_extensions/model/active_record.rb

@@ -104,12 +104,6 @@ module ScaffoldingExtensions::MetaActiveRecord
     [reflection.klass, reflection.primary_key_name, reflection.association_foreign_key, reflection.options[:join_table]]
   end
 
-  # Which associations to include when querying for multiple objects.
-  # Can be set with an instance variable.
-  def scaffold_include(action = :default)
-    @scaffold_include
-  end
-
   # Returns a hash of values to be used as url parameters on the link to create a new
   # :has_many associated object.  Defaults to setting the foreign key field to the
   # record's primary key, and the STI type to this model's name, if :as is one of
@@ -144,11 +138,6 @@ module ScaffoldingExtensions::MetaActiveRecord
   end
 
   private
-    # The associations to include when loading the association
-    def scaffold_include_association(association)
-      scaffold_associated_class(association).scaffold_include(:association)
-    end
-    
     # Updates associated records for a given reflection and from record to point to the
     # to record
     def scaffold_reflection_merge(reflection, from, to)
@@ -176,9 +165,4 @@ class ActiveRecord::Base
   extend ScaffoldingExtensions::MetaARDM
   extend ScaffoldingExtensions::MetaActiveRecord
   extend ScaffoldingExtensions::Overridable
-  class << self
-    extend ScaffoldingExtensions::MetaOverridable
-    scaffold_override_methods(:add_associated_objects, :associated_objects, :association_find_object, :association_find_objects, :find_object, :find_objects, :new_associated_object_values, :remove_associated_objects, :save, :unassociated_objects, :filter_attributes)
-    scaffold_override_iv_methods(:associated_human_name, :association_use_auto_complete, :fields, :include, :select_order, :attributes, :include_association, :select_order_association)
-  end
 end

data/lib/scaffolding_extensions/model/data_mapper.rb

@@ -105,7 +105,6 @@ module ScaffoldingExtensions::MetaDataMapper
 
   # Retrieve multiple objects given a hash of options
   def scaffold_get_objects(options)
-    options.delete(:include)
     options[:conditions] = scaffold_merge_conditions(options[:conditions])
     all(options)
   end
@@ -116,11 +115,6 @@ module ScaffoldingExtensions::MetaDataMapper
     [reflection.constant, reflection.left_foreign_key, reflection.right_foreign_key, reflection.join_table]
   end
 
-  # DataMapper doesn't use includes, so this is always nil
-  def scaffold_include(action = :default)
-    nil
-  end
-
   # Returns a hash of values to be used as url parameters on the link to create a new
   # :has_many associated object.  Defaults to setting the foreign key field to the
   # record's primary key.
@@ -150,11 +144,6 @@ module ScaffoldingExtensions::MetaDataMapper
   end
 
   private
-    # DataMapper doesn't need to include, so this is always nil
-    def scaffold_include_association(association)
-      nil
-    end
-    
     # Updates associated records for a given reflection and from record to point to the
     # to record
     def scaffold_reflection_merge(reflection, from, to)
@@ -182,9 +171,4 @@ class DataMapper::Base
   extend ScaffoldingExtensions::MetaARDM
   extend ScaffoldingExtensions::MetaDataMapper
   extend ScaffoldingExtensions::Overridable
-  class << self
-    extend ScaffoldingExtensions::MetaOverridable
-    scaffold_override_methods(:add_associated_objects, :associated_objects, :association_find_object, :association_find_objects, :find_object, :find_objects, :new_associated_object_values, :remove_associated_objects, :save, :unassociated_objects, :filter_attributes)
-    scaffold_override_iv_methods(:associated_human_name, :association_use_auto_complete, :fields, :select_order, :attributes, :select_order_association)
-  end
 end

data/lib/scaffolding_extensions/model/sequel.rb

@@ -129,6 +129,7 @@ module ScaffoldingExtensions::MetaSequel
         else records.order(o)
       end
     end
+    records = records.eager(options[:include]) if options[:include]
     records = records.limit(options[:limit], options[:offset]) if options[:limit]
     records.all
   end
@@ -139,11 +140,6 @@ module ScaffoldingExtensions::MetaSequel
     [reflection[:class], reflection[:left_key], reflection[:right_key], reflection[:join_table]]
   end
 
-  # Sequel doesn't do eager loading yet, so this is always nil 
-  def scaffold_include(action = :default)
-    nil
-  end
-
   # Returns a hash of values to be used as url parameters on the link to create a new
   # :has_many associated object.  Defaults to setting the foreign key field to the
   # record's primary key.
@@ -184,11 +180,6 @@ module ScaffoldingExtensions::MetaSequel
   end
 
   private
-    # Sequel doesn't do eager loading yet
-    def scaffold_include_association(association)
-      nil
-    end
-    
     # Updates associated records for a given reflection and from record to point to the
     # to record
     def scaffold_reflection_merge(reflection, from, to)
@@ -216,9 +207,4 @@ class Sequel::Model
   extend ScaffoldingExtensions::MetaModel
   extend ScaffoldingExtensions::MetaSequel
   extend ScaffoldingExtensions::Overridable
-  class << self
-    extend ScaffoldingExtensions::MetaOverridable
-    scaffold_override_methods(:add_associated_objects, :associated_objects, :association_find_object, :association_find_objects, :find_object, :find_objects, :new_associated_object_values, :remove_associated_objects, :save, :unassociated_objects, :filter_attributes)
-    scaffold_override_iv_methods(:associated_human_name, :association_use_auto_complete, :fields, :select_order, :attributes, :select_order_association)
-  end
 end

data/lib/scaffolding_extensions/overridable.rb

@@ -1,5 +1,13 @@
 module ScaffoldingExtensions
   module Overridable
+    def self.extended(klass)
+      class << klass
+        extend ScaffoldingExtensions::MetaOverridable
+        scaffold_override_methods(:add_associated_objects, :associated_objects, :association_find_object, :association_find_objects, :find_object, :find_objects, :new_associated_object_values, :remove_associated_objects, :save, :unassociated_objects, :filter_attributes)
+        scaffold_override_iv_methods(:associated_human_name, :association_use_auto_complete, :fields, :include, :select_order, :attributes, :include_association, :select_order_association) 
+      end
+    end
+
     private
       # If a method exists matches scaffold_#{action}_#{m}, return a proc that calls it.
       # If not and the instance variable @scaffold_#{action}_#{m} is defined, return a

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: scaffolding_extensions
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
-date: 2008-04-15 00:00:00 -07:00
+  version: 1.1.3
+date: 2008-04-29 00:00:00 -07:00
 summary: Administrative database front-end for multiple web-frameworks and ORMs
 require_paths: 
 - lib