scaffolding_extensions 1.5.0 → 1.5.1

data/README

@@ -21,14 +21,14 @@ to better suit your needs.
 Scaffolding Extensions currently supports:
 
 * Web Frameworks
-  * Rails 3.0.3
-  * Ramaze 2010.06.18
+  * Rails 3.0.9
+  * Ramaze 2011.01.30
   * Camping 2.1
-  * Sinatra 1.1.0
-  * Rack 1.2.1
+  * Sinatra 1.2.6
+  * Rack 1.2.2
 * Object Relational Mappers
-  * ActiveRecord 3.0.3
-  * Sequel 3.19.0
+  * ActiveRecord 3.0.9
+  * Sequel 3.25.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/doc/datamapper.txt

@@ -17,4 +17,6 @@ The DataMapper module has some quirks, mainly:
      scaffold_all_models :only =>[DmEmployee, DmGroup, DmPosition]
    end
 
-You need dm-core, dm-validations, and do_sqlite3 in order to run the test_suite for scaffolding_extensions with datamapper.
+You need dm-core, dm-validations, dm-transactions to use scaffolding
+extensions with datamapper.  You also need do_sqlite3 in order to run
+the test_suite for scaffolding_extensions with datamapper.

data/lib/scaffolding_extensions/controller/sinatra.rb

@@ -49,7 +49,9 @@ module ScaffoldingExtensions
           views_path = render_options.delete(:views) || self.class.views || "./views"
           views_dir = Dir.new(views_path) rescue nil
           template = scaffold_template_code(views_dir, suffix_action, action)
-          layout = scaffold_template_code(views_dir, 'layout', 'layout'){|s| s.gsub('@content', 'yield')}
+          layout_file = settings.send(:erb)[:layout] if settings.respond_to?(:erb)
+          layout_file ||= :layout
+          layout = scaffold_template_code(views_dir, layout_file, 'layout'){|s| s.gsub('@content', 'yield')}
           render(:erb, template, :layout=>layout)
         end
       end

data/lib/scaffolding_extensions/meta_model.rb

@@ -167,9 +167,10 @@ module ScaffoldingExtensions::MetaModel
   end
 
   # Whether to use autocompleting for linked associations. Defaults to whether the
-  # associated class uses auto completing.
+  # associated class uses auto completing.  Always false if scaffold_association_find_objects
+  # is overridden for the specific association.
   def scaffold_association_use_auto_complete(association)
-    scaffold_associated_class(association).scaffold_use_auto_complete
+    scaffold_associated_class(association).scaffold_use_auto_complete && !respond_to?("scaffold_#{association}_association_find_objects")
   end
 
   # Defaults to associations specified by scaffold fields that are autocompleting. Can be set with an instance variable.

metadata

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