kirgudu_base 0.0.21 → 0.0.22

data/app/assets/{stylesheets/kirgudu_base/admin/good → templates/kirgudu_base/admin/zapanel/stylesheets}/uploadify.css

@@ -71,7 +71,7 @@ Released under the MIT License <http://www.opensource.org/licenses/mit-license.p
 	background-color: #FDE5DD !important;
 }
 .uploadify-queue-item .cancel a {
-	background: url('../img/uploadify-cancel.png') 0 0 no-repeat;
+	background: url('/assets/kirgudu_base/admin/zapanel/images/uploadify/uploadify-cancel.png') 0 0 no-repeat;
 	float: right;
 	height:	16px;
 	text-indent: -9999px;

data/app/controllers/kirgudu_base/admin_controller.rb

@@ -2,17 +2,9 @@
 
 
 module KirguduBase
-
-	class AdminController < ::KirguduBase::ApplicationController
-
+	class AdminController < ::KirguduBase::DynamicPagesController
 		before_action :authenticate_user
 
-		layout "/layouts/application"
-
-
-		def left_menu_path
-			"/admin/kirgudu_base/left_menu"
-		end
 
 		def current_entry
 			@entry
@@ -21,13 +13,12 @@ module KirguduBase
 
 		include KirguduBase::GuiHelper
 
-
 		protected
 
 		rescue_from ActiveRecord::RecordNotFound do
-			flash[:error] = I18n.t("#{self.to_i18n}.entry_not_found", entry_id: params[:id])
+			@local_data = I18n.t("#{self.to_i18n}.errors.entry_not_found", entry_id: params[:id])
 			respond_to do |format|
-				format.html { render_redirect url_for(action: 'index') }
+				format.html { render_redirect self.to_url_for(:index) }
 				format.json { render_json_not_found(message: flash[:error]) }
 			end
 		end
@@ -35,12 +26,14 @@ module KirguduBase
 		protected
 
 		def before_entry_create(entry, filter_params, options)
-			entry.creator = @current_user if entry.respond_to?(:creator)
-			entry.updater = @current_user if entry.respond_to?(:updater)
+			super(entry, filter_params, options)
+			entry.creator = self.current_user if entry.respond_to?(:creator)
+			entry.updater = self.current_user if entry.respond_to?(:updater)
 		end
 
 		def before_entry_update(entry, filter_params, options)
-			entry.updater = @current_user if entry.respond_to?(:updater)
+			super(entry, filter_params, options)
+			entry.updater = self.current_user if entry.respond_to?(:updater)
 		end
 	end
 end

data/app/controllers/kirgudu_base/application_controller.rb

@@ -3,73 +3,63 @@ module KirguduBase
 	class ApplicationController < ActionController::Base
 
 
-		include ::KirguduBase::UrlHelper
-		include ::KirguduBase::BreadcrumbsHelper
-		include ::KirguduBase::ApplicationHelper
+		########################################################################################
+		############################## Extending Controller ####################################
+		########################################################################################
+
+		# DynamicPages Helper
+		extend ::KirguduBase::Controllers::DynamicPages::Class
+		include ::KirguduBase::Controllers::DynamicPages::Instance
 
-		extend ::KirguduBase::Controllers::DynamicPages
+		# DynamicTransactions Helper
 		extend ::KirguduBase::Controllers::DynamicTransactions
+
+		# ObligatoryFilters Helper
 		extend ::KirguduBase::Controllers::ObligatoryFilters
 
 
-		before_action :initialize_global_variables
 
-		after_action :rails_log_after # filter: last - 1
-		after_action :request_finished # filter: last
+		include ::KirguduBase::UrlHelper
+		include ::KirguduBase::BreadcrumbsHelper
+		include ::KirguduBase::ApplicationHelper
 
 
-		kb_transaction_injection do
-			method :before_entry_create
-			action :create
-			flow_position :before_save
-		end
+		########################################################################################
+		#########################      Before&After Actions      ###############################
+		########################################################################################
 
-		kb_transaction_injection do
-			method :before_entry_update
-			action :update
-			flow_position :before_save
-		end
 
+		before_action :request_started # first filter of request
+		before_action :initialize_global_variables
 
-		def entry_class
-			self.class.get_kb_entry_class
-		end
 
-		def initialize_global_variables
+		after_action :request_finished # last filter of request
 
-			@current_user = get_current_user
+		########################################################################################
+		##############################      Views Paths      ###################################
+		########################################################################################
 
-			@settings_manager = ::KirguduBase::Settings::SettingsManager.new
+		# template path
+		kb_template_path "kirgudu_base/admin/zapanel"
+		# layout view pathes
+		kb_views_paths_layout "layouts/application"
+		# action views pathes
+		kb_views_paths_dashboard "common/dashboard"
+		kb_views_paths_index "common/index"
+		kb_views_paths_new "common/new"
+		kb_views_paths_edit "common/edit"
+		kb_views_paths_delete "common/delete"
+		kb_views_paths_show "common/show"
+		kb_views_paths_management "/common/management"
+		kb_views_paths_sorting "/common/sorting"
+		# common views pathes
+		kb_views_paths_entry_not_found "shared/entry_not_found"
+		kb_views_paths_404_page "shared/page_404"
 
-			default_host_to_set = request.host
-			default_host_to_set += ":#{request.port}" if  request.port && request.port != 80
 
-			Rails.application.routes.default_url_options[:host] = default_host_to_set
 
 
-			I18n.locale = :ru
-			#@string_logger.info("\tHOST: #{request.host}") if @string_logger
-			#@string_logger.info("\tLOCALE: #{I18n.locale}") if @string_logger
-			#@current_user = get_current_user
-			#@string_logger.info("\tUSER#{@current_user}") if @string_logger
 
-			WillPaginate.per_page = 20
-			#will_paginate_count = @settings_manager.get('will_paginate')
-			#WillPaginate.per_page = will_paginate_count if will_paginate_count
-		end
-
-
-		def authenticate_user
-			unless @current_user
-				session[:user_id] = nil
-				session[:back_url] = request.url
-				#params[:back_url] = request.path
-				respond_to do |format|
-					#format.js { render partial: "sessions/login", layout: false}
-					format.html { redirect_to ::KirguduBase.authentications_controller.to_url_for(:login) }
-				end
-			end
-		end
 
 
 		def page_for_default_redirection_after_login
@@ -84,17 +74,26 @@ module KirguduBase
 				               when "xml"
 					               "text/xml"
 			               end
-			headers["Content-Type"] = content_type
+			self.headers["Content-Type"] = content_type if content_type
 		end
 
 
+
+		def entry_class
+			self.class.get_kb_entry_class
+		end
+
+
+
+
+
 		#########################################################################################################################
 		######################################            Breadcrumbs             ###############################################
 		#########################################################################################################################
 
 
 		def render *args
-			self.create_breadcrumbs
+			self.render_breadcrumbs
 
 			#raise "BreadCrumbs: #{self.create_breadcrumbs}"
 
@@ -102,7 +101,7 @@ module KirguduBase
 		end
 
 
-		def create_breadcrumbs
+		def render_breadcrumbs
 			#if self.class.respond_to?(:dashboard_controller_class_name)
 			#	if self.class.to_s == self.class.dashboard_controller_class_name.to_s
 			#		add_new_breadcrumb(I18n.t("#{self.class.dashboard_controller_class_name.to_i18n}.index.title"))
@@ -113,7 +112,7 @@ module KirguduBase
 		end
 
 		def add_new_breadcrumb(label, path = nil)
-			self.breadcrumbs << {label: label, url: path}
+			self.kb_breadcrumbs << {label: label, url: path}
 		end
 
 
@@ -121,12 +120,12 @@ module KirguduBase
 			#string_logger.info("BREADCRUMBS: #{breadcrumbs}")
 		end
 
-		def breadcrumbs
-			@breadcrumbs ||= []
+		def kb_breadcrumbs
+			@kb_breadcrumbs ||= []
 		end
 
 		def breadcrumbs_length
-			self.breadcrumbs.length
+			self.kb_breadcrumbs.length
 		end
 
 
@@ -158,10 +157,6 @@ module KirguduBase
 		###############################            Routes Generator  Methods             ########################################
 		#########################################################################################################################
 
-		#include ActionView::Helpers
-		#include ActionDispatch::Routing
-		#include Rails.application.routes.url_helpers
-
 		def self.to_url_for(action, options = {})
 			options ||= {}
 			options.merge!(
@@ -174,14 +169,12 @@ module KirguduBase
 
 		def to_url_for(action = nil, options = {})
 			self.class.to_url_for(action, options)
-			#options ||= {}
-			#options.merge!(
-			#	controller: self.to_route_path,
-			#	action: action || :index
-			#)
-			#Rails.application.routes.url_helpers.url_for(options)
 		end
 
+		#########################################################################################################################
+		####################################            Routes Injection             ############################################
+		#########################################################################################################################
+
 
 		#########################################################################################################################
 		#####################################             Strong Parameters           ###########################################
@@ -218,28 +211,20 @@ module KirguduBase
 
 		def get_filters_for_list(list, source)
 			result = {}
-
-			list.filters.each do |filter|
-				source_value = source[filter.name]
-				if [:autocomplete, :autocomplete_with_id, :text_edit, :select, :chosen_select].include?(filter.input_type)
-					if source_value
-						source_value.strip!
-						source_value = nil if source_value.blank?
+			if list
+				list.filters.each do |filter|
+					source_value = source[filter.name]
+					if [:autocomplete, :autocomplete_with_id, :text_edit, :select, :chosen_select].include?(filter.input_type)
+						if source_value
+							source_value.strip!
+							source_value = nil if source_value.blank?
+						end
 					end
-				end
-				result[filter.name] = source_value if source_value
-			end if list.filters
+					result[filter.name] = source_value if source_value
+				end if list.filters
 
-			begin
-				source_value = source[:page]
-				result[:page] = source_value.to_i if source_value
-			rescue
-			end
-
-			begin
-				source_value = source[:per_page]
-				result[:per_page] = source_value.to_i if source_value
-			rescue
+				result[:page] = source[:page].to_i rescue nil
+				result[:per_page] = source[:per_page] rescue nil
 			end
 			result
 		end
@@ -267,6 +252,7 @@ module KirguduBase
 				method_result = controller_class.send(method_name, *method_args) if controller_class.respond_to?(method_name)
 				return method_result if method_result
 			end
+			method_result
 		end
 
 		#########################################################################################################################
@@ -293,187 +279,7 @@ module KirguduBase
 			transaction_is_ok
 		end
 
-		#########################################################################################################################
-		###############################            Strong Parameters Filters Methods            ########################################
-		#########################################################################################################################
-
-		def class_strong_filters(list)
-
-			strong_filters = {}
 
-			list.filters.each do |filter|
-				#raise "Found Filter for list: #{filter}"
-				strong_filters[filter.name] = params[filter.name] if params[filter.name]
-			end if list.filters
-
-			strong_filters
-		end
-
-		#########################################################################################################################
-		###############################            Obligatory Filters Methods            ########################################
-		#########################################################################################################################
-
-
-		def fill_obligatory_filters(filters, options = {})
-			options ||= {}
-
-			classes_to_process = self.get_class_hierarchy
-
-			classes_to_process.each do |kontroller_klass|
-				kontroller_klass.get_kb_obligatory_filters.each do |filter|
-					execute_flag = true
-
-					if filter.only && filter.only.length > 0
-						execute_flag = false
-						filter.only.each do |item|
-							if item == self.action.to_sym
-								execute_flag = true
-							end
-						end
-					end
-					if filter.skip && filter.skip.length > 0
-						filter.skip.each do |item|
-							if item == self.action.to_sym
-								execute_flag = false
-							end
-						end
-					end
-					filters[filter.name] = self.send(filter.source_method) if execute_flag
-				end if kontroller_klass.respond_to?(:get_kb_obligatory_filters)
-			end
-			#raise "Obligatory Filters: #{filters.to_json}"
-		end
-
-		#########################################################################################################################
-		################################             Data For Controls Methods            #######################################
-		#########################################################################################################################
-
-
-		def load_data_for_entry_controls(form, entry, options = {})
-			controls_data = {}
-
-
-			form.properties.values.select { |p| !p.data_source.nil? }.each do |property|
-				if property.data_source
-					controls_data[property.name] = if property.data_source.type == :db || property.data_source.type == :jquery_db
-						                               filters = {}
-						                               parent_value = nil
-						                               if property.parent
-							                               parent_value = entry[property.parent]
-							                               filters[property.parent] = parent_value
-						                               end
-
-						                               self.fill_obligatory_filters(filters, options)
-						                               filters.merge!({
-							                                              per_page: 9999999,
-							                                              page: 1
-						                                              })
-						                               property.data_source.model.get_entries(nil, filters, options).map { |u| [u.send(property.data_source.label_property), u.send(property.data_source.value_property)] } if property.parent.nil? || parent_value
-						                           elsif property.data_source.type == :i18n
-
-						                           elsif property.data_source.type == :enum
-							                           property.data_source.model.to_select
-						                           elsif property.data_source.type == :array
-							                           property.data_source.model.map { |i| i.is_a?(Array) ? [i[0], i[0]] : [i, i] }
-						                           end
-				end
-			end if form.properties
-			controls_data
-		end
-
-		def load_data_for_filters_controls(list, values_source, options = {})
-			controls_data = {}
-
-			list.filters.select { |f| !f.data_source.nil? }.each do |filter|
-
-				controls_data[filter.name] = if filter.data_source.type == :db || filter.data_source.type == :jquery_db
-					                             filters = {}
-					                             if filter.parent
-						                             parent_value = values_source[filter.parent]
-						                             filters[filter.parent] = values_source[filter.parent] if parent_value
-					                             end
-					                             fill_obligatory_filters(filters, options)
-					                             filters.merge!({
-						                                            per_page: 9999999,
-						                                            page: 1
-					                                            })
-					                             filter.data_source.model.get_entries(nil, filters, options).map { |u| [u.send(filter.data_source.label_property), u.send(filter.data_source.value_property)] }
-					                         elsif filter.data_source.type == :i18n
-
-					                         elsif filter.data_source.type == :enum
-						                         filter.data_source.model.to_select
-					                         elsif filter.data_source.type == :array
-						                         filter.data_source.model
-					                         end
-
-			end if list.filters
-			controls_data
-		end
-
-
-		#def fill_parents_for_local_data(local_data, filters)
-		#	if local_data && local_data.is_a?(Hash)
-		#		controllers_hierarchy = ::ChupakabraTools::ClassHelper.get_controller_hierarchy(self.class)
-		#
-		#		local_data[:parent_elements] = {}
-		#
-		#		controllers_hierarchy.each do |ctrler|
-		#			if ctrler.respond_to?(:get_kb_parents)
-		#				parent_controllers = ctrler.get_kb_parents
-		#				parent_controllers.each do |pk|
-		#					local_data[:parent_elements][pk[:id]] = pk[:controller].get_kb_entry_class.get_entry_by_id(params[pk[:id]], filters, {logger: string_logger})
-		#				end if parent_controllers
-		#			else
-		#				break
-		#			end
-		#		end
-		#
-		#		#raise "Parent Elements: #{local_data[:parent_elements]}"
-		#
-		#		local_data[:parent_ids] = {}
-		#
-		#
-		#		local_data[:parent_elements].each_pair do |key, element|
-		#			local_data[:parent_ids][key] = element.id
-		#		end
-		#	end
-		#end
-
-
-		def fill_parents_for_local_data(local_data, filters)
-			local_data[:parents] = []
-			local_data[:parent_elements] = {}
-			local_data[:parent_ids] = {}
-
-			if local_data && local_data.is_a?(Hash)
-				controllers_hierarchy = ::ChupakabraTools::ClassHelper.get_controller_hierarchy(self.class)
-
-				controllers_hierarchy.each do |ctrler|
-					if ctrler.respond_to?(:get_kb_parents)
-						parent_controllers = ctrler.get_kb_parents
-						parent_controllers.each do |pk|
-							parent_entry = pk[:controller].get_kb_entry_class.get_entry_by_id(params[pk[:id]], filters, {logger: string_logger})
-							parent_hash = {
-								controller: pk[:controller],
-								entry: parent_entry,
-								id_param: pk[:id],
-								id_value: parent_entry.id
-							}
-							local_data[:parents] << parent_hash
-						end if parent_controllers
-
-						parent_controllers.each do |pk|
-							local_data[:parent_elements][pk[:id]] = pk[:controller].get_kb_entry_class.get_entry_by_id(params[pk[:id]], filters, {logger: string_logger})
-						end if parent_controllers
-
-					end
-				end
-				#raise "Parent Elements: #{local_data[:parent_elements]}"
-				local_data[:parent_elements].each_pair do |key, element|
-					local_data[:parent_ids][key] = element.id
-				end
-			end
-		end
 
 		#########################################################################################################################
 		######################################            Locale Methods            #############################################
@@ -544,16 +350,196 @@ module KirguduBase
 			#end
 		end
 
+		def get_best_locale
+			locale = request.env['HTTP_ACCEPT_LANGUAGE'].scan(/^[a-z]{2}/).first.to_sym
+			if I18n.available_locales.include?(locale)
+				locale
+			else
+				I18n.default_locale
+			end
+		end
+
 
 		def prepare_applications_data
 
 		end
 
+
+		#########################################################################################################################
+		#####################################            Global Variables            ############################################
+		#########################################################################################################################
+
+		# called in before_action in ::KirguduBase::ApplicationController
+		def initialize_global_variables
+
+			@template_path = self.class.get_method_latest_result(:get_kb_template)
+
+			@settings_manager = ::KirguduBase::Settings::SettingsManager.new
+
+			default_host_to_set = request.host
+			default_host_to_set += ":#{request.port}" if  request.port && request.port != 80
+
+			Rails.application.routes.default_url_options[:host] = default_host_to_set
+
+			if Rails.env.development?
+				I18n.locale = :ru
+			end
+
+			WillPaginate.per_page = 20
+		end
+
+		#########################################################################################################################
+		####################################       Current User To Override          ############################################
+		#########################################################################################################################
+
+		# method for Ability
+		def current_user
+			@current_user
+		end
+
+		def current_user= value
+			@current_user = value
+		end
+
+		def current_user_symbol
+			:user_id
+		end
+
+		#########################################################################################################################
+		#######################################            Current User            ##############################################
+		#########################################################################################################################
+
+
+		def current_user_set_info(user, remember_me = nil)
+			#logger.info("USER is ::KirguduBase::Security::User") if user && user.is_a?(::KirguduBase::Security::User)
+			self.current_user = user
+			self.session[self.current_user_symbol] = user.id
+			self.session[:"#{self.current_user_symbol}_expire"] = DateTime.now.utc + 1.day
+			self.session[:"#{self.current_user_symbol}_remember_me"] = remember_me
+			#logger.info("Session[:user_id]=#{self.session[:user_id]}")
+		end
+
+		def current_user_clear_info
+			self.current_user = nil
+			self.session[self.current_user_symbol] = nil
+			self.session[:"#{self.current_user_symbol}_expire"] = DateTime.now.utc - 1.day
+			self.session[:"#{self.current_user_symbol}_remember_me"] = false
+		end
+
+		def current_user_query_db(user_id)
+			::KirguduBase::Security::User.where(id: user_id).first if user_id
+		end
+
+		def authenticate_user
+			time_now = DateTime.now.utc
+			user_remember_me = self.session[:"#{self.current_user_symbol}_remember_me"]
+			slided_expire_time = time_now + (user_remember_me ? 2.weeks : 1.day)
+			user_session_expire = self.session[:"#{self.current_user_symbol}_expire"] || slided_expire_time
+			user_id = self.session[self.current_user_symbol]
+
+			if  user_session_expire < time_now
+				logger.info("User Session Expired. Expire At: #{user_session_expire}")
+				#raise "Session Expired #{user_session_expire}, #{self.session[:"#{self.current_user_symbol}_expire"]}"
+				self.current_user_clear_info
+			else
+				if user_id
+					logger.info("User ID: #{user_id}")
+					logger.info("Slided Expire At: #{slided_expire_time}")
+					self.current_user = self.current_user_query_db(user_id)
+					self.session[:"#{self.current_user_symbol}_expire"] = slided_expire_time
+				else
+					logger.info("User ID is null")
+					self.current_user_clear_info
+				end
+			end
+
+			logger.info("Current User is null") if self.current_user.nil?
+			logger.info("Current User: #{self.current_user.full_name}") unless self.current_user.nil?
+
+
+			if self.current_user.nil? || self.current_user.deletion_status_id != ::ChupakabraTools::DeletionStatus.id_by_tag(:actual)
+				logger.info("1Current User is null") if self.current_user.nil?
+				#logger.info("1Current User deletion_status_id: #{::ChupakabraTools::DeletionStatus[self.current_user.deletion_status_id]}") unless self.current_user.deletion_status_id == ::ChupakabraTools::DeletionStatus.id_by_tag(:actual)
+				self.current_user_clear_info
+				self.session[:return_to] = request.url
+				respond_to do |format|
+					format.json { render_json_need_authentication }
+					format.html { redirect_to self.get_url_to_redirect_for_authentication }
+				end
+			end
+
+			logger.info("User Authentications is Complete")
+			logger.info("Current User is null") if self.current_user.nil?
+			#logger.info("Current User deletion_status_id: #{::ChupakabraTools::DeletionStatus[self.current_user.deletion_status_id]}") unless ::ChupakabraTools::DeletionStatus.id_by_tag(:actual)
+			logger.info("Current User: #{self.current_user.full_name}") unless self.current_user.nil?
+		end
+
+		def get_url_to_redirect_for_authentication
+			auth_controller = ::KirguduBase.authentications_controller
+			raise "Put in 'intializers' value for 'KirguduBase.authentications_controller' or override 'get_url_to_redirect_for_authentication' method" unless auth_controller
+
+			if auth_controller.is_a?(String)
+				auth_controller = eval(auth_controller)
+			end
+			auth_controller.to_url_for(:login)
+		end
+
+
+		##############################################################################################
+		#####################################   Views Paths    #######################################
+		##############################################################################################
+
+		def get_template_path
+			self.class.get_method_latest_result(:get_kb_template);
+		end
+
+		def get_view_path(view_name, include_template = true)
+			view_path = self.class.get_method_latest_result(:get_kb_view_path, view_name)
+			view_path ||= self.get_view_default_path(view_name)
+			template_path = ""
+			template_path = self.get_template_path if include_template
+
+			include_template ? "#{template_path}/#{view_path}" : "#{view_path}"
+		end
+
+		def get_layout_path(include_template = true)
+			self.get_view_path(:layout, include_template)
+		end
+
+		def get_view_default_path(view_name)
+			defaults = {
+				layout: "layouts/application",
+				page_404: "shared/page_404",
+				entry_not_found: "shared/entry_not_found",
+				index: "common/index",
+				new: "common/new",
+				edit: "common/edit",
+				delete: "common/delete",
+				show: "common/show",
+				management: "common/management",
+				sorting: "common/sorting",
+			    dashboard: "common/dashboard"
+			}
+			defaults[view_name]
+		end
+
+
+		##############################################################################################
+		#############################################          #######################################
+		##############################################################################################
+
 		def string_logger
 			@string_logger
 		end
 
-		protected
+		def string_logger= value
+			@string_logger = value
+		end
+
+		##############################################################################################
+		#############################################          #######################################
+		##############################################################################################
+
 
 		def update_url_with_ajax_referer_url
 			if params[:current_url]
@@ -574,20 +560,6 @@ module KirguduBase
 		end
 
 
-		def get_best_locale
-			locale = request.env['HTTP_ACCEPT_LANGUAGE'].scan(/^[a-z]{2}/).first.to_sym
-			if I18n.available_locales.include?(locale)
-				locale
-			else
-				I18n.default_locale
-			end
-		end
-
-		# method for Ability
-		def current_user
-			@current_user
-		end
-
 		def system_logging_init
 			#@logging_options = Hash.new
 			#
@@ -778,7 +750,7 @@ module KirguduBase
 		end
 
 
-		def e404
+		def render_page_e404
 			respond_to do |format|
 				format.html { render :template => 'layouts/404', :status => 404 }
 				format.all { render :nothing => true, :status => "404" }
@@ -810,63 +782,23 @@ module KirguduBase
 		# ************************************** PRIVATE METHODS ****************************************
 		# ***********************************************************************************************
 		private
-		def get_current_user
-			if session[:user_id]
-				::KirguduBase::Security::User.where(id: session[:user_id]).first
-			end
-		end
 
 
 		def debugger_before_action
-			#string_logger.info("Params: #{params.to_json}")
-			if @logging_options[:status] == true
 
-			end
 		end
 
 		def debugger_after_action
-			if @logging_options[:status] == true
-				system_logging_write_event("", ::SystemZone::Logging::Event::LEVEL_DEBUG, response.body)
-				system_logging_write_event("", ::SystemZone::Logging::Event::LEVEL_TIME, response.body)
-			end
-		end
-
-		def rails_log_before
-			@string_logger.debug("BEGIN #{self.class}.#{self.action_name}") if @string_logger
-			@string_logger.depth_up if @string_logger
-			@string_logger.debug("\tPARAMS: #{params.to_json}") if @string_logger
-			@string_logger.debug("\tREQUEST FORMAT: #{request.format}") if @string_logger
-			@string_logger.debug(" ") if @string_logger
-
 
 		end
 
-		def rails_log_after
-			@string_logger.depth_down if @string_logger
-			@string_logger.debug ("END") if @string_logger
-			@string_logger.debug "*********************************************************************************" if @string_logger
-		end
-
 
 		def request_started
-			@string_logger = ::ChupakabraTools::Logging::StringLogger.new
-		end
-
-		def request_finished
-			#string_logger.log_data.each do |d|
-			#	logger.info(d[:data])
-			#end
-		end
-
-
-		def before_entry_create(entry, filter_params, options)
 
 		end
 
-		def before_entry_update(entry, filter_params, options)
+		def request_finished
 
 		end
-
-
 	end
 end