rails_blocks 0.7.12 → 0.9.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2a84c6a01f23c69fe7f169d96b91e5782294f46183580d00228e560b48432a8
-  data.tar.gz: f0b7db3e83e3c440af25cf6aadada6a570fad79cfb3f307ae7f83d1a5f06f327
+  metadata.gz: 033ebb0f7ed446801f2ae9cd57276c54881fa1ce0790b67475e8c0d3d58aaf68
+  data.tar.gz: 909f87b36efb9f8c909de64e51564b5ca57c575253052374c4791b891f0705c6
 SHA512:
-  metadata.gz: 960c9b3f790bb2f7a569b57fa5c08b24db852597651bef47a8a3035b1e925b4bf50bdc45c560354108ceb52975c6cef09998fd2a3f7c1f8af8f99bf7a0c0208c
-  data.tar.gz: b715a1b9720ba3e34aee0ac527c151f20cda6fc4d4230a6b5015bb613df7d426af748b76018ddb54bf96767cad5fb1928d2478898762c627e255336356b697b0
+  metadata.gz: ed545d3e344a507e4c30cbd7b14bee0186e464e9a54c60d8f4498557607bec1bc1df142eefcfa9d37039f254cb08e5ab7cc0863123d6d4363a9a43480af58133
+  data.tar.gz: 6f95e004db9ef7883bf17f41bd36fd226b3c7659ae3b5e85ae975c3dd6f63fcafe093de2674312a12ad915f8fcbc2b50c2ae4197bbbcbbbc9c1d03828cec5be6

data/app/assets/javascripts/bem_blocks.js

@@ -0,0 +1,140 @@
+(function() {
+	var hasProp = {}.hasOwnProperty;
+
+	window.$$ = {
+		decls: {},
+		cache: {},
+		bem_class: 'js-bem',
+		bem_class_selector: ".js-bem",
+		bemDataKey: 'bem',
+		blockInitializationErrorHandler: function(e) {
+			return console.error("Can't initialize block " + name + ", check declaration. " + e.name + " : " + e.message);
+		},
+		processOptions: function($dom, item_name, b_name, o) {
+			var attr, attr_value, currentData, e_name, e_o, ref, ref1;
+			if (o.attrs) {
+				ref = o.attrs;
+				for (attr in ref) {
+					attr_value = ref[attr];
+					$dom.prop(attr, attr_value);
+				}
+			}
+			if (o.content) {
+				$dom.html(o.content);
+			}
+			if (o.mix) {
+				$dom.addClass($$.mixClass(o.mix));
+			}
+			if (o.data) {
+				currentData = $dom.data($$.bemDataKey) || {};
+				currentData[item_name] = o.data;
+				$dom.data($$.bemDataKey, currentData);
+			}
+			if (o.elements) {
+				ref1 = o.elements;
+				for (e_name in ref1) {
+					e_o = ref1[e_name];
+					$$.makeElement($dom, b_name, e_name, e_o);
+				}
+			}
+			return $dom;
+		},
+		makeDom: function(o, klass) {
+			var tag;
+			o || (o = {});
+			tag = o.tag || 'div';
+			return $("<" + tag + ">)").addClass(klass);
+		},
+		makeElement: function($parent, b_name, e_name, o) {
+			var $e, item_name;
+			item_name = $$.elementClass(b_name, e_name);
+			$e = this.makeDom(o, item_name);
+			$$.processOptions($e, item_name, b_name, o);
+			if (o.prepend) {
+				$parent.prepend($e);
+			} else {
+				$parent.append($e);
+			}
+			return $e;
+		},
+		makeBlock: function(b_name, o) {
+			var $b, item_name;
+			item_name = $$.blockClass(b_name);
+			$b = this.makeDom(o, item_name);
+			$$.processOptions($b, item_name, b_name, o);
+			return $b;
+		},
+		init: function($context) {
+			var $blocks;
+			$blocks = $context.find($$.bem_class_selector);
+			if ($context.hasClass($$.bem_class)) {
+				$blocks = $blocks.add($context);
+			}
+			return $$.initBlocks($blocks);
+		},
+		initBlocks: function($context, options) {
+			return $context.each(function() {
+				var $node, allParams, name, params, results;
+				$node = $(this);
+				allParams = $node.data($$.bemDataKey);
+				results = [];
+				for (name in allParams) {
+					if (!hasProp.call(allParams, name)) continue;
+					params = allParams[name];
+					if (name.indexOf('__') !== -1) {
+						continue;
+					}
+					results.push($$.getBlock($node, name, params));
+				}
+				return results;
+			});
+		},
+		getBlock: function($b, name, params) {
+			var bid, block, cacheKey, e;
+			cacheKey = name + "_bid";
+			bid = $b.data(cacheKey);
+			if (bid) {
+				return $$.cache[bid];
+			}
+			try {
+				block = new $$.decls[$$.utils.camelCase(name)]($b, params, name);
+				bid = block.id;
+				$b.data(cacheKey, bid);
+				$$.cache[bid] = block;
+				return block;
+			} catch (error) {
+				e = error;
+				if ($$.blockInitializationErrorHandler) {
+					return $$.blockInitializationErrorHandler(e, name, params);
+				}
+			}
+		},
+		makeMod: function(name, value) {
+			var mod;
+			mod = name;
+			if (value) {
+				mod += "_" + value;
+			}
+			return mod;
+		},
+		mixClass: function(mix) {
+			if (mix.e) {
+				return mix.b + "__" + mix.e;
+			}
+			return mix.b;
+		},
+		blockModClass: function(name, mod, value) {
+			return name + "--" + ($$.makeMod(mod, value));
+		},
+		elementModClass: function(b_name, e_name, mod, value) {
+			return ($$.elementClass(b_name, e_name)) + "--" + ($$.makeMod(mod, value));
+		},
+		blockClass: function(b_name) {
+			return b_name;
+		},
+		elementClass: function(b_name, e_name) {
+			return b_name + "__" + e_name;
+		}
+	};
+
+}).call(this);

data/app/assets/javascripts/block.js

@@ -0,0 +1,94 @@
+class Block {
+	constructor($b, params, name) {
+		this.$node = $b;
+		this.name = name;
+		this.id = $$.utils.guid();
+		this.params = params;
+		if (this.events) {
+			this._addEvents();
+		}
+		if (this.init) {
+			this.init();
+		}
+	}
+
+	elem(e_name, mod_name, mod_value, context) {
+		var $elem;
+		if (context == null) {
+			context = this.$node;
+		}
+		$elem = $(this.elemSelector(e_name, mod_name, mod_value), context);
+		$elem.e_name = e_name;
+		$elem.b_name = this.name;
+		return $elem;
+	};
+
+	elemSelector(e_name, mod_name, mod_value) {
+		if (mod_name) {
+			return "." + ($$.elementModClass(this.name, e_name, mod_name, mod_value));
+		}
+		return "." + (this._elementClass(e_name));
+	};
+
+	on() {
+		return this.$node.on.apply(this.$node, arguments);
+	};
+
+	_addEvents(element) {
+		var event_name, handler, p, ref, results;
+		ref = this.events;
+		results = [];
+		for (event_name in ref) {
+			handler = ref[event_name];
+			p = event_name.split(' ');
+			if (typeof handler === 'string') {
+				handler = decl.methods[handler];
+			}
+			results.push(this.$node.on(p[0], p[1], handler.bind(this)));
+		}
+		return results;
+	};
+
+	_trigger(event, data) {
+		return this.$node.trigger(event, data);
+	};
+
+	_elementClass(e_name) {
+		return $$.elementClass(this.name, e_name);
+	};
+
+	addElem(e_name, o, $parent) {
+		var $elem;
+		o || (o = {});
+		$elem = $$.makeElement($parent || this.$node, this.name, e_name, o);
+		$elem.e_name = e_name;
+		$elem.b_name = this.name;
+		return $elem;
+	};
+
+	asElem($elem, name) {
+		$elem.e_name = name;
+		$elem.b_name = this.name;
+		return $elem;
+	};
+
+	addMod(mod, value) {
+		return this.$node.addClass($$.blockModClass(this.name, mod, value));
+	};
+
+	delMod(mod, value) {
+		return this.$node.removeClass($$.blockModClass(this.name, mod, value));
+	};
+
+	toggleMod(mod, value) {
+		if (this.hasMod(mod, value)) {
+			return this.delMod(mod, value);
+		} else {
+			return this.addMod(mod, value);
+		}
+	};
+
+	hasMod(mod, value) {
+		return this.$node.hasClass($$.blockModClass(this.name, mod, value));
+	};
+}

data/app/assets/javascripts/jquery.bem_exts.js

@@ -0,0 +1,72 @@
+(function() {
+	$(function() {
+		var originalEq;
+		$.b = function(name) {
+			arguments[0] = '.' + name;
+			return $.apply(null, arguments);
+		};
+		originalEq = $.fn.eq;
+		return $.fn.extend({
+			destroyBlocks: function() {
+				return this.find($$.bem_class_selector).getBlocks().each(function() {
+					return this.destroy();
+				});
+			},
+			isElem: function() {
+				if (this.e_name) {
+					return true;
+				}
+				return false;
+			},
+			addMod: function(name, value) {
+				if (this.isElem()) {
+					return this.addClass($$.elementModClass(this.b_name, this.e_name, name, value));
+				} else {
+					return this.addClass($$.blockModClass(this.b_name, name, value));
+				}
+			},
+			hasMod: function(name, value) {
+				if (this.isElem()) {
+					return this.hasClass($$.elementModClass(this.b_name, this.e_name, name, value));
+				} else {
+					return this.hasClass($$.blockModClass(this.b_name, name, value));
+				}
+			},
+			toggleMod: function(mod, value) {
+				if (this.hasMod(mod, value)) {
+					return this.delMod(mod, value);
+				} else {
+					return this.addMod(mod, value);
+				}
+			},
+			delMod: function(name, value) {
+				if (this.isElem()) {
+					return this.removeClass($$.elementModClass(this.b_name, this.e_name, name, value));
+				} else {
+					return this.removeClass($$.blockModClass(this.b_name, name, value));
+				}
+			},
+			asBlock: function(name, o) {
+				this.addClass("" + name);
+				return $$.getBlock(this, name, o);
+			},
+			bemParams: function() {
+				var allParams;
+				allParams = this.data($$.bemDataKey);
+				if (this.isElem()) {
+					return allParams[$$.elementClass(this.b_name, this.e_name)];
+				} else {
+					return console.log('Error, only for elements. Use initBlock for blocks.');
+				}
+			},
+			eq: function() {
+				var collection;
+				collection = originalEq.apply(this, arguments);
+				collection.b_name = this.b_name;
+				collection.e_name = this.e_name;
+				return collection;
+			}
+		});
+	});
+
+}).call(this);

data/app/assets/javascripts/utils.js

@@ -0,0 +1,17 @@
+(function() {
+	window.$$.utils = {
+		_id: 0,
+		camelCase: function(input) {
+			return input.toLowerCase().replace(/(^|-)(.)/g, function(match, $1, $2) {
+				return $2.toUpperCase();
+			});
+		},
+		dash: function(input) {
+			return input.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
+		},
+		guid: function() {
+			return this._id++;
+		}
+	};
+
+}).call(this);

data/app/helpers/block_helper.rb

@@ -1,6 +1,18 @@
 require 'rails_blocks/names'
 require 'rails_blocks/path'
 
+class RenderContext
+	attr_accessor :slots, :rendered_slots
+	def initialize
+		@slots = {}
+		@rendered_slots = {}
+	end
+
+	def slot(name, &block)
+		slots[name] = block
+	end
+end
+
 module BlockHelper
 	include RailsBlocks::Path
 	include RailsBlocks::Names
@@ -65,12 +77,14 @@ module BlockHelper
 	end
 	
 	def entity(template, type, name, options, &block)
-		content = block ? capture(&block) : options[:content]
+		ctx = RenderContext.new
+		content = block ? capture(ctx, &block) : options[:content]
+		ctx.slots.each {|k, v| ctx.rendered_slots[k] = capture(&v)}
 		#важно заполнять публичные поля только после того, как закапчюрится то, что внутри энтити, иначе они перезапишутся.
 		@attrs = nil
 		@current_options = options
 		@current_entity = {type: type, name: name}
-		template.nil? ? empty(content) : render(file: template, locals: {content: content, options: options})
+		template.nil? ? empty(content) : render(template: template, locals: {content: content, options: options, slots: ctx.rendered_slots})
 	end
 	
 	def empty(content)

data/lib/rails_blocks/path.rb

@@ -10,12 +10,14 @@ module RailsBlocks
 		end
 
 		def self.tree
-			#so slow, переделать на оновление при запросе, а не каждый раз
-			#return build_tree if Rails.env.development?
 			@tree ||= (
 				build_tree
 			)
 		end
+
+		def self.reload_tree
+			@tree = build_tree
+		end
 		
 		def self.blocks_dir
 			Rails.root.join RailsBlocks.config.blocks_dir
@@ -64,8 +66,11 @@ module RailsBlocks
 				files = Dir["#{blocks_dir}/**/*#{RailsBlocks.config.template_engine}"]
 				files.each do |file|
 					file.sub! blocks_dir.to_s + '/', ''
+					file.sub! '.html' + RailsBlocks.config.template_engine, ''
+					
 					parts = file.split('/')
-					filename = parts[2].sub RailsBlocks.config.template_engine, ''
+					filename = File.basename(file, RailsBlocks.config.template_engine)
+					filename = File.basename(filename, '.html')
 					template = {
 						level: parts[0],
 						block: parts[1],

data/lib/rails_blocks/version.rb

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

data/lib/rails_blocks.rb

@@ -21,4 +21,8 @@ module RailsBlocks
 	def self.reset
 		@config = Configuration.new
 	end
+
+	def self.reload_tree
+		
+	end
 end

data/rails_blocks.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
 	spec.test_files		= spec.files.grep(%r{^(test|spec|features)/})
 	spec.require_paths = ["lib"]
 
-	spec.add_dependency 'rails', '~> 5.0'
+	spec.add_dependency 'rails', ">= 5.2", "< 7.1"
 	#testing
 	spec.add_development_dependency 'combustion', '~> 0.5.5'
 	spec.add_development_dependency 'bundler', '~> 1.7'

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: rails_blocks
 version: !ruby/object:Gem::Version
-  version: 0.7.12
+  version: 0.9.0.beta.1
 platform: ruby
 authors:
 - Andrey Potetiurin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-27 00:00:00.000000000 Z
+date: 2023-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
@@ -151,11 +157,11 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- app/assets/javascripts/bem_blocks.coffee
-- app/assets/javascripts/block.coffee
-- app/assets/javascripts/jquery.bem_exts.coffee
+- app/assets/javascripts/bem_blocks.js
+- app/assets/javascripts/block.js
+- app/assets/javascripts/jquery.bem_exts.js
 - app/assets/javascripts/rails_blocks.js
-- app/assets/javascripts/utils.coffee
+- app/assets/javascripts/utils.js
 - app/assets/stylesheets/rails_blocks.sass
 - app/helpers/block_helper.rb
 - app/views/rails_blocks/element.slim
@@ -221,12 +227,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.4.15
 signing_key: 
 specification_version: 4
 summary: Rails plugin for work with some modification of BEM methodology

data/app/assets/javascripts/bem_blocks.coffee

@@ -1,95 +0,0 @@
-window.$$ =
-	decls: {}
-	cache: {}
-	bem_class: 'js-bem'
-	bem_class_selector: ".js-bem"
-	bemDataKey: 'bem'
-
-	blockInitializationErrorHandler: (e) ->
-		console.error "Can't initialize block #{name}, check declaration. #{e.name} : #{e.message}"
-
-	processOptions: ($dom, item_name, b_name, o) ->
-		if o.attrs
-			for attr, attr_value of o.attrs
-				$dom.prop(attr, attr_value)
-		if o.content
-			$dom.html(o.content)
-		if o.mix
-			$dom.addClass($$.mixClass(o.mix))
-		if o.data
-			currentData = $dom.data($$.bemDataKey) || {}
-			currentData[item_name] = o.data
-			$dom.data($$.bemDataKey, currentData)
-		if o.elements
-			for e_name, e_o of o.elements
-				$$.makeElement($dom, b_name, e_name, e_o)
-		$dom
-	
-	makeDom: (o, klass) ->
-		o ||= {}
-		tag = o.tag || 'div'
-		$("<#{tag}>)").addClass(klass)
-
-	makeElement: ($parent, b_name, e_name, o) ->
-		item_name = $$.elementClass(b_name, e_name)
-		$e = @makeDom(o, item_name)
-		$$.processOptions($e, item_name, b_name, o)
-		if o.prepend
-			$parent.prepend $e
-		else
-			$parent.append $e
-		$e
-			
-	makeBlock: (b_name, o) ->
-		item_name = $$.blockClass(b_name)
-		$b = @makeDom(o, item_name)
-		$$.processOptions($b, item_name, b_name, o)
-		$b
-		
-	init: ($context) ->
-		$blocks = $context.find($$.bem_class_selector)
-		$blocks = $blocks.add($context) if $context.hasClass $$.bem_class
-		$$.initBlocks($blocks)
-		
-	initBlocks: ($context, options) ->
-		$context.each ->
-			$node = $(this)
-			allParams = $node.data($$.bemDataKey)
-			for own name, params of allParams
-				continue if name.indexOf('__') != -1
-				$$.getBlock($node, name, params)
-	
-	getBlock: ($b, name, params)->
-		cacheKey = "#{name}_bid"
-		bid = $b.data(cacheKey)
-		if bid
-			return $$.cache[bid]
-		try
-			block = new $$.decls[$$.utils.camelCase(name)]($b, params, name)
-			bid = block.id
-			$b.data cacheKey, bid
-			$$.cache[bid] = block
-			block
-		catch e
-			$$.blockInitializationErrorHandler(e) if $$.blockInitializationErrorHandler
-		
-	makeMod: (name, value) ->
-		mod = name
-		mod += "_#{value}" if value
-		mod
-		
-	mixClass: (mix) ->
-		return "#{mix.b}__#{mix.e}" if mix.e
-		mix.b
-
-	blockModClass: (name,  mod, value) ->
-		"#{name}--#{$$.makeMod(mod,  value)}"
-
-	elementModClass: (b_name, e_name,  mod, value) ->
-		"#{$$.elementClass(b_name,  e_name)}--#{$$.makeMod(mod,  value)}"
-
-	blockClass: (b_name) ->
-		b_name
-
-	elementClass: (b_name, e_name) ->
-		"#{b_name}__#{e_name}"

data/app/assets/javascripts/block.coffee

@@ -1,65 +0,0 @@
-class window.Block
-	constructor: ($b, params, name) ->
-		@$node = $b
-		@name = name
-		@id = $$.utils.guid()
-		@params = params
-		#$.extend this, decl.methods
-		@_addEvents() if @events
-		# if @elements
-		# 	for element in @elements
-		# 		@_addEvents(element)
-		@init() if @init
-	
-	elem: (e_name, mod_name, mod_value, context = @$node) ->
-		$elem = $(@elemSelector.apply(@, arguments), context)
-		$elem.e_name = e_name
-		$elem.b_name = @name
-		$elem
-	
-	elemSelector: (e_name, mod_name, mod_value) ->
-		return ".#{$$.elementModClass(@name, e_name,  mod_name,  mod_value)}" if mod_name
-		".#{@_elementClass(e_name)}"
-	
-	on: () ->
-		@$node.on.apply(@$node, arguments)
-
-	_addEvents: (element)->
-		for event_name, handler of @events
-			p = event_name.split(' ')
-			if typeof handler == 'string'
-				handler = decl.methods[handler]
-			@$node.on p[0], p[1], handler.bind(@)
-			
-	_trigger: (event, data) ->
-		@$node.trigger event, data
-
-	_elementClass: (e_name) ->
-		$$.elementClass(@name, e_name)
-
-	addElem: (e_name, o, $parent) ->
-		o ||= {}
-		$elem = $$.makeElement($parent || @$node, @name, e_name, o)
-		$elem.e_name = e_name
-		$elem.b_name = @name
-		$elem
-
-	asElem: ($elem, name) ->
-		$elem.e_name = name
-		$elem.b_name = @name
-		$elem
-		
-	addMod: (mod, value) ->
-		@$node.addClass($$.blockModClass(@name, mod, value))
-		
-	delMod: (mod, value) ->
-		@$node.removeClass($$.blockModClass(@name, mod, value))
-	
-	toggleMod: (mod, value) ->
-		if @hasMod(mod, value)
-			@delMod(mod, value)
-		else
-			@addMod(mod, value)
-
-	hasMod: (mod, value) ->
-		@$node.hasClass($$.blockModClass(@name, mod, value))

data/app/assets/javascripts/jquery.bem_exts.coffee

@@ -1,56 +0,0 @@
-$ ->
-	$.b = (name) ->
-		arguments[0] = '.' + name
-		$.apply(null, arguments)
-	
-	originalEq = $.fn.eq;
-
-	$.fn.extend
-		destroyBlocks: ->
-			@find($$.bem_class_selector).getBlocks().each ->
-				@destroy()
-
-		isElem: ->
-			return true if @e_name
-			false
-
-		addMod: (name, value) ->
-			if @isElem()
-				@addClass($$.elementModClass(@b_name, @e_name, name, value))
-			else
-				@addClass($$.blockModClass(@b_name, name, value))
-		
-		hasMod: (name, value) ->
-			if @isElem()
-				return @hasClass($$.elementModClass(@b_name, @e_name, name, value))
-			else
-				return @hasClass($$.blockModClass(@b_name, name, value))
-
-		toggleMod: (mod, value) ->
-			if @hasMod(mod, value)
-				@delMod(mod, value)
-			else
-				@addMod(mod, value)
-
-		delMod: (name, value) ->
-			if @isElem()
-				@removeClass($$.elementModClass(@b_name, @e_name, name, value))
-			else
-				@removeClass($$.blockModClass(@b_name, name, value))
-				
-		asBlock: (name, o) ->
-			@addClass("#{name}")
-			$$.getBlock(@, name, o)
-
-		bemParams: () ->
-			allParams = @data($$.bemDataKey)
-			if @isElem()
-				return allParams[$$.elementClass(@b_name, @e_name)]
-			else
-				console.log('Error, only for elements. Use initBlock for blocks.')
-
-		eq: () ->
-			collection = originalEq.apply(@, arguments)
-			collection.b_name = @b_name
-			collection.e_name = @e_name
-			collection

data/app/assets/javascripts/utils.coffee

@@ -1,9 +0,0 @@
-window.$$.utils =
-	_id: 0
-	camelCase: (input) ->
-		input.toLowerCase().replace /(^|-)(.)/g, (match, $1, $2) ->
-			$2.toUpperCase()
-	dash: (input) ->
-		input.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase()
-	guid: () ->
-		return @_id++