scaffolding_extensions 1.3.8 → 1.3.9

data/lib/scaffolding_extensions/controller/ramaze.rb

@@ -75,10 +75,8 @@ module ScaffoldingExtensions
 
   # Class methods for Ramaze::Controller related necessary for Scaffolding Extensions
   module MetaRamazeController
-    DENY_LAYOUT_RE = %r{\A(scaffold_auto_complete_for|associations|add|remove)_}
 
     private
-    # Denies the layout to names that match DENY_LAYOUT_RE (the Ajax methods).
     # Sets request.params['id'] if it was given as part of the request path.
     # Checks nonidempotent requests require POST.
     def scaffold_define_method(name, &block)
@@ -98,7 +96,7 @@ module ScaffoldingExtensions
       map_views '/'
       map_layouts '/'
       engine :Erubis
-      layout(:layout){|name, wish| DENY_LAYOUT_RE !~ name }
+      layout(:layout){|name, wish| !request.xhr? }
 
       o = Ramaze::App[:scaffolding_extensions].options
       o.roots = [scaffold_template_dir]

data/lib/scaffolding_extensions/meta_model.rb

@@ -94,7 +94,7 @@ module ScaffoldingExtensions::MetaModel
   :search_limit=>:scaffold_search_results_limit}.each do |default, iv|
     ivs = "@#{iv}"
     define_method(iv) do
-      if instance_variables.include?(ivs)
+      if instance_variable_defined?(ivs)
         instance_variable_get(ivs)
       else
         instance_variable_set(ivs, SCAFFOLD_OPTIONS[default])
@@ -549,10 +549,19 @@ module ScaffoldingExtensions::MetaModel
     end
 
     # Filters the provided attributes to just the ones given by scaffold_attributes for
-    # the given action.
+    # the given action, and converts foreign key fields to integers so that autocompleting
+    # works correctly.
     def scaffold_filter_attributes(action, attributes)
-      allowed_attributes = scaffold_attributes(action).collect{|x| x.to_s}
-      attributes.reject{|k,v| !allowed_attributes.include?(k.to_s.split('(')[0])}
+      convert_attributes, allowed_attributes = scaffold_fields(action).partition{|x| scaffold_association(x)}.map{|x| x.map{|y| scaffold_field_id(y).to_s}}
+      h = {}
+      attributes.each do |k,v|
+        if allowed_attributes.include?(k)
+          h[k] = v
+        elsif convert_attributes.include?(k)
+          h[k] = v.to_i.to_s
+        end
+      end
+      h
     end
     
     # The associations to include when loading the association

data/lib/scaffolding_extensions/overridable.rb

@@ -17,7 +17,7 @@ module ScaffoldingExtensions
         meth = "scaffold_#{action}_#{m}"
         if respond_to?(meth, true)
           Proc.new{send(meth)}
-        elsif instance_variables.include?(meth = "@#{meth}")
+        elsif instance_variable_defined?(meth = "@#{meth}")
           Proc.new{instance_variable_get(meth)}
         end 
       end 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: scaffolding_extensions
 version: !ruby/object:Gem::Version 
-  version: 1.3.8
+  version: 1.3.9
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-12 00:00:00 -07:00
+date: 2009-06-26 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -105,7 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.8.6
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: