rails_blocks 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6435b02e6fc6b71cad5e2d91b80a5080f7a49a67
-  data.tar.gz: 65cdfa3d3b3ae5daeffbb5161d74661bffa45cfa
+  metadata.gz: 9cbc3e4923986aed356514685bea330f592e98fa
+  data.tar.gz: aaabae0bebfeb63364dc9c5bb6da2e881e385c98
 SHA512:
-  metadata.gz: 39f9883d6e1e8fcf2b4b389f79c6decb6875a43fa35a616dbf4cfeac64cbb592b66463ae9188f4d74877977b81d84c56ef3ebe28e0225716c0ed80e73de58fc6
-  data.tar.gz: b1c32c0dbbe398a9b608d2b1db86fb4b9fda0bdf624e90a7ba7b52c2e83d4f715c348111f8a33c74c7e74ffe1b68443ff4defdbdc8c3c410c87fc9fc9e18dced
+  metadata.gz: a6e9ab6a12a8c688ff3245831d6abed11753b32a455409380fd2b90400df174622351455d941922781ba611d186f9d713d4366cd9cf783bda80d7aba36cb1892
+  data.tar.gz: e58092b574eb2adb80c8d443f6579d3fed08a2ae91217a06a7e58577f28ce10c4771038f1e9bbf345f48446442edb3506bd18a214d989d403d7948f22a3b240a

data/app/assets/javascripts/bem_blocks.coffee

@@ -5,7 +5,7 @@ window.$$ =
 	bem_class_selector: ".js-bem"
 	bemDataKey: 'bem'
 
-	processOptions: ($dom, b_name, o) ->
+	processOptions: ($dom, item_name, b_name, o) ->
 		if o.attrs
 			for attr, attr_value of o.attrs
 				$dom.prop(attr, attr_value)
@@ -13,14 +13,24 @@ window.$$ =
 			$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)
-			
-	makeElement: ($parent, b_name, e_name, o) ->
+		$dom
+	
+	makeDom: (o, klass) ->
+		o ||= {}
 		tag = o.tag || 'div'
-		$e = $("<#{tag} class='#{b_name}__#{e_name}'>")
-		$$.processOptions($e, b_name, o)
+		$("<#{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
@@ -28,10 +38,9 @@ window.$$ =
 		$e
 			
 	makeBlock: (b_name, o) ->
-		o ||= {}
-		tag = o.tag || 'div'
-		$b = $("<#{tag} class='#{b_name}'>")
-		$$.processOptions($b, b_name, o)
+		item_name = $$.blockClass(b_name)
+		$b = @makeDom(o, item_name)
+		$$.processOptions($b, item_name, b_name, o)
 		$b
 		
 	init: ($context) ->
@@ -55,8 +64,7 @@ window.$$ =
 		try
 			block = new $$.decls[$$.utils.camelCase(name)]($b, params, name)
 		catch e
-			console.log "Can't initialize block #{name}, check declaration."
-			throw e
+			console.error "Can't initialize block #{name}, check declaration. #{e.name} : #{e.message}"
 
 		bid = block.id
 		$b.data cacheKey, bid
@@ -78,5 +86,8 @@ window.$$ =
 	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

@@ -20,8 +20,10 @@ class window.Block
 		$elem.e_name = e_name
 		$elem.b_name = @name
 		$elem
-			
-		
+	
+	on: () ->
+		@$node.on.apply(@$node, arguments)
+
 	_addEvents: (element)->
 		for event_name, handler of @events
 			p = event_name.split(' ')
@@ -29,8 +31,8 @@ class window.Block
 				handler = decl.methods[handler]
 			@$node.on p[0], p[1], handler.bind(@)
 			
-	_trigger: (event) ->
-		@$node.trigger event
+	_trigger: (event, data) ->
+		@$node.trigger event, data
 
 	_elementClass: (e_name) ->
 		$$.elementClass(@name, e_name)

data/lib/rails_blocks/version.rb

@@ -1,3 +1,3 @@
 module RailsBlocks
-	VERSION = "0.7.6".freeze
+	VERSION = "0.7.7".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_blocks
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors:
 - Andrey Potetiurin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-28 00:00:00.000000000 Z
+date: 2017-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails