rails_blocks 0.9.0.beta.2 → 0.9.0.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e037cb85e19c073e95220d11d5216f35bb58f1544a61c6510f2b2885dbc45565
-  data.tar.gz: bf00672538f7e357accdf84659f826b2967ce86ccae8584530cdfb3a19721850
+  metadata.gz: 03e2b58cf290941dd680f6e0d7893c5ad06ccaed98e6f6549f9c24876204e9aa
+  data.tar.gz: 5d5fda3dc88c986ea65c00f5291874c3e17f9b5712f42540be04c77f9e8e4fa9
 SHA512:
-  metadata.gz: 87b20842800181fe3d7af4a2a6694dc1fb471224ab1812e72b660c530ff3032eef8fba240b1cd9df110549680df707fcc7de326c817da1df53497d26bbd6a309
-  data.tar.gz: d3af99de53ce9fd44a444b5eb930d39212688381daa0b8a726f5f2b46a254ab8f0288d46ed418e141ba86fa0559d356f7ffa96bdbeed4d4326568391fa6c73de
+  metadata.gz: 837d083a5707d595483fc788b169c44ae9cda7db9ed35a5727f70330b4753980ee1e3da6fb173bc6aa633cf04b6d9afc0ce003569b63acd725ea7bba2ccfb82b
+  data.tar.gz: e0e8e4a89613e8859d2a5e6af26d543963418e56ee87aaa0ec921578c1967e779785308bba035efea81ef058cb81d14fc7e5a6195868d468601889a859d2c81a

data/app/helpers/block_helper.rb

@@ -35,7 +35,7 @@ module BlockHelper
 	def b(b_name, options = {}, &block)
 		options = page_options.merge options
 		options[:parent_block] = context_block
-		push_context_block b_name
+		push_context_block b_name, options
 		template = block_template b_name, options
 		result = entity(template, :block, b_name, options, &block)
 		pop_context_block
@@ -44,7 +44,7 @@ module BlockHelper
 	
 	def b_classes(b_name, options = {})
 		parent_block = context_block
-		push_context_block b_name
+		push_context_block b_name, options
 		options = page_options.merge options
 		options[:parent_block] = parent_block if parent_block
 		classes = block_classes b_name, options
@@ -52,8 +52,8 @@ module BlockHelper
 		classes
 	end
 	
-	def b_context(b_name, &block)
-		push_context_block b_name
+	def b_context(b_name, options = {}, &block)
+		push_context_block b_name, options
 		result = capture(&block)
 		pop_context_block
 		result
@@ -160,7 +160,7 @@ module BlockHelper
 		def block_data(name, js)
 			level = block_js_level(context_block, @current_options[:levels])
 			return {} if !js
-			data = (js == true ? {} : js).merge!({level: level})
+			data = (js == true ? {} : js).merge!({level: level, js_ext: block_js_ext(context_block, level)})
 			entity_data(name, data)
 		end
 
@@ -169,7 +169,10 @@ module BlockHelper
 		end
 
 		def entity_data(name, data)
-			return {name => data} if data.is_a? Hash
+			if data.is_a? Hash
+				transformed_data = data.transform_keys {|k| k.to_s.camelize(:lower)}
+				return {name => transformed_data}
+			end
 			return {name => {}} if data == true
 			{}
 		end
@@ -189,11 +192,15 @@ module BlockHelper
 		end
 		
 		def context_block
-			blocks_stack.last
+			blocks_stack.last&.fetch(:name, nil)
+		end
+
+		def context_block_options
+			blocks_stack.last&.fetch(:options, nil)
 		end
 		
-		def push_context_block(b_name)
-			blocks_stack.push b_name
+		def push_context_block(b_name, options)
+			blocks_stack.push({name: b_name, options: options})
 		end
 		
 		def pop_context_block

data/lib/rails_blocks/configuration.rb

@@ -6,6 +6,7 @@ module RailsBlocks
 		attr_accessor :element_separator
 		attr_accessor :modifier_separator
 		attr_accessor :js_class
+		attr_accessor :js_exts
 		
 		def ns(name)
 			@ns ||= {}
@@ -20,6 +21,7 @@ module RailsBlocks
 			@element_separator = '__'
 			@modifier_separator = '--'
 			@js_class = 'js-bem'
+			@js_exts = ['js']
 		end
 	end
 end

data/lib/rails_blocks/path.rb

@@ -36,6 +36,10 @@ module RailsBlocks
 				Path.tree.dig(level, b_name, :js)
 			end
 		end
+
+		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|
@@ -94,17 +98,21 @@ module RailsBlocks
 			end
 
 			def self.add_js(t)
-				js_files = Dir["#{blocks_dir}/**/*.js"]
+				exts = RailsBlocks.config.js_exts.join(',')
+				js_files = Dir["#{blocks_dir}/**/*.{#{exts}}"]
 				js_files.each do |file|
 					file.sub! blocks_dir.to_s + '/', ''
 					parts = file.split('/')
 					level, block, filename = parts
+					ext = File.extname(filename)
 					filename = File.basename(filename, '.*')
 
 					t[level] ||= {}
 					block_def = t[level][block] ||= {elements: {}}
 					block_def[:js] = true
+					block_def[:js_ext] = ext[1..-1]
 				end
+				p t
 			end
 			
 			def self.is_e_file(file)

data/lib/rails_blocks/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_blocks
 version: !ruby/object:Gem::Version
-  version: 0.9.0.beta.2
+  version: 0.9.0.beta.4
 platform: ruby
 authors:
 - Andrey Potetiurin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-26 00:00:00.000000000 Z
+date: 2023-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -181,7 +181,6 @@ files:
 - lib/rails_blocks/path.rb
 - lib/rails_blocks/version.rb
 - lib/tasks/rails_blocks.rake
-- rails_blocks-0.7.11.gem
 - rails_blocks.gemspec
 - spec/helpers/block_helper_spec.rb
 - spec/internal/app/blocks/app/block3/_mod1.slim