rails_blocks 0.9.0.beta.4 → 0.9.0.beta.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03e2b58cf290941dd680f6e0d7893c5ad06ccaed98e6f6549f9c24876204e9aa
-  data.tar.gz: 5d5fda3dc88c986ea65c00f5291874c3e17f9b5712f42540be04c77f9e8e4fa9
+  metadata.gz: bc74656544b8c832b8a27f558279e3e9ee410e7572c22dbc03227b8b058ec2f0
+  data.tar.gz: d040fa04f369046ee122bf644acfb05949a0fa182f623ae3930c2333d079c4c9
 SHA512:
-  metadata.gz: 837d083a5707d595483fc788b169c44ae9cda7db9ed35a5727f70330b4753980ee1e3da6fb173bc6aa633cf04b6d9afc0ce003569b63acd725ea7bba2ccfb82b
-  data.tar.gz: e0e8e4a89613e8859d2a5e6af26d543963418e56ee87aaa0ec921578c1967e779785308bba035efea81ef058cb81d14fc7e5a6195868d468601889a859d2c81a
+  metadata.gz: 25e2b23f1803c200a8e75da1b4944b9733e2feb2c4bb4a326a7c4133a88c52e2653a13b5aa81e28a2e8cc1e581c1e1947006573fd0798cabef1f47c63dfda492
+  data.tar.gz: 56545688413c6e6c66f9180421cdd6d25e3f0e1bcebc74b3b88fe838bca4ab373367fcf7fe8e66c0b7606c4233bccc927b2f3e56d118c6a492edb7f3708b6140

data/app/helpers/block_helper.rb

@@ -16,21 +16,21 @@ end
 module BlockHelper
 	include RailsBlocks::Path
 	include RailsBlocks::Names
-	
+
 	BEM_KEYS = [:tag, :class, :attrs, :mods, :mix, :data, :levels, :content]
-	
+
 	def bem_page(options, &block)
 		@page_options = options
 		block_given? ? capture(&block) : ''
 	end
-	
+
 	def page_options
 		defaults = {
 			levels: RailsBlocks.config.levels
 		}
 		defaults.merge @page_options || {}
 	end
-	
+
 	#TODO бога ради, отрефактори это дерьмо
 	def b(b_name, options = {}, &block)
 		options = page_options.merge options
@@ -41,7 +41,7 @@ module BlockHelper
 		pop_context_block
 		result
 	end
-	
+
 	def b_classes(b_name, options = {})
 		parent_block = context_block
 		push_context_block b_name, options
@@ -51,14 +51,14 @@ module BlockHelper
 		pop_context_block
 		classes
 	end
-	
+
 	def b_context(b_name, options = {}, &block)
 		push_context_block b_name, options
 		result = capture(&block)
 		pop_context_block
 		result
 	end
-	
+
 	def e(e_name, options = {}, &block)
 		options = page_options.merge options
 		parent_block = options[:b] || context_block
@@ -67,7 +67,7 @@ module BlockHelper
 		template = element_template parent_block, e_name, options
 		entity(template, :elem, e_name, options, &block)
 	end
-	
+
 	def e_classes(e_name, options = {})
 		parent_block = options[:b] || context_block
 		raise RailsBlocks::NoBlockContextError unless parent_block
@@ -75,9 +75,11 @@ module BlockHelper
 		options[:parent_block] = parent_block
 		element_classes(parent_block, e_name, options).join(' ')
 	end
-	
+
 	def entity(template, type, name, options, &block)
+		# p template
 		ctx = RenderContext.new
+		# content = block ? block.call(ctx) : options[:content]
 		content = block ? capture(ctx, &block) : options[:content]
 		ctx.slots.each {|k, v| ctx.rendered_slots[k] = capture(&v)}
 		#важно заполнять публичные поля только после того, как закапчюрится то, что внутри энтити, иначе они перезапишутся.
@@ -85,16 +87,33 @@ module BlockHelper
 		@current_options = options
 		@current_entity = {type: type, name: name}
 		template.nil? ? empty(content) : render(template: template, locals: {content: content, options: options, slots: ctx.rendered_slots})
+
+		# result = nil
+		# if template.nil?
+		# 	result = empty(content&.to_s&.html_safe)
+		# else
+		# 	result = my_render(template: template, locals: {content: content&.to_s&.html_safe, options: options, slots: ctx.rendered_slots})
+		# end
+		# result.html_safe
+	end
+
+	def my_render(opts)
+		p opts[:template]["file"], opts[:locals]
+		if(opts[:template][:template])
+			return opts[:template][:template].render(self, opts[:locals]).html_safe
+		end
+		# return opts[:locals][:content] || 'foo'
 	end
-	
+
 	def empty(content)
+		# content_tag(bem_tag, content, bem_attrs_without_tag, false).html_safe
 		content_tag bem_tag, content, bem_attrs_without_tag
 	end
-	
+
 	def bem_tag
 		bem_attrs[:tag]
 	end
-	
+
 	def bem_attrs
 		if @attrs.nil?
 			@attrs = {class: current_entity_classes.join(' ')}
@@ -106,7 +125,7 @@ module BlockHelper
 
 		@attrs
 	end
-	
+
 	def bem_attrs_without_tag
 		bem_attrs.except :tag
 	end
@@ -129,7 +148,7 @@ module BlockHelper
 		return @current_options[:mix].push(mix) if mix.is_a? Hash
 		@current_options[:mix].push(*mix) if mix.is_a? Array
 	end
-	
+
 	private
 		def current_bem_data
 			data = {}
@@ -158,9 +177,10 @@ module BlockHelper
 		end
 
 		def block_data(name, js)
-			level = block_js_level(context_block, @current_options[:levels])
+			level = block_js_level(name, @current_options[:levels])
 			return {} if !js
-			data = (js == true ? {} : js).merge!({level: level, js_ext: block_js_ext(context_block, level)})
+
+			data = (js == true ? {} : js).merge!({level: level, js_ext: block_js_ext(name, level)})
 			entity_data(name, data)
 		end
 
@@ -190,7 +210,7 @@ module BlockHelper
 		def blocks_stack
 			@blocks_stack = @blocks_stack || []
 		end
-		
+
 		def context_block
 			blocks_stack.last&.fetch(:name, nil)
 		end
@@ -198,11 +218,11 @@ module BlockHelper
 		def context_block_options
 			blocks_stack.last&.fetch(:options, nil)
 		end
-		
+
 		def push_context_block(b_name, options)
 			blocks_stack.push({name: b_name, options: options})
 		end
-		
+
 		def pop_context_block
 			blocks_stack.pop
 		end

data/lib/rails_blocks/names.rb

@@ -1,13 +1,16 @@
 module RailsBlocks
 	module Names
+		@@block_classes_cache = {}
 		def element_classes(b_name, e_name, options = {})
 			base_class = element_class b_name, e_name
 			classes(base_class, false, options)
 		end
 		
 		def block_classes(b_name, options = {})
-			base_class = block_class b_name
-			classes(base_class, true, options)
+			@@block_classes_cache[{type: :block, name: b_name, options: options}] ||= (
+				base_class = block_class b_name
+				classes(base_class, true, options)
+			)
 		end
 
 		def block_name(b_name)

data/lib/rails_blocks/path.rb

@@ -4,7 +4,7 @@ module RailsBlocks
 		include RailsBlocks::Names
 		ELEMENT_FILE_PREFIX = '__'
 		MOD_FILE_PREFIX = '_'
-		
+
 		class << self
 			attr_writer :tree
 		end
@@ -18,11 +18,11 @@ module RailsBlocks
 		def self.reload_tree
 			@tree = build_tree
 		end
-		
+
 		def self.blocks_dir
 			Rails.root.join RailsBlocks.config.blocks_dir
 		end
-		
+
 		def block_template(b_name, options = {})
 			options[:levels].reverse.each do |level|
 				next unless Path.tree[level][b_name]
@@ -31,6 +31,15 @@ module RailsBlocks
 			nil
 		end
 
+		def block_template_precompiled
+
+		end
+
+		def element_template_precompiled
+
+		end
+
+
 		def block_js_level(b_name, levels)
 			return levels.reverse.find do |level|
 				Path.tree.dig(level, b_name, :js)
@@ -40,7 +49,7 @@ module RailsBlocks
 		def block_js_ext(b_name, level)
 			return Path.tree.dig(level, b_name, :js_ext)
 		end
-		
+
 		def element_template(b_name, e_name, options = {})
 			options[:levels].reverse.each do |level|
 				next unless Path.tree[level][b_name]
@@ -49,13 +58,13 @@ module RailsBlocks
 			end
 			nil
 		end
-		
+
 		private
 			def mod(options)
 				return '' unless options[:mods] && !options[:mods].empty?
 				mod_class(*options[:mods].first)
 			end
-			
+
 			def get_block_dir(b_name, levels)
 				levels.reverse.each do |level|
 					block_dir = File.join(self.blocks_dir, level, b_name)
@@ -65,19 +74,35 @@ module RailsBlocks
 				end
 				nil
 			end
-			
+
 			def self.build_tree
 				file_tree
 			end
-			
+
 			def self.file_tree
+				# p '****' * 20
+				# Slim::Engine.set_options
+
 				t = {}
 				engine_ext = RailsBlocks.config.template_engine
 				files = Dir["#{blocks_dir}/**/*#{engine_ext}"]
 				files.each do |file|
+					# p file
+					# template = Tilt.new(file,
+					# 	use_html_safe: true,
+					# 	sort_attrs: false,
+					# 	attr_quote: "'",
+					# 	hyphen_underscore_attrs: true,
+					# 	pretty: false,
+					# 	streaming: false,
+					# 	disable_escape: true,
+					# 	disable_capture: true
+					# )
+					# p template if file.include?('header.html.slim')
 					file.sub! blocks_dir.to_s + '/', ''
 					file.sub! '.html' + engine_ext, ''
-					
+
+
 					parts = file.split('/')
 					filename = File.basename(file, engine_ext)
 					filename = File.basename(filename, '.html')
@@ -85,12 +110,19 @@ module RailsBlocks
 					level, block = parts
 					t[level] ||= {}
 					block_def = (t[level][block] ||= {elements: {}})
-					
+
 					if is_e_file(filename)
 						block_def[:elements][get_e_name(filename)] ||= {}
 						block_def[:elements][get_e_name(filename)][get_e_mod(filename)] = file
+
+						# block_def[:elements][get_e_name(filename)][get_e_mod(filename)] ||= {}
+						# block_def[:elements][get_e_name(filename)][get_e_mod(filename)][:file] ||= file
+						# block_def[:elements][get_e_name(filename)][get_e_mod(filename)][:template] ||= template
 					else
 						block_def[get_b_mod(filename)] = file
+						# block_def[get_b_mod(filename)] ||= {}
+						# block_def[get_b_mod(filename)][:file] = file
+						# block_def[get_b_mod(filename)][:template] = template
 					end
 				end
 				add_js(t)
@@ -112,24 +144,23 @@ module RailsBlocks
 					block_def[:js] = true
 					block_def[:js_ext] = ext[1..-1]
 				end
-				p t
 			end
-			
+
 			def self.is_e_file(file)
 				file.start_with? ELEMENT_FILE_PREFIX
 			end
-			
+
 			def self.get_e_name(file)
 				file.match(/\A__([^_]*)/)
 				$1
 			end
-			
+
 			def self.get_e_mod(file)
 				return '' unless file.match(/__\w+#{MOD_FILE_PREFIX}\w/)
 				file.match(/\A__(?:[^_]*)_(.*)/)
 				$1
 			end
-			
+
 			def self.get_b_mod(file)
 				return '' unless file.start_with? MOD_FILE_PREFIX
 				file.match(/^_(.*)/)

data/lib/rails_blocks/version.rb

@@ -1,3 +1,3 @@
 module RailsBlocks
-	VERSION = "0.9.0.beta.4".freeze
+	VERSION = "0.9.0.beta.5".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_blocks
 version: !ruby/object:Gem::Version
-  version: 0.9.0.beta.4
+  version: 0.9.0.beta.5
 platform: ruby
 authors:
 - Andrey Potetiurin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-17 00:00:00.000000000 Z
+date: 2024-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -230,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.4.15
+rubygems_version: 3.4.20
 signing_key: 
 specification_version: 4
 summary: Rails plugin for work with some modification of BEM methodology