adminpanel 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8786bc62300628c7d87037f3e529408e44b4dd0
-  data.tar.gz: dd2c11295e1b0b9d39f26d72697e05e7b8189a58
+  metadata.gz: 12212a53c9a9f2c010bfd19215a87d260a8fdf5c
+  data.tar.gz: f2c4698f3c330934d03727b23e71d1d8a30a3f6a
 SHA512:
-  metadata.gz: 9c8a839e94618e65d911c6f8e4bd9667138660e46c78a746a670d54404f766d387d9ec13ff0e60d912f150fdbe2377e67cfd6bceead9395cd79f76994c83a312
-  data.tar.gz: 1b2e8b33ebef3b4b535ca73df2c8067e02c0a42de5d919f55d4510a85d521e37abe657e097424434a1a400afc0dddfe32770e14520da84eccc127636cb66c9d9
+  metadata.gz: c9ff9e24e0b7ce8e63c86f0599dc576a93cd6b1526733bf21b5d50276d5622d37f2148737bf5b5fdaf7e8ea9f8b0a199e373f7c3c45e5e0b1aa4c5d8b8cf76e3
+  data.tar.gz: d8a24e70bac9aeba5efe00103af7cc9708d31c0c9cfece3253d49a0129f4d4a76c8b8f744a5c9dd9ad0da8e83fb2d610cae2550439637061661bc5526b393e88

data/Gemfile

@@ -18,16 +18,15 @@ gem 'font-awesome-rails', '>= 4.0.3.1'
 gem 'koala', '>= 1.9.0', '<= 2.0.0'
 
 group :assets do
+	gem 'coffee-script', require: true
 	gem 'sass-rails', '>= 4.0.3', require: true
 end
 
-gem 'minitest'
 group :development, :test do
+	gem 'minitest', '>= 5.3.4', '<= 6.0.0'
 	gem 'sqlite3', '>= 1.3.9', '<= 2.0.0', :platform => [:ruby, :mswin, :mingw]
-	gem 'minitest-emoji'
-	gem 'minitest-capybara'
-	gem 'mocha'
-	gem 'poltergeist'
-  gem 'parallel_tests'
-	# gem 'minitest-debugger'
+	gem 'minitest-emoji', '2.0.0'
+	gem 'minitest-capybara', '>= 0.6.1', '<= 1.0.0'
+	# gem 'mocha'
+	gem 'poltergeist', '>= 1.5.1', '<= 2.0.0'
 end

data/Rakefile

@@ -11,10 +11,11 @@ Rake::TestTask.new do |t|
   t.warning = false
 end
 
-# namespace :test do
-#   task :isolated do
-#     Dir.glob("test/**/*_test.rb").all? do |file|
-#       sh(Gem.ruby, '-w', '-Ilib:test', file)
-#     end or raise "Failures"
-#   end
-# end
+#to run isolated tests...
+namespace :test do
+  task :isolated do
+    Dir.glob("test/**/*_test.rb").all? do |file|
+      sh(Gem.ruby, '-w', '-Ilib:test', file)
+    end or raise "Failures"
+  end
+end

data/adminpanel.gemspec

@@ -34,13 +34,13 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'sass-rails', '>= 4.0.3', '<= 4.1.0'
   spec.add_dependency 'font-awesome-rails', '>= 4.0.3.1', '<= 4.1.0'
   spec.add_dependency 'koala', '>= 1.9.0', '<= 2.0.0'
+  spec.add_dependency 'coffee-script'
 
   spec.add_development_dependency 'sqlite3', '>= 1.3.9', '<= 2.0.0'
-  spec.add_dependency 'minitest'
-  spec.add_development_dependency 'minitest-emoji'
-  spec.add_development_dependency 'minitest-capybara'
-  spec.add_development_dependency 'mocha'
-  spec.add_development_dependency 'minitest-metadata'
-  spec.add_development_dependency 'poltergeist'
+  spec.add_development_dependency 'minitest', '>= 5.3.4', '<= 6.0.0'
+  spec.add_development_dependency 'minitest-emoji', '2.0.0'
+  spec.add_development_dependency 'minitest-capybara', '>= 0.6.1', '<= 1.0.0'
+  # spec.add_development_dependency 'mocha'
+  spec.add_development_dependency 'poltergeist', '>= 1.5.1', '<= 2.0.0'
   # spec.add_development_dependency 'minitest-debugger'
 end

data/app/controllers/adminpanel/application_controller.rb

@@ -8,6 +8,7 @@ module Adminpanel
     include Adminpanel::RestActions
     include Adminpanel::GalleryzableActions
     include Adminpanel::FacebookActions
+    include Adminpanel::SitemapActions
 
     layout 'admin'
 

data/app/controllers/concerns/adminpanel/facebook_actions.rb

@@ -3,7 +3,7 @@ module Adminpanel
     extend ActiveSupport::Concern
 
     included do
-      before_filter :set_auths_count
+      before_filter :set_auths_count, only:[:index, :create, :update, :destroy, :show]
     end
 
     def fb_choose_page

data/app/controllers/concerns/adminpanel/sitemap_actions.rb

@@ -0,0 +1,13 @@
+module Adminpanel
+  module SitemapActions
+    extend ActiveSupport::Concern
+    included do
+      before_filter :set_default_host, only:[:create, :update, :destroy]
+    end
+
+    protected
+    def set_default_host
+      Rails.application.routes.default_url_options[:host] = request.host
+    end
+  end
+end

data/app/models/concerns/adminpanel/base.rb

@@ -4,7 +4,6 @@ module Adminpanel
     #instance methods
     # static(class) methods
     module ClassMethods
-
       def mount_images(relation)
         has_many relation, :dependent => :destroy
         accepts_nested_attributes_for relation, :allow_destroy => true
@@ -100,7 +99,7 @@ module Adminpanel
           false
         end
       end
-      
+
       def fb_share?
         false
       end

data/app/models/concerns/adminpanel/facebook.rb

@@ -13,7 +13,7 @@ module Adminpanel
     #   )
     # end
     def fb_link
-      'www.google.com'
+      'www.overwrite.fb_link.com'
     end
 
     # static(class) methods

data/app/models/concerns/adminpanel/sitemap.rb

@@ -0,0 +1,34 @@
+module Adminpanel
+  module Sitemap
+    extend ActiveSupport::Concern
+    include Rails.application.routes.url_helpers
+
+    included do
+      after_create :ping_engines
+      after_update :ping_engines
+      after_destroy :ping_engines
+    end
+
+    def ping_urls
+      {
+        google: "http://www.google.com/webmasters/tools/ping?sitemap=%s",
+        ask: "http://submissions.ask.com/ping?sitemap=%s",
+        bing: "http://www.bing.com/webmaster/ping.aspx?siteMap=%s"
+      }
+    end
+
+    def ping_engines
+      logger.info Time.now
+      ping_urls.each do |name, url|
+        request = url % CGI.escape("#{root_url}/sitemap.xml")
+        logger.info "  Pinging #{name} with #{request}"
+        if Rails.env == "production"
+          response = Net::HTTP.get_response(URI.parse(request))
+          logger.info "    #{response.code}: #{response.message}"
+          logger.info "    Body: #{response.body}"
+        end
+      end
+    end
+
+  end
+end

data/lib/adminpanel/version.rb

@@ -1,3 +1,3 @@
 module Adminpanel
-  VERSION = "2.1.1"
+  VERSION = "2.1.2"
 end

data/lib/generators/adminpanel/gallery/gallery_generator.rb

@@ -1,39 +1,37 @@
 require 'rails/generators/active_record'
 module Adminpanel
-  module Generators
-    class GalleryGenerator < ActiveRecord::Generators::Base
-      source_root File.expand_path("../templates", __FILE__)
-      desc "Generate the resource files necessary to use a model"
+  class GalleryGenerator < ActiveRecord::Generators::Base
+    source_root File.expand_path("../templates", __FILE__)
+    desc "Generate the resource files necessary to use a model"
 
-      def generate_model
-        template 'gallery_template.rb', "app/models/adminpanel/#{lower_name}.rb"
-      end
-
-      def generate_uploader
-        template 'uploader.rb', "app/uploaders/adminpanel/#{lower_name}_uploader.rb"
-      end
+    def generate_model
+      template 'gallery_template.rb', "app/models/adminpanel/#{lower_name}.rb"
+    end
 
-      def generate_migration
-        migration_template(
-          'gallery_migration.rb',
-          "db/migrate/create_adminpanel_#{lower_name.pluralize}.rb"
-        )
-        puts "don't forget to add the form_field, the relationship and #{lower_name}s_attributes it to the permited params"
-      end
+    def generate_uploader
+      template 'uploader.rb', "app/uploaders/adminpanel/#{lower_name}_uploader.rb"
+    end
 
-    private
-      def reference_name
-        name.singularize.downcase
-      end
+    def generate_migration
+      migration_template(
+        'gallery_migration.rb',
+        "db/migrate/create_adminpanel_#{lower_name.pluralize}.rb"
+      )
+      puts "don't forget to add the form_field, the relationship and #{lower_name}s_attributes it to the permited params"
+    end
 
-      def lower_name
-        "#{reference_name}file"
-      end
+  private
+    def reference_name
+      name.singularize.downcase
+    end
 
-      def class_name
-        "#{lower_name.capitalize}"
-      end
+    def lower_name
+      "#{reference_name}file"
+    end
 
+    def class_name
+      "#{lower_name.capitalize}"
     end
+
   end
 end

data/lib/generators/adminpanel/initialize/initialize_generator.rb

@@ -1,67 +1,65 @@
 require 'rails/generators/active_record'
 module Adminpanel
-	module Generators
-		class InitializeGenerator < ActiveRecord::Generators::Base
-			desc "Generate the migrations necessary to start the gem"
-  		source_root File.expand_path("../templates", __FILE__)
-			argument :name, :type => :string, :default => "default", :require => false
-			class_option :'skip-category',
-				:type => :boolean,
-				:aliases => '-c',
-				:default => false,
-				:desc => "Skip category skeleton and migration for it if true"
-			class_option :'skip-section-uploader',
-				:type => :boolean,
-				:aliases => '-u',
-				:default => false,
-				:desc => 'Skip section uploader if true'
-			class_option :'skip-migration',
-				:type => :boolean,
-				:aliases => '-m',
-				:default => false,
-				:desc => 'Skip initial migrations if true'
-			class_option :'skip-setup',
-				:type => :boolean,
-				:aliases => '-p',
-				:default => false,
-				:desc => 'Skip setup if true'
-			class_option :'skip-setup',
-				:type => :boolean,
-				:aliases => '-y',
-				:default => false,
-				:desc => 'Skip cancan\'s ability.rb'
+	class InitializeGenerator < ActiveRecord::Generators::Base
+		desc "Generate the migrations necessary to start the gem"
+		source_root File.expand_path("../templates", __FILE__)
+		argument :name, :type => :string, :default => "default", :require => false
+		class_option :'skip-category',
+			:type => :boolean,
+			:aliases => '-c',
+			:default => false,
+			:desc => "Skip category skeleton and migration for it if true"
+		class_option :'skip-section-uploader',
+			:type => :boolean,
+			:aliases => '-u',
+			:default => false,
+			:desc => 'Skip section uploader if true'
+		class_option :'skip-migration',
+			:type => :boolean,
+			:aliases => '-m',
+			:default => false,
+			:desc => 'Skip initial migrations if true'
+		class_option :'skip-setup',
+			:type => :boolean,
+			:aliases => '-p',
+			:default => false,
+			:desc => 'Skip setup if true'
+		class_option :'skip-setup',
+			:type => :boolean,
+			:aliases => '-y',
+			:default => false,
+			:desc => 'Skip cancan\'s ability.rb'
 
-			def create_initializer
-				if !options[:'skip-setup']
-					copy_file 'adminpanel_setup.rb', 'config/initializers/adminpanel_setup.rb'
-				end
+		def create_initializer
+			if !options[:'skip-setup']
+				copy_file 'adminpanel_setup.rb', 'config/initializers/adminpanel_setup.rb'
 			end
+		end
 
-			def create_ability
-				if !options[:'skip-ability']
-					copy_file 'ability.rb', 'app/models/ability.rb'
-				end
+		def create_ability
+			if !options[:'skip-ability']
+				copy_file 'ability.rb', 'app/models/ability.rb'
 			end
+		end
 
-			def create_category
-				if !options[:'skip-category']
-					copy_file "category_template.rb", 'app/models/adminpanel/category.rb'
-    			migration_template 'create_adminpanel_categories_table.rb', 'db/migrate/create_adminpanel_categories_table.rb'
-				end
+		def create_category
+			if !options[:'skip-category']
+				copy_file "category_template.rb", 'app/models/adminpanel/category.rb'
+  			migration_template 'create_adminpanel_categories_table.rb', 'db/migrate/create_adminpanel_categories_table.rb'
 			end
+		end
 
-			def create_section_uploader
-				if !options[:'skip-section-uploader']
-					copy_file "section_uploader.rb", 'app/uploaders/adminpanel/section_uploader.rb'
-				end
+		def create_section_uploader
+			if !options[:'skip-section-uploader']
+				copy_file "section_uploader.rb", 'app/uploaders/adminpanel/section_uploader.rb'
 			end
+		end
 
-			def create_adminpanel_migration
-				if !options[:'skip-migration']
-    			migration_template 'create_adminpanel_tables.rb', 'db/migrate/create_adminpanel_tables.rb'
-				end
+		def create_adminpanel_migration
+			if !options[:'skip-migration']
+  			migration_template 'create_adminpanel_tables.rb', 'db/migrate/create_adminpanel_tables.rb'
 			end
-
 		end
+
 	end
 end

data/lib/generators/adminpanel/resource/resource_generator.rb

@@ -1,251 +1,248 @@
-# require "action_view"
 require 'rails/generators/active_record'
 module Adminpanel
-	module Generators
-		class ResourceGenerator < ActiveRecord::Generators::Base
-  		source_root File.expand_path("../templates", __FILE__)
-			desc "Generate the resource files necessary to use a model"
-			class_option :'include-gallery',
-				:type => :boolean,
-				:aliases => '-g',
-				:default => true,
-				:desc => 'Creates the gallery for this resource'
-
-  		argument :fields, :type => :array, :default => [], :banner => "field[:type][:index] field[:type][:index]"
-
-			def change_fields_aliases
-				fields.each do |attribute|
-					type = attribute.split(':').second
-					case type
-					when 'wysiwyg'
-						fields.delete(attribute)
-						fields << attribute.split(':').first + ':' + 'text'
-					end
+	class ResourceGenerator < ActiveRecord::Generators::Base
+		source_root File.expand_path("../templates", __FILE__)
+		desc "Generate the resource files necessary to use a model"
+		class_option :'gallery',
+			:type => :boolean,
+			:aliases => '-g',
+			:default => true,
+			:desc => 'Creates the gallery for this resource'
+
+		argument :fields, :type => :array, :default => [], :banner => "field[:type][:index] field[:type][:index]"
+
+		def change_fields_aliases
+			fields.each do |attribute|
+				type = attribute.split(':').second
+				case type
+				when 'wysiwyg'
+					fields.delete(attribute)
+					fields << attribute.split(':').first + ':' + 'text'
 				end
 			end
+		end
 
-			def generate_model
-    		template 'resource.rb', "app/models/adminpanel/#{lower_singularized_name}.rb"
-			end
+		def generate_model
+  		template 'resource.rb', "app/models/adminpanel/#{lower_singularized_name}.rb"
+		end
 
-			def generate_controller
-				if is_a_resource?
-					template "controller.rb", "app/controllers/adminpanel/#{pluralized_name}_controller.rb"
-				end
+		def generate_controller
+			if is_a_resource?
+				template "controller.rb", "app/controllers/adminpanel/#{pluralized_name}_controller.rb"
 			end
+		end
 
-			def generate_migrations
-				parameters = fields
-				parameters.delete_if{ |pair| pair.split(':').second == 'has_many' }
-				invoke :migration, ["create_adminpanel_#{pluralized_name}", parameters]
-			end
+		def generate_migration
+			parameters = fields
+			parameters.delete_if{ |pair| pair.split(':').second == 'has_many' }
+			invoke :migration, ["create_adminpanel_#{pluralized_name}", parameters]
+			puts parameters if ENV['RAILS_ENV']
+		end
 
-			def generate_gallery
-				if has_gallery? && is_a_resource?
-					invoke 'adminpanel:gallery', [lower_singularized_name]
-				end
+		def generate_gallery
+			if has_gallery? && is_a_resource?
+				invoke 'adminpanel:gallery', [lower_singularized_name]
 			end
+		end
 
-			def add_resource_to_config
-				if setup_is_found? && is_a_resource?
-					inject_into_file 'config/initializers/adminpanel_setup.rb',
-						after: 'config.displayable_resources = [' do
-						indent "\n:#{pluralized_name},", 4
-					end
+		def add_resource_to_config
+			if setup_is_found? && is_a_resource?
+				inject_into_file 'config/initializers/adminpanel_setup.rb',
+					after: 'config.displayable_resources = [' do
+					indent "\n:#{pluralized_name},", 4
 				end
 			end
+		end
 
-			def print_messages
-				puts "don't forget to restart your server"
-			end
-
-		private
+		def print_messages
+			puts "don't forget to restart your server"
+		end
 
-			def setup_is_found?
-				if Dir.exists?('config') && Dir.exists?('config/initializers') && File.exists?('config/initializers/adminpanel_setup.rb')
-					true
-				else
-					false
-				end
+	private
+		def setup_is_found?
+			if Dir.exists?('config') && Dir.exists?('config/initializers') && File.exists?('config/initializers/adminpanel_setup.rb')
+				true
+			else
+				false
 			end
+		end
 
-			def is_a_resource?
-				fields.each do |attribute|
-					assign_attributes_variables(attribute)
-					if @attr_type != 'belongs_to'
-						return true
-					end
+		def is_a_resource?
+			fields.each do |attribute|
+				assign_attributes_variables(attribute)
+				if @attr_type != 'belongs_to'
+					return true
 				end
-				false
 			end
+			false
+		end
 
-			def has_gallery?
-				options[:'include-gallery']
-			end
+		def has_gallery?
+			options[:'gallery']
+		end
 
-			def gallery_name
-				"#{lower_singularized_name}file"
-			end
+		def gallery_name
+			"#{lower_singularized_name}file"
+		end
 
-			def lower_singularized_name
-				name.singularize.downcase
-			end
+		def lower_singularized_name
+			name.singularize.downcase
+		end
 
-			def capitalized_resource
-				lower_singularized_name.capitalize
-			end
+		def capitalized_resource
+			lower_singularized_name.capitalize
+		end
 
-			def pluralized_name
-				"#{lower_singularized_name.pluralize}"
-			end
+		def pluralized_name
+			"#{lower_singularized_name.pluralize}"
+		end
 
-			def belongs_to_field(resource)
-				"#{resource.singularize.downcase}_id"
-			end
+		def belongs_to_field(resource)
+			"#{resource.singularize.downcase}_id"
+		end
 
-			def has_many_field(resource)
-				"#{resource.singularize.downcase}_ids"
-			end
+		def has_many_field(resource)
+			"#{resource.singularize.downcase}_ids"
+		end
 
-			def resource_class_name(resource)
-				"#{resource.singularize.capitalize}"
-			end
+		def resource_class_name(resource)
+			"#{resource.singularize.capitalize}"
+		end
 
-			def assign_attributes_variables(attribute)
-				@attr_field = attribute.split(":").first
-				if attribute.split(":").second.nil?
-					@attr_type = "string"
-				else
-					@attr_type = attribute.split(":").second
-				end
+		def assign_attributes_variables(attribute)
+			@attr_field = attribute.split(":").first
+			if attribute.split(":").second.nil?
+				@attr_type = "string"
+			else
+				@attr_type = attribute.split(":").second
 			end
+		end
 
-			def symbolized_attributes
-				fields.map do |attribute|
-					assign_attributes_variables(attribute)
-					case @attr_type
-						when 'belongs_to'
-	        		':' + belongs_to_field(@attr_field)
-						when 'has_many'
-							':' + has_many_field(@attr_field)
-						else
-						":#{attribute.split(':').first}"
-					end
-				end.join(",\n")
-			end
+		def symbolized_attributes
+			fields.map do |attribute|
+				assign_attributes_variables(attribute)
+				case @attr_type
+					when 'belongs_to'
+        		':' + belongs_to_field(@attr_field)
+					when 'has_many'
+						':' + has_many_field(@attr_field)
+					else
+					":#{attribute.split(':').first}"
+				end
+			end.join(",\n")
+		end
 
-			def get_attribute_hash
-				fields.map do |attribute|
-					assign_attributes_variables(attribute)
-					send(@attr_type + '_form_hash')
-				end.join(", \n")
-			end
+		def get_attribute_hash
+			fields.map do |attribute|
+				assign_attributes_variables(attribute)
+				send(@attr_type + '_form_hash')
+			end.join(", \n")
+		end
 
-			def string_form_hash
-				attribute_hash(@attr_field, 'text_field')
-			end
+		def string_form_hash
+			attribute_hash(@attr_field, 'text_field')
+		end
 
-			def float_form_hash
-				attribute_hash(@attr_field, 'text_field')
-			end
+		def float_form_hash
+			attribute_hash(@attr_field, 'text_field')
+		end
 
-			def text_form_hash
-				attribute_hash(@attr_field ,'wysiwyg_field')
-			end
+		def text_form_hash
+			attribute_hash(@attr_field ,'wysiwyg_field')
+		end
 
-			def integer_form_hash
-				attribute_hash(@attr_field, 'number_field')
-			end
+		def integer_form_hash
+			attribute_hash(@attr_field, 'number_field')
+		end
 
-			def boolean_form_hash
-				attribute_hash(@attr_field, 'boolean')
-			end
+		def boolean_form_hash
+			attribute_hash(@attr_field, 'boolean')
+		end
 
-			def datepicker_form_hash
-				attribute_hash(@attr_field, 'datepicker')
-			end
+		def datepicker_form_hash
+			attribute_hash(@attr_field, 'datepicker')
+		end
 
-			def file_field_form_hash
-				attribute_hash(gallery_name.pluralize, 'adminpanel_file_field')
-			end
+		def file_field_form_hash
+			attribute_hash(gallery_name.pluralize, 'adminpanel_file_field')
+		end
 
-			def belongs_to_form_hash
-				attribute_hash(belongs_to_field(@attr_field), 'belongs_to', resource_class_name(@attr_field))
-			end
+		def belongs_to_form_hash
+			attribute_hash(belongs_to_field(@attr_field), 'belongs_to', resource_class_name(@attr_field))
+		end
 
-			def has_many_form_hash
-				attribute_hash(has_many_field(resource_class_name(@attr_field)), 'has_many', 'has_many model')
-			end
+		def has_many_form_hash
+			attribute_hash(has_many_field(resource_class_name(@attr_field)), 'has_many', 'has_many model')
+		end
 
-			def attribute_hash(name, type, model = '')
-				if model != ''
-					model = model_type(model) + ",\n"
-				end
-				"{\n" +
-					indent("'#{name}'" + " => {\n", 2) +
-						indent(form_type(type), 4) + ",\n" +
-						indent(label_type, 4) + ",\n" +
-						indent(placeholder_type, 4) + ",\n" +
-						indent(model, 4) +
-					indent("}\n", 2) +
-				'}'
-			end
+		def attribute_hash(name, type, model = '')
+			if model != ''
+				model = model_type(model) + ",\n"
+			end
+			"{\n" +
+				indent("'#{name}'" + " => {\n", 2) +
+					indent(form_type(type), 4) + ",\n" +
+					indent(label_type, 4) + ",\n" +
+					indent(placeholder_type, 4) + ",\n" +
+					indent(model, 4) +
+				indent("}\n", 2) +
+			'}'
+		end
 
-			def form_type(type)
-				"'type' => '#{type}'"
-			end
+		def form_type(type)
+			"'type' => '#{type}'"
+		end
 
-			def label_type
-				"'label' => '#{@attr_field}'"
-			end
+		def label_type
+			"'label' => '#{@attr_field}'"
+		end
 
-			def placeholder_type
-				"'placeholder' => '#{@attr_field}'"
-			end
+		def placeholder_type
+			"'placeholder' => '#{@attr_field}'"
+		end
 
-			def model_type(type)
-				"'model' => 'Adminpanel::#{type}'"
-			end
+		def model_type(type)
+			"'model' => 'Adminpanel::#{type}'"
+		end
 
-			def has_associations?
-				fields.each do |attribute|
-					assign_attributes_variables(attribute)
-					if @attr_type == "images" || @attr_type == "belongs_to" || @attr_type == "has_many" || @attr_type == "has_many_through"
-						return true
-					end
+		def has_associations?
+			fields.each do |attribute|
+				assign_attributes_variables(attribute)
+				if @attr_type == "images" || @attr_type == "belongs_to" || @attr_type == "has_many" || @attr_type == "has_many_through"
+					return true
 				end
-				return false
 			end
+			return false
+		end
 
-			def associations
-				association = ""
-				fields.each do |attribute|
-					assign_attributes_variables(attribute)
-					if @attr_type == "belongs_to"
-						association = "#{association}#{belongs_to_association(@attr_field)}"
-					elsif @attr_type == "has_many" || @attr_type == "has_many_through"
-						association = "#{association}#{has_many_association(@attr_field)}"
-					end
-
+		def associations
+			association = ""
+			fields.each do |attribute|
+				assign_attributes_variables(attribute)
+				if @attr_type == "belongs_to"
+					association = "#{association}#{belongs_to_association(@attr_field)}"
+				elsif @attr_type == "has_many" || @attr_type == "has_many_through"
+					association = "#{association}#{has_many_association(@attr_field)}"
 				end
-				association
-			end
 
-			def belongs_to_association(field)
-				"belongs_to :#{field.singularize.downcase}\n\t\t"
 			end
+			association
+		end
 
-			def has_many_association(field)
-				return "# has_many :categorizations\n\t\t" +
-				"# has_many :#{@attr_field}, " +
-				":through => :categorizations, " +
-				":dependent => :destroy\n\t\t"
-			end
+		def belongs_to_association(field)
+			"belongs_to :#{field.singularize.downcase}\n\t\t"
+		end
 
-			def get_gallery
-				return "\n\t\tmount_images :#{gallery_name.pluralize}\n"
-			end
+		def has_many_association(field)
+			return "# has_many :categorizations\n\t\t" +
+			"# has_many :#{@attr_field}, " +
+			":through => :categorizations, " +
+			":dependent => :destroy\n\t\t"
+		end
 
+		def get_gallery
+			return "\n\t\tmount_images :#{gallery_name.pluralize}\n"
 		end
+
 	end
 end