rails_blocks 0.7.10 → 0.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9c2eaeee389ac41547e2bc5ffff58ad1fcd84e51
-  data.tar.gz: 26799cba32acfebe52ac62694473b3ac40afceb0
+SHA256:
+  metadata.gz: 98997bf17ad7da0d3352b7e34d658bcc93fe9354a3fa2d6a9b9e2f098fdec175
+  data.tar.gz: a85a23ac0a5238468e3c65cf027f3be4acf603b1339a84e2ebcb0251c6b915ed
 SHA512:
-  metadata.gz: 17c0ec7aac3c95a1c59f42c4f58924290c01336f63662414b284664321809d5ccba579d5e491eed89afbfdc28b39d3e2ac995a4c212c64348ccd7c6aa26b24b7
-  data.tar.gz: 313b5e1c935783241c3f1a6c9fc9ec1990711c910c2f72ab7f41405ad28c6e1d4d8e1fea7b4f8c6b2c0cead2483f7c5bd51c0066903056c84ce2ddc6fa55fa56
+  metadata.gz: 816b8b7aec4a7b6f6cb16f1101affb821c2889de7d6f09d87f7c7cb144fae874537ab8a5ae1feeaac8765bc2238b0b4e9d2a8d45f3bd4dbea379baf36e70afce
+  data.tar.gz: 1cc959e2530a6a10150e0e1e6d1c5543dbacb4704884dfa8fe01cce060aeb926a68970953f720001d83504ec6664764098b0e22aa221543ff075c3dd54c2a7e9

data/app/assets/javascripts/bem_blocks.coffee

@@ -5,6 +5,9 @@ window.$$ =
 	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
@@ -63,14 +66,13 @@ window.$$ =
 			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
-			console.error "Can't initialize block #{name}, check declaration. #{e.name} : #{e.message}"
-
-		bid = block.id
-		$b.data cacheKey, bid
-		$$.cache[bid] = block
-		block
-			
+			$$.blockInitializationErrorHandler(e) if $$.blockInitializationErrorHandler
+		
 	makeMod: (name, value) ->
 		mod = name
 		mod += "_#{value}" if value

data/lib/rails_blocks/version.rb

@@ -1,3 +1,3 @@
 module RailsBlocks
-	VERSION = "0.7.10".freeze
+	VERSION = "0.7.11".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_blocks
 version: !ruby/object:Gem::Version
-  version: 0.7.10
+  version: 0.7.11
 platform: ruby
 authors:
 - Andrey Potetiurin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-15 00:00:00.000000000 Z
+date: 2019-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -153,10 +153,7 @@ files:
 - Rakefile
 - app/assets/javascripts/bem_blocks.coffee
 - app/assets/javascripts/block.coffee
-- app/assets/javascripts/jblocks.coffee
 - app/assets/javascripts/jquery.bem_exts.coffee
-- app/assets/javascripts/jquery_bem.coffee
-- app/assets/javascripts/jquery_bem_copy.coffee
 - app/assets/javascripts/rails_blocks.js
 - app/assets/javascripts/utils.coffee
 - app/assets/stylesheets/rails_blocks.sass
@@ -228,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Rails plugin for work with some modification of BEM methodology

data/app/assets/javascripts/jblocks.coffee

@@ -1,95 +0,0 @@
-camelCase = (input) ->
-	input.toLowerCase().replace /(^|-)(.)/g, (match, $1, $2) ->
-		$2.toUpperCase()
-
-window.$$ =
-	decls: {}
-	cache: {}
-	utils: {}
-	_id: 0
-	bem_class: 'js_bem'
-	bem_class_selector: '.js_bem'
-	guid: () ->
-		return @_id++
-
-	processOptions: ($dom, 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.elements
-			for e_name, e_o of o.elements
-				$$.makeElement($dom, b_name, e_name, e_o)
-			
-	makeElement: ($parent, b_name, e_name, o) ->
-		tag = o.tag || 'div'
-		$e = $("<#{tag} class='b-#{b_name}__#{e_name}'>")
-		$$.processOptions($e, b_name, o)
-		if o.prepend
-			$parent.prepend $e
-		else
-			$parent.append $e
-		$e
-			
-	makeBlock: (b_name, o) ->
-		o ||= {}
-		tag = o.tag || 'div'
-		$b = $("<#{tag} class='b-#{b_name}'>")
-		$$.processOptions($b, b_name, o)
-		$b
-		
-	init: ($context) ->
-		$$.getBlocks($context.find($$.bem_class_selector))
-		$$.getBlocks($context) if $context.hasClass $$.bem_class
-		
-	getBlocks: ($context, options) ->
-		$context.map ->
-			$$.getBlock($(this), options)
-	
-	getBlock: ($b, options)->
-		bid = $b.data('_bid')
-		if bid
-			return $$.cache[bid]
-		block = new $$.decls[camelCase($$.getBlockName($b))]($b, options)
-		bid = block.id
-		$b.data '_bid', bid
-		$$.cache[bid] = block
-		block
-		
-	getBlockName: ($b) ->
-		regexp = /^b(-[a-zA-Z0-9]+)+$/
-		for klass in $b.attr('class').split(/\s+/)
-			return klass.replace('b-', '') if regexp.test(klass)
-			
-	makeMod: (name, value) ->
-		mod = name
-		mod += "_#{value}" if value
-		mod
-		
-	mixClass: (mix) ->
-		"b-#{mix.b}__#{mix.e}"
-			
-$.fn.destroyBlocks = ->
-	@find($$.bem_class_selector).getBlocks().each ->
-		@destroy()
-
-$.fn.addMod = (name, value) ->
-	mod = $$.makeMod(name, value)
-	if @e_name
-		@addClass("b-#{@b_name}__#{@e_name}--#{mod}")
-	else
-		@addClass("b-#{@b_name}--#{mod}")
-
-$.fn.delMod = (name, value) ->
-	mod = $$.makeMod(name, value)
-	if @e_name
-		@removeClass("b-#{@b_name}__#{@e_name}--#{mod}")
-	else
-		@removeClass("b-#{@b_name}--#{mod}")
-		
-$.fn.asBlock = (name, o) ->
-	@addClass("b-#{name}")
-	$$.getBlock(@, o)

data/app/assets/javascripts/jquery_bem.coffee

@@ -1,4 +0,0 @@
-$ ->
-	$.b = (name) ->
-		arguments[0] = '.b-' + name
-		$.apply(null, arguments)

data/app/assets/javascripts/jquery_bem_copy.coffee

@@ -1,486 +0,0 @@
-### @required jQuery ###
-
-(($) ->
-
-	###*
-	# Base BEM class.
-	# @constructor
-	###
-
-	BEM = (config) ->
-
-		###*
-		# Default configuration.
-		# @type {Object}
-		###
-
-		@config = config or {}
-		@blockClassRe = @buildBlockClassRe()
-		@elemClassRe = @buildElemClassRe()
-		@modClassRe = @buildModClassRe()
-		return
-
-	###*
-	# Get parent block of element.
-	# @public
-	#
-	# @param {Object} $this
-	# @return {Object}
-	###
-
-	BEM::getBlock = ($this) ->
-		blockClass = @getBlockClass($this)
-		block = $this.closest('.' + blockClass)
-		block.selector = blockClass
-		block
-
-	###*
-	# Switch block context.
-	# @public
-	#
-	# @param {Object} $this
-	# @param {String} block
-	# @param {String} [elem]
-	# @return {Object}
-	###
-
-	BEM::switchBlock = ($this, block, elem) ->
-		`var elem`
-		elem = elem or null
-		if elem then ($this.selector = @buildSelector(
-			block: block
-			elem: elem)) else ($this.selector = @buildSelector(block: block))
-		$this
-
-	###*
-	# Find element in block.
-	# @public
-	#
-	# @param	{Object}	$this		DOM element
-	# @param	{String}	elemKey	Element name
-	# @return {Object}
-	###
-
-	BEM::findElem = ($this, elemKey) ->
-		blockClass = @getBlockClass($this)
-		elemName = @buildElemClass(blockClass, elemKey)
-		elem = $this.find('.' + elemName)
-		elem
-
-	###*
-	# Get value of modifier.
-	# @public
-	#
-	# @param {Object} $this
-	# @param {String} modKey
-	# @return {String}
-	###
-
-	BEM::getMod = ($this, modKey) ->
-		mods = @extractMods($this.first())
-		if mods[modKey] != undefined
-			return mods[modKey]
-		null
-
-	###*
-	# Check modifier of element.
-	# @public
-	#
-	# @param {Object} $this
-	# @param {String} modKey
-	# @param {String} [modVal]
-	# @return {Boolean}
-	###
-
-	BEM::hasMod = ($this, modKey, modVal) ->
-		mods = @extractMods($this.first())
-		if modVal
-			if mods[modKey] == modVal
-				return true
-		else
-			if mods[modKey]
-				return true
-		false
-
-	###*
-	# Set modifier on element.
-	# @public
-	#
-	# @param {Object} $this
-	# @param {String} modKey
-	# @param {String} [modVal]
-	# @param {Object}
-	###
-
-	BEM::setMod = ($this, modKey, modVal) ->
-		self = this
-		selector = $this.selector
-		$this.each ->
-			current = $(this)
-			current.selector = selector
-			mods = self.extractMods(current)
-			baseName = self.getBaseClass(current)
-			if mods[modKey] != undefined
-				oldModName = self.buildModClass(baseName, modKey, mods[modKey])
-				current.removeClass oldModName
-			if modVal != false
-				newModName = self.buildModClass(baseName, modKey, modVal)
-			current.addClass(newModName).trigger 'setmod', [
-				modKey
-				modVal
-			]
-			return
-		$this
-
-	###*
-	# Delete modifier on element.
-	# @public
-	#
-	# @param {Object} $this
-	# @param {String} modKey
-	# @param {String} [modVal]
-	# @param {Object}
-	###
-
-	BEM::delMod = ($this, modKey, modVal) ->
-		self = this
-		selector = $this.selector
-		$this.each ->
-			`var modName`
-			current = $(this)
-			current.selector = selector
-			mods = self.extractMods(current)
-			baseName = self.getBaseClass(current)
-			if modVal
-				if mods[modKey] == modVal
-					modName = self.buildModClass(baseName, modKey, mods[modKey])
-			else
-				modName = self.buildModClass(baseName, modKey, mods[modKey])
-			current.removeClass(modName).trigger 'delmod', [
-				modKey
-				modVal
-			]
-			return
-		$this
-
-	###*
-	# Filtering elements by modifier.
-	# @public
-	#
-	# @param {Object} $this
-	# @param {String} modKey
-	# @param {String} [modVal]
-	# @param {Boolean} [inverse]
-	# @return {Object}
-	###
-
-	BEM::byMod = ($this, modKey, modVal, inverse) ->
-		`var inverse`
-		`var modVal`
-		self = this
-		modVal = modVal or null
-		inverse = inverse or false
-		selector = $this.selector
-		result = $()
-		$this.each ->
-			`var modName`
-			current = $(this)
-			current.selector = selector
-			mods = self.extractMods(current)
-			baseName = self.getBaseClass(current)
-			if modVal
-				if mods[modKey] == modVal
-					modName = self.buildModClass(baseName, modKey, mods[modKey])
-			else
-				if mods[modKey] != undefined
-					modName = self.buildModClass(baseName, modKey, mods[modKey])
-			result = result.add(if inverse then current.not('.' + modName) else current.filter('.' + modName))
-			return
-		result.selector = selector
-		result
-
-	###*
-	# Get block names from element.
-	# @protected
-	#
-	# @param {Object|String} $this
-	# @return {Object}
-	###
-
-	BEM::extractBlocks = ($this) ->
-		self = this
-		result = []
-		selectors = @getClasses($this)
-		$.each selectors, (i, sel) ->
-			type = self.getClassType(sel)
-			if type == 'block'
-				result.push sel
-			else if type == 'elem'
-				elem = sel.split(self.config.elemPrefix)
-				result.push elem[0]
-			return
-		result
-
-	###*
-	# Get element names from element.
-	# @protected
-	#
-	# @param {Object} $this
-	# @return {Object}
-	###
-
-	BEM::extractElems = ($this) ->
-		self = this
-		result = []
-		$.each self.getClasses($this), (i, className) ->
-			if self.getClassType(className) == 'elem'
-				elemName = className.split(self.config.elemPrefix)
-				result.push elemName[1]
-			return
-		result
-
-	###*
-	# Get modifiers from element.
-	# @protected
-	#
-	# @param {Object} $this
-	# @return {Object}
-	###
-
-	BEM::extractMods = ($this) ->
-		self = this
-		result = {}
-		$this.each ->
-			`var $this`
-			$this = $(this)
-			$.each self.getClasses($this), (i, className) ->
-				`var modVal`
-				if self.getClassType(className) == 'mod'
-					re = self.buildModClassRe().exec(className)
-					modName = re[1].split(self.config.modDlmtr)
-					if modName[1] != undefined and modName[1] != false
-						modVal = modName[1]
-					else
-						modVal = true
-					result[modName[0]] = modVal
-				return
-			return
-		result
-
-	###*
-	# Get classes names from element.
-	# @protected
-	#
-	# @param {Object} $this
-	# @return {Object}
-	###
-
-	BEM::getClasses = ($this) ->
-		classes = undefined
-		result = []
-		if typeof $this == 'object'
-			if $this.selector.indexOf('.') == 0
-				classes = $this.selector.split('.')
-			else if $this.attr('class') != undefined
-				classes = $this.attr('class').split(' ')
-			else
-				return null
-		else
-			classes = $this.split('.')
-		$.each classes, (i, className) ->
-			if className != ''
-				result.push $.trim(className)
-			return
-		result
-
-	###*
-	# Build regexp for blocks.
-	# @protected
-	#
-	# @return {RegExp}
-	###
-
-	BEM::buildBlockClassRe = ->
-		new RegExp('^(' + @config.namePattern + ')$')
-
-	###*
-	# Build regexp for elements.
-	# @protected
-	#
-	# @return {RegExp}
-	###
-
-	BEM::buildElemClassRe = ->
-		new RegExp('^' + @config.namePattern + @config.elemPrefix + '(' + @config.namePattern + ')$')
-
-	###*
-	# Build regexp for modifiers.
-	# @protected
-	#
-	# @return {RegExp}
-	###
-
-	BEM::buildModClassRe = ->
-		new RegExp('^(?:' + @config.namePattern + '|' + @config.namePattern + @config.elemPrefix + @config.namePattern + ')' + @config.modPrefix + '(' + @config.namePattern + '((' + @config.modDlmtr + @config.namePattern + ')$|$))')
-
-	###*
-	# Build class name for block.
-	# @protected
-	#
-	# @param {String} blockName
-	# @return {String}
-	###
-
-	BEM::buildBlockClass = (blockName) ->
-		@config.blockPrefix + blockName
-
-	###*
-	# Build class name for element.
-	# @protected
-	#
-	# @param {String} blockName
-	# @param {String} elemKey
-	# @return {String}
-	###
-
-	BEM::buildElemClass = (blockName, elemKey) ->
-		blockName + @config.elemPrefix + elemKey
-
-	###*
-	# Build class name for modifier.
-	# @protected
-	#
-	# @param {String} blockName
-	# @param {String} modKey
-	# @param {String} modVal
-	# @return {String}
-	###
-
-	BEM::buildModClass = (baseClass, modKey, modVal) ->
-		if modVal != undefined and modVal != true
-			baseClass + @config.modPrefix + modKey + @config.modDlmtr + modVal
-		else
-			baseClass + @config.modPrefix + modKey
-
-	###*
-	# Build selector from object or string.
-	# @private
-	#
-	# @param {String|Object}
-	# @param {String}
-	# @return {String}
-	###
-
-	BEM::buildSelector = (selector, prefix) ->
-		`var prefix`
-		if prefix != ''
-			prefix = prefix or '.'
-		if typeof selector == 'object'
-			if selector.block != undefined
-				buildSelector = @buildBlockClass(selector.block)
-				if selector.elem != undefined
-					buildSelector = @buildElemClass(buildSelector, selector.elem)
-				if selector.mod != undefined
-					mod = selector.mod.split(':')
-					buildSelector = @buildModClass(buildSelector, mod[0], mod[1])
-		if buildSelector != undefined then prefix + buildSelector else prefix + selector
-
-	###*
-	# Build class name for block.
-	# @protected
-	#
-	# @param {Object|String} $this
-	# @param {Number} [index]
-	# @return {String}
-	###
-
-	BEM::getBlockClass = ($this, index) ->
-		`var index`
-		blockClasses = @extractBlocks($this)
-		index = index or 0
-		if index <= blockClasses.length - 1 then blockClasses[index] else null
-
-	###*
-	# Get base class from element.
-	# @protected
-	#
-	# @param {Object} $this
-	# @return {String}
-	###
-
-	BEM::getBaseClass = ($this) ->
-		self = this
-		baseClass = null
-		selectors = @getClasses($this)
-		$.each selectors, (i, sel) ->
-			classType = self.getClassType(sel)
-			if classType and classType != 'mod'
-				baseClass = sel
-			return
-		baseClass
-
-	###*
-	# Get class type.
-	# @protected
-	#
-	# @param {String} className
-	# @return {String}
-	###
-
-	BEM::getClassType = (className) ->
-		if @modClassRe.test(className)
-			return 'mod'
-		else if @elemClassRe.test(className)
-			return 'elem'
-		else if @blockClassRe.test(className)
-			return 'block'
-		null
-
-	###*
-	# Create BEM instance.
-	###
-
-	$.BEM = new BEM(
-		namePattern: '[a-zA-Z0-9-]+'
-		blockPrefix: ''
-		elemPrefix: '__'
-		modPrefix: '--'
-		modDlmtr: '_')
-
-	###*
-	# Extend jQuery object.
-	###
-
-	$.fn.extend
-		block: ->
-			$.BEM.getBlock this
-		elem: (elemKey) ->
-			$.BEM.findElem this, elemKey
-		ctx: (block, elem) ->
-			$.BEM.switchBlock this, block, elem
-		mod: (modKey, modVal) ->
-			if typeof modVal == 'undefined'
-				modVal = null
-			if modVal == false
-				return $.BEM.delMod(this, modKey)
-			if modVal != null
-				$.BEM.setMod(this, modKey, modVal)
-			else
-				$.BEM.getMod(this, modKey)
-		setMod: (modKey, modVal) ->
-			$.BEM.setMod this, modKey, modVal
-		delMod: (modKey, modVal) ->
-			$.BEM.delMod this, modKey, modVal
-		hasMod: (modKey, modVal) ->
-			$.BEM.hasMod this, modKey, modVal
-		byMod: (modKey, modVal) ->
-			$.BEM.byMod this, modKey, modVal
-		byNotMod: (modKey, modVal) ->
-			$.BEM.byMod this, modKey, modVal, 'inverse'
-		toggleMod: (modKey, modVal1, modVal2) ->
-			if @hasMod(modKey, modVal1)
-				@delMod(modKey, modVal1).setMod modKey, modVal2
-			else
-				@delMod(modKey, modVal2).setMod modKey, modVal1
-	return
-) jQuery