scaffolding_extensions 1.3.7 → 1.3.8

data/README

@@ -22,13 +22,13 @@ Scaffolding Extensions currently supports:
 
 * Web Frameworks
   * Rails 2.3.2
-  * Ramaze 2009.02
+  * Ramaze 2009.06.12
   * Camping 1.5
   * Sinatra 0.9.2
   * Merb 1.0.4
 * Object Relational Mappers
   * ActiveRecord 2.3.2
-  * Sequel 3.0.0
+  * Sequel 3.1.0
 * Javascript Libaries (used for Ajax/Autocompleting)
   * Prototype 1.6.0.3
   * JQuery 1.2.3

data/doc/ramaze.txt

@@ -18,7 +18,3 @@ 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.rb

@@ -7,17 +7,6 @@ module ScaffoldingExtensions
         scaffold_method_not_allowed if scaffolded_nonidempotent_method?(scaffold_request_action) && scaffold_request_method != 'POST'
       end
       
-      # Force the given value into an array.  If the items is currently an array,
-      # return it.  If the item is nil or false, return the empty array.  Otherwise,
-      # return an array with the value as the only member.
-      def scaffold_force_array(value)
-        if value
-          Array === value ? value : [value]
-        else
-          []
-        end
-      end
-      
       # Returns path to the given scaffold template file
       def scaffold_path(template_name)
         File.join(self.class.scaffold_template_dir, "#{template_name}.rhtml")
@@ -51,14 +40,19 @@ module ScaffoldingExtensions
         return send(meth, notice) if respond_to?(meth, true)
         meth = "scaffold_#{action}_redirect"
         return send(meth, suffix, notice) if respond_to?(meth, true)
-        scaffold_flash[:notice] = notice if notice
+        scaffold_set_flash(notice)
         scaffold_redirect_to(scaffold_url(action_suffix, oid ? {:id=>oid} : {}))
       end
       
       # Converts the value to an array, converts all values of the array to integers,
       # removes all 0 values, and returns the array.
       def scaffold_select_ids(value)
-        scaffold_force_array(value).collect{|x| x.to_i}.delete_if{|x| x == 0}
+        Array(value).collect{|x| x.to_i}.delete_if{|x| x == 0}
+      end
+
+      # Set the notice entry in the scaffold_flash hash by default.
+      def scaffold_set_flash(notice)
+        scaffold_flash[:notice] = notice if notice
       end
       
       # Return whether scaffolding defined the method, whether or not it was overwritten

data/lib/scaffolding_extensions/controller/action_controller.rb

@@ -11,12 +11,6 @@ module ScaffoldingExtensions
   # Helper methods for ActionController::Base that override the defaults in Scaffolding Extensions
   module ActionControllerHelper
     private
-      # ActionController::Base requires that params that are desired to be lists have
-      # the suffix '[]'
-      def scaffold_param_list_suffix
-        '[]'
-      end
-      
       # ActionController::Base allows easy access to the CSRF token via token_tag
       def scaffold_token_tag
         token_tag

data/lib/scaffolding_extensions/controller/ramaze.rb

@@ -13,15 +13,15 @@ module ScaffoldingExtensions
       def scaffold_flash
         flash
       end
-      
+
       def scaffold_method_not_allowed
         respond('Method not allowed', 405)
       end
-      
+
       def scaffold_redirect_to(url)
         redirect(url)
       end
-      
+
       # Renders user provided template if it exists, otherwise renders a scaffold template.
       # If a layout is specified (either in the controller or as an render_option), use that layout,
       # otherwise uses the scaffolded layout.  If :inline is one of the render_options,
@@ -32,78 +32,84 @@ module ScaffoldingExtensions
         @scaffold_options ||= options
         @scaffold_suffix ||= suffix
         @scaffold_class ||= @scaffold_options[:class]
-        unless ::Ramaze::Action.current.template
+        unless self.action.view
           if render_options.include?(:inline)
             response['Content-Type'] = 'text/javascript' if @scaffold_javascript
             render_options[:inline]
           else
-            ::Ramaze::Action.current.template = scaffold_path(action)
+            self.action.view = scaffold_path(action)
           end
         end
       end
-      
+
       def scaffold_request_action
-        ::Ramaze::Action.current.name
+        action.name
       end
-      
+
       def scaffold_request_env
         request.env
       end
-      
+
       def scaffold_request_id
         request.params['id']
       end
-      
+
       def scaffold_request_method
         request.env['REQUEST_METHOD']
       end
-      
+
       def scaffold_request_param(v)
         request.params[v.to_s]
       end
-      
+
       def scaffold_session
         session
       end
-      
+
       # Treats the id option as special (appending it so the list of options),
       # which requires a lambda router.
       def scaffold_url(action, options = {})
-        options[:id] ? Rs(action, options.delete(:id), options) : Rs(action, options)
+        options[:id] ? r(action, options.delete(:id), options) : r(action, options)
       end
   end
-  
+
   # Class methods for Ramaze::Controller related necessary for Scaffolding Extensions
   module MetaRamazeController
     DENY_LAYOUT_RE = %r{\A(scaffold_auto_complete_for|associations|add|remove)_}
-    
+
     private
-      # Denies the layout to names that match DENY_LAYOUT_RE (the Ajax methods).
-      # Sets request.params['id'] if it was given as part of the request path.
-      # Checks nonidempotent requests require POST.
-      def scaffold_define_method(name, &block)
-        deny_layout(name) if DENY_LAYOUT_RE.match(name)
-        scaffolded_methods.add(name)
-        define_method(name) do |*args|
-          scaffold_check_nonidempotent_requests
-          request.params['id'] = args.shift if args.length > 0
-          instance_eval(&block)
-        end
-      end
-      
-      # Adds a default scaffolded layout if none has been set.  Activates the Erubis
-      # engine.  Includes the necessary scaffolding helper and controller methods.
-      def scaffold_setup_helper
-        engine :Erubis
-        include ScaffoldingExtensions::Controller
-        include ScaffoldingExtensions::RamazeController
-        include ScaffoldingExtensions::Helper
-        include ScaffoldingExtensions::PrototypeHelper
-        unless trait[:layout] && trait[:layout][:all]
-          layout(:scaffold_layout) 
-          define_method(:scaffold_layout){::Ramaze::Action.current.template = scaffold_path(:layout)}
-        end
+    # Denies the layout to names that match DENY_LAYOUT_RE (the Ajax methods).
+    # Sets request.params['id'] if it was given as part of the request path.
+    # Checks nonidempotent requests require POST.
+    def scaffold_define_method(name, &block)
+      scaffolded_methods.add(name)
+
+      define_method(name) do |*args|
+        scaffold_check_nonidempotent_requests
+        request.params['id'] = args.shift if args.length > 0
+        instance_eval(&block)
       end
+    end
+
+    # Adds a default scaffolded layout if none has been set.  Activates the Erubis
+    # engine.  Includes the necessary scaffolding helper and controller methods.
+    def scaffold_setup_helper
+      map generate_mapping, :scaffolding_extensions
+      map_views '/'
+      map_layouts '/'
+      engine :Erubis
+      layout(:layout){|name, wish| DENY_LAYOUT_RE !~ name }
+
+      o = Ramaze::App[:scaffolding_extensions].options
+      o.roots = [scaffold_template_dir]
+      o.views = ['/']
+      o.layouts = ['/']
+
+      include ScaffoldingExtensions::Controller
+      include ScaffoldingExtensions::RamazeController
+      include ScaffoldingExtensions::Helper
+      include ScaffoldingExtensions::PrototypeHelper
+    end
   end
 end
 
@@ -112,3 +118,4 @@ class Ramaze::Controller
   extend ScaffoldingExtensions::MetaController
   extend ScaffoldingExtensions::MetaRamazeController
 end
+

data/lib/scaffolding_extensions/controller/sinatra.rb

@@ -76,7 +76,7 @@ module ScaffoldingExtensions
       end
       
       def scaffold_request_method
-        @scaffold_request_method
+        request.env['REQUEST_METHOD']
       end
       
       def scaffold_request_param(v)
@@ -110,18 +110,18 @@ module ScaffoldingExtensions
       include ScaffoldingExtensions::Helper
       include ScaffoldingExtensions::PrototypeHelper
       include ScaffoldingExtensions::SinatraHelper
+      p = 'POST'
+      block = lambda do
+        captures = params[:captures] || []
+        @scaffold_path = request.env['SCRIPT_NAME']
+        @scaffold_method = meth = captures[0] || 'index'
+        params[:id] ||= captures[1]
+        raise(ArgumentError, 'Method Not Allowed') if scaffold_request_method != p && scaffolded_nonidempotent_method?(meth)
+        scaffolded_method?(meth) ? send(meth) : pass
+      end
+      get('/?', &block)
       [:get, :post].each do |req_meth|
-        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
+        send(req_meth, %r{\A/(\w+)(?:/(\w+))?\z}, &block)
       end
       self
     end

data/lib/scaffolding_extensions/helper.rb

@@ -154,6 +154,11 @@ module ScaffoldingExtensions
         ''
       end
       
+      # Return the notice entry in the flash hash.
+      def scaffold_get_flash
+        scaffold_flash[:notice]
+      end
+
       # Returns html fragment containing autocompleting text or select boxes to add associated records
       # to the current record, and line items with buttons to remove associated records
       # from the current record.
@@ -204,6 +209,11 @@ module ScaffoldingExtensions
         content
       end
       
+      # Is the action given an idempotent action?  True for show and edit, false otherwise
+      def scaffold_idempotent_action?(action)
+        [:show, :edit].include?(action)
+      end
+
       # Script tag with javascript included inside a CDATA section
       def scaffold_javascript_tag(javascript)
         "<script type='text/javascript'>\n//<![CDATA[\n#{javascript}\n//]]>\n</script>"
@@ -278,7 +288,7 @@ module ScaffoldingExtensions
       
       # The suffix needed to params that should be lists.  The empty string by default.
       def scaffold_param_list_suffix
-        ''
+        '[]'
       end
       
       # A select tag with the provided name for the given collection of items. The options

data/lib/scaffolding_extensions/meta_controller.rb

@@ -149,7 +149,7 @@ module ScaffoldingExtensions
             page = scaffold_request_param(:page).to_i > 1 ? scaffold_request_param(:page).to_i : 1
             page -= 1 if scaffold_request_param(:page_previous)
             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=>scaffold_force_array(scaffold_request_param(:notnull)), :null=>scaffold_force_array(scaffold_request_param(:null)), :page=>page, :session=>scaffold_session)
+            @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)
           end

data/lib/scaffolding_extensions/meta_model.rb

@@ -126,11 +126,8 @@ module ScaffoldingExtensions::MetaModel
   def scaffold_add_associated_objects(association, object, options, *associated_object_ids)
     unless associated_object_ids.empty?
       scaffold_transaction do
-        associated_objects = associated_object_ids.collect do |associated_object_id|
-          associated_object = scaffold_association_find_object(association, associated_object_id.to_i, :session=>options[:session])
-          scaffold_add_associated_object(association, object, associated_object)
-          associated_object
-        end
+        associated_objects = associated_object_ids.map{|i| scaffold_association_find_object(association, i.to_i, :session=>options[:session])}
+        associated_objects.each{|o| scaffold_add_associated_object(association, object, o)}
         associated_object_ids.length == 1 ? associated_objects.first : associated_objects
       end
     end
@@ -310,7 +307,7 @@ module ScaffoldingExtensions::MetaModel
   # The name string to use in urls, defaults to name.underscore.  Can be set with an 
   # instance variable.
   def scaffold_name
-    @scaffold_name ||= name.underscore
+    @scaffold_name ||= name.underscore.gsub('/', '__')
   end
 
   # Merges the record with id from into the record with id to.  Updates all 

data/lib/scaffolding_extensions/model/active_record.rb

@@ -20,8 +20,7 @@ module ScaffoldingExtensions::MetaActiveRecord
   # Add the associated object to the object's association
   def scaffold_add_associated_object(association, object, associated_object)
     association_proxy = object.send(association)
-    next if association_proxy.include?(associated_object)
-    association_proxy << associated_object
+    association_proxy << associated_object unless association_proxy.include?(associated_object)
   end
 
   # Array of all association reflections for this model

data/lib/scaffolding_extensions/model/sequel.rb

@@ -19,7 +19,7 @@ module ScaffoldingExtensions::MetaSequel
   
   # Add the associated object to the object's association
   def scaffold_add_associated_object(association, object, associated_object)
-    object.send(association_reflection(association).add_method, associated_object)
+    object.send(association_reflection(association).add_method, associated_object) unless object.send(association).include?(associated_object)
   end
 
   # Array of all association reflections for this model

data/scaffolds/layout.rhtml

@@ -74,7 +74,7 @@
 </head>
 <body>
 <%= "<h1>#{@scaffold_title}</h1>" if @scaffold_title %>
-<%= "<h4>#{scaffold_flash[:notice]}</h4>" if scaffold_flash[:notice] %>
+<%= "<h4>#{scaffold_get_flash}</h4>" if scaffold_get_flash %>
 
 <%= @content %>
 

data/scaffolds/list.rhtml

@@ -1,6 +1,6 @@
 <% @scaffold_title = "Choose #{hn = @scaffold_options[:singular_lc_human_name]} to #{(haction = (action = @scaffold_action).to_s.humanize).downcase}" %>
 
-<%= scaffold_form(scaffold_url("#{action}#{@scaffold_suffix}"), :method=>(action == :destroy ? :post : :get)) %>
+<%= scaffold_form(scaffold_url("#{action}#{@scaffold_suffix}"), :method=>scaffold_idempotent_action?(action) ? :get : :post) %>
 <% if @scaffold_class.scaffold_use_auto_complete %>
   <%= scaffold_text_field_tag_with_auto_complete('id', @scaffold_options[:singular_name]) %>
 <% else %>

metadata

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