scaffolding_extensions 1.4.0 → 1.4.1

data/README

@@ -24,11 +24,11 @@ Scaffolding Extensions currently supports:
   * Rails 2.3.5 (with or without RailsXss plugin)
   * Ramaze 2009.06.12
   * Camping 1.5
-  * Sinatra 0.9.4
+  * Sinatra 1.0
   * Merb 1.0.4
 * Object Relational Mappers
   * ActiveRecord 2.3.5
-  * Sequel 3.8.0
+  * Sequel 3.10.0
   * DataMapper 0.10.2 (see doc/datamapper.txt for details)
 * Javascript Libaries (used for Ajax/Autocompleting)
   * Prototype 1.6.0.3

data/lib/scaffolding_extensions/controller/sinatra.rb

@@ -51,18 +51,14 @@ module ScaffoldingExtensions
           response['Content-Type'] = 'text/javascript' if use_js
           render(:erb, scaffold_fix_template(render_options[:inline]), :layout=>false)
         else
-          views_dir = render_options.delete(:views) || self.class.views || "./views"
-          begin
-            template, filename, line_number = lookup_template(:erb, suffix_action.to_sym, views_dir)
-          rescue
-            template = scaffold_fix_template(File.read(scaffold_path(action)))
-          end
-          layout, filename, line_number = lookup_layout(:erb, :layout, views_dir)
-          layout ||= scaffold_fix_template(File.read(scaffold_path('layout'))).gsub('@content', 'yield')
+          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')}
           render(:erb, template, :layout=>layout)
         end
       end
-      
+
       def scaffold_request_action
         @scaffold_method
       end
@@ -90,6 +86,16 @@ module ScaffoldingExtensions
       def scaffold_session
         session
       end
+
+      def scaffold_template_code(views_dir, sin_name, se_name)
+        if views_dir && views_dir.member?("#{sin_name}.erb")
+          sin_name.to_sym
+        else
+          code = scaffold_fix_template(File.read(scaffold_path(se_name))) 
+          code = yield code if block_given?
+          code
+        end
+      end
       
       # Treats the id option as special, appending it to the path.
       # Uses the rest of the options as query string parameters.

data/lib/scaffolding_extensions/model/sequel.rb

@@ -37,9 +37,7 @@ module ScaffoldingExtensions::MetaSequel
   # constraint, as it is assumed that all objects currently assocated with the given object
   # have already met the criteria.  If that is not the case, you should override this method.
   def scaffold_associated_objects(association, object, options)
-    assoc = object.send(association)
-    reflection = association_reflection(association)
-    reflection[:cache] || reflection[:type] == :many_to_one ? assoc : assoc.all
+    object.send(association)
   end
   
   # The association reflection for this association
@@ -51,9 +49,9 @@ module ScaffoldingExtensions::MetaSequel
   # associated with the current object), :edit for :many_to_many (since you
   # can edit the list of associated objects), or :one for :many_to_one.
   def scaffold_association_type(association)
-    case scaffold_association(association)[:type]
+    case (a = scaffold_association(association))[:type]
       when :one_to_many
-        :new
+        a[:one_to_one] ? :one : :new
       when :many_to_many
         :edit
       else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: scaffolding_extensions
 version: !ruby/object:Gem::Version 
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-08 00:00:00 -08:00
+date: 2010-03-30 00:00:00 -07:00
 default_executable: 
 dependencies: []