rails_blocks 0.9.0.beta.1 → 0.9.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 033ebb0f7ed446801f2ae9cd57276c54881fa1ce0790b67475e8c0d3d58aaf68
-  data.tar.gz: 909f87b36efb9f8c909de64e51564b5ca57c575253052374c4791b891f0705c6
+  metadata.gz: e037cb85e19c073e95220d11d5216f35bb58f1544a61c6510f2b2885dbc45565
+  data.tar.gz: bf00672538f7e357accdf84659f826b2967ce86ccae8584530cdfb3a19721850
 SHA512:
-  metadata.gz: ed545d3e344a507e4c30cbd7b14bee0186e464e9a54c60d8f4498557607bec1bc1df142eefcfa9d37039f254cb08e5ab7cc0863123d6d4363a9a43480af58133
-  data.tar.gz: 6f95e004db9ef7883bf17f41bd36fd226b3c7659ae3b5e85ae975c3dd6f63fcafe093de2674312a12ad915f8fcbc2b50c2ae4197bbbcbbbc9c1d03828cec5be6
+  metadata.gz: 87b20842800181fe3d7af4a2a6694dc1fb471224ab1812e72b660c530ff3032eef8fba240b1cd9df110549680df707fcc7de326c817da1df53497d26bbd6a309
+  data.tar.gz: d3af99de53ce9fd44a444b5eb930d39212688381daa0b8a726f5f2b46a254ab8f0288d46ed418e141ba86fa0559d356f7ffa96bdbeed4d4326568391fa6c73de

data/app/helpers/block_helper.rb

@@ -133,10 +133,14 @@ module BlockHelper
 	private
 		def current_bem_data
 			data = {}
-			data.merge! entity_data(current_entity_name, @current_options[:js]) if @current_options[:js]
+			if(@current_entity[:type] == :block)
+				data.merge! block_data(@current_entity[:name], @current_options[:js])
+			else
+				data.merge! element_data(context_block, @current_entity[:name], @current_options[:js])
+			end
 			data.merge! mix_data(@current_options[:mix]) if @current_options[:mix]
 
-			return nil if data == {}
+			return nil if data.length == 0
 			data
 		end
 
@@ -145,18 +149,25 @@ module BlockHelper
 			data = mixes.map do |mix|
 				next unless mix[:js]
 				if mix[:e]
-					if mix[:b]
-						entity_data(element_name(mix[:b], mix[:e]), mix[:js])
-					else
-						entity_data(element_name(context_block, mix[:e]), mix[:js])
-					end
+					element_data(mix[:b] || context_block, mix[:e], mix[:js])
 				else
 					raise RailsBlocks::BadMixError if mix[:b].nil?
-					entity_data(block_name(mix[:b]), mix[:js])
+					block_data(mix[:b], mix[:js])
 				end
 			end.compact.inject(&:merge) || {}
 		end
 
+		def block_data(name, js)
+			level = block_js_level(context_block, @current_options[:levels])
+			return {} if !js
+			data = (js == true ? {} : js).merge!({level: level})
+			entity_data(name, data)
+		end
+
+		def element_data(b, e, js)
+			entity_data(element_name(b || context_block, e), js)
+		end
+
 		def entity_data(name, data)
 			return {name => data} if data.is_a? Hash
 			return {name => {}} if data == true

data/lib/rails_blocks/path.rb

@@ -30,6 +30,12 @@ module RailsBlocks
 			end
 			nil
 		end
+
+		def block_js_level(b_name, levels)
+			return levels.reverse.find do |level|
+				Path.tree.dig(level, b_name, :js)
+			end
+		end
 		
 		def element_template(b_name, e_name, options = {})
 			options[:levels].reverse.each do |level|
@@ -41,7 +47,6 @@ module RailsBlocks
 		end
 		
 		private
-			
 			def mod(options)
 				return '' unless options[:mods] && !options[:mods].empty?
 				mod_class(*options[:mods].first)
@@ -63,31 +68,44 @@ module RailsBlocks
 			
 			def self.file_tree
 				t = {}
-				files = Dir["#{blocks_dir}/**/*#{RailsBlocks.config.template_engine}"]
+				engine_ext = RailsBlocks.config.template_engine
+				files = Dir["#{blocks_dir}/**/*#{engine_ext}"]
 				files.each do |file|
 					file.sub! blocks_dir.to_s + '/', ''
-					file.sub! '.html' + RailsBlocks.config.template_engine, ''
+					file.sub! '.html' + engine_ext, ''
 					
 					parts = file.split('/')
-					filename = File.basename(file, RailsBlocks.config.template_engine)
+					filename = File.basename(file, engine_ext)
 					filename = File.basename(filename, '.html')
-					template = {
-						level: parts[0],
-						block: parts[1],
-						file: filename
-					}
-					t[template[:level]] ||= {}
-					t[template[:level]][template[:block]] ||= {elements: {}}
+					# p filename
+					level, block = parts
+					t[level] ||= {}
+					block_def = (t[level][block] ||= {elements: {}})
 					
 					if is_e_file(filename)
-						t[template[:level]][template[:block]][:elements][get_e_name(filename)] ||= {}
-						t[template[:level]][template[:block]][:elements][get_e_name(filename)][get_e_mod(filename)] = file
+						block_def[:elements][get_e_name(filename)] ||= {}
+						block_def[:elements][get_e_name(filename)][get_e_mod(filename)] = file
 					else
-						t[template[:level]][template[:block]][get_b_mod(filename)] = file
+						block_def[get_b_mod(filename)] = file
 					end
 				end
+				add_js(t)
 				t.with_indifferent_access.freeze
 			end
+
+			def self.add_js(t)
+				js_files = Dir["#{blocks_dir}/**/*.js"]
+				js_files.each do |file|
+					file.sub! blocks_dir.to_s + '/', ''
+					parts = file.split('/')
+					level, block, filename = parts
+					filename = File.basename(filename, '.*')
+
+					t[level] ||= {}
+					block_def = t[level][block] ||= {elements: {}}
+					block_def[:js] = true
+				end
+			end
 			
 			def self.is_e_file(file)
 				file.start_with? ELEMENT_FILE_PREFIX

data/lib/rails_blocks/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_blocks
 version: !ruby/object:Gem::Version
-  version: 0.9.0.beta.1
+  version: 0.9.0.beta.2
 platform: ruby
 authors:
 - Andrey Potetiurin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-19 00:00:00.000000000 Z
+date: 2023-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails