scaffolding_extensions 1.3.6 → 1.3.7

data/README

@@ -24,11 +24,11 @@ Scaffolding Extensions currently supports:
   * Rails 2.3.2
   * Ramaze 2009.02
   * Camping 1.5
-  * Sinatra 0.9.1
+  * Sinatra 0.9.2
   * Merb 1.0.4
 * Object Relational Mappers
   * ActiveRecord 2.3.2
-  * Sequel 2.11.0
+  * Sequel 3.0.0
 * Javascript Libaries (used for Ajax/Autocompleting)
   * Prototype 1.6.0.3
   * JQuery 1.2.3

data/doc/ramaze.txt

@@ -18,3 +18,7 @@ controllers have been loaded.
 
 Also, note that Scaffolding Extensions uses the :Erubis engine in Ramaze,
 so you must have Erubis installed to use it.
+
+Scaffolding Extensions currently does not support Ramaze 2009.04+ (the
+versions based on Innate).  A patch that gives partial support is
+available at http://pastie.org/484442.

data/lib/scaffolding_extensions/controller/sinatra.rb

@@ -51,8 +51,14 @@ module ScaffoldingExtensions
           response['Content-Type'] = 'text/javascript' if use_js
           render(:erb, scaffold_fix_template(render_options[:inline]), :layout=>false)
         else
-          template = lookup_template(:erb, suffix_action.to_sym, render_options) rescue scaffold_fix_template(File.read(scaffold_path(action)))
-          layout, _ = lookup_layout(:erb, render_options) || [scaffold_fix_template(File.read(scaffold_path('layout'))).gsub('@content', 'yield'), nil]
+          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')
           render(:erb, template, :layout=>layout)
         end
       end

data/lib/scaffolding_extensions/model/sequel.rb

@@ -171,7 +171,7 @@ module ScaffoldingExtensions::MetaSequel
   # is string.
   def scaffold_table_column_type(column)
     if String === column
-      return nil unless str_columns.include?(column)
+      return nil unless columns.map{|x| x.to_s}.include?(column)
       column = column.to_sym
     end
     if column_info = db_schema[column] and type = column_info[:type]

data/lib/scaffolding_extensions.rb

@@ -94,6 +94,9 @@ require 'scaffolding_extensions/controller/sinatra' if defined? Sinatra
 require 'scaffolding_extensions/controller/merb' if defined? Merb
 
 require 'scaffolding_extensions/model/active_record' if defined? ActiveRecord::Base
-require 'scaffolding_extensions/model/sequel' if defined? Sequel::Model
+if defined? Sequel::Model
+  require('sequel/extensions/inflector') unless [:singularize, :pluralize, :camelize, :underscore, :constantize].all?{|meth| "".respond_to?(meth)}
+  require 'scaffolding_extensions/model/sequel'
+end
 
 ScaffoldingExtensions.javascript_library = 'Prototype'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: scaffolding_extensions
 version: !ruby/object:Gem::Version 
-  version: 1.3.6
+  version: 1.3.7
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-16 00:00:00 -07:00
+date: 2009-05-26 00:00:00 -07:00
 default_executable: 
 dependencies: []