kirgudu_base 0.0.3 → 0.0.4

data/app/helpers/kirgudu_base/models/exports.rb

@@ -36,132 +36,132 @@ module KirguduBase
 
 			private
 
-			def validate_data_filters(properties)
-				if Rails.env == 'development'
-					if properties && properties.is_a?(Array)
-						properties.each do |p|
-							validate_data_filter(p)
-						end
-					end
-				end
-			end
-
-			def validate_data_filter(property)
-
-				entry = self.new
-
-				#validateing property by input_type
-				property_input_type = property[:input_type] || :text_field
-
-				if property_input_type == :chosen_select
-					validate_data_filter_chosen_select(property, entry)
-				elsif property_input_type == :autocomplete_with_id
-					validate_data_filter_autocomplete_with_id(property, entry)
-				elsif property_input_type == :switcher
-
-				elsif property_input_type == :date_picker
-
-				elsif property_input_type == :time_picker
-
-				elsif property_input_type == :image_selector
-
-				elsif property_input_type == :check_box
-
-				elsif property_input_type == :radio_button
-
-				elsif property_input_type == :link
-
-				elsif property_input_type == :elastic_text_area
-
-
-				elsif property_input_type == :text_area
-
-				elsif property_input_type == :text_field
-
-				else
-					raise "Current Model Class: #{self}\r\nForm Property '#{property[:name]}'\r\nINPUT TYPE #{property_input_type} is not supported at the moment"
-				end
-
-				# validating class attribute
-				validate_data_filter_attribute_class(property, entry)
-				# validating span attribute
-				validate_data_filter_attribute_span(property, entry)
-			end
-
-			def validate_data_filter_autocomplete_with_id(property, entry)
-				#validateting text_value_property attribute
-				validate_data_filter_attribute_text_value_property(property, entry)
-				#validating placeholder presense
-				validate_data_filter_attribute_placeholder(property, entry)
-				#validatting onchange attribute
-				validate_data_filter_attribute_onchange(property, entry)
-
-
-				validate_data_filter_attribute_source(property, entry)
-			end
-
-			def validate_data_filter_chosen_select(property, entry)
-				#validateting text_value_property attribute
-				validate_data_filter_attribute_text_value_property(property, entry)
-				#validating placeholder presense
-				validate_data_filter_attribute_placeholder(property, entry)
-				#validatting onchange attribute
-				validate_data_filter_attribute_onchange(property, entry)
-
-			end
+			#def validate_data_filters(properties)
+			#	if Rails.env == 'development'
+			#		if properties && properties.is_a?(Array)
+			#			properties.each do |p|
+			#				validate_data_filter(p)
+			#			end
+			#		end
+			#	end
+			#end
+			#
+			#def validate_data_filter(property)
+			#
+			#	entry = self.new
+			#
+			#	#validateing property by input_type
+			#	property_input_type = property[:input_type] || :text_field
+			#
+			#	if property_input_type == :chosen_select
+			#		validate_data_filter_chosen_select(property, entry)
+			#	elsif property_input_type == :autocomplete_with_id
+			#		validate_data_filter_autocomplete_with_id(property, entry)
+			#	elsif property_input_type == :switcher
+			#
+			#	elsif property_input_type == :date_picker
+			#
+			#	elsif property_input_type == :time_picker
+			#
+			#	elsif property_input_type == :image_selector
+			#
+			#	elsif property_input_type == :check_box
+			#
+			#	elsif property_input_type == :radio_button
+			#
+			#	elsif property_input_type == :link
+			#
+			#	elsif property_input_type == :elastic_text_area
+			#
+			#
+			#	elsif property_input_type == :text_area
+			#
+			#	elsif property_input_type == :text_field
+			#
+			#	else
+			#		raise "Current Model Class: #{self}\r\nForm Property '#{property[:name]}'\r\nINPUT TYPE #{property_input_type} is not supported at the moment"
+			#	end
+			#
+			#	# validating class attribute
+			#	validate_data_filter_attribute_class(property, entry)
+			#	# validating span attribute
+			#	validate_data_filter_attribute_span(property, entry)
+			#end
+			#
+			#def validate_data_filter_autocomplete_with_id(property, entry)
+			#	#validateting text_value_property attribute
+			#	validate_data_filter_attribute_text_value_property(property, entry)
+			#	#validating placeholder presense
+			#	validate_data_filter_attribute_placeholder(property, entry)
+			#	#validatting onchange attribute
+			#	validate_data_filter_attribute_onchange(property, entry)
+			#
+			#
+			#	validate_data_filter_attribute_source(property, entry)
+			#end
+			#
+			#def validate_data_filter_chosen_select(property, entry)
+			#	#validateting text_value_property attribute
+			#	validate_data_filter_attribute_text_value_property(property, entry)
+			#	#validating placeholder presense
+			#	validate_data_filter_attribute_placeholder(property, entry)
+			#	#validatting onchange attribute
+			#	validate_data_filter_attribute_onchange(property, entry)
+			#
+			#end
 
 
 			##################################### FORM PROPERTY ATTRIBUTE VALIDATIONS #####################
 
-			def validate_data_filter_attribute_onchange(property, entry)
-				if property[:onchange]
-
-				end
-			end
-
-			def validate_data_filter_attribute_class(property, entry)
-				if property[:class]
-					unless property[:class].is_a?(String)
-						raise "Current Model Class: #{self}\r\nForm Property '#{property[:name]}'\r\nCLASS attribute is not a String'"
-					end
-				end
-			end
-
-			def validate_data_filter_attribute_span(property, entry)
-				if property[:span]
-					unless property[:span].is_a?(String)
-						raise "Current Model Class: #{self}\r\nForm Property '#{property[:name]}'\r\nSPAN attribute is not a String'"
-					end
-				end
-			end
-
-			def validate_data_filter_attribute_placeholder(property, entry)
-				if property[:placeholder].nil? || property[:placeholder].blank?
-					raise "Current Model Class: #{self}\r\nForm Property '#{property[:name]}'\r\nPLACEHOLDER missed"
-				end
-			end
-
-			def validate_data_filter_attribute_text_value_property(property, entry)
-				unless property[:text_value_property]
-					raise "Current Model Class: #{self}\r\nForm Property '#{property[:name]}'\r\nTEXT_VALUE_PROPERTY attribute missed"
-				end
-
-				unless entry.respond_to?(property[:text_value_property])
-					raise "Current Model Class: #{self}\r\nForm Property '#{property[:name]}'\r\nTEXT_VALUE_PROPERTY '#{property[:text_value_property]}' method not found for this class"
-				end
-			end
-
-			def validate_data_filter_attribute_source_url(property, entry)
-				unless property[:source_url]
-					raise "Current Model Class: #{self}\r\nForm Property '#{property[:name]}'\r\nSOURCE_URL attribute missed"
-				end
-			end
-
-			def validate_data_filter_attribute_source(property, entry)
-				unless property[:source]
-					raise "Current Model Class: #{self}\r\nForm Property '#{property[:name]}'\r\nSOURCE attribute missed"
-				end
-			end
+			#def validate_data_filter_attribute_onchange(property, entry)
+			#	if property[:onchange]
+			#
+			#	end
+			#end
+			#
+			#def validate_data_filter_attribute_class(property, entry)
+			#	if property[:class]
+			#		unless property[:class].is_a?(String)
+			#			raise "Current Model Class: #{self}\r\nForm Property '#{property[:name]}'\r\nCLASS attribute is not a String'"
+			#		end
+			#	end
+			#end
+			#
+			#def validate_data_filter_attribute_span(property, entry)
+			#	if property[:span]
+			#		unless property[:span].is_a?(String)
+			#			raise "Current Model Class: #{self}\r\nForm Property '#{property[:name]}'\r\nSPAN attribute is not a String'"
+			#		end
+			#	end
+			#end
+			#
+			#def validate_data_filter_attribute_placeholder(property, entry)
+			#	if property[:placeholder].nil? || property[:placeholder].blank?
+			#		raise "Current Model Class: #{self}\r\nForm Property '#{property[:name]}'\r\nPLACEHOLDER missed"
+			#	end
+			#end
+			#
+			#def validate_data_filter_attribute_text_value_property(property, entry)
+			#	unless property[:text_value_property]
+			#		raise "Current Model Class: #{self}\r\nForm Property '#{property[:name]}'\r\nTEXT_VALUE_PROPERTY attribute missed"
+			#	end
+			#
+			#	unless entry.respond_to?(property[:text_value_property])
+			#		raise "Current Model Class: #{self}\r\nForm Property '#{property[:name]}'\r\nTEXT_VALUE_PROPERTY '#{property[:text_value_property]}' method not found for this class"
+			#	end
+			#end
+			#
+			#def validate_data_filter_attribute_source_url(property, entry)
+			#	unless property[:source_url]
+			#		raise "Current Model Class: #{self}\r\nForm Property '#{property[:name]}'\r\nSOURCE_URL attribute missed"
+			#	end
+			#end
+			#
+			#def validate_data_filter_attribute_source(property, entry)
+			#	unless property[:source]
+			#		raise "Current Model Class: #{self}\r\nForm Property '#{property[:name]}'\r\nSOURCE attribute missed"
+			#	end
+			#end
 		end
 	end
 end

data/app/helpers/kirgudu_base/models/scopes.rb

@@ -152,8 +152,13 @@ module KirguduBase
 			module ByDeletionStatus
 				def self.included(base)
 					base.scope :by_deletion_status, lambda { |value| base.where(deletion_status_id: value) if value }
+					base.scope :with_deletion_status_active, lambda { |value| base.where(deletion_status_id: 1) if value == 1 }
+					base.scope :with_deletion_status_deleted, lambda { |value| base.where(deletion_status_id: 2) if value == 1 }
+					base.scope :with_deletion_status_purged, lambda { |value| base.where(deletion_status_id: 3) if value == 1 }
 				end
+
 			end
+
 		end
 	end
 end

data/app/mailers/authentications_mailer.rb

@@ -0,0 +1,53 @@
+#encoding: utf-8
+module KirguduBase
+	class AuthenticationsMailer < ActionMailer::Base
+
+		def confirmation_code(from, to, user, confirmation, template_path)
+			@data = {}
+			@data[:user] = user
+			@data[:confirmation] = confirmation
+
+			# mail(from: from, to: to, subject: I18n.t("kirgudu_base.authentications.confirm_email.email.subject")) do |format|
+			# 	format.text { render "#{KirguduBase.path_to_views}/mailers/authentications/confirmation_code.html" }
+			# 	format.html { render "#{KirguduBase.path_to_views}/mailers/authentications/confirmation_code.html" }
+			# end
+
+			mail(from: from, to: to, subject: I18n.t("kirgudu_base.authentications.confirm_email.email.subject"), content_type: "text/html") do |format|
+				format.html { render "#{KirguduBase.path_to_views}/mailers/authentications/confirmation_code" }
+			end
+
+		end
+
+		def restore_password_code(from, to, user, restore)
+			@data = {}
+			@data[:user] = user
+			@data[:restore] = restore
+
+			# mail(from: from, to: to, subject: I18n.t("kirgudu_base.authentications.restore_password.email.subject")) do |format|
+			# 	format.text { render "#{KirguduBase.path_to_views}/mailers/authentications/restore_password_code" }
+			# 	format.html { render "#{KirguduBase.path_to_views}/mailers/authentications/restore_password_code" }
+			# end
+
+			mail(from: from, to: to, subject: I18n.t("kirgudu_base.authentications.restore_password_code.email.subject"), content_type: "text/html") do |format|
+				format.html { render "/mailers/authentications/restore_password_code" }
+			end
+
+		end
+
+		def restore_password_success(from, to, user, password)
+			@data = {}
+			@data[:user] = user
+			@data[:password] = password
+
+			# mail(from: from, to: to, subject: I18n.t("kirgudu_base.authentications.restore_password_success.email.subject"), content_type: "text/html") do |format|
+			# 	format.text { render "#{KirguduBase.path_to_views}/mailers/authentications/restore_password_success" }
+			# 	format.html { render "#{KirguduBase.path_to_views}/mailers/authentications/restore_password_success" }
+			# end
+
+			mail(from: from, to: to, subject: I18n.t("kirgudu_base.authentications.restore_password_success.email.subject"), content_type: "text/html") do  |format|
+				format.html { render "#{self.class.get_method_latest_result(:get_kb_template)}#{KirguduBase.path_to_views}/mailers/authentications/restore_password_success" }
+			end
+
+		end
+	end
+end

data/app/models/kirgudu_base/base_model.rb

@@ -138,13 +138,14 @@ module KirguduBase
 
 		def self.apply_filters_to_query(query, filters = {})
 			filters ||= {}
-			per_page = filters[:per_page] || ::WillPaginate.per_page
-			per_page = 99999 if per_page.nil? || per_page <= 0
-			order_by = filters[:order] || "name asc"
-			page = nil
-			page = filters[:page].to_i if filters[:page]
-			if page.nil? || page < 1
-				page = 1
+			per_page = filters[:per_page]
+			if per_page
+				per_page = 99999 if per_page <= 0
+				page_number = nil
+				page_number = filters[:page].to_i if filters[:page]
+				if page_number.nil? || page_number < 1
+					page_number = 1
+				end
 			end
 
 
@@ -152,12 +153,13 @@ module KirguduBase
 
 			query = query.with_slug(filters[:slug]) if self.respond_to?(:with_slug)
 			query = query.with_keyword(filters[:keyword]) if self.respond_to?(:with_keyword)
-			if self.respond_to?(:with_name)
-				query = query.with_name(filters[:name])
-			end
+			query = query.with_name(filters[:name]) if self.respond_to?(:with_name)
 
 
 			query = query.by_deletion_status(filters[:deletion_status_id]) if self.respond_to?(:by_deletion_status)
+			query = query.with_deletion_status_active(filters[:active]) if self.respond_to?(:with_deletion_status_active)
+			query = query.with_deletion_status_deleted(filters[:deleted]) if self.respond_to?(:with_deletion_status_deleted)
+			query = query.with_deletion_status_purged(filters[:purged]) if self.respond_to?(:with_deletion_status_purged)
 
 			query = query.by_creator(filters[:created_by]) if self.respond_to?(:by_creator)
 			query = query.by_creator(filters[:updated_by]) if self.respond_to?(:by_creator)
@@ -168,10 +170,15 @@ module KirguduBase
 			query = query.by_updated_at_start(filters[:updated_at]) if self.respond_to?(:by_updated_at_start)
 			query = query.by_updated_at_start(filters[:updated_at]) if self.respond_to?(:by_updated_at_finish)
 
-			query
-			.order(order_by)
-			.page(page)
-			.per_page(per_page)
+
+			if per_page
+				query = query
+				.page(page_number)
+				.per_page(per_page)
+			end
+
+			query.order(filters[:order] || "name asc")
+
 		end
 
 		def self.for_form_params
@@ -182,6 +189,32 @@ module KirguduBase
 			self.class.for_model_params
 		end
 
+
+		def self.for_sql_order_by(name, direction = nil)
+			if name.nil?
+				raise "Class. Ordery By Colum Name is Null"
+			end
+
+			direction = direction.to_sym if direction
+			direction ||= :asc
+			"#{self.table_name}.#{name} #{direction == :asc ? 'asc' : 'desc'}"
+		end
+
+		def self.for_sql_order_by_inverted(name, direction = nil)
+			direction = direction.to_sym if direction
+			direction ||= :asc
+			self.for_sql_order_by(name, direction == :asc ? :desc : :asc)
+		end
+
+		def for_sql_order_by(name, direction = nil)
+			self.class.for_sql_order_by(name, direction)
+		end
+
+		def for_sql_order_by_inverted(name, direction = nil)
+			self.class.for_sql_order_by_inverted(name, direction)
+		end
+
+
 		protected
 
 		def normalize_values_before_validation

data/app/models/kirgudu_base/dynamic_pages/builder.rb

@@ -2,9 +2,6 @@ module KirguduBase
 	module DynamicPages
 		class Builder
 			def initialize(&block)
-				self.kontroller_klass = kontroller_klass
-				self.parent_element = parent_element
-
 				instance_eval(&block) if block_given?
 			end
 
@@ -49,9 +46,6 @@ module KirguduBase
 				raise "Parameter \"#{name}\" must be a \"String\" or a :Symbol." unless value && (value.is_a?(String) || value.is_a?(Symbol))
 			end
 
-			attr_accessor :kontroller_klass
-			attr_accessor :parent_element
-
 			def validate_generated_element(element)
 				errors = []
 				unless element.valid?
@@ -68,9 +62,7 @@ module KirguduBase
 				if errors.length > 0
 
 					raise "ERRORS<br/>
-						   Controller: #{kontroller_klass} <br/>
 						   Class: #{element.class}
-						   Parent: #{element.parent_element} <br/>
 						   Name: #{element.name if element.respond_to?(:name)} <br/>
 
 						   #{errors.join('<br/>')}".html_safe

data/app/models/kirgudu_base/dynamic_pages/controller_link.rb

@@ -12,6 +12,7 @@ module KirguduBase
 				self.controller = nil
 				self.action = nil
 				self.id = nil
+				self.ids = nil
 
 				super(options)
 			end
@@ -20,6 +21,7 @@ module KirguduBase
 			attr_accessor :controller
 			attr_accessor :action
 			attr_accessor :id
+			attr_accessor :ids
 
 
 			def to_external_hash(options = {})
@@ -27,7 +29,8 @@ module KirguduBase
 				options.merge!({
 					               controller: self.controller,
 					               action: self.action,
-					               id: self.id
+					               id: self.id,
+				                   ids: self.ids
 				               })
 				super(options)
 			end

data/app/models/kirgudu_base/dynamic_pages/controller_link_builder.rb

@@ -9,7 +9,8 @@ module KirguduBase
 					{
 						controller: nil,
 						action: nil,
-						id: nil
+						id: nil,
+					    ids: nil
 					}
 				)
 

data/app/models/kirgudu_base/dynamic_pages/controller_link_id.rb

@@ -2,20 +2,20 @@ module KirguduBase
 	module DynamicPages
 		class ControllerLinkId < ::KirguduBase::DynamicPages::Element
 
-			mergeable_attributes :id_source, :id_target
+			mergeable_attributes :from, :to
 
-			validates_presence_of :id_source, :id_target
+			validates_presence_of :from, :to
 
 			def initialize(options = {})
 
-				self.id_source = nil
-				self.id_target = nil
+				self.from = nil
+				self.to = nil
 
 				super(options)
 			end
 
-			attr_accessor :id_source
-			attr_accessor :id_target
+			attr_accessor :from
+			attr_accessor :to
 
 
 			def to_external_hash(options = {})

data/app/models/kirgudu_base/dynamic_pages/controller_link_id_builder.rb

@@ -9,8 +9,8 @@ module KirguduBase
 			def initialize(&block)
 				self.builder_options.merge!(
 					{
-						id_source: nil,
-						id_target: nil
+						from: nil,
+						to: nil
 					}
 				)
 
@@ -18,12 +18,12 @@ module KirguduBase
 			end
 
 
-			def id_source(value)
-				self.builder_options[:id_source] = value
+			def from(value)
+				self.builder_options[:from] = value
 			end
 
-			def id_target(value)
-				self.builder_options[:id_target] = value
+			def to(value)
+				self.builder_options[:to] = value
 			end
 
 			def to_element

data/app/models/kirgudu_base/dynamic_pages/element.rb

@@ -41,16 +41,15 @@ module KirguduBase
 				self.parent_entry.kontroller_klass if self.parent_entry && self.parent_entry.respond_to?(:kontroller_klass)
 			end
 
-			protected
-
-			attr_writer :parent_entry
-
 			def as_json(options = {})
 				super((options || {}).merge({
-					                            :except => [:parent_entry]
+					                            :except => [:parent_entry, :validation_context, :errors]
 				                            }))
 			end
 
+			protected
+
+			attr_writer :parent_entry
 
 		end
 	end

data/app/models/kirgudu_base/dynamic_pages/entry_builder.rb

@@ -30,8 +30,8 @@ module KirguduBase
 				elements = ::KirguduBase::DynamicPages::EntryPropertiesBlockBuilder.new(&block).to_elements
 
 				elements.each do |element|
-					self.builder_options[:properties] = [] unless self.builder_options[:properties]
-					self.builder_options[:properties] << element
+					self.builder_options[:properties] = {} unless self.builder_options[:properties]
+					self.builder_options[:properties][element.name] = element
 				end
 			end
 

data/app/models/kirgudu_base/dynamic_pages/event_if_block_builder.rb

@@ -22,7 +22,7 @@ module KirguduBase
 				@actions.each do |element|
 					element.constraint = ::KirguduBase::DynamicPages::EventActionConstraint.new(name: self.name, values: self.values)
 
-					#element.constraint = ::KirguduBase::DynamicPages::EventActionConstraint.new(parent_element)
+
 					#element.constraint.name = self.name
 					#element.constraint.values = self.values
 				end

data/app/models/kirgudu_base/dynamic_pages/form_builder.rb

@@ -36,8 +36,8 @@ module KirguduBase
 			def properties(&block)
 				elements = ::KirguduBase::DynamicPages::FormPropertiesBlockBuilder.new(&block).to_elements
 				elements.each do |element|
-					self.builder_options[:properties] = [] unless self.builder_options[:properties]
-					self.builder_options[:properties] << element
+					self.builder_options[:properties] = {} unless self.builder_options[:properties]
+					self.builder_options[:properties][element.name] = element
 				end
 			end
 

data/app/models/kirgudu_base/dynamic_pages/list.rb

@@ -21,6 +21,7 @@ module KirguduBase
 				self.cells = nil
 				self.model = nil
 				self.parent = nil
+				self.relation = nil
 
 				super(options)
 
@@ -35,6 +36,7 @@ module KirguduBase
 			attr_accessor :filters
 			attr_accessor :model
 			attr_accessor :parent
+			attr_accessor :relation
 
 
 		end

data/app/models/kirgudu_base/dynamic_pages/list_builder.rb

@@ -40,12 +40,16 @@ module KirguduBase
 				self.builder_options[:per_page] = value
 			end
 
+			def relation(&block)
+				self.builder_options[:relation] = ::KirguduBase::DynamicPages::RelationBuilder.new(&block).to_element
+			end
+
 
 			def properties(&block)
 				elements = ::KirguduBase::DynamicPages::ListPropertiesBlockBuilder.new(&block).to_elements
 				elements.each do |element|
-					self.builder_options[:properties] = [] unless self.builder_options[:properties]
-					self.builder_options[:properties] << element
+					self.builder_options[:properties] = {} unless self.builder_options[:properties]
+					self.builder_options[:properties][element.name] = element
 				end if elements
 			end
 
@@ -73,7 +77,7 @@ module KirguduBase
 			end
 
 			def parent(&block)
-				self.builder_options[:parent] = ::KirguduBase::DynamicPages::ParentElementBuilder.new(&block).to_parent
+				self.builder_options[:parent] = ::KirguduBase::DynamicPages::ParentElementBuilder.new(&block).to_element
 			end