check get current page

@@ -3,6 +3,11 @@ module Kanjai
 
 
 		attr_reader :domain, :lang, :url
 		attr_reader :domain, :lang, :url
 
 
+		PAGE_ID = 0
+		PARENT_PAGE_ID=1
+		PAGE_URL=2
+		PAGE_DATA_ID=3
+
 		def initialize(domain:, lang:, url:)
 		def initialize(domain:, lang:, url:)
 			@domain = domain
 			@domain = domain
 			@lang = lang
 			@lang = lang
@@ -14,65 +19,35 @@ module Kanjai
 			root_page = nil			
 			root_page = nil			
 			page_datum = nil
 			page_datum = nil
 
 
-			params = {}
-
-			loop do
-				if mas.count  == 0 && page_datum
-					page_url = page_datum.page.menu_url('http', lang)
-					regust_url = "/#{lang}#{url}"
-
-					page_url_mas = page_url.split('/')
-					regust_url_mas = regust_url.split('/')
-					page_url_mas.each_with_index do |segment, index|
-						if segment == ':param'
-							page_url_mas[index] = regust_url_mas[index]
-							params[:param] = regust_url_mas[index]
-						end
-					end
 
 
-					if page_url_mas.join('/') != regust_url_mas.join('/')
-						page_datum = nil
-					end
-				end
-
-				break if mas.count == 0
-
-				check_length = mas.count
+			params = {}
 
 
-				loop do
-					break if check_length <= 0
+			page_urls = prepare_data
+			record = page_urls.select{|item| item[:url] == url }.first
+			if record
+				page_datum = Kanjai::PageDatum.find(record[:data_id])
+			else
+				collection = page_urls.select{|item| item[:url].to_s.include?(':param') }
+				collection.each do |item|
+					if page_datum.nil?
+						mas_url = url.split('/')
+						mas_item_url = item[:url].split('/')
+
+						if mas_url.count == mas_item_url.count
+							mas_item_url.each_with_index do |segment, index|
+								if segment == ':param'
+									mas_item_url[index] = mas_url[index]
+									params[:param] = mas_url[index]
+								end
+							end
 
 
-					work_url = mas[0...check_length].join('/')
-					work_url = '/' if work_url.to_s.empty?
-					sheck_scope = scope
-					if root_page
-						page_ids = [].tap do |n|
-							root_page.walk_tree do |page, level|
-								n << page.id
+							if mas_url == mas_item_url
+								page_datum = Kanjai::PageDatum.find(item[:data_id])
 							end
 							end
-						end
-						sheck_scope = sheck_scope.where(kanjai_pages: {id: page_ids})
-					end
 
 
-					page_datum = sheck_scope.find_by(url: work_url)
-					page_datum = sheck_scope.find_by(url: "/#{work_url}") if page_datum.nil?
-					page_datum = sheck_scope.find_by(url: "#{work_url}/") if page_datum.nil?
-					page_datum = sheck_scope.find_by(url: "/#{work_url}/") if page_datum.nil?
-					page_datum = sheck_scope.find_by(url: ":param") if page_datum.nil? && check_length == 1
-
-					if page_datum
-						root_page = page_datum.page
-						mas = mas.last(mas.count - check_length)
-						break
-					else
-						check_length -= 1
+						end
 					end
 					end
 				end
 				end
-				break if page_datum.nil?
-			end 
-
-			if page_datum.nil? && url == '/'
-				page_datum = scope.find_by(url: url)
 			end
 			end
 
 
 			{page: page_datum, params: params}
 			{page: page_datum, params: params}
@@ -81,7 +56,31 @@ module Kanjai
 		private
 		private
 
 
 		def scope
 		def scope
-			@scope ||= PageDatum.joins(page: :domain).where(lang: lang, kanjai_domains: {id: domain.id})
+			@scope ||= domain.pages.joins("left join kanjai_page_data on kanjai_pages.id = kanjai_page_data.page_id and kanjai_page_data.lang='#{lang}'").pluck(:id, :parent_id, 'kanjai_page_data.url', "kanjai_page_data.id")
+		end
+
+		def prepare_data
+			[].tap do |n|
+				scope.each do |item|
+				  url = ((item[PAGE_URL].to_s.first == '/' ? [] : generate_url(item[PARENT_PAGE_ID])) + [item[PAGE_URL]]).flatten.reject { |e| e.nil? || e&.empty? || e.to_s == '/' }.join('/')
+				  url = '/' + url if url.to_s.present? && url.first != '/'
+				  n << {
+				    id: item[PAGE_ID],
+				    data_id: item[PAGE_DATA_ID],
+				    url: url
+				  }
+				end
+			end
+		end
+
+		def generate_url(parent_id)
+		  url = []
+		  if parent_id
+		    parent_item = scope.select{|item| item[PAGE_ID] == parent_id }.first
+		    url = [parent_item[PAGE_URL]] + url
+		    url = (parent_item[PAGE_URL].to_s.first == '/' ? [] : generate_url(parent_item[PARENT_PAGE_ID])) + url
+		  end
+		  return url
 		end
 		end
 
 
 	end
 	end

 module Kanjai
 module Kanjai
-  VERSION = "0.0.359"
+  VERSION = "0.0.360"
 end
 end