scaffolding_extensions 1.3.0 → 1.3.1

data/doc/camping.txt

@@ -23,3 +23,6 @@ For example:
   end
 
 The path given to scaffold_R will be the root of the plugin.
+
+Camping is not fully supported in that you can't override the scaffolded
+layout or scaffold templates without changing the scaffold_template_dir.

data/doc/merb.txt

@@ -11,3 +11,8 @@ controllers:
     scaffold_habtm Model1, :things
     scaffold_all_models :only=>[Model1, Model2, Model3]
   end
+
+Merb isn't fully supported in that if you override a scaffolded form
+but don't add your own layout, it won't use the scaffolded layout. Also,
+using your own layout and overriding the scaffolded forms is untested,
+though it should work.

data/lib/scaffolding_extensions/controller/merb.rb

@@ -38,7 +38,7 @@ module ScaffoldingExtensions
       # use the contents of it as the template without the layout.
       #
       # There may well be a much better way to do this via modifying the _template_roots, but
-      # I didn't have much luck and decided to take the path I used with Camping and Sinatra,
+      # I didn't have much luck and decided to take the path I used with Camping,
       # rendering the templates directly.
       def scaffold_render_template(action, options = {}, render_options = {})
         suffix = options[:suffix]

data/lib/scaffolding_extensions/controller/sinatra.rb

@@ -1,13 +1,7 @@
-begin
-  require 'erubis'
-  ERB = Erubis::Eruby
-rescue
-  require 'erb'
-end
+require 'erb'
 require 'cgi'
 
 module ScaffoldingExtensions
-  SCAFFOLD_ROOTS={}
   class << self
     private
       # Sinatra doesn't have a default location for models, so assume none
@@ -35,22 +29,19 @@ module ScaffoldingExtensions
       def scaffold_flash
         {}
       end
+
+      # Sinatra's ERB renderer doesn't like "-%>"
+      def scaffold_fix_template(text)
+        text.gsub('-%>', '%>')
+      end
       
-      # Proc that redirects to given url
       def scaffold_redirect_to(url)
-        env = @sinatra_event.request.env
+        env = request.env
         host = env['HTTP_HOST'] || "#{env['SERVER_NAME']}#{":#{env['SERVER_PORT']}" if env['SERVER_PORT'] && env['SERVER_PORT'].to_i != 80}"
-        Proc.new{redirect("//#{host}#{url}")}
+        redirect("//#{host}#{url}")
       end
       
-      # In order to override the default templates, you need to set 
-      # @scaffold_template_dir and then create a template file inside that
-      # to override the template (make sure the default templates are also
-      # in this folder). It doesn't support user modifiable layouts,
-      # so you'll have to modify the layout.rhtml file in @scaffold_template_dir.
-      #
-      # This returns a proc that renders the necessary template using a plain
-      # text renderer.
+      # Render's the scaffolded template.  A user can override both the template and the layout.
       def scaffold_render_template(action, options = {}, render_options = {})
         suffix = options[:suffix]
         suffix_action = "#{action}#{suffix}"
@@ -59,15 +50,12 @@ module ScaffoldingExtensions
         @scaffold_class ||= @scaffold_options[:class]
         if render_options.include?(:inline)
           use_js = @scaffold_javascript
-          text = ERB.new(render_options[:inline]).result(binding)
-          Proc.new do
-            headers('Content-Type'=>'text/javascript') if use_js
-            render(:text, text, :layout=>false)
-          end
+          headers('Content-Type'=>'text/javascript') if use_js
+          render(:erb, scaffold_fix_template(render_options[:inline]), :layout=>false)
         else
-          @content = ERB.new(File.read(scaffold_path(File.exists?(scaffold_path(suffix_action)) ? suffix_action : action))).result(binding)
-          text = ERB.new(File.read(scaffold_path('layout'))).result(binding)
-          Proc.new{render(:text, text, :layout=>false)}
+          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')
+          render(:erb, template, :layout=>layout)
         end
       end
       
@@ -76,11 +64,11 @@ module ScaffoldingExtensions
       end
       
       def scaffold_request_env
-        @sinatra_event.request.env
+        request.env
       end
       
       def scaffold_request_id
-        @sinatra_event.params[:id]
+        params[:id]
       end
       
       def scaffold_request_method
@@ -88,7 +76,7 @@ module ScaffoldingExtensions
       end
       
       def scaffold_request_param(v)
-        sparams = @sinatra_event.params
+        sparams = params
         unless param = sparams[v.to_sym]
           param = {}
           sparams.each do |k,value|
@@ -106,15 +94,9 @@ module ScaffoldingExtensions
       # is only used for access control, so if you aren't using 
       # scaffold_session_value, it shouldn't matter.
       def scaffold_session
-        @sinatra_event.session
+        session
       end
       
-      def scaffold_set_vars(meth, event)
-        @scaffold_path = self.class.scaffold_root
-        @scaffold_method = meth
-        @sinatra_event = event
-      end
-
       # Treats the id option as special, appending it to the path.
       # Uses the rest of the options as query string parameters.
       def scaffold_url(action, options = {})
@@ -126,60 +108,49 @@ module ScaffoldingExtensions
         "#{@scaffold_path}/#{action}#{id}"
       end
   end
-  
-  # Class methods for Sinatra necessary for Scaffolding Extensions
-  module MetaSinatraController
-    include ScaffoldingExtensions::MetaController
-    attr_accessor :scaffold_root
+end
 
-    private
-      def scaffold_setup_helper
-        include ScaffoldingExtensions::Controller
-        include ScaffoldingExtensions::SinatraController
-        include ScaffoldingExtensions::Helper
-        include ScaffoldingExtensions::PrototypeHelper
-        include ScaffoldingExtensions::SinatraHelper
-      end
+class Sinatra::EventContext
+  SCAFFOLD_ROOTS = []
+  extend ScaffoldingExtensions::MetaController
+
+  def self.scaffold_setup_helper
   end
 
-  module TextRenderer
-    def render_text(template, options = {})
-      template
+  def self.scaffold_action_setup(root)
+    if SCAFFOLD_ROOTS.empty?
+      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]
+          raise(ArgumentError, 'Method Not Allowed') if req_meth == :get && scaffolded_nonidempotent_method?(meth)
+          raise(Sinatra::NotFound) unless scaffolded_method?(meth) 
+          send(meth)
+        end
+      end
+    end
+    self
   end
 end
 
-class Sinatra::EventContext
-  include ScaffoldingExtensions::TextRenderer
-end
-
 def scaffold(root, model, options = {})
-  scaffold_setup(root).send(:scaffold, model, options)
+  Sinatra::EventContext.scaffold_action_setup(root).send(:scaffold, model, options)
 end
 
 def scaffold_all_models(root, options = {})
-  scaffold_setup(root).send(:scaffold_all_models, options)
+  Sinatra::EventContext.scaffold_action_setup(root).send(:scaffold_all_models, options)
 end
 
 def scaffold_habtm(root, model, association)
-  scaffold_setup(root).send(:scaffold_habtm, model, association)
+  Sinatra::EventContext.scaffold_action_setup(root).send(:scaffold_habtm, model, association)
 end
 
-def scaffold_setup(root)
-  unless klass = ScaffoldingExtensions::SCAFFOLD_ROOTS[root]
-    klass = ScaffoldingExtensions::SCAFFOLD_ROOTS[root] = Class.new
-    klass.send(:extend, ScaffoldingExtensions::MetaSinatraController)
-    klass.scaffold_root = root
-    [:get, :post].each do |req_meth|
-      send(req_meth, "#{klass.scaffold_root}/?:meth?/?:request_id?") do
-        meth = params[:meth] ||= 'index'
-        params[:id] ||= params[:request_id]
-        @controller = klass.new
-        raise(ArgumentError, 'Method Not Allowed') if req_meth == :get && @controller.send(:scaffolded_nonidempotent_method?, meth)
-        @controller.send(:scaffold_set_vars, meth, self)
-        instance_eval(&@controller.send(meth))
-      end
-    end
-  end 
-  klass
-end

data/lib/scaffolding_extensions/meta_model.rb

@@ -471,7 +471,7 @@ module ScaffoldingExtensions::MetaModel
   
   # Returns all objects of the associated class not currently associated with this object.
   def scaffold_unassociated_objects(association, object, options)
-    scaffold_associated_class(association).scaffold_get_objects(:conditions=>[scaffold_unassociated_condition(association, object), scaffold_session_conditions(options[:session])], :order=>scaffold_select_order_association(association), :include=>scaffold_include_association(association))
+    scaffold_associated_class(association).scaffold_get_objects(:conditions=>[scaffold_unassociated_condition(association, object), scaffold_associated_class(association).scaffold_session_conditions(options[:session])], :order=>scaffold_select_order_association(association), :include=>scaffold_include_association(association))
   end
   
   # Updates attributes for the given action, but does not save the record.

metadata

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