authorized_rails_scaffolds 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4cc14b123806899b25bbaadc0927e65e0e0d722
-  data.tar.gz: dacbe35061fa6f53f5fd24396e87ec9f379cb5ef
+  metadata.gz: c307ff40cc7d76b304b65af1a46ac08010c04ebd
+  data.tar.gz: 2aafb9e88c59ebc6c0d616b55df02aa2181b459a
 SHA512:
-  metadata.gz: aaa1fa35d7855c20468b714dbe6393c5ac33767f05fe8bc92a127d0c96dea3e817936069355870bf4af0c17d9f5332fa343053d9ef8700dda91d27a967b88706
-  data.tar.gz: d3916f9285b0e1cc606c37bf05413640ca3086b9c88cc1c6b8ca667dde8ef39eab9e279c0ed372710f67ca7054436679943c046c7fed3fc05d7d8ce98bde0ad3
+  metadata.gz: a7f7f59ee4d5fbe7211fd1ac6cd062741f0e450d5f4e4ebb63fd6fc56643d98463fdc6e4239d63da783ad4e25dba3ad86edbd6c1437d0cb041f19813c459c756
+  data.tar.gz: d99f4cb9d11e25bdf85785d30ba56d6f575ee13c642feec2f40cff0cf8c3f7db9417f6fa2ac05b9978ed55ded60750ebe2f758a2998f23f2f6eae4d10f44242d

data/README.md

@@ -22,7 +22,7 @@ Add this line to your application's Gemfile:
 
     gem 'authorized_rails_scaffolds', :group => :development
 
-Create a initializer at `config/nitializers/authorized_rails_scaffolds.rb` containing:
+Create a initializer at `config/initializers/authorized_rails_scaffolds.rb` containing:
 
     if Rails.env.development? 
     

data/lib/authorized_rails_scaffolds/helper.rb

@@ -7,7 +7,7 @@ module AuthorizedRailsScaffolds
       @var_name = options[:var_name] || options[:file_name] # Non-namespaced variable name
 
       # Pluralized non-namespaced variable name
-      @plural_var_name ||= options[:plural_var_name] || @var_name.pluralize
+      @plural_var_name ||= options[:plural_var_name]
 
       # Determine namespace prefix i.e awesome
       # options[:namespace_prefix]
@@ -35,11 +35,11 @@ module AuthorizedRailsScaffolds
     end
 
     def collection_route_prefix
-      @collection_route_prefix ||= [route_prefix_values + [resource_table_name.pluralize]].reject{|x|x.blank?}.join('_')
+      @collection_route_prefix ||= (route_prefix_values + [resource_table_name.pluralize]).join('_')
     end
 
     def member_route_prefix
-      @member_route_prefix ||= [route_prefix_values + [resource_table_name]].reject{|x|x.blank?}.join('_')
+      @member_route_prefix ||= (route_prefix_values + [resource_table_name]).join('_')
     end
 
     def parent_variables

data/lib/authorized_rails_scaffolds/rails_erb_scaffold_helper.rb

@@ -19,7 +19,7 @@ class AuthorizedRailsScaffolds::RailsErbScaffoldHelper < AuthorizedRailsScaffold
 
     # Add the models
     parent_model_tables.each do |parent_model|
-      form_argument_values << "@#{parent_model}"
+      form_argument_values << parent_variable(parent_model)
     end
 
     form_argument_values << variable

data/lib/authorized_rails_scaffolds/resource_macros.rb

@@ -8,12 +8,12 @@ module ResourceMacros
   # Class name of the resource being tested (i.e. 'FooBar')
   def resource_class
     # @local_class_name
-    @resource_class ||= modular_class_name.split('::')[-1]
+    @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 ||= resource_class.underscore
+    @resource_table_name ||= (var_name || resource_class.underscore)
   end
 
   # Symbol used to represent resource (i.e. :foo_bar)
@@ -23,7 +23,7 @@ module ResourceMacros
 
   # Name for plural of a resource
   def resource_plural_name
-    @resource_plural_name ||= plural_var_name || (var_name || resource_table_name).pluralize
+    @resource_plural_name ||= (plural_var_name || resource_table_name.pluralize)
   end
 
   def resource_plural_sym
@@ -32,7 +32,7 @@ module ResourceMacros
 
   # Variable resource is assigned to in a singular context (i.e. @foo_bar)
   def resource_var
-    @resource_var_name ||= "@#{var_name || resource_table_name}"
+    @resource_var_name ||= "@#{resource_table_name}"
   end
 
   # Variable resource is assigned to in a plural context (i.e. @foo_bars)
@@ -42,7 +42,7 @@ module ResourceMacros
 
   # Directory of the current resource: i.e. awesome/foo_bars
   def resource_directory
-    @resource_directory = [parent_module_groups + [resource_table_name.pluralize]].join("/")
+    @resource_directory = ((parent_module_groups || []) + [resource_plural_name]).join("/")
   end
 
   ### Parent Models ###
@@ -70,7 +70,7 @@ module ResourceMacros
 
   # The parent modules of a controller (i.e. ['Api', 'V1'])
   def parent_modules
-    @parent_modules ||= modular_class_name.split('::')[0..-2]
+    @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'])

data/lib/authorized_rails_scaffolds/test_var_macros.rb

@@ -31,7 +31,7 @@ module TestVarMacros
 
   # Generator for properties used for testing
   def resource_test_property(var_number = nil)
-    resource_property = "test_#{var_name}"
+    resource_property = "test_#{resource_table_name}"
     resource_property = "#{resource_property}_#{var_number}" unless var_number.nil?
     resource_property
   end

data/lib/authorized_rails_scaffolds/version.rb

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

data/spec/lib/authorized_rails_scaffolds/rspec_scaffold_controller_helper_spec.rb

@@ -56,7 +56,7 @@ describe AuthorizedRailsScaffolds::RSpecScaffoldControllerHelper do
       end
       it 'returns a code fragment including the parent reference' do
         subject = build_controller_spec_helper :var_name => 'foo_bar'
-        subject.create_resource_from_factory.should eq('FactoryGirl.create(:foo_bar, :parent => @parent)')
+        subject.create_resource_from_factory.should eq('FactoryGirl.create(:foo_bar, :parent => parent_parent)')
       end
     end
     context 'with multiple parent models' do
@@ -67,7 +67,7 @@ describe AuthorizedRailsScaffolds::RSpecScaffoldControllerHelper do
       end
       it 'returns a code fragment including the last parent fragment' do
         subject = build_controller_spec_helper :var_name => 'foo_bar'
-        subject.create_resource_from_factory.should eq('FactoryGirl.create(:foo_bar, :parent => @parent)')
+        subject.create_resource_from_factory.should eq('FactoryGirl.create(:foo_bar, :parent => parent_parent)')
       end
     end
   end
@@ -92,7 +92,7 @@ describe AuthorizedRailsScaffolds::RSpecScaffoldControllerHelper do
       end
       it 'returns last parent fragment with a references to the grandparent' do
         subject = build_controller_spec_helper
-        subject.create_parent_resource_from_factory('parent').should eq('FactoryGirl.create(:parent, :grandparent => @grandparent)')
+        subject.create_parent_resource_from_factory('parent').should eq('FactoryGirl.create(:parent, :grandparent => parent_grandparent)')
       end
       it 'returns the grandparent element with no references to other classes' do
         subject = build_controller_spec_helper
@@ -132,23 +132,53 @@ describe AuthorizedRailsScaffolds::RSpecScaffoldControllerHelper do
     end
   end
 
+  describe '#resource_table_name' do
+    it 'returns the var_name' do
+      subject = build_controller_spec_helper :var_name => 'foo_bar'
+      subject.resource_table_name.should eq('foo_bar')
+    end
+    it 'returns the converts class_name into underscored' do
+      subject = build_controller_spec_helper :class_name => 'FooBar'
+      subject.resource_table_name.should eq('foo_bar')
+    end
+  end
+
+  describe '#resource_symbol' do
+    it 'returns var_name preceeded by an :' do
+      subject = build_controller_spec_helper :var_name => 'foo_bar'
+      subject.resource_symbol.should eq(':foo_bar')
+    end
+    it 'falls back to a underscored class_name preceeded by an :' do
+      subject = build_controller_spec_helper :class_name => 'FooBar', :var_name => nil
+      subject.resource_symbol.should eq(':foo_bar')
+    end
+  end
+
   describe '#resource_var' do
     it 'returns var_name preceeded by an @' do
       subject = build_controller_spec_helper :var_name => 'foo_bar'
       subject.resource_var.should eq('@foo_bar')
     end
-    context 'with a parent module' do
-      it 'falls back to using class_name if var_name is not present' do
-        subject = build_controller_spec_helper :var_name => nil, :class_name => 'Example::FooBar'
-        subject.resource_var.should eq('@foo_bar')
-      end
+    it 'falls back to a underscored class_name preceeded by an :' do
+      subject = build_controller_spec_helper :class_name => 'FooBar', :var_name => nil
+      subject.resource_var.should eq('@foo_bar')
     end
+    # context 'with a parent module' do
+    #   it 'falls back to using class_name if var_name is not present' do
+    #     subject = build_controller_spec_helper :var_name => nil, :class_name => 'Example::FooBar'
+    #     subject.resource_var.should eq('@test_foo_bar')
+    #   end
+    # end
   end
 
   describe '#resource_test_var' do
     it 'returns var_name preceeded by an @' do
       subject = build_controller_spec_helper :var_name => 'foo_bar'
-      subject.resource_test_var.should eq('@foo_bar')
+      subject.resource_test_var.should eq('@test_foo_bar')
+    end
+    it 'falls back to a underscored class_name preceeded by an @' do
+      subject = build_controller_spec_helper :class_name => 'FooBar', :var_name => nil
+      subject.resource_test_var.should eq('@test_foo_bar')
     end
   end
 

data/spec/lib/authorized_rails_scaffolds/rspec_scaffold_view_helper_spec.rb

@@ -64,22 +64,22 @@ describe AuthorizedRailsScaffolds::RSpecScaffoldViewHelper do
   describe '#resource_test_sym' do
     it 'returns var_name preceeded by an :' do
       subject = build_view_spec_helper :var_name => 'foo_bar'
-      subject.resource_test_sym.should eq(':foo_bar')
+      subject.resource_test_sym.should eq(':test_foo_bar')
     end
     it 'appends a number if included' do
       subject = build_view_spec_helper :var_name => 'foo_bar'
-      subject.resource_test_sym(2).should eq(':foo_bar_2')
+      subject.resource_test_sym(2).should eq(':test_foo_bar_2')
     end
   end
 
   describe '#resource_test_var' do
     it 'returns var_name preceeded by an @' do
       subject = build_view_spec_helper :var_name => 'foo_bar'
-      subject.resource_test_var.should eq('@foo_bar')
+      subject.resource_test_var.should eq('@test_foo_bar')
     end
     it 'appends a number if included' do
       subject = build_view_spec_helper :var_name => 'foo_bar'
-      subject.resource_test_var(2).should eq('@foo_bar_2')
+      subject.resource_test_var(2).should eq('@test_foo_bar_2')
     end
   end
 

data/spec/support/rails_erb_scaffold_helper_macros.rb

@@ -3,9 +3,9 @@ module RailsErbScaffoldHelperMacros
 
   def build_rails_erb_scaffold_spec_helper(options = {})
     defaults = {
-      class_name: 'Scaffold::Example', # Model class name
-      singular_table_name: 'scaffold_example', # path and model name
-      file_name: 'example', # last part of singular_table_name
+      # class_name: 'Scaffold::Example', # Model class name
+      # singular_table_name: 'scaffold_example', # path and model name
+      # file_name: 'example', # last part of singular_table_name
       attributes: [],
     }
     defaults.merge! options

data/spec/support/rails_scaffold_controller_helper_macros.rb

@@ -3,9 +3,9 @@ module RailsScaffoldControllerHelperMacros
 
   def build_rails_controller_spec_helper(options = {})
     defaults = {
-      class_name: 'Scaffold::Example', # Model class name
-      singular_table_name: 'scaffold_example', # path and model name
-      file_name: 'example', # last part of singular_table_name
+      # class_name: 'Scaffold::Example', # Model class name
+      # singular_table_name: 'scaffold_example', # path and model name
+      # file_name: 'example', # last part of singular_table_name
       attributes: [],
     }
     defaults.merge! options

data/spec/support/rspec_scaffold_controller_helper_macros.rb

@@ -3,9 +3,9 @@ module RSpecScaffoldControllerHelperMacros
 
   def build_controller_spec_helper(args = {})
     defaults = {
-      class_name: 'Scaffold::Example', # Model class name
-      singular_table_name: 'scaffold_example', # path and model name
-      file_name: 'example', # last part of singular_table_name
+      # class_name: 'Scaffold::Example', # Model class name
+      # singular_table_name: 'scaffold_example', # path and model name
+      # file_name: 'example', # last part of singular_table_name
       attributes: [],
     }
     defaults.merge! (args)

data/spec/support/rspec_scaffold_routing_helper_macros.rb

@@ -3,9 +3,9 @@ module RSpecScaffoldRoutingHelperMacros
 
   def build_routing_spec_helper(args = {})
     defaults = {
-      class_name: 'Scaffold::Example', # Model class name
-      singular_table_name: 'scaffold_example', # path and model name
-      file_name: 'example', # last part of singular_table_name
+      # class_name: 'Scaffold::Example', # Model class name
+      # singular_table_name: 'scaffold_example', # path and model name
+      # file_name: 'example', # last part of singular_table_name
       attributes: [],
     }
     defaults.merge! (args)

data/spec/support/rspec_scaffold_view_helper_macros.rb

@@ -3,9 +3,9 @@ module RSpecScaffoldViewHelperMacros
 
   def build_view_spec_helper(args = {})
     defaults = {
-      class_name: 'Scaffold::Example', # Model class name
-      singular_table_name: 'scaffold_example', # path and model name
-      file_name: 'example', # last part of singular_table_name
+      # class_name: 'Scaffold::Example', # Model class name
+      # singular_table_name: 'scaffold_example', # path and model name
+      # file_name: 'example', # last part of singular_table_name
       attributes: [],
     }
     defaults.merge! (args)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authorized_rails_scaffolds
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - bmorrall