authorized_rails_scaffolds 0.0.10 → 0.0.11

data/lib/authorized_rails_scaffolds/route_example_macros.rb

@@ -0,0 +1,43 @@
+module RouteExampleMacros
+
+  # Example index route: i.e. /awesome/users/2/foo_bars
+  def example_controller_path
+    unless @example_controller_path
+      example_controller_path_parts = []
+
+      parent_model_tables.each do |parent_model|
+        # users, 2
+        parent_value = example_parent_values["#{parent_model}_id"]
+        example_controller_path_parts << parent_model.pluralize
+        example_controller_path_parts << parent_value
+      end
+
+      # Example index route: i.e. /awesome/users/2/foo_bars
+      @example_controller_path = [parent_module_groups + example_controller_path_parts + [resource_table_name.pluralize]].join("/")
+    end
+    "/#{@example_controller_path}"
+  end
+
+  # Extra params for an example controller path: i.e. ', :user_id => 2'
+  def example_controller_path_extra_params
+    @example_controller_path_extra_params ||= example_parent_values.any? ? ', ' + example_parent_values.map{ |parent_model_id, parent_value| ":#{parent_model_id} => \"#{parent_value}\"" }.join(', ') : ''
+  end
+
+  def example_route_extra_params
+    @example_route_extra_params ||= parent_model_tables.collect{ |parent_table| ":#{parent_table}_id => #{references_test_property(parent_table)}.to_param" }
+  end
+
+  protected
+
+  # Creates example values for parent id params (i.e. :user_id => 2)
+  def example_parent_values
+    unless @example_parent_values
+      @example_parent_values = {}
+      parent_model_tables.each_with_index do |parent_model, index|
+        @example_parent_values["#{parent_model}_id"] = index + 2
+      end
+    end
+    @example_parent_values
+  end
+
+end

data/lib/authorized_rails_scaffolds/rspec_scaffold_controller_helper.rb

@@ -0,0 +1,17 @@
+class AuthorizedRailsScaffolds::RSpecScaffoldControllerHelper < AuthorizedRailsScaffolds::RSpecScaffoldHelper
+  include ControllerMacros
+  include FactoryMacros
+  include RouteExampleMacros
+
+  def initialize(options = {})
+    super options
+
+    # Modularized class name generated by spec generator
+    @controller_class_name = options[:controller_class_name]
+  end
+
+  def build_example_request_params(*extra_params)
+    [example_route_extra_params + extra_params].join(", ")
+  end
+
+end

data/lib/authorized_rails_scaffolds/rspec_scaffold_helper.rb

@@ -0,0 +1,26 @@
+class AuthorizedRailsScaffolds::RSpecScaffoldHelper < AuthorizedRailsScaffolds::Helper
+  include TestVarMacros
+
+  def initialize(options = {})
+    super options
+
+    @modular_class_name = options[:class_name] || options[:local_class_name]
+    @attributes = options[:attributes]
+  end
+
+  # Class name with parent modules included (i.e. Example::FooBar)
+  # Name of class assumed by default generators, used as a base for determining modules and class
+  def modular_class_name
+    @modular_class_name
+  end
+
+  def parent_variables
+    @parent_variables ||= parent_model_tables.collect{ |parent_table| references_test_property(parent_table) }
+  end
+
+  def references_show_route(attribute_name, variable = nil)
+    variable ||= "#{resource_test_property}.#{attribute_name}"
+    super attribute_name, variable
+  end
+
+end

data/lib/authorized_rails_scaffolds/rspec_scaffold_routing_helper.rb

@@ -0,0 +1,12 @@
+class AuthorizedRailsScaffolds::RSpecScaffoldRoutingHelper < AuthorizedRailsScaffolds::RSpecScaffoldHelper
+  include ControllerMacros
+  include RouteExampleMacros
+
+  def initialize(options = {})
+    super options
+
+    # Modularized class name generated by spec generator
+    @controller_class_name = options[:controller_class_name]
+  end
+
+end

data/lib/authorized_rails_scaffolds/{rspec_scaffold_generator_view_helper.rb → rspec_scaffold_view_helper.rb}

@@ -1,4 +1,5 @@
-class AuthorizedRailsScaffolds::RSpecScaffoldGeneratorViewHelper < AuthorizedRailsScaffolds::RSpecScaffoldGeneratorHelper
+class AuthorizedRailsScaffolds::RSpecScaffoldViewHelper < AuthorizedRailsScaffolds::RSpecScaffoldHelper
+  include FactoryMacros
 
   def initialize(options = {})
     super options
@@ -13,7 +14,7 @@ class AuthorizedRailsScaffolds::RSpecScaffoldGeneratorViewHelper < AuthorizedRai
   end
 
   def standard_attributes
-    @standard_attributes ||= @attributes.reject{|attribute| [:time, :date, :datetime].include? attribute.type }
+    @standard_attributes ||= @attributes.reject{|attribute| [:time, :date, :datetime, :references].include? attribute.type }
   end
 
   def datetime_attributes

data/lib/authorized_rails_scaffolds/test_var_macros.rb

@@ -0,0 +1,40 @@
+module TestVarMacros
+
+  # Variable to hold stubs of parent models
+  def references_test_var(references_table)
+    "@#{references_test_property(references_table)}"
+  end
+
+  def references_test_sym(references_table)
+    ":#{references_test_property(references_table)}"
+  end
+
+  def references_test_property(references_table, var_number = nil)
+    if parent_model_tables.include? references_table
+      parent_property = "parent_#{references_table}"
+    else
+      parent_property = "stub_#{references_table}"
+    end
+    parent_property = "#{parent_property}_#{var_number}" unless var_number.nil?
+    parent_property
+  end
+
+  # Variable name stub resource is assigned to (i.e. @foo_bar)
+  def resource_test_var(var_number = nil)
+    "@#{resource_test_property(var_number)}"
+  end
+
+  # Symbol used to assign test resources (i.e. :foo_bar)
+  def resource_test_sym(var_number = nil)
+    ":#{resource_test_property(var_number)}"
+  end
+
+  # Generator for properties used for testing
+  def resource_test_property(var_number = nil)
+    resource_property = "test_#{var_name}"
+    resource_property = "#{resource_property}_#{var_number}" unless var_number.nil?
+    resource_property
+  end
+  
+
+end

data/lib/authorized_rails_scaffolds/version.rb

@@ -1,3 +1,3 @@
 module AuthorizedRailsScaffolds
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/lib/generators/authorized_rails_scaffolds/install_templates/templates/scaffold/_form.html.erb

@@ -1,17 +1,15 @@
 <%-
 
-t_helper = AuthorizedRailsScaffolds::Helper.new(
+t_helper = AuthorizedRailsScaffolds::RailsErbScaffoldHelper.new(
   :class_name => class_name,
   :singular_table_name => singular_table_name,
   :file_name => file_name
 )
 
-local_class_name = t_helper.local_class_name # Non-Namespaced class name
-var_name = t_helper.var_name # Non-namespaced variable name
-plural_var_name = t_helper.plural_var_name # Pluralized non-namespaced variable name
+resource_var = t_helper.resource_var
 
 -%>
-<%%= simple_form_for(<%= t_helper.form_object_array %>, :html => { class: 'form-horizontal' }) do |f| %>
+<%%= simple_form_for(<%= t_helper.scoped_values_for_form %>, :html => { class: 'form-horizontal' }) do |f| %>
   <%%= f.error_notification %>
 
   <div class="form-inputs">
@@ -23,7 +21,7 @@ plural_var_name = t_helper.plural_var_name # Pluralized non-namespaced variable
   <div class="form-actions">
     <%%= f.button :submit, :class => 'btn-primary' %>
     <%%= link_to t('.cancel', :default => t("helpers.links.cancel")),
-                @<%= var_name %>.persisted? ? <%= t_helper.controller_show_route "@#{var_name}" %> : <%= t_helper.controller_index_path %>,
+                <%= resource_var %>.persisted? ? <%= t_helper.controller_show_route resource_var %> : <%= t_helper.controller_index_path %>,
                 :class => 'btn'
     %>
   </div>

data/lib/generators/authorized_rails_scaffolds/install_templates/templates/scaffold/controller.rb

@@ -4,74 +4,90 @@ require_dependency "<%= namespaced_file_path %>/application_controller"
 <% end -%>
 <%-
 
-t_helper = AuthorizedRailsScaffolds::Helper.new(
+#
+# Available properties:
+# 
+#   class_name
+#   controller_class_name
+#   singular_table_name
+#   file_name
+#   orm_instance
+#   route_url
+#
+
+t_helper = AuthorizedRailsScaffolds::RailsScaffoldControllerHelper.new(
   :class_name => class_name,
+  :controller_class_name => controller_class_name,
   :singular_table_name => singular_table_name,
   :file_name => file_name
 )
 
-local_class_name = t_helper.local_class_name # Non-Namespaced class name
-var_name = t_helper.var_name # Non-namespaced variable name
-plural_var_name = t_helper.plural_var_name # Pluralized non-namespaced variable name
+resource_class = t_helper.resource_class # Non-Namespaced class name
+resource_symbol = t_helper.resource_symbol
+resource_table_name = t_helper.resource_table_name
+resource_var = t_helper.resource_var
+resources_var = t_helper.resources_var # Pluralized non-namespaced variable name
+
+example_controller_path = t_helper.example_controller_path
 
 # Override default orm instance
-orm_instance = Rails::Generators::ActiveModel.new var_name
+orm_instance = Rails::Generators::ActiveModel.new resource_table_name
 
 -%>
 <% module_namespacing do -%>
-class <%= controller_class_name %>Controller < <%= t_helper.ns_controller_prefix %>ApplicationController
+class <%= t_helper.controller_class_name %> < <%= t_helper.application_controller_class %>
   <%- AuthorizedRailsScaffolds.config.parent_models.each_with_index do |model, model_index| -%>
   load_and_authorize_resource :<%= model.underscore %><% if model_index > 0 %>, :through => :<%= AuthorizedRailsScaffolds.config.parent_models[model_index - 1].underscore %><% end %>
   <%- end -%>
-  load_and_authorize_resource :<%= var_name%><% if AuthorizedRailsScaffolds.config.parent_models.any? %>, :through => :<%= AuthorizedRailsScaffolds.config.parent_models.last.underscore %><% end %>
+  load_and_authorize_resource :<%= t_helper.resource_table_name %><% if t_helper.parent_models.any? %>, :through => :<%= t_helper.parent_models.last.underscore %><% end %>
 
-  # GET <%= route_url %>
-  # GET <%= route_url %>.json
+  # GET <%= example_controller_path %>
+  # GET <%= example_controller_path %>.json
   def index
-    # @<%= plural_var_name %> = <%= orm_class.all(local_class_name) %>
+    # <%= resources_var %> = <%= orm_class.all(resource_class) %>
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render <%= key_value :json, "@#{plural_var_name}" %> }
+      format.json { render <%= key_value :json, resources_var %> }
     end
   end
 
-  # GET <%= route_url %>/1
-  # GET <%= route_url %>/1.json
+  # GET <%= example_controller_path %>/1
+  # GET <%= example_controller_path %>/1.json
   def show
-    # @<%= var_name %> = <%= orm_class.find(local_class_name, "params[:id]") %>
+    # <%= resource_var %> = <%= orm_class.find(resource_class, "params[:id]") %>
 
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render <%= key_value :json, "@#{var_name}" %> }
+      format.json { render <%= key_value :json, resource_var %> }
     end
   end
 
-  # GET <%= route_url %>/new
-  # GET <%= route_url %>/new.json
+  # GET <%= example_controller_path %>/new
+  # GET <%= example_controller_path %>/new.json
   def new
-    # @<%= var_name %> = <%= orm_class.build(local_class_name) %>
+    # <%= resource_var %> = <%= orm_class.build(resource_class) %>
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render <%= key_value :json, "@#{var_name}" %> }
+      format.json { render <%= key_value :json, resource_table_name %> }
     end
   end
 
-  # GET <%= route_url %>/1/edit
+  # GET <%= example_controller_path %>/1/edit
   def edit
-    # @<%= var_name %> = <%= orm_class.find(local_class_name, "params[:id]") %>
+    # <%= resource_var %> = <%= orm_class.find(resource_class, "params[:id]") %>
   end
 
-  # POST <%= route_url %>
-  # POST <%= route_url %>.json
+  # POST <%= example_controller_path %>
+  # POST <%= example_controller_path %>.json
   def create
-    # @<%= var_name %> = <%= orm_class.build(local_class_name, "params[:#{var_name}]") %>
+    # <%= resource_var %> = <%= orm_class.build(resource_class, "params[#{resource_symbol}]") %>
 
     respond_to do |format|
       if @<%= orm_instance.save %>
-        format.html { redirect_to <%= t_helper.controller_show_route("@#{var_name}") %>, <%= key_value :notice, "'#{human_name} was successfully created.'" %> }
-        format.json { render <%= key_value :json, "@#{var_name}" %>, <%= key_value :status, ':created' %>, <%= key_value :location, t_helper.controller_show_route("@#{var_name}") %> }
+        format.html { redirect_to <%= t_helper.controller_show_route(resource_var) %>, <%= key_value :notice, "'#{human_name} was successfully created.'" %> }
+        format.json { render <%= key_value :json, resource_var %>, <%= key_value :status, ':created' %>, <%= key_value :location, t_helper.controller_show_route(resource_var) %> }
       else
         format.html { render <%= key_value :action, '"new"' %> }
         format.json { render <%= key_value :json, "@#{orm_instance.errors}" %>, <%= key_value :status, ':unprocessable_entity' %> }
@@ -79,14 +95,14 @@ class <%= controller_class_name %>Controller < <%= t_helper.ns_controller_prefix
     end
   end
 
-  # PUT <%= route_url %>/1
-  # PUT <%= route_url %>/1.json
+  # PUT <%= example_controller_path %>/1
+  # PUT <%= example_controller_path %>/1.json
   def update
-    # @<%= var_name %> = <%= orm_class.find(local_class_name, "params[:id]") %>
+    # <%= resource_var %> = <%= orm_class.find(resource_class, "params[:id]") %>
 
     respond_to do |format|
-      if @<%= orm_instance.update_attributes("params[:#{var_name}]") %>
-        format.html { redirect_to <%= t_helper.controller_show_route "@#{var_name}" %>, <%= key_value :notice, "'#{human_name} was successfully updated.'" %> }
+      if @<%= orm_instance.update_attributes("params[#{resource_symbol}]") %>
+        format.html { redirect_to <%= t_helper.controller_show_route resource_var %>, <%= key_value :notice, "'#{human_name} was successfully updated.'" %> }
         format.json { head :no_content }
       else
         format.html { render <%= key_value :action, '"edit"' %> }
@@ -95,10 +111,10 @@ class <%= controller_class_name %>Controller < <%= t_helper.ns_controller_prefix
     end
   end
 
-  # DELETE <%= route_url %>/1
-  # DELETE <%= route_url %>/1.json
+  # DELETE <%= example_controller_path %>/1
+  # DELETE <%= example_controller_path %>/1.json
   def destroy
-    # @<%= var_name %> = <%= orm_class.find(local_class_name, "params[:id]") %>
+    # <%= resource_var %> = <%= orm_class.find(resource_class, "params[:id]") %>
     @<%= orm_instance.destroy %>
 
     respond_to do |format|

data/lib/generators/authorized_rails_scaffolds/install_templates/templates/scaffold/edit.html.erb

@@ -1,15 +1,13 @@
 <%-
 
-t_helper = AuthorizedRailsScaffolds::Helper.new(
+t_helper = AuthorizedRailsScaffolds::RailsErbScaffoldHelper.new(
   :class_name => class_name,
   :singular_table_name => singular_table_name,
   :file_name => file_name
 )
 
-local_class_name = t_helper.local_class_name # Non-Namespaced class name
-
 -%>
-<%%- model_class = <%= local_class_name %> -%>
+<%%- model_class = <%= t_helper.resource_class %> -%>
 <div class="page-header">
   <h1><%%=t '.title', :default => [:'helpers.titles.edit', 'Edit %{model}'], :model => model_class.model_name.human %></h1>
 </div>

data/lib/generators/authorized_rails_scaffolds/install_templates/templates/scaffold/index.html.erb

@@ -1,17 +1,16 @@
 <%-
 
-t_helper = AuthorizedRailsScaffolds::Helper.new(
+t_helper = AuthorizedRailsScaffolds::RailsErbScaffoldHelper.new(
   :class_name => class_name,
   :singular_table_name => singular_table_name,
   :file_name => file_name
 )
 
-local_class_name = t_helper.local_class_name # Non-Namespaced class name
-var_name = t_helper.var_name # Non-namespaced variable name
-plural_var_name = t_helper.plural_var_name # Pluralized non-namespaced variable name
+resource_class = t_helper.resource_class
+resource_table_name = t_helper.resource_table_name # Non-namespaced variable name
 
 -%>
-<%%- model_class = <%= local_class_name %> -%>
+<%%- model_class = <%= resource_class %> -%>
 <div class="page-header">
   <h1><%%=t '.title', :default => model_class.model_name.human.pluralize %></h1>
 </div>
@@ -33,36 +32,36 @@ plural_var_name = t_helper.plural_var_name # Pluralized non-namespaced variable
     </tr>
   </thead>
   <tbody>
-    <%% @<%= plural_var_name %>.each do |<%= var_name %>| %>
-      <tr class="<%= var_name %>_<%%= <%= var_name %>.id %>">
-        <td class="id-column"><%%= <%= var_name %>.id %></td>
+    <%% <%= t_helper.resources_var %>.each do |<%= resource_table_name %>| %>
+      <tr class="<%= resource_table_name %>_<%%= <%= resource_table_name %>.id %>">
+        <td class="id-column"><%%= <%= resource_table_name %>.id %></td>
   <%- if attributes.any? -%>
-        <td class="title-column"><%%= link_to <%= var_name %>.<%= attributes[0].name %>, <%= t_helper.controller_show_route(var_name) %> %></td>
+        <td class="title-column"><%%= link_to <%= resource_table_name %>.<%= attributes[0].name %>, <%= t_helper.controller_show_route(resource_table_name) %> %></td>
     <%- attributes[1..-1].each do |attribute| -%>
       <%- if attribute.type == :references -%>
         <%% unless @<%= attribute.name %> %>
-          <td><%%= <%= var_name %>.<%= attribute.name %> %></td>
+          <td><%%= <%= resource_table_name %>.<%= attribute.name %> %></td>
         <%% end %>
       <%- elsif [:datetime, :timestamp, :time, :date].include? attribute.type -%>
-        <td><%% unless <%= var_name %>.<%= attribute.name %>.nil? %><%%=l <%= var_name %>.<%= attribute.name %><% if attribute.type == :datetime %>, :format => :long<% end %><% if attribute.type == :time %>, :format => :short<% end %> %><%% end %></td>
+        <td><%% unless <%= resource_table_name %>.<%= attribute.name %>.nil? %><%%=l <%= resource_table_name %>.<%= attribute.name %><% if attribute.type == :datetime %>, :format => :long<% end %><% if attribute.type == :time %>, :format => :short<% end %> %><%% end %></td>
       <%- else -%>
-        <td><%%= <%= var_name %>.<%= attribute.name %> %></td>
+        <td><%%= <%= resource_table_name %>.<%= attribute.name %> %></td>
       <%- end -%>
     <%- end -%>
   <%- end -%>
-        <td><%%=l <%= var_name %>.created_at, :format => :long %></td>
+        <td><%%=l <%= resource_table_name %>.created_at, :format => :long %></td>
         <td class="table-actions">
           <%%= link_to t('.edit', :default => t("helpers.links.edit")),
-                      edit_<%= t_helper.controller_show_route var_name %>,
+                      edit_<%= t_helper.controller_show_route resource_table_name %>,
                       :class => 'btn btn-mini',
-                      :disabled => !can?(:update, <%= var_name %>)
+                      :disabled => !can?(:update, <%= resource_table_name %>)
           %>
           <%%= link_to t('.destroy', :default => t("helpers.links.destroy")),
-                      <%= t_helper.controller_show_route var_name %>,
+                      <%= t_helper.controller_show_route resource_table_name %>,
                       :method => :delete,
                       :data => { :confirm => t('.confirm', :default => t("helpers.links.confirm", :default => 'Are you sure?')) },
                       :class => 'btn btn-mini btn-danger',
-                      :disabled => !can?(:destroy, <%= var_name %>)
+                      :disabled => !can?(:destroy, <%= resource_table_name %>)
           %>
         </td>
       </tr>
@@ -70,7 +69,7 @@ plural_var_name = t_helper.plural_var_name # Pluralized non-namespaced variable
   </tbody>
 </table>
 
-<%% if can?(:create, <%= local_class_name %>) %>
+<%% if can?(:create, <%= resource_class %>) %>
   <%%= link_to t('.new', :default => t("helpers.links.new")),
             new_<%= t_helper.controller_show_route %>,
             :class => 'btn btn-primary' %>