scaffolding_extensions 1.1.5 → 1.1.6

data/README

@@ -28,7 +28,7 @@ Scaffolding Extensions currently supports:
 * Object/Relational Mappers
   * ActiveRecord 2.1
   * DataMapper 0.3.1
-  * Sequel 2.0.1
+  * Sequel 2.1.0
 * Javascript Libaries (used for Ajax/Autocompleting)
   * Prototype 1.6.0.1
   * JQuery 1.2.3
@@ -49,7 +49,7 @@ You can get Scaffolding Extensions via git or as a gem:
 * gem: sudo gem install scaffolding_extensions
 * demo: http://scaffolding-extensions.jeremyevans.net
 * github: http://github.com/jeremyevans/scaffolding_extensions
-* RDoc: http://code.jeremyevans.net/doc/scaffolding_extensions
+* RDoc: http://scaffolding-ext.rubyforge.org
 * Bug Tracker: http://rubyforge.org/tracker/?atid=22169&group_id=5726&func=browse
 * Forum: http://rubyforge.org/forum/forum.php?forum_id=22403
 

data/doc/advanced.txt

@@ -72,9 +72,6 @@ Note how :sql_name can pull in data from multiple tables, since they are
 specified via @scaffold_include.  Note that the syntax might be database
 specific (the accounting applation only supports PostreSQL).
 
-Autocompleting currently requires the Prototype library (prototype.js,
-effects.js, and controls.js).
-
 == Customization
 
 Scaffolding Extensions is extremely customizable.  The database layer is split
@@ -136,9 +133,6 @@ objects to the association via Ajax.  There is also a list of currently
 associated objects that can be removed from the associated via Ajax.  This
 allows for quick modification of habtm associations.
 
-HABTM Ajax functionality currently requires the Prototype library
-(prototype.js).
-
 == merge scaffolding
 
 By default, Scaffolding Extensions will produce a merge scaffold for every

data/doc/conversion.txt

@@ -97,6 +97,6 @@ If you can't upgrade to the new version of the plugin and you want to use the
 old version, use the following svn revision depending on the version of Rails
 you are using:
 
-Rails 2.0: svn revision 89
-Rails 1.2: svn revision 81
-Rails 1.1: svn revision 61
+- Rails 2.0: svn revision 89
+- Rails 1.2: svn revision 81
+- Rails 1.1: svn revision 61

data/lib/scaffolding_extensions/model/sequel.rb

@@ -105,6 +105,9 @@ module ScaffoldingExtensions::MetaSequel
   # Retrieve multiple objects given a hash of options
   def scaffold_get_objects(options)
     records = dataset
+    records = records.send(scaffold_use_eager_graph ? :eager_graph : :eager, *options[:include]) if options[:include]
+    records = records.order(*options[:order]) if options[:order]
+    records = records.limit(options[:limit], options[:offset]) if options[:limit]
     conditions = options[:conditions]
     if conditions && Array === conditions && conditions.length > 0
       if String === conditions[0]
@@ -120,17 +123,6 @@ module ScaffoldingExtensions::MetaSequel
         end
       end
     end
-    order = options[:order]
-    order = [order] unless Array === order
-    order.each do |o|
-      next if o.nil?
-      records = case o
-        when Proc then records.order(&o)
-        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
 
@@ -180,6 +172,13 @@ module ScaffoldingExtensions::MetaSequel
     table_name
   end
 
+  # Whether to use eager_graph instead of eager for eager loading.  This is
+  # necessary if you need to reference associated tables when filtering.
+  # Can be set with an instance variable. 
+  def scaffold_use_eager_graph
+    @scaffold_use_eager_graph ||= false
+  end
+
   # Sequel doesn't allow you to use transaction on a model (only on a database),
   # so add a transaction method that starts a transaction on the associated database.
   def transaction(&block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: scaffolding_extensions
 version: !ruby/object:Gem::Version 
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-13 00:00:00 -07:00
+date: 2008-06-26 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -82,13 +82,22 @@ files:
 - scaffolds/show.rhtml
 - test/scaffolding_extensions_test.rb
 has_rdoc: true
-homepage: http://scaffolding_extensions.jeremyevans.net
+homepage: http://scaffolding-ext.rubyforge.org/
 post_install_message: 
 rdoc_options: 
 - --inline-source
 - --line-numbers
 - README
+- LICENSE
 - lib
+- doc/advanced.txt
+- doc/camping.txt
+- doc/controller_spec.txt
+- doc/conversion.txt
+- doc/model_spec.txt
+- doc/ramaze.txt
+- doc/sinatra.txt
+- doc/testing.txt
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement