kirgudu_base 0.0.21 → 0.0.22

data/app/helpers/kirgudu_base/controllers/container_items_management_actions.rb

@@ -18,7 +18,7 @@ module KirguduBase
 					management_settings = self.class.get_kb_option(:management_settings)
 
 					filters_4_container = {}
-					self.fill_obligatory_filters(filters_4_container)
+					self.fill_obligatory_db_query_params(filters_4_container)
 
 					local_data = {}
 
@@ -28,7 +28,7 @@ module KirguduBase
 					local_data[:container] = local_container
 
 					filters_4_items = {}
-					self.fill_obligatory_filters(filters_4_items)
+					self.fill_obligatory_db_query_params(filters_4_items)
 					filters_4_items[management_settings.container_id_property] = params[management_settings.container_id_property]
 
 					local_items = management_settings.item_class.get_entries(nil, filters_4_items, {logger: string_logger})
@@ -51,14 +51,14 @@ module KirguduBase
 
 					#loading container data
 					filters_4_container = {}
-					self.fill_obligatory_filters(filters_4_container)
+					self.fill_obligatory_db_query_params(filters_4_container)
 
 					local_container = management_settings.container_class.get_entry_by_id(params[management_settings.container_id_property], filters_4_container, {logger: string_logger})
 					local_data[:container] = local_container
 
 					#loading items data
 					filters_4_items = {}
-					self.fill_obligatory_filters(filters_4_items)
+					self.fill_obligatory_db_query_params(filters_4_items)
 					filters_4_items[management_settings.container_id_property] = params[management_settings.container_id_property]
 					filters_4_items[:per_page] = 999999
 					filters_4_items[:page] = 1
@@ -69,7 +69,7 @@ module KirguduBase
 					#entries_order_by = get_managing_entries_order_by if self.respond_to?(:get_managing_entries_order_by)
 					#entries_order_by = "name asc" unless entries_order_by
 					filters_4_entries = {}
-					self.fill_obligatory_filters(filters_4_entries)
+					self.fill_obligatory_db_query_params(filters_4_entries)
 					filters_4_entries[management_settings.entry_id_property] = params[management_settings.entry_id_property]
 					filters_4_entries[:per_page] = 999999
 					filters_4_entries[:page] = 1
@@ -82,7 +82,7 @@ module KirguduBase
 
 					# fill parent for data
 					filters_for_parents = {}
-					self.fill_obligatory_filters(filters_for_parents)
+					self.fill_obligatory_db_query_params(filters_for_parents)
 					self.fill_parents_for_local_data(local_data, filters_for_parents)
 
 
@@ -103,12 +103,12 @@ module KirguduBase
 
 					#loading container data
 					filters_4_container = {}
-					self.fill_obligatory_filters(filters_4_container)
+					self.fill_obligatory_db_query_params(filters_4_container)
 					local_container = management_settings.container_class.get_entry_by_id(params[management_settings.container_id_property], filters_4_container, {logger: string_logger})
 
 					#loading entry data
 					filters_4_entries = {}
-					self.fill_obligatory_filters(filters_4_entries)
+					self.fill_obligatory_db_query_params(filters_4_entries)
 					local_entry = management_settings.entry_class.get_entry_by_id(params[management_settings.entry_id_property], filters_4_entries, {logger: string_logger})
 
 					#checking if data found and valid
@@ -122,7 +122,7 @@ module KirguduBase
 					end
 
 					filters_4_item = {}
-					self.fill_obligatory_filters(filters_4_item)
+					self.fill_obligatory_db_query_params(filters_4_item)
 					filters_4_item[management_settings.entry_id_property] = params[management_settings.entry_id_property]
 					filters_4_item[management_settings.container_id_property] = params[management_settings.container_id_property]
 
@@ -135,7 +135,7 @@ module KirguduBase
 
 						if local_item.respond_to?(:sort_position)
 							filters_4_items_max = {}
-							self.fill_obligatory_filters(filters_4_items_max)
+							self.fill_obligatory_db_query_params(filters_4_items_max)
 							filters_4_items_max[management_settings.container_id_property] = params[management_settings.container_id_property]
 
 							max_sort_position = management_settings.item_class.get_entries(nil, filters_4_items_max, {logger: string_logger}).maximum(:sort_position)
@@ -162,7 +162,7 @@ module KirguduBase
 
 					#loading container data
 					filters_4_container = {}
-					self.fill_obligatory_filters(filters_4_container)
+					self.fill_obligatory_db_query_params(filters_4_container)
 					local_container = management_settings.container_class.get_entry_by_id(params[management_settings.container_id_property], filters_4_container, {logger: string_logger})
 
 					unless local_container
@@ -171,7 +171,7 @@ module KirguduBase
 					end
 
 					filters_4_item = {}
-					self.fill_obligatory_filters(filters_4_item)
+					self.fill_obligatory_db_query_params(filters_4_item)
 					filters_4_item[management_settings.entry_id_property] = params[management_settings.entry_id_property]
 					filters_4_item[management_settings.container_id_property] = params[management_settings.container_id_property]
 

data/app/helpers/kirgudu_base/controllers/dynamic_pages.rb

@@ -1,188 +1,208 @@
 module KirguduBase
 	module Controllers
 		module DynamicPages
+			module Class
 
+				attr_accessor :kirgudu_controller_options
 
-			attr_accessor :kirgudu_controller_options
 
+				def kb_page(name, &block)
+					#raise "Page Name: #{name}"
 
-			def kb_page(name, &block)
+					@kirgudu_base_pages ||= {}
 
-				#raise "Page Name: #{name}"
-
-				@kirgudu_base_pages ||= {}
+					element = ::KirguduBase::DynamicPages::PageBuilder.new(name, &block).to_element
+					existent_page = @kirgudu_base_pages[element.name]
+					if existent_page
+						existent_page.merge(element)
+					else
+						@kirgudu_base_pages[element.name] = element
+					end
+				end
 
-				element = ::KirguduBase::DynamicPages::PageBuilder.new(name, &block).to_element
+				def kb_menu(name, &block)
+					#raise "Page Name: #{name}"
+					@kirgudu_base_menus ||= {}
+					element = ::KirguduBase::DynamicPages::MenuBuilder.new(name, &block).to_element
 
-				existent_page = @kirgudu_base_pages[element.name]
+					existent_element = @kirgudu_base_menus[element.name]
 
-				if existent_page
-					existent_page.merge(element)
-				else
-					@kirgudu_base_pages[element.name] = element
+					if existent_element
+						existent_element.merge(element)
+					else
+						@kirgudu_base_menus[element.name] = element
+					end
 				end
-			end
 
-			def kb_menu(name, &block)
 
-				#raise "Page Name: #{name}"
-
-				@kirgudu_base_menus ||= {}
+				def kb_parent_controller(controller, id)
+					options = kb_get_options_container
+					options[:parent_controller_data] = {controller: controller, id: id}
+				end
 
-				element = ::KirguduBase::DynamicPages::MenuBuilder.new(name, &block).to_element
 
-				existent_element = @kirgudu_base_menus[element.name]
+				def kb_entry_class(entry_class)
+					options = kb_get_options_container
+					options[:entry_class] = entry_class
+				end
 
-				if existent_element
-					existent_element.merge(element)
-				else
-					@kirgudu_base_menus[element.name] = element
+				def kb_home_controller(name)
+					raise "'kb_home_controller' method is no longer supported. Use 'kb_home_path' method instead"
+					options = kb_get_options_container
+					options[:home_controller] = name
 				end
-			end
 
+				def kb_home_path(controller, action, params = {})
+					options = kb_get_options_container
+					options[:home_path] = {
+						controller: controller,
+					    action: action,
+					    params: params
+					}
+				end
 
-			def kb_parent_controller(controller, id)
-				options_array = kb_get_parents_options_container
-				options_array << {controller: controller, id: id}
-			end
 
+				def kb_management_settings(&block)
+					options = kb_get_options_container
+					options[:management_settings] = ::KirguduBase::DynamicPages::ManagementSettingsBuilder.new(&block).to_element
+				end
 
-			def kb_entry_class(entry_class)
-				options = kb_get_options_container
-				options[:entry_class] = entry_class
-			end
+				def kb_views_paths_404_page(value)
+					kb_set_view_path(:page_404, value, 'kb_views_paths_404_page', '404 Page')
+				end
 
-			def kb_home_controller(name)
-				options = kb_get_options_container
-				options[:home_controller] = name
-			end
+				def kb_views_paths_entry_not_found(value)
+					kb_set_view_path(:entry_not_found, value, 'kb_views_paths_entry_not_found', 'Entry Not Found Page')
+				end
 
+				def kb_views_paths_index(value)
+					kb_set_view_path(:index, value, 'kb_views_paths_index', 'Index Page')
+				end
 
-			def kb_management_settings(&block)
-				options = kb_get_options_container
-				options[:management_settings] = ::KirguduBase::DynamicPages::ManagementSettingsBuilder.new(&block).to_element
-			end
+				def kb_views_paths_new(value)
+					kb_set_view_path(:new, value, 'kb_views_paths_new', 'New Page')
+				end
 
-			def kb_views_paths_404_page(value)
-				set_kb_view_path(:page_404, value, 'kb_views_paths_404_page', '404 Page')
-			end
+				def kb_views_paths_edit(value)
+					kb_set_view_path(:edit, value, 'kb_views_paths_edit', 'Edit Page')
+				end
 
-			def kb_views_paths_entry_not_found(value)
-				set_kb_view_path(:entry_not_found, value, 'kb_views_paths_entry_not_found', 'Entry Not Found Page')
-			end
+				def kb_views_paths_delete(value)
+					kb_set_view_path(:delete, value, 'kb_views_paths_delete', 'Delete Page')
+				end
 
-			def kb_views_paths_index(value)
-				set_kb_view_path(:index, value, 'kb_views_paths_index', 'Index Page')
-			end
+				def kb_views_paths_show(value)
+					kb_set_view_path(:show, value, 'kb_views_paths_show', 'Show Page')
+				end
 
-			def kb_views_paths_new(value)
-				set_kb_view_path(:new, value, 'kb_views_paths_new', 'New Page')
-			end
+				def kb_views_paths_management(value)
+					kb_set_view_path(:management, value, "kb_views_paths_management", "Management Page")
+				end
 
-			def kb_views_paths_edit(value)
-				set_kb_view_path(:edit, value, 'kb_views_paths_edit','Edit Page')
-			end
+				def kb_views_paths_sorting(value)
+					kb_set_view_path(:management, value, 'kb_views_paths_sorting', 'Sorting Page')
+				end
 
-			def kb_views_paths_delete(value)
-				set_kb_view_path(:delete, value, 'kb_views_paths_delete', 'Delete Page')
-			end
+				def kb_views_paths_layout(value)
+					kb_set_view_path(:layout, value, 'kb_views_paths_layout', 'Page Layout')
+				end
 
-			def kb_views_paths_show(value)
-				set_kb_view_path(:show, value, 'kb_views_paths_show', 'Show Page')
-			end
+				def kb_views_paths_dashboard(value)
+					kb_set_view_path(:dashboard, value, 'kb_views_paths_dashboard', 'Dashboard PAge')
+				end
 
-			def kb_views_paths_management(value)
-				set_kb_view_path(:management, value, "kb_views_paths_management", "Management Page")
-			end
 
-			def kb_views_paths_sorting(value)
-				set_kb_view_path(:management, value, 'kb_views_paths_sorting', 'Sorting Page')
-			end
+				def kb_template_path(name)
+					options = kb_get_options_container
+					options[:template_path] = name
+				end
 
 
-			def kb_template(name)
-				options = kb_get_options_container
-				options[:template] = name
-			end
+				def get_kb_option(name)
+					@kirgudu_controller_options[name] if @kirgudu_controller_options
+				end
 
+				def get_kb_page(name)
+					@kirgudu_base_pages[name] if @kirgudu_base_pages
+				end
 
-			def get_kb_option(name)
-				@kirgudu_controller_options[name] if @kirgudu_controller_options
-			end
+				def get_kb_menu(name)
+					@kirgudu_base_menus[name] if @kirgudu_base_menus
+				end
 
-			def get_kb_page(name)
-				@kirgudu_base_pages[name] if @kirgudu_base_pages
-			end
+				def get_kb_view_path(view_name)
+					if view_name
+						options = kb_get_view_paths_options_container
+						view_name = view_name.to_sym
+						options[view_name]
+					end
+				end
 
-			def get_kb_menu(name)
-				@kirgudu_base_menus[name] if @kirgudu_base_menus
-			end
 
-			def get_kb_view_path(view_name)
-				if view_name
-					options = kb_get_view_paths_options_container
-					options[view_name.to_sym]
+				def get_kb_parent_controller_data
+					options = kb_get_options_container
+					options[:parent_controller_data]
 				end
-			end
-
-			def get_kb_parents
-				kb_get_parents_options_container
-			end
 
-			def get_kb_entry_class
-				options = kb_get_options_container
-				options[:entry_class]
-			end
+				def get_kb_entry_class
+					options = kb_get_options_container
+					options[:entry_class]
+				end
 
-			def get_kb_home_controller
-				options = kb_get_options_container
-				options[:home_controller]
-			end
+				def get_kb_home_controller
+					raise "'get_kb_home_controller' method is no longer supported. Use 'get_kb_home_path' method instead"
+					options = kb_get_options_container
+					options[:home_controller]
+				end
 
-			def get_kb_template
-				options = kb_get_options_container
-				options[:template]
-			end
+				def get_kb_home_path
+					options = kb_get_options_container
+					options[:home_path]
+				end
 
-			def kb_form_properties_template_set(name, &block)
 
-				#raise "Page Name: #{name}"
+				def get_kb_template
+					options = kb_get_options_container
+					options[:template_path]
+				end
 
-				#@form_properties_template_set = {} unless @form_properties_template_set
+				# def kb_form_properties_template_set(name, &block)
 				#
-				#template_set = ::KirguduBase::DynamicPages::FormPropertiesNamedSetBuilder.new(name, &block).to_set
-				#@@form_properties_template_set[template_set.name] = template_set
-			end
-
-			def get_form_properties_template_set(name)
-				@kirgudu_base_pages[name] if @kirgudu_base_pages
-			end
+				# 	#raise "Page Name: #{name}"
+				#
+				# 	#@form_properties_template_set = {} unless @form_properties_template_set
+				# 	#
+				# 	#template_set = ::KirguduBase::DynamicPages::FormPropertiesNamedSetBuilder.new(name, &block).to_set
+				# 	#@@form_properties_template_set[template_set.name] = template_set
+				# end
+				#
+				# def get_form_properties_template_set(name)
+				# 	@kirgudu_base_pages[name] if @kirgudu_base_pages
+				# end
+
+				protected
+				def kb_get_view_paths_options_container
+					options = self.kb_get_options_container
+					options[:views_paths] ||= {}
+					options[:views_paths]
+				end
 
-			protected
-			def kb_get_view_paths_options_container
-				options = self.kb_get_options_container
-				options[:views_paths] ||= {}
-				options[:views_paths]
-			end
+				def kb_get_options_container
+					self.kirgudu_controller_options ||= {}
+					self.kirgudu_controller_options
+				end
 
-			def kb_get_options_container
-				self.kirgudu_controller_options ||= {}
-				self.kirgudu_controller_options
-			end
+				def kb_set_view_path(view, path, method_name, page_name)
+					raise "Class Method: #{method_name}\r\nView Path for '#{page_name}' cannot be null or empty" if path.nil? || path.blank?
+					options = kb_get_view_paths_options_container
+					path_value = ::ChupakabraTools::Strings.trim(path, "/", force_trim_whitespaces: true)
+					options[view] = path_value
+				end
 
-			def kb_get_parents_options_container
-				options = kb_get_options_container
-				options[:parents] ||= []
-				options[:parents]
 			end
+			module Instance
 
-			def set_kb_view_path(view, path, method_name, page_name)
-				raise "Class Method: #{method_name}\r\nView Path for '#{page_name}' cannot be null or empty" if path.nil? || path.blank?
-				options = kb_get_view_paths_options_container
-				path_value = ::ChupakabraTools::Strings.trim(path, "/", force_trim_whitespaces: true)
-				options[view] = path_value
 			end
-
 		end
 	end
 end

data/app/helpers/kirgudu_base/controllers/dynamic_transactions.rb

@@ -3,7 +3,7 @@ module KirguduBase
 		module DynamicTransactions
 			def kb_transaction_injection(&block)
 				@kirgudu_base_transaction_injections ||= []
-				entry = ::KirguduBase::DynamicTransactions::TransactionInjectionBuilder.new(&block).to_injection
+				entry = ::KirguduBase::Dynamic::Transactions::InjectionBuilder.new(&block).to_injection
 				@kirgudu_base_transaction_injections << entry
 				#raise "Transaction Injections #{@kirgudu_base_transaction_injections.to_json}"
 			end

data/app/helpers/kirgudu_base/controllers/obligatory_filters.rb

@@ -7,7 +7,7 @@ module KirguduBase
 
 				@kirgudu_base_obligatory_filters = {} unless @kirgudu_base_obligatory_filters
 
-				entry = ::KirguduBase::DynamicFilters::ObligatoryFilterBuilder.new(name, &block).to_filter
+				entry = ::KirguduBase::Dynamic::DataFilters::ObligatoryFilterBuilder.new(name, &block).to_filter
 				@kirgudu_base_obligatory_filters[entry.name] = entry unless @kirgudu_base_obligatory_filters[entry.name]
 			end