scaffolding_extensions 1.3.1 → 1.3.2

data/README

@@ -22,13 +22,13 @@ Scaffolding Extensions currently supports:
 
 * Web Frameworks
   * Rails 2.2.2
-  * Ramaze 2008.11
+  * Ramaze 2009.01
   * Camping 1.5
-  * Sinatra 0.3.2
+  * Sinatra 0.9.0.4
   * Merb 1.0.4
 * Object/Relational Mappers
   * ActiveRecord 2.2.2
-  * Sequel 2.8.0
+  * Sequel 2.9.0
 * Javascript Libaries (used for Ajax/Autocompleting)
   * Prototype 1.6.0.1
   * JQuery 1.2.3

data/doc/sinatra.txt

@@ -12,9 +12,22 @@ To use the plugin if installing the gem:
 
   require 'scaffolding_extensions'
 
-To use the plugin, just call one of the root level scaffold methods with the
-path at which you want the plugin mounted:
+To use the plugin, call one of the scaffold methods inside a Sinatra::Base
+subclass:
 
-  scaffold '/admin', Model1
-  scaffold_habtm '/admin', Model1, :things
-  scaffold_all_models '/admin', :only=>[Model1, Model2, Model3]
+  class Scaf < Sinatra::Base
+    scaffold Model1
+    scaffold_habtm Model1, :things
+    scaffold_all_models :only=>[Model1, Model2, Model3]
+  end
+
+As this is going to add paths directly to where Scaf is mounted, you generally
+are going to want to mount Scaf at a subpath and build and run you own Rack app:
+
+  app = Rack::Builder.app do
+    map("/"){run MainApp}
+    map("/admin"){run Scaf}
+  end
+  Rack::Handler.get('mongrel').run(app, :Host=>'0.0.0.0', :Port=>7976) do |server|
+    trap(:INT){server.stop}
+  end

data/lib/scaffolding_extensions/controller/sinatra.rb

@@ -50,11 +50,11 @@ module ScaffoldingExtensions
         @scaffold_class ||= @scaffold_options[:class]
         if render_options.include?(:inline)
           use_js = @scaffold_javascript
-          headers('Content-Type'=>'text/javascript') if use_js
+          response['Content-Type'] = 'text/javascript' if use_js
           render(:erb, scaffold_fix_template(render_options[:inline]), :layout=>false)
         else
-          template = resolve_template(:erb, suffix_action.to_sym, render_options, false) || scaffold_fix_template(File.read(scaffold_path(action)))
-          layout = determine_layout(:erb, :layout, {}) || scaffold_fix_template(File.read(scaffold_path('layout'))).gsub('@content', 'yield')
+          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]
           render(:erb, template, :layout=>layout)
         end
       end
@@ -76,17 +76,7 @@ module ScaffoldingExtensions
       end
       
       def scaffold_request_param(v)
-        sparams = params
-        unless param = sparams[v.to_sym]
-          param = {}
-          sparams.each do |k,value|
-           if match = /#{v}\[([^\]]+)\]/.match(k.to_s)
-              param[match[1]] = value
-            end 
-          end
-          param = nil if param.empty?
-        end
-        param
+        params[v]
       end
       
       # You need to enable Sinatra's session support for this to work, 
@@ -108,49 +98,33 @@ module ScaffoldingExtensions
         "#{@scaffold_path}/#{action}#{id}"
       end
   end
-end
-
-class Sinatra::EventContext
-  SCAFFOLD_ROOTS = []
-  extend ScaffoldingExtensions::MetaController
 
-  def self.scaffold_setup_helper
-  end
-
-  def self.scaffold_action_setup(root)
-    if SCAFFOLD_ROOTS.empty?
+  module MetaSinatraController
+    def scaffold_setup_helper
       include ScaffoldingExtensions::Controller
       include ScaffoldingExtensions::SinatraController
       include ScaffoldingExtensions::Helper
       include ScaffoldingExtensions::PrototypeHelper
       include ScaffoldingExtensions::SinatraHelper
-    end
-    unless SCAFFOLD_ROOTS.include?(root)
-      SCAFFOLD_ROOTS << root
       [:get, :post].each do |req_meth|
-        Object.send(req_meth, "#{root}/?:meth?/?:request_id?") do
-          @scaffold_path = root
-          @scaffold_method = meth = params[:meth] ||= 'index'
-          params[:id] ||= params[:request_id]
+        sreq_meth = req_meth.to_s.upcase
+        send(req_meth, %r{\A(?:/(\w+)(?:/(\w+))?)?\z}) do
+          captures = params[:captures] || []
+          @scaffold_path = request.env['SCRIPT_NAME']
+          @scaffold_method = meth = captures[0] || 'index'
+          @scaffold_request_method = sreq_meth
+          params[:id] ||= captures[1]
           raise(ArgumentError, 'Method Not Allowed') if req_meth == :get && scaffolded_nonidempotent_method?(meth)
           raise(Sinatra::NotFound) unless scaffolded_method?(meth) 
           send(meth)
         end
       end
+      self
     end
-    self
   end
 end
 
-def scaffold(root, model, options = {})
-  Sinatra::EventContext.scaffold_action_setup(root).send(:scaffold, model, options)
-end
-
-def scaffold_all_models(root, options = {})
-  Sinatra::EventContext.scaffold_action_setup(root).send(:scaffold_all_models, options)
-end
-
-def scaffold_habtm(root, model, association)
-  Sinatra::EventContext.scaffold_action_setup(root).send(:scaffold_habtm, model, association)
+class Sinatra::Base
+  extend ScaffoldingExtensions::MetaController
+  extend ScaffoldingExtensions::MetaSinatraController
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: scaffolding_extensions
 version: !ruby/object:Gem::Version 
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-17 00:00:00 -08:00
+date: 2009-01-29 00:00:00 -08:00
 default_executable: 
 dependencies: []