authorized_rails_scaffolds 0.0.7 → 0.0.8

data/lib/authorized_rails_scaffolds.rb

@@ -1,5 +1,4 @@
 require "authorized_rails_scaffolds/version"
-require "authorized_rails_scaffolds/helper"
 
 module AuthorizedRailsScaffolds
   
@@ -7,3 +6,8 @@ module AuthorizedRailsScaffolds
   @@parent_models = []
   
 end
+
+require "authorized_rails_scaffolds/helper"
+require "authorized_rails_scaffolds/controller_spec_helper"
+require "authorized_rails_scaffolds/routing_spec_helper"
+require "authorized_rails_scaffolds/view_spec_helper"

data/lib/authorized_rails_scaffolds/controller_spec_helper.rb

@@ -0,0 +1,31 @@
+class AuthorizedRailsScaffolds::ControllerSpecHelper < AuthorizedRailsScaffolds::Helper
+
+  def initialize(options = {})
+    super options
+
+    @attributes = options[:attributes]
+  end
+
+  def create_factory_model
+    extra_params = extra_model_params
+    "FactoryGirl.create(:#{var_name}#{extra_params})"
+  end
+
+  def create_parent_model(model_name)
+    extra_params = extra_model_params(model_name)
+    "FactoryGirl.create(:#{model_name}#{extra_params})"
+  end
+
+  protected
+
+  def extra_model_params(model_name = nil)
+    argument_params = []
+    AuthorizedRailsScaffolds.parent_models.each do |parent_model|
+      attribute = parent_model.underscore
+      break if model_name == attribute
+      argument_params << ", :#{attribute} => @#{attribute}"
+    end
+    argument_params.join('')
+  end
+
+end

data/lib/authorized_rails_scaffolds/helper.rb

@@ -2,20 +2,19 @@ module AuthorizedRailsScaffolds
   
   class Helper
 
-    def initialize(class_name, singular_table_name, file_name, plural_file_name = nil)
-      @local_class_name = class_name.split('::')[-1] # Non-Namespaced class name
-      @var_name = file_name # Non-namespaced variable name
-      @plural_var_name = plural_file_name || file_name.pluralize # Pluralized non-namespaced variable name
-
+    def initialize(options = {})
+      @local_class_name = options[:local_class_name] || options[:class_name].split('::')[-1]
+      @var_name = options[:var_name] || options[:file_name] # Non-namespaced variable name
+      @plural_var_name = options[:plural_var_name] || @var_name.pluralize # Pluralized non-namespaced variable name
       # Determine namespace prefix i.e awesome
-      @namespace_prefix = singular_table_name[0..-(file_name.length + 2)]
+      @namespace_prefix = options[:namespace_prefix] || options[:singular_table_name][0..-(@var_name.length + 2)]
 
       # Determine Parent Prefix i.e. user_company
       parent_prefix = AuthorizedRailsScaffolds.parent_models.collect{ |x| x.underscore }.join('_')
-      parent_prefix = "#{parent_prefix}_" unless parent_prefix.blank?
 
       # Route Prefix i.e. awesome_user_company
-      @route_prefix = @namespace_prefix.blank? ? parent_prefix : "#{@namespace_prefix}_#{parent_prefix}"
+      route_prefix = [@namespace_prefix, parent_prefix].reject{ |x|x.blank? }.join('_')
+      @route_prefix = route_prefix.blank? ? '' : "#{route_prefix}_"
 
       @parent_variables = AuthorizedRailsScaffolds.parent_models.collect{ |x| "@#{x.underscore}" }.join(', ')
 
@@ -25,27 +24,21 @@ module AuthorizedRailsScaffolds
       @single_path_prefix = "#{@route_prefix}#{var_name}"
     end
 
+    # Non-namespaced class name (i.e. FooBar)
     def local_class_name
       @local_class_name
     end
 
+    # Non-namespaced variable name (i.e. foo_bar)
     def var_name
       @var_name
     end
 
+    # Pluralized non-namespaced variable name (i.e. foo_bars)
     def plural_var_name
       @plural_var_name
     end
 
-    def create_model_with_attributes(attributes)
-      extra_params = ''
-      attribute = AuthorizedRailsScaffolds.parent_models.any? ? AuthorizedRailsScaffolds.parent_models.last.underscore : nil
-      if attribute && attributes.collect{|a|a.name.underscore}.include?(attribute)
-        extra_params = ", :#{attribute} => @#{attribute}"
-      end
-      "FactoryGirl.create(:#{var_name}#{extra_params})"
-    end
-
     def form_object_array(variable = nil)
       variable ||= "@#{var_name}"
       namespace_prefix = ":#{@namespace_prefix}" unless @namespace_prefix.blank?

data/lib/authorized_rails_scaffolds/routing_spec_helper.rb

@@ -0,0 +1,29 @@
+class AuthorizedRailsScaffolds::RoutingSpecHelper
+
+  def initialize(options = {})
+    @ns_table_name = options[:ns_table_name]
+  end
+
+  def extra_params
+    extra_params = ''
+    AuthorizedRailsScaffolds.parent_models.each_with_index do |model, model_index|
+      extra_params += ", :#{model.underscore}_id => \"#{model_index + 2}\""
+    end
+    extra_params
+  end
+
+  def request_path
+    # Remove last part of the path
+    parts = @ns_table_name.split('/')[0..-2] || []
+
+    AuthorizedRailsScaffolds.parent_models.each_with_index do |model, model_index|
+      parts << model.underscore.pluralize
+      parts << model_index + 2
+    end
+
+    # Add Final Part
+    parts << @ns_table_name.split('/')[-1]
+    parts.join('/')
+  end
+
+end

data/lib/authorized_rails_scaffolds/version.rb

@@ -1,3 +1,3 @@
 module AuthorizedRailsScaffolds
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/authorized_rails_scaffolds/view_spec_helper.rb

@@ -0,0 +1,49 @@
+class AuthorizedRailsScaffolds::ViewSpecHelper < AuthorizedRailsScaffolds::Helper
+
+  def initialize(options = {})
+    super options
+
+    @attributes = options[:attributes]
+  end
+
+  def output_attributes
+    @output_attributes ||= @attributes.reject{|attribute| [:timestamp].include? attribute.type }
+  end
+
+  def references_attributes
+    @references_attributes ||= @attributes.reject{|attribute| ![:references].include? attribute.type }
+  end
+
+  def standard_attributes
+    @standard_attributes ||= @attributes.reject{|attribute| [:time, :date, :datetime].include? attribute.type }
+  end
+
+  def datetime_attributes
+    @datetime_attributes ||= @attributes.reject{|attribute| ![:time, :date, :datetime].include? attribute.type }
+  end
+
+  def date_select_year_value(date_string)
+    DateTime.parse(date_string).strftime('%Y')
+  end
+
+  def date_select_month_value(date_string)
+    DateTime.parse(date_string).strftime('%-m')
+  end
+
+  def date_select_month_text(date_string)
+    DateTime.parse(date_string).strftime('%B')
+  end
+
+  def date_select_day_value(date_string)
+    DateTime.parse(date_string).strftime('%-d')
+  end
+
+  def date_select_hour_value(date_string)
+    DateTime.parse(date_string).strftime('%H')
+  end
+
+  def date_select_minute_value(date_string)
+    DateTime.parse(date_string).strftime('%M')
+  end
+
+end

data/lib/generators/authorized_rails_scaffolds/{install_spec → install_macros}/USAGE

@@ -2,8 +2,8 @@ Description:
     Installs rspec templates that offer better coverage than the default rspec templates
 
 Example:
-    rails generate authorized_rails_scaffolds:install_spec
+    rails generate authorized_rails_scaffolds:install_macros
 
     This will create:
-        RSpec controller and view spec templates in lib/rspec/scaffold
+        Controller spec macros in spec/support
         

data/lib/generators/authorized_rails_scaffolds/{install_spec/install_spec_generator.rb → install_macros/install_macros_generator.rb}

@@ -1,22 +1,9 @@
-class AuthorizedRailsScaffolds::InstallSpecGenerator < Rails::Generators::Base
+class AuthorizedRailsScaffolds::InstallMacrosGenerator < Rails::Generators::Base
   source_root File.expand_path('../templates', __FILE__)
 
   class_option :authentication, :type => 'string', :default => 'devise', :desc => "Authentication Provider (Devise)"
   class_option :authorization, :type => 'string', :default => 'can_can', :desc => "Authorization Provider (CanCan)"
 
-  def create_model_templates
-    copy_model_template 'model_spec.rb'
-  end
-
-  def create_scaffold_templates
-    copy_scaffold_template 'controller_spec.rb'
-    copy_scaffold_template 'edit_spec.rb'
-    copy_scaffold_template 'index_spec.rb'
-    copy_scaffold_template 'new_spec.rb'
-    copy_scaffold_template 'show_spec.rb'
-    copy_scaffold_template 'routing_spec.rb'
-  end
-
   def create_controller_macros
     parts = []
     parts << options[:authentication].underscore unless options[:authentication].nil?
@@ -27,14 +14,4 @@ class AuthorizedRailsScaffolds::InstallSpecGenerator < Rails::Generators::Base
     readme [template_file, 'USAGE'].join('/')
   end
 
-  protected
-
-  def copy_model_template(template_name)
-    copy_file template_name, "lib/templates/rspec/model/#{template_name}"
-  end
-
-  def copy_scaffold_template(template_name)
-    copy_file template_name, "lib/templates/rspec/scaffold/#{template_name}"
-  end
-
 end

data/lib/generators/authorized_rails_scaffolds/{install_scaffold → install_templates}/USAGE

@@ -7,3 +7,4 @@ Example:
     This will create:
         ERB view templates in lib/erb/scaffold
         Scaffold controller templates in lib/rails/scaffold_controller
+        RSpec controller and view spec templates in lib/rspec/scaffold

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

@@ -0,0 +1,51 @@
+class AuthorizedRailsScaffolds::InstallTemplatesGenerator < Rails::Generators::Base
+  source_root File.expand_path('../templates', __FILE__)
+
+  def copy_rails_templates
+    # Controller Templates
+    copy_rails_scaffold_controller 'controller.rb'
+
+    # View Templates (erb)
+    copy_erb_scaffold_template '_form.html.erb'
+    copy_erb_scaffold_template 'edit.html.erb'
+    copy_erb_scaffold_template 'index.html.erb'
+    copy_erb_scaffold_template 'new.html.erb'
+    copy_erb_scaffold_template 'show.html.erb'
+  end
+
+  def create_spec_templates
+    # Controller Spec Templates
+    copy_rspec_scaffold_template 'controller_spec.rb'
+
+    # Model Spec Templates
+    copy_rspec_model_template 'model_spec.rb'
+
+    # Routing Spec Templates
+    copy_rspec_scaffold_template 'routing_spec.rb'
+
+    # View Spec Templates
+    copy_rspec_scaffold_template 'edit_spec.rb'
+    copy_rspec_scaffold_template 'index_spec.rb'
+    copy_rspec_scaffold_template 'new_spec.rb'
+    copy_rspec_scaffold_template 'show_spec.rb'
+  end
+
+  protected
+
+  def copy_erb_scaffold_template(template_name)
+    copy_file "scaffold/#{template_name}", "lib/templates/erb/scaffold/#{template_name}"
+  end
+
+  def copy_rails_scaffold_controller(template_name)
+    copy_file "scaffold/#{template_name}", "lib/templates/rails/scaffold_controller/#{template_name}"
+  end
+
+  def copy_rspec_model_template(template_name)
+    copy_file "spec/#{template_name}", "lib/templates/rspec/model/#{template_name}"
+  end
+
+  def copy_rspec_scaffold_template(template_name)
+    copy_file "spec/#{template_name}", "lib/templates/rspec/scaffold/#{template_name}"
+  end
+
+end

data/lib/generators/authorized_rails_scaffolds/{install_scaffold/templates → install_templates/templates/scaffold}/_form.html.erb

@@ -1,10 +1,14 @@
 <%-
 
-t_helper = AuthorizedRailsScaffolds::Helper.new(class_name, singular_table_name, file_name)
+t_helper = AuthorizedRailsScaffolds::Helper.new(
+  :class_name => class_name,
+  :singular_table_name => singular_table_name,
+  :file_name => file_name
+)
 
-local_class_name = file_name.classify # Non-Namespaced class name
-var_name = file_name # Non-namespaced variable name
-plural_var_name = var_name.pluralize # Pluralized non-namespaced variable 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
 
 -%>
 <%%= simple_form_for(<%= t_helper.form_object_array %>, :html => { class: 'form-horizontal' }) do |f| %>

data/lib/generators/authorized_rails_scaffolds/{install_scaffold/templates → install_templates/templates/scaffold}/controller.rb

@@ -4,12 +4,17 @@ require_dependency "<%= namespaced_file_path %>/application_controller"
 <% end -%>
 <%-
 
-t_helper = AuthorizedRailsScaffolds::Helper.new(class_name, singular_table_name, file_name)
+t_helper = AuthorizedRailsScaffolds::Helper.new(
+  :class_name => class_name,
+  :singular_table_name => singular_table_name,
+  :file_name => file_name
+)
 
-local_class_name = local_class_name = class_name.split("::")[-1] # Non-Namespaced class name
-var_name = file_name # Non-namespaced variable name
-plural_var_name = var_name.pluralize # Pluralized non-namespaced variable 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
 
+# Override default orm instance
 orm_instance = Rails::Generators::ActiveModel.new var_name
 
 -%>

data/lib/generators/authorized_rails_scaffolds/{install_scaffold/templates → install_templates/templates/scaffold}/edit.html.erb

@@ -1,8 +1,12 @@
 <%-
 
-t_helper = AuthorizedRailsScaffolds::Helper.new(class_name, singular_table_name, file_name)
+t_helper = AuthorizedRailsScaffolds::Helper.new(
+  :class_name => class_name,
+  :singular_table_name => singular_table_name,
+  :file_name => file_name
+)
 
-local_class_name = file_name.classify # Non-Namespaced class name
+local_class_name = t_helper.local_class_name # Non-Namespaced class name
 
 -%>
 <%%- model_class = <%= local_class_name %> -%>

data/lib/generators/authorized_rails_scaffolds/{install_scaffold/templates → install_templates/templates/scaffold}/index.html.erb

@@ -1,10 +1,14 @@
 <%-
 
-t_helper = AuthorizedRailsScaffolds::Helper.new(class_name, singular_table_name, file_name)
+t_helper = AuthorizedRailsScaffolds::Helper.new(
+  :class_name => class_name,
+  :singular_table_name => singular_table_name,
+  :file_name => file_name
+)
 
-local_class_name = file_name.classify # Non-Namespaced class name
-var_name = file_name # Non-namespaced variable name
-plural_var_name = var_name.pluralize # Pluralized non-namespaced variable 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
 
 -%>
 <%%- model_class = <%= local_class_name %> -%>

data/lib/generators/authorized_rails_scaffolds/{install_scaffold/templates → install_templates/templates/scaffold}/new.html.erb

@@ -1,8 +1,12 @@
 <%-
 
-t_helper = AuthorizedRailsScaffolds::Helper.new(class_name, singular_table_name, file_name)
+t_helper = AuthorizedRailsScaffolds::Helper.new(
+  :class_name => class_name,
+  :singular_table_name => singular_table_name,
+  :file_name => file_name
+)
 
-local_class_name = file_name.classify # Non-Namespaced class name
+local_class_name = t_helper.local_class_name # Non-Namespaced class name
 
 -%>
 <%%- model_class = <%= local_class_name %> -%>

data/lib/generators/authorized_rails_scaffolds/{install_scaffold/templates → install_templates/templates/scaffold}/show.html.erb

@@ -1,10 +1,14 @@
 <%-
 
-t_helper = AuthorizedRailsScaffolds::Helper.new(class_name, singular_table_name, file_name)
+t_helper = AuthorizedRailsScaffolds::Helper.new(
+  :class_name => class_name,
+  :singular_table_name => singular_table_name,
+  :file_name => file_name
+)
 
-local_class_name = file_name.classify # Non-Namespaced class name
-var_name = file_name # Non-namespaced variable name
-plural_var_name = var_name.pluralize # Pluralized non-namespaced variable 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
 
 -%>
 <%%- model_class = <%= local_class_name %> -%>

data/lib/generators/authorized_rails_scaffolds/{install_spec/templates → install_templates/templates/spec}/controller_spec.rb

@@ -21,11 +21,16 @@ require 'spec_helper'
 <% module_namespacing do -%>
 <%-
 
-t_helper = AuthorizedRailsScaffolds::Helper.new(class_name, singular_table_name, file_name)
+t_helper = AuthorizedRailsScaffolds::ControllerSpecHelper.new(
+  :class_name => class_name,
+  :singular_table_name => singular_table_name,
+  :file_name => file_name,
+  :attributes => attributes
+)
 
-local_class_name = class_name.split('::')[-1] # Non-Namespaced class name
-var_name = file_name # Non-namespaced variable name
-plural_var_name = var_name.pluralize # Pluralized non-namespaced variable 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
 
 -%>
 describe <%= controller_class_name %>Controller do
@@ -45,7 +50,7 @@ describe <%= controller_class_name %>Controller do
 <%- if AuthorizedRailsScaffolds.parent_models.any? -%>
   before(:each) do
     <%- AuthorizedRailsScaffolds.parent_models.each do |model| -%>
-    @<%= model.underscore %> = FactoryGirl.create(:<%= model.underscore %>)
+    @<%= model.underscore %> = <%= t_helper.create_parent_model model.underscore %>
     <%- end -%>
   end
 
@@ -55,7 +60,7 @@ describe <%= controller_class_name %>Controller do
     context 'without a user' do
       describe 'with valid request' do
         before(:each) do
-          @<%= var_name %> = <%= t_helper.create_model_with_attributes attributes %>
+          @<%= var_name %> = <%= t_helper.create_factory_model %>
           get :index, {<%= t_helper.index_action_params_prefix %>}
         end
         it { should redirect_to(new_user_session_path) }
@@ -66,7 +71,7 @@ describe <%= controller_class_name %>Controller do
       login_unauthorized_user
       describe 'with valid request' do
         before(:each) do
-          @<%= var_name %> = <%= t_helper.create_model_with_attributes attributes %>
+          @<%= var_name %> = <%= t_helper.create_factory_model %>
           get :index, {<%= t_helper.index_action_params_prefix %>}
         end
         it { should redirect_to(root_url) }
@@ -77,7 +82,7 @@ describe <%= controller_class_name %>Controller do
       login_user_with_ability :read, <%= local_class_name %>
       describe 'with valid request' do
         before(:each) do
-          @<%= var_name %> = <%= t_helper.create_model_with_attributes attributes %>
+          @<%= var_name %> = <%= t_helper.create_factory_model %>
           get :index, {<%= t_helper.index_action_params_prefix %>}
         end
         it { should respond_with(:success) }
@@ -95,7 +100,7 @@ describe <%= controller_class_name %>Controller do
     context 'without a user' do
       describe 'with valid request' do
         before(:each) do
-          @<%= var_name %> = <%= t_helper.create_model_with_attributes attributes %>
+          @<%= var_name %> = <%= t_helper.create_factory_model %>
           get :show, {<%= t_helper.action_params_prefix %>:id => @<%= var_name %>.to_param}
         end
         it { should redirect_to(new_user_session_path) }
@@ -106,7 +111,7 @@ describe <%= controller_class_name %>Controller do
       login_unauthorized_user
       describe 'with valid request' do
         before(:each) do
-          @<%= var_name %> = <%= t_helper.create_model_with_attributes attributes %>
+          @<%= var_name %> = <%= t_helper.create_factory_model %>
           get :show, {<%= t_helper.action_params_prefix %>:id => @<%= var_name %>.to_param}
         end
         it { should redirect_to(<%= t_helper.controller_index_route %>) }
@@ -117,7 +122,7 @@ describe <%= controller_class_name %>Controller do
       login_user_with_ability :read, <%= local_class_name %>
       describe 'with valid request' do
         before(:each) do
-          @<%= var_name %> = <%= t_helper.create_model_with_attributes attributes %>
+          @<%= var_name %> = <%= t_helper.create_factory_model %>
           get :show, {<%= t_helper.action_params_prefix %>:id => @<%= var_name %>.to_param}
         end
         it { should respond_with(:success) }
@@ -170,7 +175,7 @@ describe <%= controller_class_name %>Controller do
     context 'without a user' do
       describe 'with valid request' do
         before(:each) do
-          @<%= var_name %> = <%= t_helper.create_model_with_attributes attributes %>
+          @<%= var_name %> = <%= t_helper.create_factory_model %>
           get :edit, {<%= t_helper.action_params_prefix %>:id => @<%= var_name %>.to_param}
         end
         it { should redirect_to(new_user_session_path) }
@@ -181,7 +186,7 @@ describe <%= controller_class_name %>Controller do
       login_unauthorized_user
       describe 'with valid request' do
         before(:each) do
-          @<%= var_name %> = <%= t_helper.create_model_with_attributes attributes %>
+          @<%= var_name %> = <%= t_helper.create_factory_model %>
           get :edit, {<%= t_helper.action_params_prefix %>:id => @<%= var_name %>.to_param}
         end
         it { should redirect_to(<%= t_helper.controller_index_route %>) }
@@ -192,7 +197,7 @@ describe <%= controller_class_name %>Controller do
       login_user_with_ability :update, <%= local_class_name %>
       describe 'with valid request' do
         before(:each) do
-          @<%= var_name %> = <%= t_helper.create_model_with_attributes attributes %>
+          @<%= var_name %> = <%= t_helper.create_factory_model %>
           get :edit, {<%= t_helper.action_params_prefix %>:id => @<%= var_name %>.to_param}
         end
         it { should respond_with(:success) }
@@ -265,7 +270,7 @@ describe <%= controller_class_name %>Controller do
     context 'without a user' do
       describe 'with valid params' do
         before(:each) do
-          @<%= var_name %> = <%= t_helper.create_model_with_attributes attributes %>
+          @<%= var_name %> = <%= t_helper.create_factory_model %>
           put :update, {<%= t_helper.action_params_prefix %>:id => @<%= var_name %>.to_param, :<%= var_name %> => valid_update_attributes}
         end
         it { should redirect_to(new_user_session_path) }
@@ -276,7 +281,7 @@ describe <%= controller_class_name %>Controller do
       login_unauthorized_user
       describe "with valid params" do
         before(:each) do
-          @<%= var_name %> = <%= t_helper.create_model_with_attributes attributes %>
+          @<%= var_name %> = <%= t_helper.create_factory_model %>
           put :update, {<%= t_helper.action_params_prefix %>:id => @<%= var_name %>.to_param, :<%= var_name %> => valid_update_attributes}
         end
         it { should redirect_to(<%= t_helper.controller_index_route %>) }
@@ -287,7 +292,7 @@ describe <%= controller_class_name %>Controller do
       login_user_with_ability :update, <%= local_class_name %>
       describe "with valid params" do
         it "updates the requested <%= var_name %>" do
-          @<%= var_name %> = <%= t_helper.create_model_with_attributes attributes %>
+          @<%= var_name %> = <%= t_helper.create_factory_model %>
           # Assuming there are no other <%= var_name %> in the database, this
           # specifies that the <%= local_class_name %> created on the previous line
           # receives the :update_attributes message with whatever params are
@@ -302,7 +307,7 @@ describe <%= controller_class_name %>Controller do
       end
       describe "with valid params" do
         before(:each) do
-          @<%= var_name %> = <%= t_helper.create_model_with_attributes attributes %>
+          @<%= var_name %> = <%= t_helper.create_factory_model %>
           put :update, {<%= t_helper.action_params_prefix %>:id => @<%= var_name %>.to_param, :<%= var_name %> => valid_update_attributes}
         end
         it "assigns the requested <%= var_name %> as @<%= var_name %>" do
@@ -314,7 +319,7 @@ describe <%= controller_class_name %>Controller do
       end
       describe "with invalid params" do
         before(:each) do
-          @<%= var_name %> = <%= t_helper.create_model_with_attributes attributes %>
+          @<%= var_name %> = <%= t_helper.create_factory_model %>
           # Trigger the behavior that occurs when invalid params are submitted
           <%= local_class_name %>.any_instance.stub(:save).and_return(false)
           put :update, {<%= t_helper.action_params_prefix %>:id => @<%= var_name %>.to_param, :<%= var_name %> => <%= formatted_hash(example_invalid_attributes) %>}
@@ -332,7 +337,7 @@ describe <%= controller_class_name %>Controller do
     context 'without a user' do
       describe 'with valid request' do
         before(:each) do
-          @<%= var_name %> = <%= t_helper.create_model_with_attributes attributes %>
+          @<%= var_name %> = <%= t_helper.create_factory_model %>
           delete :destroy, {<%= t_helper.action_params_prefix %>:id => @<%= var_name %>.to_param}
         end
         it { should redirect_to(new_user_session_path) }
@@ -343,7 +348,7 @@ describe <%= controller_class_name %>Controller do
       login_unauthorized_user
       describe "with valid request" do
         before(:each) do
-          @<%= var_name %> = <%= t_helper.create_model_with_attributes attributes %>
+          @<%= var_name %> = <%= t_helper.create_factory_model %>
           delete :destroy, {<%= t_helper.action_params_prefix %>:id => @<%= var_name %>.to_param}
         end
         it { should redirect_to(<%= t_helper.controller_index_route %>) }
@@ -353,14 +358,14 @@ describe <%= controller_class_name %>Controller do
     context 'as user with destroy ability' do
       login_user_with_ability :destroy, <%= local_class_name %>
       it "destroys the requested <%= var_name %>" do
-        @<%= var_name %> = <%= t_helper.create_model_with_attributes attributes %>
+        @<%= var_name %> = <%= t_helper.create_factory_model %>
         expect {
           delete :destroy, {<%= t_helper.action_params_prefix %>:id => @<%= var_name %>.to_param}
         }.to change(<%= local_class_name %>, :count).by(-1)
       end
       describe 'with valid request' do
         before(:each) do
-          @<%= var_name %> = <%= t_helper.create_model_with_attributes attributes %>
+          @<%= var_name %> = <%= t_helper.create_factory_model %>
           delete :destroy, {<%= t_helper.action_params_prefix %>:id => @<%= var_name %>.to_param}
         end
         it "redirects to the <%= var_name %> list" do

data/lib/generators/authorized_rails_scaffolds/{install_spec/templates → install_templates/templates/spec}/edit_spec.rb

@@ -2,14 +2,19 @@ require 'spec_helper'
 
 <%-
 
-t_helper = AuthorizedRailsScaffolds::Helper.new(class_name, singular_table_name, file_name)
+t_helper = AuthorizedRailsScaffolds::ViewSpecHelper.new(
+  :class_name => class_name,
+  :singular_table_name => singular_table_name,
+  :file_name => file_name,
+  :attributes => attributes
+)
 
-local_class_name = class_name.split('::')[-1] # Non-Namespaced class name
-var_name = file_name # Non-namespaced variable name
+local_class_name = t_helper.local_class_name # Non-Namespaced class name
+var_name = t_helper.var_name # Non-namespaced variable name
 
-output_attributes   = attributes.reject{|attribute| [:timestamp].include? attribute.type }
-standard_attributes = attributes.reject{|attribute| [:time, :date, :datetime].include? attribute.type }
-datetime_attributes = attributes.reject{|attribute| ![:time, :date, :datetime].include? attribute.type }
+output_attributes = t_helper.output_attributes
+standard_attributes = t_helper.standard_attributes
+datetime_attributes = t_helper.datetime_attributes
 
 -%>
 describe "<%= ns_table_name %>/edit" do
@@ -76,21 +81,21 @@ describe "<%= ns_table_name %>/edit" do
       # <%= attribute.name %> values
   <%- if [:date, :datetime].include? attribute.type -%>
       assert_select "select#<%= var_name %>_<%= attribute.name %>_1i[name=?]", "<%= var_name %>[<%= attribute.name %>(1i)]" do
-        assert_select "option[selected=selected]", :text => <%= DateTime.parse(attribute.default).strftime('%Y').dump %>, :count => 1
+        assert_select "option[selected=selected]", :text => "<%= t_helper.date_select_year_value attribute.default %>", :count => 1
       end
       assert_select "select#<%= var_name %>_<%= attribute.name %>_2i[name=?]", "<%= var_name %>[<%= attribute.name %>(2i)]" do
-        assert_select "option[selected=selected][value=?]", <%= DateTime.parse(attribute.default).strftime('%-m').dump %>, :text => <%= DateTime.parse(attribute.default).strftime('%B').dump %>, :count => 1
+        assert_select "option[selected=selected][value=?]", "<%= t_helper.date_select_month_value attribute.default %>", :text => "<%= t_helper.date_select_month_text attribute.default %>", :count => 1
       end
       assert_select "select#<%= var_name %>_<%= attribute.name %>_3i[name=?]", "<%= var_name %>[<%= attribute.name %>(3i)]" do
-        assert_select "option[selected=selected]", :text => <%= DateTime.parse(attribute.default).strftime('%d').dump %>, :count => 1
+        assert_select "option[selected=selected]", :text => "<%= t_helper.date_select_day_value attribute.default %>", :count => 1
       end
   <%- end -%>
   <%- if [:time, :datetime].include? attribute.type -%>
       assert_select "select#<%= var_name %>_<%= attribute.name %>_4i[name=?]", "<%= var_name %>[<%= attribute.name %>(4i)]" do
-        assert_select "option[selected=selected]", :text => <%= DateTime.parse(attribute.default).strftime('%H').dump %>, :count => 1
+        assert_select "option[selected=selected]", :text => "<%= t_helper.date_select_hour_value attribute.default %>", :count => 1
       end
       assert_select "select#<%= var_name %>_<%= attribute.name %>_5i[name=?]", "<%= var_name %>[<%= attribute.name %>(5i)]" do
-        assert_select "option[selected=selected]", :text => <%= DateTime.parse(attribute.default).strftime('%M').dump %>, :count => 1
+        assert_select "option[selected=selected]", :text => "<%= t_helper.date_select_minute_value attribute.default %>", :count => 1
       end
   <%- end -%>
 <% end -%>

data/lib/generators/authorized_rails_scaffolds/{install_spec/templates → install_templates/templates/spec}/index_spec.rb

@@ -2,13 +2,18 @@ require 'spec_helper'
 
 <%-
 
-t_helper = AuthorizedRailsScaffolds::Helper.new(class_name, singular_table_name, file_name)
+t_helper = AuthorizedRailsScaffolds::ViewSpecHelper.new(
+  :class_name => class_name,
+  :singular_table_name => singular_table_name,
+  :file_name => file_name,
+  :attributes => attributes
+)
 
-local_class_name = class_name.split('::')[-1] # Non-Namespaced class name
-var_name = file_name # Non-namespaced variable name
-plural_var_name = var_name.pluralize # Pluralized non-namespaced variable 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
 
-output_attributes   = attributes.reject{|attribute| [:timestamp].include? attribute.type }
+output_attributes = t_helper.output_attributes
 
 -%>
 describe "<%= ns_table_name %>/index" do

data/lib/generators/authorized_rails_scaffolds/{install_spec/templates → install_templates/templates/spec}/new_spec.rb

@@ -2,14 +2,19 @@ require 'spec_helper'
 
 <%-
 
-t_helper = AuthorizedRailsScaffolds::Helper.new(class_name, singular_table_name, file_name)
+t_helper = AuthorizedRailsScaffolds::ViewSpecHelper.new(
+  :class_name => class_name,
+  :singular_table_name => singular_table_name,
+  :file_name => file_name,
+  :attributes => attributes
+)
 
-local_class_name = class_name.split('::')[-1] # Non-Namespaced class name
-var_name = file_name # Non-namespaced variable name
+local_class_name = t_helper.local_class_name # Non-Namespaced class name
+var_name = t_helper.var_name # Non-namespaced variable name
 
-output_attributes   = attributes.reject{|attribute| [:timestamp].include? attribute.type }
-standard_attributes = attributes.reject{|attribute| [:time, :date, :datetime].include? attribute.type }
-datetime_attributes = attributes.reject{|attribute| ![:time, :date, :datetime].include? attribute.type }
+output_attributes = t_helper.output_attributes
+standard_attributes = t_helper.standard_attributes
+datetime_attributes = t_helper.datetime_attributes
 
 -%>
 describe "<%= ns_table_name %>/new" do
@@ -75,21 +80,21 @@ describe "<%= ns_table_name %>/new" do
       # <%= attribute.name %> values
   <%- if [:date, :datetime].include? attribute.type -%>
       assert_select "select#<%= var_name %>_<%= attribute.name %>_1i[name=?]", "<%= var_name %>[<%= attribute.name %>(1i)]" do
-        assert_select "option[selected=selected]", :text => <%= DateTime.parse(attribute.default).strftime('%Y').dump %>, :count => 1
+        assert_select "option[selected=selected]", :text => "<%= t_helper.date_select_year_value attribute.default %>", :count => 1
       end
       assert_select "select#<%= var_name %>_<%= attribute.name %>_2i[name=?]", "<%= var_name %>[<%= attribute.name %>(2i)]" do
-        assert_select "option[selected=selected][value=?]", <%= DateTime.parse(attribute.default).strftime('%-m').dump %>, :text => <%= DateTime.parse(attribute.default).strftime('%B').dump %>, :count => 1
+        assert_select "option[selected=selected][value=?]", "<%= t_helper.date_select_month_value attribute.default %>", :text => "<%= t_helper.date_select_month_text attribute.default %>", :count => 1
       end
       assert_select "select#<%= var_name %>_<%= attribute.name %>_3i[name=?]", "<%= var_name %>[<%= attribute.name %>(3i)]" do
-        assert_select "option[selected=selected]", :text => <%= DateTime.parse(attribute.default).strftime('%d').dump %>, :count => 1
+        assert_select "option[selected=selected]", :text => "<%= t_helper.date_select_day_value attribute.default %>", :count => 1
       end
   <%- end -%>
   <%- if [:time, :datetime].include? attribute.type -%>
       assert_select "select#<%= var_name %>_<%= attribute.name %>_4i[name=?]", "<%= var_name %>[<%= attribute.name %>(4i)]" do
-        assert_select "option[selected=selected]", :text => <%= DateTime.parse(attribute.default).strftime('%H').dump %>, :count => 1
+        assert_select "option[selected=selected]", :text => "<%= t_helper.date_select_hour_value attribute.default %>", :count => 1
       end
       assert_select "select#<%= var_name %>_<%= attribute.name %>_5i[name=?]", "<%= var_name %>[<%= attribute.name %>(5i)]" do
-        assert_select "option[selected=selected]", :text => <%= DateTime.parse(attribute.default).strftime('%M').dump %>, :count => 1
+        assert_select "option[selected=selected]", :text => "<%= t_helper.date_select_minute_value attribute.default %>", :count => 1
       end
   <%- end -%>
 <% end -%>

data/lib/generators/authorized_rails_scaffolds/{install_spec/templates → install_templates/templates/spec}/routing_spec.rb

@@ -3,22 +3,12 @@ require "spec_helper"
 <% module_namespacing do -%>
 <%-
 
-parts = ns_table_name.split('/')[0..-2] || []
+t_helper = AuthorizedRailsScaffolds::RoutingSpecHelper.new(
+  ns_table_name: ns_table_name
+)
 
-AuthorizedRailsScaffolds.parent_models.each_with_index do |model, model_index|
-  parts << model.underscore.pluralize
-  parts << model_index + 2
-end
-
-parts << ns_table_name.split('/')[-1]
-request_path = parts.join('/')
-
-extra_arguments = ''
-if AuthorizedRailsScaffolds.parent_models.any?
-  AuthorizedRailsScaffolds.parent_models.each_with_index do |model, model_index|
-    extra_arguments += ", :#{model.underscore}_id => \"#{model_index + 2}\""
-  end
-end
+request_path = t_helper.request_path
+extra_params = t_helper.extra_params
 
 -%>
 describe <%= controller_class_name %>Controller do
@@ -26,32 +16,32 @@ describe <%= controller_class_name %>Controller do
 
 <% unless options[:singleton] -%>
     it "routes to #index" do
-      get("/<%= request_path %>").should route_to("<%= ns_table_name %>#index"<%= extra_arguments %>)
+      get("/<%= request_path %>").should route_to("<%= ns_table_name %>#index"<%= extra_params %>)
     end
 
 <% end -%>
     it "routes to #new" do
-      get("/<%= request_path %>/new").should route_to("<%= ns_table_name %>#new"<%= extra_arguments %>)
+      get("/<%= request_path %>/new").should route_to("<%= ns_table_name %>#new"<%= extra_params %>)
     end
 
     it "routes to #show" do
-      get("/<%= request_path %>/1").should route_to("<%= ns_table_name %>#show"<%= extra_arguments %>, :id => "1")
+      get("/<%= request_path %>/1").should route_to("<%= ns_table_name %>#show"<%= extra_params %>, :id => "1")
     end
 
     it "routes to #edit" do
-      get("/<%= request_path %>/1/edit").should route_to("<%= ns_table_name %>#edit"<%= extra_arguments %>, :id => "1")
+      get("/<%= request_path %>/1/edit").should route_to("<%= ns_table_name %>#edit"<%= extra_params %>, :id => "1")
     end
 
     it "routes to #create" do
-      post("/<%= request_path %>").should route_to("<%= ns_table_name %>#create"<%= extra_arguments %>)
+      post("/<%= request_path %>").should route_to("<%= ns_table_name %>#create"<%= extra_params %>)
     end
 
     it "routes to #update" do
-      put("/<%= request_path %>/1").should route_to("<%= ns_table_name %>#update"<%= extra_arguments %>, :id => "1")
+      put("/<%= request_path %>/1").should route_to("<%= ns_table_name %>#update"<%= extra_params %>, :id => "1")
     end
 
     it "routes to #destroy" do
-      delete("/<%= request_path %>/1").should route_to("<%= ns_table_name %>#destroy"<%= extra_arguments %>, :id => "1")
+      delete("/<%= request_path %>/1").should route_to("<%= ns_table_name %>#destroy"<%= extra_params %>, :id => "1")
     end
 
   end

data/lib/generators/authorized_rails_scaffolds/{install_spec/templates → install_templates/templates/spec}/show_spec.rb

@@ -2,13 +2,18 @@ require 'spec_helper'
 
 <%-
 
-t_helper = AuthorizedRailsScaffolds::Helper.new(class_name, singular_table_name, file_name)
+t_helper = AuthorizedRailsScaffolds::ViewSpecHelper.new(
+  :class_name => class_name,
+  :singular_table_name => singular_table_name,
+  :file_name => file_name,
+  :attributes => attributes
+)
 
-local_class_name = class_name.split('::')[-1] # Non-Namespaced class name
-var_name = file_name # Non-namespaced variable name
+local_class_name = t_helper.local_class_name # Non-Namespaced class name
+var_name = t_helper.var_name # Non-namespaced variable name
 
-output_attributes   = attributes.reject{|attribute| [:timestamp, :references].include? attribute.type }
-references_attributes = attributes.reject{|attribute| ![:references].include? attribute.type }
+output_attributes = t_helper.output_attributes
+references_attributes = t_helper.references_attributes
 
 -%>
 describe "<%= ns_table_name %>/show" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authorized_rails_scaffolds
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000Z
+date: 2013-04-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70121345852780 !ruby/object:Gem::Requirement
+  requirement: &70235954660960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70121345852780
+  version_requirements: *70235954660960
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70121345852280 !ruby/object:Gem::Requirement
+  requirement: &70235954660460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70121345852280
+  version_requirements: *70235954660460
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70121345851900 !ruby/object:Gem::Requirement
+  requirement: &70235954660080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70121345851900
+  version_requirements: *70235954660080
 description: Creates scaffolds for Twitter Bootstrap with generated RSpec coverage
 email:
 - bemo56@hotmail.com
@@ -58,27 +58,30 @@ files:
 - Rakefile
 - authorized_rails_scaffolds.gemspec
 - lib/authorized_rails_scaffolds.rb
+- lib/authorized_rails_scaffolds/controller_spec_helper.rb
 - lib/authorized_rails_scaffolds/helper.rb
+- lib/authorized_rails_scaffolds/routing_spec_helper.rb
 - lib/authorized_rails_scaffolds/version.rb
-- lib/generators/authorized_rails_scaffolds/install_scaffold/USAGE
-- lib/generators/authorized_rails_scaffolds/install_scaffold/install_scaffold_generator.rb
-- lib/generators/authorized_rails_scaffolds/install_scaffold/templates/_form.html.erb
-- lib/generators/authorized_rails_scaffolds/install_scaffold/templates/controller.rb
-- lib/generators/authorized_rails_scaffolds/install_scaffold/templates/edit.html.erb
-- lib/generators/authorized_rails_scaffolds/install_scaffold/templates/index.html.erb
-- lib/generators/authorized_rails_scaffolds/install_scaffold/templates/new.html.erb
-- lib/generators/authorized_rails_scaffolds/install_scaffold/templates/show.html.erb
-- lib/generators/authorized_rails_scaffolds/install_spec/USAGE
-- lib/generators/authorized_rails_scaffolds/install_spec/install_spec_generator.rb
-- lib/generators/authorized_rails_scaffolds/install_spec/templates/controller_spec.rb
-- lib/generators/authorized_rails_scaffolds/install_spec/templates/devise_can_can/USAGE
-- lib/generators/authorized_rails_scaffolds/install_spec/templates/devise_can_can/controller_macros.rb
-- lib/generators/authorized_rails_scaffolds/install_spec/templates/edit_spec.rb
-- lib/generators/authorized_rails_scaffolds/install_spec/templates/index_spec.rb
-- lib/generators/authorized_rails_scaffolds/install_spec/templates/model_spec.rb
-- lib/generators/authorized_rails_scaffolds/install_spec/templates/new_spec.rb
-- lib/generators/authorized_rails_scaffolds/install_spec/templates/routing_spec.rb
-- lib/generators/authorized_rails_scaffolds/install_spec/templates/show_spec.rb
+- lib/authorized_rails_scaffolds/view_spec_helper.rb
+- lib/generators/authorized_rails_scaffolds/install_macros/USAGE
+- lib/generators/authorized_rails_scaffolds/install_macros/install_macros_generator.rb
+- lib/generators/authorized_rails_scaffolds/install_macros/templates/devise_can_can/USAGE
+- lib/generators/authorized_rails_scaffolds/install_macros/templates/devise_can_can/controller_macros.rb
+- lib/generators/authorized_rails_scaffolds/install_templates/USAGE
+- lib/generators/authorized_rails_scaffolds/install_templates/install_templates_generator.rb
+- lib/generators/authorized_rails_scaffolds/install_templates/templates/scaffold/_form.html.erb
+- lib/generators/authorized_rails_scaffolds/install_templates/templates/scaffold/controller.rb
+- lib/generators/authorized_rails_scaffolds/install_templates/templates/scaffold/edit.html.erb
+- lib/generators/authorized_rails_scaffolds/install_templates/templates/scaffold/index.html.erb
+- lib/generators/authorized_rails_scaffolds/install_templates/templates/scaffold/new.html.erb
+- lib/generators/authorized_rails_scaffolds/install_templates/templates/scaffold/show.html.erb
+- lib/generators/authorized_rails_scaffolds/install_templates/templates/spec/controller_spec.rb
+- lib/generators/authorized_rails_scaffolds/install_templates/templates/spec/edit_spec.rb
+- lib/generators/authorized_rails_scaffolds/install_templates/templates/spec/index_spec.rb
+- lib/generators/authorized_rails_scaffolds/install_templates/templates/spec/model_spec.rb
+- lib/generators/authorized_rails_scaffolds/install_templates/templates/spec/new_spec.rb
+- lib/generators/authorized_rails_scaffolds/install_templates/templates/spec/routing_spec.rb
+- lib/generators/authorized_rails_scaffolds/install_templates/templates/spec/show_spec.rb
 homepage: https://github.com/bmorrall/authorized_rails_scaffolds
 licenses:
 - MIT

data/lib/generators/authorized_rails_scaffolds/install_scaffold/install_scaffold_generator.rb

@@ -1,26 +0,0 @@
-class AuthorizedRailsScaffolds::InstallScaffoldGenerator < Rails::Generators::Base
-  source_root File.expand_path('../templates', __FILE__)
-
-  def create_erb_templates
-    copy_erb_template '_form.html.erb'
-    copy_erb_template 'edit.html.erb'
-    copy_erb_template 'index.html.erb'
-    copy_erb_template 'new.html.erb'
-    copy_erb_template 'show.html.erb'
-  end
-
-  def copy_rails_templates
-    copy_rails_template 'controller.rb'
-  end
-
-  protected
-
-  def copy_erb_template(template_name)
-    copy_file template_name, "lib/templates/erb/scaffold/#{template_name}"
-  end
-
-  def copy_rails_template(template_name)
-    copy_file template_name, "lib/templates/rails/scaffold_controller/#{template_name}"
-  end
-
-end