authorized_rails_scaffolds 0.0.14 → 0.0.15

data/lib/authorized_rails_scaffolds/{test_var_macros.rb → macros/test_var_macros.rb}

@@ -1,16 +1,16 @@
-module TestVarMacros
+module AuthorizedRailsScaffolds::Macros::TestVarMacros
 
   # Variable to hold stubs of parent models
   def references_test_var(references_table)
-    "@#{references_test_property(references_table)}"
+    "@#{references_test_name(references_table)}"
   end
 
   def references_test_sym(references_table)
-    ":#{references_test_property(references_table)}"
+    ":#{references_test_name(references_table)}"
   end
 
-  def references_test_property(references_table, var_number = nil)
-    if parent_model_tables.include? references_table
+  def references_test_name(references_table, var_number = nil)
+    if parent_model_names.include? references_table
       parent_property = "parent_#{references_table}"
     else
       parent_property = "stub_#{references_table}"
@@ -21,17 +21,17 @@ module TestVarMacros
 
   # Variable name stub resource is assigned to (i.e. @foo_bar)
   def resource_test_var(var_number = nil)
-    "@#{resource_test_property(var_number)}"
+    "@#{resource_test_name(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)}"
+    ":#{resource_test_name(var_number)}"
   end
 
   # Generator for properties used for testing
-  def resource_test_property(var_number = nil)
-    resource_property = "test_#{resource_table_name}"
+  def resource_test_name(var_number = nil)
+    resource_property = "test_#{resource_name}"
     resource_property = "#{resource_property}_#{var_number}" unless var_number.nil?
     resource_property
   end

data/lib/authorized_rails_scaffolds/rails_erb_scaffold_helper.rb

@@ -6,31 +6,6 @@ class AuthorizedRailsScaffolds::RailsErbScaffoldHelper < AuthorizedRailsScaffold
     @modular_class_name = options[:class_name] || options[:local_class_name]
   end
 
-  # returns values that should be parsed by a form in order for post and put actions to work
-  def scoped_values_for_form(variable = nil)
-    variable ||= resource_var
-
-    form_argument_values = []
-
-    # Add the modules
-    parent_module_groups.each do |parent_module|
-      form_argument_values << ":#{parent_module}"
-    end
-
-    # Add the models
-    parent_model_tables.each do |parent_model|
-      form_argument_values << parent_variable(parent_model)
-    end
-
-    form_argument_values << variable
-
-    if form_argument_values.count == 1
-      return variable
-    else
-      "[#{form_argument_values.join(', ')}]"
-    end
-  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

data/lib/authorized_rails_scaffolds/rails_helper_helper.rb

@@ -0,0 +1,41 @@
+class AuthorizedRailsScaffolds::RailsHelperHelper < AuthorizedRailsScaffolds::Helper
+
+  def initialize(options = {})
+    super options
+
+    @modular_class_name = options[:class_name] || options[:local_class_name]
+  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.singularize
+  end
+
+  # returns values that should be parsed by a form in order for post and put actions to work
+  def scoped_values_for_form(variable, use_shallow_route=false)
+    variable ||= resource_var
+
+    form_argument_values = []
+
+    # Add the modules
+    parent_module_groups.each do |parent_module|
+      form_argument_values << ":#{parent_module}"
+    end
+
+    # Add the models
+    parent_models = use_shallow_route ? parent_model_names[0..-2] : parent_model_names
+    parent_models.each do |parent_model|
+      form_argument_values << parent_variable(parent_model)
+    end
+
+    form_argument_values << variable
+
+    if form_argument_values.count == 1
+      return variable
+    else
+      "[#{form_argument_values.join(', ')}]"
+    end
+  end
+
+end

data/lib/authorized_rails_scaffolds/rails_scaffold_controller_helper.rb

@@ -1,6 +1,6 @@
 class AuthorizedRailsScaffolds::RailsScaffoldControllerHelper < AuthorizedRailsScaffolds::Helper
-  include ControllerMacros
-  include RouteExampleMacros
+  include AuthorizedRailsScaffolds::Macros::ControllerMacros
+  include AuthorizedRailsScaffolds::Macros::RouteExampleMacros
 
   def initialize(options = {})
     super options
@@ -17,4 +17,29 @@ class AuthorizedRailsScaffolds::RailsScaffoldControllerHelper < AuthorizedRailsS
     @modular_class_name
   end
 
+  def load_and_authorize_parent(model_name)
+    load_resource_code = "load_and_authorize_resource #{parent_sym(model_name)}"
+
+    parent_model = model_parent_name(model_name)
+    unless parent_model.nil?
+      load_resource_code += ", :through => #{parent_sym(parent_model)}"
+    end
+
+    load_resource_code
+  end
+
+  def load_resource
+    load_resource_code = "load_resource #{resource_symbol}"
+
+    if parent_models.any?
+      load_resource_code += ", :through => #{parent_sym(parent_model_names.last)}"
+    end
+
+    if shallow_routes?
+      load_resource_code += ", :shallow => true"
+    end
+
+    load_resource_code
+  end
+
 end

data/lib/authorized_rails_scaffolds/rspec_integration_helper.rb

@@ -0,0 +1,9 @@
+class AuthorizedRailsScaffolds::RSpecIntegrationHelper < AuthorizedRailsScaffolds::RSpecScaffoldHelper
+  include AuthorizedRailsScaffolds::Macros::FactoryMacros
+  include AuthorizedRailsScaffolds::Macros::RouteExampleMacros
+
+  def extra_comments
+    parent_models.any? ? " belonging to a #{parent_models[-1]}" : ''
+  end
+
+end

data/lib/authorized_rails_scaffolds/rspec_scaffold_controller_helper.rb

@@ -1,7 +1,7 @@
 class AuthorizedRailsScaffolds::RSpecScaffoldControllerHelper < AuthorizedRailsScaffolds::RSpecScaffoldHelper
-  include ControllerMacros
-  include FactoryMacros
-  include RouteExampleMacros
+  include AuthorizedRailsScaffolds::Macros::ControllerMacros
+  include AuthorizedRailsScaffolds::Macros::FactoryMacros
+  include AuthorizedRailsScaffolds::Macros::RouteExampleMacros
 
   def initialize(options = {})
     super options
@@ -10,8 +10,12 @@ class AuthorizedRailsScaffolds::RSpecScaffoldControllerHelper < AuthorizedRailsS
     @controller_class_name = options[:controller_class_name]
   end
 
-  def build_example_request_params(*extra_params)
+  def build_example_index_params(*extra_params)
     [example_route_extra_params + extra_params].join(", ")
   end
 
+  def build_example_show_params(*extra_params)
+    [example_route_extra_params(shallow_routes?) + extra_params].join(", ")
+  end
+
 end

data/lib/authorized_rails_scaffolds/rspec_scaffold_helper.rb

@@ -1,5 +1,5 @@
 class AuthorizedRailsScaffolds::RSpecScaffoldHelper < AuthorizedRailsScaffolds::Helper
-  include TestVarMacros
+  include AuthorizedRailsScaffolds::Macros::TestVarMacros
 
   def initialize(options = {})
     super options
@@ -14,12 +14,13 @@ class AuthorizedRailsScaffolds::RSpecScaffoldHelper < AuthorizedRailsScaffolds::
     @modular_class_name
   end
 
-  def parent_variables
-    @parent_variables ||= parent_model_tables.collect{ |parent_table| references_test_property(parent_table) }
+  def parent_variables(use_shallow_route=false)
+    @parent_variables ||= parent_model_names.collect{ |parent_table| references_test_name(parent_table) }
+    use_shallow_route ? @parent_variables[0..-2] : @parent_variables
   end
 
   def references_show_route(attribute_name, variable = nil)
-    variable ||= "#{resource_test_property}.#{attribute_name}"
+    variable ||= "#{resource_test_name}.#{attribute_name}"
     super attribute_name, variable
   end
 

data/lib/authorized_rails_scaffolds/rspec_scaffold_routing_helper.rb

@@ -1,6 +1,6 @@
 class AuthorizedRailsScaffolds::RSpecScaffoldRoutingHelper < AuthorizedRailsScaffolds::RSpecScaffoldHelper
-  include ControllerMacros
-  include RouteExampleMacros
+  include AuthorizedRailsScaffolds::Macros::ControllerMacros
+  include AuthorizedRailsScaffolds::Macros::RouteExampleMacros
 
   def initialize(options = {})
     super options

data/lib/authorized_rails_scaffolds/rspec_scaffold_view_helper.rb

@@ -1,5 +1,5 @@
 class AuthorizedRailsScaffolds::RSpecScaffoldViewHelper < AuthorizedRailsScaffolds::RSpecScaffoldHelper
-  include FactoryMacros
+  include AuthorizedRailsScaffolds::Macros::FactoryMacros
 
   def initialize(options = {})
     super options

data/lib/authorized_rails_scaffolds/version.rb

@@ -1,3 +1,3 @@
 module AuthorizedRailsScaffolds
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

data/lib/generators/authorized_rails_scaffolds/install_macros/install_macros_generator.rb

@@ -9,8 +9,9 @@ class AuthorizedRailsScaffolds::InstallMacrosGenerator < Rails::Generators::Base
     parts << options[:authentication].underscore unless options[:authentication].nil?
     parts << options[:authorization].underscore unless options[:authorization].nil?
     template_file = parts.any? ? parts.join('_') : nil
-    
+
     copy_file [template_file, 'controller_macros.rb'].join('/'), "spec/support/#{template_file}_controller_macros.rb"
+    copy_file [template_file, 'request_macros.rb'].join('/'), "spec/support/#{template_file}_request_macros.rb"
     readme [template_file, 'USAGE'].join('/')
   end
 

data/lib/generators/authorized_rails_scaffolds/install_macros/templates/devise_can_can/USAGE

@@ -4,4 +4,5 @@
 RSpec.configure do |config|
   config.include Devise::TestHelpers, :type => :controller
   config.include DeviseCanCanControllerMacros, :type => :controller
+  config.include DeviseCanCanRequestMacros, :type => :request
 end

data/lib/generators/authorized_rails_scaffolds/install_macros/templates/devise_can_can/request_macros.rb

@@ -0,0 +1,8 @@
+module DeviseCanCanRequestMacros
+
+  def sign_in_user(user=nil)
+    user ||= FactoryGirl.create(:user)
+    post user_session_path, :user => { :email => user.email, :password => user.password }
+  end
+
+end

data/lib/generators/authorized_rails_scaffolds/install_templates/install_templates_generator.rb

@@ -20,6 +20,12 @@ class AuthorizedRailsScaffolds::InstallTemplatesGenerator < Rails::Generators::B
     # Model Spec Templates
     copy_rspec_model_template 'model_spec.rb'
 
+    # Helper Spec Template
+    copy_rails_helper_controller 'helper.rb'
+
+    # Request Spec Templates
+    copy_rspec_integration_template 'request_spec.rb'
+
     # Routing Spec Templates
     copy_rspec_scaffold_template 'routing_spec.rb'
 
@@ -32,6 +38,10 @@ class AuthorizedRailsScaffolds::InstallTemplatesGenerator < Rails::Generators::B
 
   protected
 
+  def copy_rails_helper_controller(template_name)
+    copy_file "scaffold/#{template_name}", "lib/templates/rails/helper/#{template_name}"
+  end
+
   def copy_erb_scaffold_template(template_name)
     copy_file "scaffold/#{template_name}", "lib/templates/erb/scaffold/#{template_name}"
   end
@@ -40,6 +50,10 @@ class AuthorizedRailsScaffolds::InstallTemplatesGenerator < Rails::Generators::B
     copy_file "scaffold/#{template_name}", "lib/templates/rails/scaffold_controller/#{template_name}"
   end
 
+  def copy_rspec_integration_template(template_name)
+    copy_file "spec/#{template_name}", "lib/templates/rspec/integration/#{template_name}"
+  end
+
   def copy_rspec_model_template(template_name)
     copy_file "spec/#{template_name}", "lib/templates/rspec/model/#{template_name}"
   end

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

@@ -6,10 +6,11 @@ t_helper = AuthorizedRailsScaffolds::RailsErbScaffoldHelper.new(
   :file_name => file_name
 )
 
+resource_name = t_helper.resource_name
 resource_var = t_helper.resource_var
 
 -%>
-<%%= simple_form_for(<%= t_helper.scoped_values_for_form %>, :html => { class: 'form-horizontal' }) do |f| %>
+<%%= simple_form_for(<%= resource_name %>_form_values(<%= resource_var %>), :html => { class: 'form-horizontal' }) do |f| %>
   <%%= f.error_notification %>
 
   <div class="form-inputs">

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

@@ -11,126 +11,159 @@ require_dependency "<%= namespaced_file_path %>/application_controller"
 #   controller_class_name
 #   singular_table_name
 #   file_name
+#   human_name
 #   orm_instance
 #   route_url
 #
 
 t_helper = AuthorizedRailsScaffolds::RailsScaffoldControllerHelper.new(
   :class_name => class_name,
+  :human_name => human_name,
   :controller_class_name => controller_class_name,
   :singular_table_name => singular_table_name,
   :file_name => file_name
 )
 
 resource_class = t_helper.resource_class # Non-Namespaced class name
+resource_human_name = t_helper.resource_human_name
 resource_symbol = t_helper.resource_symbol
-resource_table_name = t_helper.resource_table_name
+resource_name = t_helper.resource_name
+resource_array_name = t_helper.resource_array_name
 resource_var = t_helper.resource_var
-resources_var = t_helper.resources_var # Pluralized non-namespaced variable name
+resource_array_var = t_helper.resource_array_var # Pluralized non-namespaced variable name
 
-example_controller_path = t_helper.example_controller_path
+example_index_path = t_helper.example_index_path
+example_show_path = t_helper.example_show_path
 
 # Override default orm instance
-orm_instance = Rails::Generators::ActiveModel.new resource_table_name
+orm_instance = Rails::Generators::ActiveModel.new resource_name
 
 -%>
 <% module_namespacing do -%>
 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 %>
+  <%- t_helper.parent_model_names.each_with_index do |model_name, model_index| -%>
+  <%= t_helper.load_and_authorize_parent model_name %>
   <%- 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 <%= example_controller_path %>
-  # GET <%= example_controller_path %>.json
+  <%= t_helper.load_resource %>
+<%- if t_helper.shallow_routes? -%>
+  before_filter :load_shallow_resources
+<%- end -%>
+  authorize_resource <%= resource_symbol %>
+
+  # GET <%= example_index_path %>
+  # GET <%= example_index_path %>.json
   def index
-    # <%= resources_var %> = <%= orm_class.all(resource_class) %>
+    # <%= resource_array_var %> = <%= orm_class.all(resource_class) %>
+    # <%= resource_array_var %> = <%= resource_array_var %>.page(params[:page] || 1)
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render <%= key_value :json, resources_var %> }
+      format.json { render <%= key_value :json, "{ #{key_value(resource_array_name, resource_array_var)} }" %> }
     end
   end
 
-  # GET <%= example_controller_path %>/1
-  # GET <%= example_controller_path %>/1.json
+  # GET <%= example_show_path %>
+  # GET <%= example_show_path %>.json
   def show
     # <%= resource_var %> = <%= orm_class.find(resource_class, "params[:id]") %>
 
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render <%= key_value :json, resource_var %> }
+      format.json { render <%= key_value :json, "{ #{key_value(resource_name, resource_var)} }" %> }
     end
   end
 
-  # GET <%= example_controller_path %>/new
-  # GET <%= example_controller_path %>/new.json
+  # GET <%= example_index_path %>/new
+  # GET <%= example_index_path %>/new.json
   def new
     # <%= resource_var %> = <%= orm_class.build(resource_class) %>
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render <%= key_value :json, resource_table_name %> }
+      format.json { render <%= key_value :json, "{ #{key_value(resource_name, resource_var)} }" %> }
     end
   end
 
-  # GET <%= example_controller_path %>/1/edit
+  # GET <%= example_show_path %>/edit
   def edit
     # <%= resource_var %> = <%= orm_class.find(resource_class, "params[:id]") %>
   end
 
-  # POST <%= example_controller_path %>
-  # POST <%= example_controller_path %>.json
+  # POST <%= example_index_path %>
+  # POST <%= example_index_path %>.json
   def create
     # <%= 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(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) %> }
+        format.html { redirect_to <%= t_helper.controller_show_route(resource_var) %>, <%= key_value :notice, "'#{resource_human_name} was successfully created.'" %> }
+        format.json { render <%= key_value :json, "{ #{key_value(resource_name, 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' %> }
+        format.json { render <%= key_value :json, "{ " + key_value('errors', "@#{orm_instance.errors}") + " }" %>, <%= key_value :status, ':unprocessable_entity' %> }
       end
     end
   end
 
-  # PUT <%= example_controller_path %>/1
-  # PUT <%= example_controller_path %>/1.json
+  # PUT <%= example_show_path %>
+  # PUT <%= example_show_path %>.json
   def update
     # <%= resource_var %> = <%= orm_class.find(resource_class, "params[:id]") %>
 
     respond_to do |format|
       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.html { redirect_to <%= t_helper.controller_show_route resource_var %>, <%= key_value :notice, "'#{resource_human_name} was successfully updated.'" %> }
         format.json { head :no_content }
       else
         format.html { render <%= key_value :action, '"edit"' %> }
-        format.json { render <%= key_value :json, "@#{orm_instance.errors}" %>, <%= key_value :status, ':unprocessable_entity' %> }
+        format.json { render <%= key_value :json, "{ " + key_value('errors', "@#{orm_instance.errors}") + " }" %>, <%= key_value :status, ':unprocessable_entity' %> }
       end
     end
   end
 
-  # DELETE <%= example_controller_path %>/1
-  # DELETE <%= example_controller_path %>/1.json
+  # DELETE <%= example_show_path %>
+  # DELETE <%= example_show_path %>.json
   def destroy
     # <%= resource_var %> = <%= orm_class.find(resource_class, "params[:id]") %>
     @<%= orm_instance.destroy %>
 
     respond_to do |format|
-      format.html { redirect_to <%= t_helper.controller_index_route %> }
+      format.html { redirect_to <%= t_helper.controller_index_route %>, <%= key_value :notice, "'#{resource_human_name} was successfully deleted.'" %> }
       format.json { head :no_content }
     end
   end
 
   protected
+<%- if t_helper.shallow_routes? -%>
+
+  # Loads parent resources from <%= resource_var %> if not included in route
+  def load_shallow_resources
+<%- reverse_parent_models = t_helper.parent_model_names.reverse -%>
+<%- reverse_parent_models.each_with_index do |parent_model, parent_index| -%>
+  <%- if parent_index == 0 -%>
+    if <%= resource_var %> && <%= resource_var %>.persisted?
+      <%= t_helper.parent_variable(parent_model) %> = <%= resource_var %>.<%= parent_model %> if <%= t_helper.parent_variable(parent_model) %>.nil?
+    end
+  <%- else -%>
+    if <%= t_helper.parent_variable(reverse_parent_models[parent_index-1]) %> && <%= t_helper.parent_variable(parent_model) %>.nil?
+      <%= t_helper.parent_variable(parent_model) %> = <%= t_helper.parent_variable(reverse_parent_models[parent_index-1]) %>.<%= parent_model %>
+    end
+  <%- end -%>
+<%- end -%>
+  end
+<%- end -%>
 
   # Capture any access violations, ensure User isn't unnessisarily redirected to root
   rescue_from CanCan::AccessDenied do |exception|
-    if params[:action] == 'index'
-      redirect_to root_url, :alert => exception.message
-    else
-      redirect_to <%= t_helper.controller_index_route %>, :alert => exception.message
+    respond_to do |format|
+      format.html do
+        if params[:action] == 'index'<%= t_helper.parent_model_names.collect { |parent_model| " or #{t_helper.parent_variable(parent_model)}.nil?" }.join('') %>
+          redirect_to root_url, :alert => exception.message
+        else
+          redirect_to <%= t_helper.controller_index_route %>, :alert => exception.message
+        end
+      end
+      format.json { head :no_content, :status => :forbidden }
     end
   end