scaffolding_extensions 1.4.1 → 1.4.2

data/README

@@ -22,10 +22,11 @@ Scaffolding Extensions currently supports:
 
 * Web Frameworks
   * Rails 2.3.5 (with or without RailsXss plugin)
-  * Ramaze 2009.06.12
-  * Camping 1.5
+  * Ramaze 2010.04.04
+  * Camping 2.0
   * Sinatra 1.0
   * Merb 1.0.4
+  * Rack 1.1.0
 * Object Relational Mappers
   * ActiveRecord 2.3.5
   * Sequel 3.10.0

data/doc/rack.txt

@@ -0,0 +1,22 @@
+Scaffolding Extensions includes a native rack adapter that can run
+directly on top of rack with no framework in between.  However, this
+mode does not support custom layouts or views.
+
+Here's an simple example of use:
+
+  require 'sequel'
+  require 'models/employee'
+  require 'scaffolding_extensions'
+  require 'scaffolding_extensions/controller/rack'
+  
+  class SequelRack < ScaffoldingExtensions::RackController
+    scaffold Employee
+  end
+  
+  puts "ScaffoldingExtensions::Rack started on port 7974"
+  Rack::Handler.get('mongrel').run(app, :Host=>'0.0.0.0', :Port=>7974) do |server|
+    trap(:INT) do
+      server.stop
+      puts "\nScaffoldingExtensions::Rack shutdown"
+    end
+  end

data/lib/scaffolding_extensions/controller/camping.rb

@@ -78,7 +78,7 @@ module ScaffoldingExtensions
       end
       
       def scaffold_request_id
-        @input[:id] || @scaffold_request_id
+        @input['id'] || @scaffold_request_id
       end
       
       def scaffold_request_method
@@ -86,7 +86,7 @@ module ScaffoldingExtensions
       end
       
       def scaffold_request_param(v)
-        @input[v]
+        @input[v.to_s]
       end
       
       # You need to enable Camping's session support for this to work, 

data/lib/scaffolding_extensions/controller/rack.rb

@@ -0,0 +1,141 @@
+require 'erb'
+require 'rack'
+
+module ScaffoldingExtensions
+  class << self
+    private
+      # Sinatra doesn't have a default location for models, so assume none
+      def model_files
+        @model_files ||= []
+      end
+  end
+  
+  class RackController
+    extend ScaffoldingExtensions::MetaController
+
+    include ScaffoldingExtensions::Controller
+    include ScaffoldingExtensions::Helper
+    include ScaffoldingExtensions::PrototypeHelper
+    include Rack::Utils
+
+    class Redirect < StandardError
+    end
+
+    alias u escape
+    alias h escape_html
+
+    def self.scaffold_setup_helper
+    end
+
+    def self.call(env)
+      new.call(env)
+    end
+
+    attr_reader :request
+    attr_reader :response
+    attr_reader :params
+
+    def call(env)
+      s = 200
+      h = {'Content-Type'=>'text/html'}
+      b = ''
+      @params = Hash.new{|hash, k| hash[k.to_s] if k.is_a?(Symbol)}
+      params.merge!(parse_nested_query(env["QUERY_STRING"]))
+      params.merge!(parse_nested_query(env["rack.input"].read)) if env["REQUEST_METHOD"] == 'POST'
+
+      @scaffold_method = meth = if ['', '/'].include?(env["PATH_INFO"])
+        'index'
+      elsif captures = %r{\A/(\w+)(?:/(\w+))?\z}.match(env["PATH_INFO"])
+        params['id'] ||= captures[2]
+        captures[1]
+      end
+
+      if !['GET', 'POST'].include?(env["REQUEST_METHOD"]) || (env["REQUEST_METHOD"] == "GET" && scaffolded_nonidempotent_method?(meth)) 
+        return [403, h, 'Method Not Allowed']
+      end
+
+      if scaffolded_method?(meth)
+        @scaffold_path = env['SCRIPT_NAME']
+        @request = env
+        @response = h
+        begin
+          b = send(meth)
+        rescue Redirect => e
+          s = 302
+          h['Location'] = e.message 
+        end
+      else
+        s = 404
+        b = 'Not Found'
+      end
+
+      [s, h, b]
+    end
+
+    private
+      # Sinatra doesn't provide a suitable flash.  You can hack one together using
+      # session if you really need it.
+      def scaffold_flash
+        {}
+      end
+
+      def scaffold_redirect_to(url)
+        raise ScaffoldingExtensions::RackController::Redirect, url
+      end
+      
+      # 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}"
+        @scaffold_options ||= options
+        @scaffold_suffix ||= suffix
+        @scaffold_class ||= @scaffold_options[:class]
+        if render_options.include?(:inline)
+          response['Content-Type'] = 'text/javascript' if @scaffold_javascript
+          ERB.new(render_options[:inline]).result(binding)
+        else
+          @content = ERB.new(File.read(scaffold_path(action))).result(binding)
+          ERB.new(File.read(scaffold_path(:layout))).result(binding)
+        end
+      end
+
+      def scaffold_request_action
+        @scaffold_method
+      end
+      
+      def scaffold_request_env
+        request
+      end
+      
+      def scaffold_request_id
+        params[:id]
+      end
+      
+      def scaffold_request_method
+        request['REQUEST_METHOD']
+      end
+      
+      def scaffold_request_param(v)
+        params[v]
+      end
+      
+      # You need to enable Sinatra's session support for this to work, 
+      # otherwise, this will always be the empty hash. The session data
+      # is only used for access control, so if you aren't using 
+      # scaffold_session_value, it shouldn't matter.
+      def scaffold_session
+        {}
+      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 = {})
+        escaped_options = {}
+        options.each{|k,v| escaped_options[u(k.to_s)] = u(v.to_s)}
+        id = escaped_options.delete('id')
+        id = id ? "/#{id}" : ''
+        id << "?#{escaped_options.to_a.collect{|k,v| "#{k}=#{v}"}.join('&')}" unless escaped_options.empty?
+        "#{@scaffold_path}/#{action}#{id}"
+      end
+  end
+end

data/lib/scaffolding_extensions/controller/sinatra.rb

@@ -1,5 +1,5 @@
 require 'erb'
-require 'cgi'
+require 'rack'
 
 module ScaffoldingExtensions
   class << self
@@ -13,11 +13,11 @@ module ScaffoldingExtensions
   module SinatraHelper
     private
       def u(s)
-        CGI.escape(s.to_s)
+        Rack::Utils.escape(s.to_s)
       end 
     
       def h(s)
-        CGI.escapeHTML(s.to_s)
+        Rack::Utils.escape_html(s.to_s)
       end 
   end
 
@@ -30,11 +30,6 @@ module ScaffoldingExtensions
         {}
       end
 
-      # Sinatra's ERB renderer doesn't like "-%>"
-      def scaffold_fix_template(text)
-        text.gsub('-%>', '%>')
-      end
-      
       def scaffold_redirect_to(url)
         redirect(url)
       end
@@ -49,7 +44,7 @@ module ScaffoldingExtensions
         if render_options.include?(:inline)
           use_js = @scaffold_javascript
           response['Content-Type'] = 'text/javascript' if use_js
-          render(:erb, scaffold_fix_template(render_options[:inline]), :layout=>false)
+          render(:erb, render_options[:inline], :layout=>false)
         else
           views_path = render_options.delete(:views) || self.class.views || "./views"
           views_dir = Dir.new(views_path) rescue nil
@@ -91,7 +86,7 @@ module ScaffoldingExtensions
         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 = File.read(scaffold_path(se_name)) 
           code = yield code if block_given?
           code
         end

data/lib/scaffolding_extensions/meta_controller.rb

@@ -45,6 +45,7 @@ module ScaffoldingExtensions
         plural_name = singular_name.pluralize
         plural_human_name = singular_human_name.pluralize
         suffix = "_#{singular_name}"
+        render_meth = :"render#{suffix}"
         add_methods = options[:only] ? Array(options[:only]) : scaffold_default_methods
         add_methods -= Array(options[:except])
         scaffold_options = {:singular_name=>singular_name, :plural_name=>plural_name, :singular_human_name=>singular_human_name, :plural_human_name=>plural_human_name, :class=>klass, :suffix=>suffix, :singular_lc_human_name=>singular_human_name.downcase, :plural_lc_human_name=>plural_human_name.downcase}
@@ -52,16 +53,21 @@ module ScaffoldingExtensions
         scaffold_auto_complete_for(klass) if klass.scaffold_use_auto_complete
         klass.scaffold_auto_complete_associations.each{|association| scaffold_auto_complete_for(klass, association)}
         
+        define_method(render_meth) do |t|
+          scaffold_render_template(t, scaffold_options)
+        end
+        private render_meth
+
         if add_methods.include?(:manage)
           scaffold_define_method("manage#{suffix}") do
-            scaffold_render_template(:manage, scaffold_options)
+            send(render_meth, :manage) 
           end
         end
         
         if add_methods.include?(:show) or add_methods.include?(:destroy) or add_methods.include?(:edit)
           scaffold_define_method("list#{suffix}") do
             @scaffold_objects ||= klass.scaffold_find_objects(@scaffold_action, :session=>scaffold_session) unless klass.scaffold_use_auto_complete
-            scaffold_render_template(:list, scaffold_options)
+            send(render_meth, :list) 
           end
         end
         
@@ -70,7 +76,7 @@ module ScaffoldingExtensions
             if scaffold_request_id
               @scaffold_object ||= klass.scaffold_find_object(:show, scaffold_request_id, :session=>scaffold_session)
               @scaffold_associations_readonly = true
-              scaffold_render_template(:show, scaffold_options)
+              send(render_meth, :show) 
             else
               @scaffold_action = :show
               send("list#{suffix}")
@@ -98,7 +104,7 @@ module ScaffoldingExtensions
             if scaffold_request_id
               @scaffold_show_associations = true if scaffold_request_param(:associations) == 'show'
               @scaffold_object ||= klass.scaffold_find_object(:edit, scaffold_request_id, :session=>scaffold_session)
-              scaffold_render_template(:edit, scaffold_options)
+              send(render_meth, :edit) 
             else
               @scaffold_action = :edit
               send("list#{suffix}")
@@ -111,7 +117,7 @@ module ScaffoldingExtensions
             if klass.scaffold_save(:edit, @scaffold_object)
               scaffold_redirect(:edit, suffix, "#{singular_human_name} was successfully updated")
             else
-              scaffold_render_template(:edit, scaffold_options)
+              send(render_meth, :edit) 
             end
           end
           
@@ -126,7 +132,7 @@ module ScaffoldingExtensions
         if add_methods.include?(:new)
           scaffold_define_method("new#{suffix}") do
             @scaffold_object ||= klass.scaffold_new_object(scaffold_request_param(singular_name), :session=>scaffold_session)
-            scaffold_render_template(:new, scaffold_options)
+            send(render_meth, :new) 
           end
           
           scaffold_define_nonidempotent_method("create#{suffix}") do
@@ -134,7 +140,7 @@ module ScaffoldingExtensions
             if klass.scaffold_save(:new, @scaffold_object)
               scaffold_redirect(:new, suffix, "#{singular_human_name} was successfully created")
             else
-              scaffold_render_template(:new, scaffold_options)
+              send(render_meth, :new) 
             end
           end
         end
@@ -142,7 +148,7 @@ module ScaffoldingExtensions
         if add_methods.include?(:search)
           scaffold_define_method("search#{suffix}") do
             @scaffold_object ||= klass.scaffold_search_object
-            scaffold_render_template(:search, scaffold_options)
+            send(render_meth, :search) 
           end
           
           scaffold_define_method("results#{suffix}") do
@@ -151,14 +157,14 @@ module ScaffoldingExtensions
             page += 1 if scaffold_request_param(:page_next)
             @scaffold_search_results_form_params, @scaffold_objects = klass.scaffold_search(:model=>scaffold_request_param(singular_name), :notnull=>Array(scaffold_request_param(:notnull)), :null=>Array(scaffold_request_param(:null)), :page=>page, :session=>scaffold_session)
             @scaffold_listtable_type = :search
-            scaffold_render_template(:listtable, scaffold_options)
+            send(render_meth, :listtable) 
           end
         end
       
         if add_methods.include?(:merge)
           scaffold_define_method("merge#{suffix}") do
             @scaffold_objects ||= klass.scaffold_find_objects(:merge, :session=>scaffold_session) unless klass.scaffold_use_auto_complete
-            scaffold_render_template(:merge, scaffold_options)
+            send(render_meth, :merge) 
           end
           
           scaffold_define_nonidempotent_method("merge_update#{suffix}") do
@@ -176,7 +182,7 @@ module ScaffoldingExtensions
             @page ||= scaffold_request_param(:page).to_i > 1 ? scaffold_request_param(:page).to_i : 1
             @next_page, @scaffold_objects = klass.scaffold_browse_find_objects(:session=>scaffold_session, :page=>@page)
             @scaffold_listtable_type = :browse
-            scaffold_render_template(:listtable, scaffold_options)
+            send(render_meth, :listtable) 
           end
         end
       end

data/scaffolds/index.rhtml

@@ -1,6 +1,6 @@
 <% @scaffold_title = 'Manage Models' %>
 <ul>
-<% @links.each do |link, human_name| -%>
+<% @links.each do |link, human_name| %>
   <li><a href="<%= scaffold_url(link) %>"><%= human_name %></a></li>
 <% end %>
 </ul>

data/scaffolds/listtable.rhtml

@@ -2,7 +2,7 @@
 
 <table id="scaffolded" class="<%= @scaffold_class.scaffold_table_class(:list) %>">
   <thead><tr>
-  <% @scaffold_class.scaffold_fields(@scaffold_listtable_type).each do |column| -%>
+  <% @scaffold_class.scaffold_fields(@scaffold_listtable_type).each do |column| %>
     <th><%=h @scaffold_class.scaffold_column_name(column) %></th>
   <% end %>
   <% if show = scaffolded_method?(ss = "show#{@scaffold_suffix}") %>
@@ -45,13 +45,13 @@
 <% if @scaffold_listtable_type == :search && @scaffold_search_results_form_params && (@scaffold_search_results_form_params[:page] > 1 || @scaffold_search_results_form_params[:next_page]) %>
   <%= scaffold_form(scaffold_url("results#{@scaffold_suffix}")) %>
   <%= scaffold_field_tag(:hidden, :value=>@scaffold_search_results_form_params[:page], :id=>'page') %>
-  <% @scaffold_search_results_form_params[:model].each do |key, value| -%>
+  <% @scaffold_search_results_form_params[:model].each do |key, value| %>
     <%= scaffold_field_tag(:hidden, :value=>value, :id=>"#{@scaffold_options[:singular_name]}_#{key}", :name=>"#{@scaffold_options[:singular_name]}[#{key}]") %>
   <% end %>
-  <% @scaffold_search_results_form_params[:notnull].each do |field| -%>
+  <% @scaffold_search_results_form_params[:notnull].each do |field| %>
     <%= scaffold_field_tag(:hidden, :value=>field, :name=>"notnull#{scaffold_param_list_suffix}") %>
   <% end %>
-  <% @scaffold_search_results_form_params[:null].each do |field| -%>
+  <% @scaffold_search_results_form_params[:null].each do |field| %>
     <%= scaffold_field_tag(:hidden, :value=>field, :name=>"null#{scaffold_param_list_suffix}") %>
   <% end %>
   <% if @scaffold_search_results_form_params[:page] > 1 %>

data/scaffolds/manage.rhtml

@@ -6,7 +6,7 @@
 ["Edit #{singular_name}", :edit],
 ["Merge #{plural_name}", :merge],
 ["Search #{plural_name}", :search],
-["Show #{singular_name}", :show]].each do |text, action| -%>
+["Show #{singular_name}", :show]].each do |text, action| %>
   <% link = scaffold_check_link(text, true, "#{action}#{@scaffold_suffix}") 
   unless link == '' %>
     <li><%= link %></li>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: scaffolding_extensions
 version: !ruby/object:Gem::Version 
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-30 00:00:00 -07:00
+date: 2010-04-14 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -32,6 +32,7 @@ files:
 - lib/scaffolding_extensions/controller/ramaze.rb
 - lib/scaffolding_extensions/controller/sinatra.rb
 - lib/scaffolding_extensions/controller/merb.rb
+- lib/scaffolding_extensions/controller/rack.rb
 - lib/scaffolding_extensions/jquery_helper.rb
 - lib/scaffolding_extensions/meta_controller.rb
 - lib/scaffolding_extensions/meta_model.rb
@@ -52,6 +53,7 @@ files:
 - doc/testing.txt
 - doc/advanced.txt
 - doc/datamapper.txt
+- doc/rack.txt
 - contrib/scaffold_associations_tree/README
 - contrib/scaffold_associations_tree/bullet.gif
 - contrib/scaffold_associations_tree/minus.gif
@@ -97,6 +99,7 @@ rdoc_options:
 - doc/testing.txt
 - doc/advanced.txt
 - doc/datamapper.txt
+- doc/rack.txt
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement