authorized_rails_scaffolds 0.0.14 → 0.0.15

data/spec/lib/authorized_rails_scaffolds/rspec_scaffold_routing_helper_spec.rb

@@ -41,18 +41,18 @@ describe AuthorizedRailsScaffolds::RSpecScaffoldRoutingHelper do
     end
   end
 
-  describe '#example_controller_path' do
+  describe '#example_index_path' do
     it 'underscores the class_name value' do
       subject = build_routing_spec_helper :class_name => 'FooBar'
-      subject.example_controller_path.should eq('/foo_bars')
+      subject.example_index_path.should eq('/foo_bars')
     end
     it 'adds parent_models to the file path' do
       subject = build_routing_spec_helper :class_name => 'Example::FooBar'
-      subject.example_controller_path.should eq('/example/foo_bars')
+      subject.example_index_path.should eq('/example/foo_bars')
     end
     it 'adds multiple parent_models to the file path' do
       subject = build_routing_spec_helper :class_name => 'Example::V1::FooBar'
-      subject.example_controller_path.should eq('/example/v1/foo_bars')
+      subject.example_index_path.should eq('/example/v1/foo_bars')
     end
     context 'with a parent model' do
       before(:each) do
@@ -62,15 +62,15 @@ describe AuthorizedRailsScaffolds::RSpecScaffoldRoutingHelper do
       end
       it 'adds the parent model before the class name' do
         subject = build_routing_spec_helper :class_name => 'FooBar'
-        subject.example_controller_path.should eq('/parents/2/foo_bars')
+        subject.example_index_path.should eq('/parents/2/foo_bars')
       end
       it 'adds the parent model after the parent module' do
         subject = build_routing_spec_helper :class_name => 'Example::FooBar'
-        subject.example_controller_path.should eq('/example/parents/2/foo_bars')
+        subject.example_index_path.should eq('/example/parents/2/foo_bars')
       end
       it 'adds the parent model after multiple parent module' do
         subject = build_routing_spec_helper :class_name => 'Example::V1::FooBar'
-        subject.example_controller_path.should eq('/example/v1/parents/2/foo_bars')
+        subject.example_index_path.should eq('/example/v1/parents/2/foo_bars')
       end
     end
     context 'with multiple parent models' do
@@ -80,25 +80,25 @@ describe AuthorizedRailsScaffolds::RSpecScaffoldRoutingHelper do
         end
         it 'adds the parent models before the class name' do
           subject = build_routing_spec_helper :class_name => 'FooBar'
-          subject.example_controller_path.should eq('/grandparents/2/parents/3/foo_bars')
+          subject.example_index_path.should eq('/grandparents/2/parents/3/foo_bars')
         end
         it 'adds the parent models after the parent module' do
           subject = build_routing_spec_helper :class_name => 'Example::FooBar'
-          subject.example_controller_path.should eq('/example/grandparents/2/parents/3/foo_bars')
+          subject.example_index_path.should eq('/example/grandparents/2/parents/3/foo_bars')
         end
       end
     end
   end
 
-  describe '#example_controller_path_extra_params' do
+  describe '#example_index_path_extra_params' do
     context 'with no parent models' do
       it 'returns an empty string with no parent module' do
         subject = build_routing_spec_helper :class_name => 'FooBar'
-        subject.example_controller_path_extra_params.should eq('')
+        subject.example_index_path_extra_params.should eq('')
       end
       it 'returns an empty string with a parent module' do
         subject = build_routing_spec_helper :class_name => 'Example::FooBar'
-        subject.example_controller_path_extra_params.should eq('')
+        subject.example_index_path_extra_params.should eq('')
       end
     end
     context 'with a parent model' do
@@ -109,7 +109,7 @@ describe AuthorizedRailsScaffolds::RSpecScaffoldRoutingHelper do
       end
       it 'adds the parent model with a value assigned to it' do
         subject = build_routing_spec_helper :class_name => 'FooBar'
-        subject.example_controller_path_extra_params.should eq(', :parent_id => "2"')
+        subject.example_index_path_extra_params.should eq(', :parent_id => "2"')
       end
     end
     context 'with multiple parent models' do
@@ -120,7 +120,7 @@ describe AuthorizedRailsScaffolds::RSpecScaffoldRoutingHelper do
       end
       it 'adds the parent models with their values' do
         subject = build_routing_spec_helper :class_name => 'FooBar'
-        subject.example_controller_path_extra_params.should eq(', :grandparent_id => "2", :parent_id => "3"')
+        subject.example_index_path_extra_params.should eq(', :grandparent_id => "2", :parent_id => "3"')
       end
     end
   end

data/spec/lib/authorized_rails_scaffolds/rspec_scaffold_view_helper_spec.rb

@@ -4,11 +4,11 @@ describe AuthorizedRailsScaffolds::RSpecScaffoldViewHelper do
   include RSpecScaffoldViewHelperMacros
   pending
 
-  describe '#parent_model_tables' do
+  describe '#parent_model_names' do
     context 'with no parent_models' do
       it 'returns an empty array' do
         subject = build_view_spec_helper
-        subject.parent_model_tables.should eq([])
+        subject.parent_model_names.should eq([])
       end
     end
     context 'with a parent model' do
@@ -19,7 +19,7 @@ describe AuthorizedRailsScaffolds::RSpecScaffoldViewHelper do
       end
       it 'returns an array containing the models table name' do
         subject = build_view_spec_helper
-        subject.parent_model_tables.should eq(['parent'])
+        subject.parent_model_names.should eq(['parent'])
       end
     end
     context 'with multiple parent models' do
@@ -30,7 +30,7 @@ describe AuthorizedRailsScaffolds::RSpecScaffoldViewHelper do
       end
       it 'returns an array containing all model table names' do
         subject = build_view_spec_helper
-        subject.parent_model_tables.should eq(['grandparent', 'parent'])
+        subject.parent_model_names.should eq(['grandparent', 'parent'])
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authorized_rails_scaffolds
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - bmorrall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-30 00:00:00.000000000 Z
+date: 2013-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -94,28 +94,34 @@ files:
 - Rakefile
 - authorized_rails_scaffolds.gemspec
 - lib/authorized_rails_scaffolds.rb
-- lib/authorized_rails_scaffolds/controller_macros.rb
-- lib/authorized_rails_scaffolds/factory_macros.rb
 - lib/authorized_rails_scaffolds/helper.rb
+- lib/authorized_rails_scaffolds/macros/controller_macros.rb
+- lib/authorized_rails_scaffolds/macros/factory_macros.rb
+- lib/authorized_rails_scaffolds/macros/parent_macros.rb
+- lib/authorized_rails_scaffolds/macros/path_macros.rb
+- lib/authorized_rails_scaffolds/macros/resource_macros.rb
+- lib/authorized_rails_scaffolds/macros/route_example_macros.rb
+- lib/authorized_rails_scaffolds/macros/test_var_macros.rb
 - lib/authorized_rails_scaffolds/rails_erb_scaffold_helper.rb
+- lib/authorized_rails_scaffolds/rails_helper_helper.rb
 - lib/authorized_rails_scaffolds/rails_scaffold_controller_helper.rb
-- lib/authorized_rails_scaffolds/resource_macros.rb
-- lib/authorized_rails_scaffolds/route_example_macros.rb
+- lib/authorized_rails_scaffolds/rspec_integration_helper.rb
 - lib/authorized_rails_scaffolds/rspec_scaffold_controller_helper.rb
 - lib/authorized_rails_scaffolds/rspec_scaffold_helper.rb
 - lib/authorized_rails_scaffolds/rspec_scaffold_routing_helper.rb
 - lib/authorized_rails_scaffolds/rspec_scaffold_view_helper.rb
-- lib/authorized_rails_scaffolds/test_var_macros.rb
 - lib/authorized_rails_scaffolds/version.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_macros/templates/devise_can_can/request_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/helper.rb
 - 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
@@ -124,9 +130,11 @@ files:
 - 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/request_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
 - spec/lib/authorized_rails_scaffolds/rails_erb_scaffold_helper_spec.rb
+- spec/lib/authorized_rails_scaffolds/rails_helper_helper_spec.rb
 - spec/lib/authorized_rails_scaffolds/rails_scaffold_controller_helper_spec.rb
 - spec/lib/authorized_rails_scaffolds/rspec_scaffold_controller_helper_spec.rb
 - spec/lib/authorized_rails_scaffolds/rspec_scaffold_routing_helper_spec.rb
@@ -164,6 +172,7 @@ summary: Replaces Rails and RSpec's default generators with templates taking ful
   advantage of Authentication (Devise), Authorization (CanCan) and Test Coverage (RSpec)
 test_files:
 - spec/lib/authorized_rails_scaffolds/rails_erb_scaffold_helper_spec.rb
+- spec/lib/authorized_rails_scaffolds/rails_helper_helper_spec.rb
 - spec/lib/authorized_rails_scaffolds/rails_scaffold_controller_helper_spec.rb
 - spec/lib/authorized_rails_scaffolds/rspec_scaffold_controller_helper_spec.rb
 - spec/lib/authorized_rails_scaffolds/rspec_scaffold_routing_helper_spec.rb

data/lib/authorized_rails_scaffolds/resource_macros.rb

@@ -1,81 +0,0 @@
-#
-# requires modular_class_name to be defined
-#
-module ResourceMacros
-
-  ### Base Resource ###
-
-  # Class name of the resource being tested (i.e. 'FooBar')
-  def resource_class
-    # @local_class_name
-    @resource_class ||= (modular_class_name.nil? ? nil : modular_class_name.split('::')[-1]) || var_name.classify
-  end
-
-  # Table name of the Resource being tested (i.e. foo_bar)
-  def resource_table_name
-    @resource_table_name ||= (var_name || resource_class.underscore)
-  end
-
-  # Symbol used to represent resource (i.e. :foo_bar)
-  def resource_symbol
-    ":#{resource_table_name}"
-  end
-
-  # Name for plural of a resource
-  def resource_plural_name
-    @resource_plural_name ||= (plural_var_name || resource_table_name.pluralize)
-  end
-
-  def resource_plural_sym
-    ":#{resource_plural_name}"
-  end
-
-  # Variable resource is assigned to in a singular context (i.e. @foo_bar)
-  def resource_var
-    @resource_var_name ||= "@#{resource_table_name}"
-  end
-
-  # Variable resource is assigned to in a plural context (i.e. @foo_bars)
-  def resources_var
-    @resource_var_name ||= "@#{resource_plural_name}"
-  end
-
-  # Directory of the current resource: i.e. awesome/foo_bars
-  def resource_directory
-    @resource_directory = ((parent_module_groups || []) + [resource_plural_name]).join("/")
-  end
-
-  ### Parent Models ###
-
-  # An array of parent model classes (i.e. ['User', 'Category])
-  def parent_models
-    @parent_models ||= AuthorizedRailsScaffolds.config.parent_models
-  end
-
-  # Table names of parent models (i.e. ['user', 'category'])
-  def parent_model_tables
-    @parent_model_tables ||= parent_models.map { |model| model.underscore }
-  end
-
-  # Variable name used to save a parent_table_name
-  def parent_variable(parent_table_name)
-    "@#{parent_table_name}"
-  end
-  
-  def parent_sym(parent_table_name)
-    ":#{parent_table_name}"
-  end
-
-  ### Parent Modules ###
-
-  # The parent modules of a controller (i.e. ['Api', 'V1'])
-  def parent_modules
-    @parent_modules ||= modular_class_name.nil? ? [] : modular_class_name.split('::')[0..-2]
-  end
-
-  # Array of symbols used for links to parents (i.e. ['api', 'v1'])
-  def parent_module_groups
-    @parent_module_groups ||= parent_modules.map { |parent_module| parent_module.underscore }
-  end
-
-end

data/lib/authorized_rails_scaffolds/route_example_macros.rb

@@ -1,43 +0,0 @@
-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