rails_blocks 0.5.6 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cad25c4a693e98e7ccc7f03ec1c60461355d2ba2
-  data.tar.gz: 41a3c86b8f2205201cb5f3a9aacb4511995011ea
+  metadata.gz: a65055e52b9b72247afafaba66b23b0587b2d6fe
+  data.tar.gz: 5b998796ec4d8eb8e0fb8bf93065792517312446
 SHA512:
-  metadata.gz: 71918f4d3f780141a77a107673dd9972971cfb62b735e90f09c822211fbf0af176646b102a412a16156deb5bbaf8b121961e06018acb724830ba964ce0eb7c16
-  data.tar.gz: 44df018325de06dbe3564dfc388a046cd734cb4ba2d6ae11d2331e35fbc1dc48c149482307269b64006f873108ec198b0f39ed64b807405e059f5789f3205fe5
+  metadata.gz: ef4f8298d9330e4b357fe8482b4116dd90cff5d25fbfc1feade504becbf2198534243de744ce17658659ddb98a7869e29d9f943836fceb3d6b62c833fe0cd481
+  data.tar.gz: d730c6e442c72c40f60cab48cd354b14382dd308f709269af3dc3547c4a748b6812e91cbbc4d6f7720a96d5cd395db48b0e2be9880adda96f153caf82391c019

data/.gitignore

@@ -7,9 +7,10 @@
 /pkg/
 /spec/reports/
 /tmp/
-/spec/internal/log/
+/spec/internal/log/*.log
 *.bundle
 *.so
 *.o
 *.a
 mkmf.log
+/.idea

data/.travis.yml

@@ -12,3 +12,4 @@ deploy:
 branches:
   only:
     - master
+    - /\d+\.\d+\.\d+/

data/app/assets/javascripts/bem_blocks.coffee

@@ -0,0 +1,106 @@
+window.$$ =
+	decls: {}
+	cache: {}
+	bem_class: 'js-bem'
+	bem_class_selector: ".js-bem"
+	bemDataKey: 'bem'
+
+	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_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_name}'>")
+		$$.processOptions($b, 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]
+		block = new $$.decls[$$.utils.camelCase(name)]($b, params, name)
+		bid = block.id
+		$b.data cacheKey, bid
+		$$.cache[bid] = block
+		block
+			
+	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)}"
+
+	elementClass: (b_name, e_name) ->
+		"#{b_name}__#{e_name}"
+
+$.fn.destroyBlocks = ->
+	@find($$.bem_class_selector).getBlocks().each ->
+		@destroy()
+
+$.fn.addMod = (name, value) ->
+	mod = $$.makeMod(name, value)
+	if @e_name
+		@addClass("#{@b_name}__#{@e_name}--#{mod}")
+	else
+		@addClass("#{@b_name}--#{mod}")
+
+$.fn.delMod = (name, value) ->
+	mod = $$.makeMod(name, value)
+	if @e_name
+		@removeClass("#{@b_name}__#{@e_name}--#{mod}")
+	else
+		@removeClass("#{@b_name}--#{mod}")
+		
+$.fn.asBlock = (name, o) ->
+	@addClass("#{name}")
+	$$.getBlock(@, name, o)
+
+$.fn.bemParams = () ->
+	allParams = @data($$.bemDataKey)
+	if @e_name
+		return allParams[$$.elementClass(@b_name, @e_name)]
+	else
+		console.log('Error, only for elements. Use initBlock for blocks.')

data/app/assets/javascripts/block.coffee

@@ -1,10 +1,10 @@
 class window.Block
-	constructor: ($b, options) ->
+	constructor: ($b, params, name) ->
 		@$node = $b
-		@name = $$.getBlockName($b)
-		@$node.b_name = @name
-		@id = $$.guid()
-		@params = $.extend({}, $b.data('bem'), options)
+		@name = name
+		console.log(@name)
+		@id = $$.utils.guid()
+		@params = params
 		#$.extend this, decl.methods
 		@_addEvents() if @events
 		# if @elements
@@ -12,11 +12,11 @@ class window.Block
 		# 		@_addEvents(element)
 		@init() if @init
 	
-	elem: (e_name, mod_name, mod_value, context) ->
-		klass = ".b-#{@name}__#{e_name}"
-		$elem = $(klass, context || @$node)
+	elem: (e_name, mod_name, mod_value, context = @$node) ->
 		if mod_name
-			$elem = $elem.filter("#{klass}--#{$$.makeMod(mod_name, mod_value)}")
+			$elem = $(".#{$$.elementModClass(@name, e_name,  mod_name,  mod_value)}", context)
+		else
+			$elem = $(".#{@_elementClass(e_name)}", context)
 		 
 		$elem.e_name = e_name
 		$elem.b_name = @name
@@ -32,19 +32,27 @@ class window.Block
 			
 	_trigger: (event) ->
 		@$node.trigger event
-	
+
+	_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.addMod(mod, value)
+		@$node.addClass($$.blockModClass(@name, mod, value))
 		
 	delMod: (mod, value) ->
-		@$node.delMod(mod, value)
+		@$node.removeClass($$.blockModClass(@name, mod, value))
 	
 	toggleMod: (mod, value) ->
 		if @hasMod(mod, value)
@@ -53,46 +61,4 @@ class window.Block
 			@$node.addMod(mod, value)
 
 	hasMod: (mod, value) ->
-		mod = $$.makeMod(mod, value)
-		@$node.hasClass("b-#{@name}--#{mod}")
-		
-# class window.Block
-# 	constructor: ($b) ->
-# 		name = $b.getBlockName()
-# 		params = $b.data('bem')
-# 		decl = RB.decls[name]
-# 		if !decl
-# 			throw new Error(name + ' block is not declared')
-# 		@name = name
-# 		@params = params
-# 		@$node = $b
-# 		@id = $$.guid()
-#
-# 		$.extend this, decl.methods
-# 		@_addEvents()
-# 		@_setInited()
-# 		@_trigger 'b-inited'
-# 		return
-#
-# 	_addEvents: ->
-# 		decl = $$.decls[@name]
-# 		events = decl.events
-# 		for e of events
-# 			if events.hasOwnProperty(e)
-# 				p = e.split(' ')
-# 				handler = events[e]
-# 				if typeof handler == 'string'
-# 					handler = decl.methods[handler]
-# 				@$node.on p[0], p[1], handler.bind(@)
-#
-# 	_setInited:->
-#
-# 	setMod: (mod, value) ->
-#
-# 	_trigger: (event) ->
-# 		@$node.trigger event
-#
-# 	destroy: ->
-# 		$$.cache[@id] = null
-# 		@$node.off()
-# 		@_trigger 'b-destroyed'
+		@$node.hasClass($$.blockModClass(@name, mod, value))

data/app/assets/javascripts/jquery_bem_copy.coffee

@@ -442,7 +442,7 @@
 
 	$.BEM = new BEM(
 		namePattern: '[a-zA-Z0-9-]+'
-		blockPrefix: 'b-'
+		blockPrefix: ''
 		elemPrefix: '__'
 		modPrefix: '--'
 		modDlmtr: '_')

data/app/assets/javascripts/rails_blocks.js

@@ -1,5 +1,3 @@
-//require 'jquery_bem_copy'
-//=require 'jquery_bem'
-//=require 'block'
-//=require 'jblocks'
-//=require 'main'
+//=require 'bem_blocks'
+//=require 'utils'
+//=require 'block'

data/app/assets/javascripts/utils.coffee

@@ -0,0 +1,9 @@
+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++

data/app/assets/stylesheets/rails_blocks.sass

@@ -1,9 +1,8 @@
-$bemBlockPrefix: 'b-'
-$bemElementSeparator: '__' 
+$bemElementSeparator: '__'
 $bemModifierSeparator: '--'
 
 @function b-class($block)
-	@return ".#{$bemBlockPrefix+$block}"
+	@return ".#{$block}"
 	
 @function selectorToString($selector)
 	$selector: inspect($selector) //cast to string
@@ -40,7 +39,7 @@ $bemModifierSeparator: '--'
 	@return str-slice($selector, 0, $start)
 
 =b($block)
-	.#{$bemBlockPrefix+$block}
+	.#{$block}
 		@content
 		
 =plus_b
@@ -90,5 +89,4 @@ $bemModifierSeparator: '--'
 	$selector: &
 	$selector: selectorToString($selector)
 	$block: if(containsModifier($selector) or containsPseudo($selector) or containsElement($selector), getBlock($selector), selectorToString($selector))
-	$block: str-slice($block, str-length($bemBlockPrefix) + 1)
 	@return image-url("#{$level}/#{$block}/images/#{$image}")

data/app/helpers/block_helper.rb

@@ -21,14 +21,11 @@ module BlockHelper
 	
 	#TODO бога ради, отрефактори это дерьмо
 	def b(b_name, options = {}, &block)
-		parent_block = context_block
-		push_context_block b_name
 		options = page_options.merge options
-		options[:parent_block] = parent_block if parent_block
+		options[:parent_block] = context_block
+		push_context_block b_name
 		template = block_template b_name, options
-		classes = block_classes b_name, options
-		
-		result = element(classes, template, options, &block)
+		result = entity(template, :block, b_name, options, &block)
 		pop_context_block
 		result
 	end
@@ -51,13 +48,12 @@ module BlockHelper
 	end
 	
 	def e(e_name, options = {}, &block)
+		options = page_options.merge options
 		parent_block = options[:b] || context_block
 		raise RailsBlocks::NoBlockContextError unless parent_block
-		options = page_options.merge options
 		options[:parent_block] = parent_block
 		template = element_template parent_block, e_name, options
-		classes = element_classes(parent_block, e_name, options)
-		element(classes, template, options, &block)
+		entity(template, :elem, e_name, options, &block)
 	end
 	
 	def e_classes(e_name, options = {})
@@ -68,42 +64,93 @@ module BlockHelper
 		element_classes(parent_block, e_name, options).join(' ')
 	end
 	
-	def element(classes, template, options, &block)
+	def entity(template, type, name, options, &block)
 		content = block ? capture(&block) : options[:content]
-		@attrs = {class: classes.join(' ')}
-		@attrs.merge! options[:attrs] if options[:attrs]
-		@attrs["data-bem"] = options[:data].to_json if options[:data]
-		@attrs[:tag] = options[:tag] || 'div'
-		
+		#важно заполнять публичные поля только после того, как закапчюрится то, что внутри энтити, иначе они перезапишутся.
+		@attrs = nil
+		@current_options = options
+		@current_entity = {type: type, name: name}
+		Rails.logger.debug "------------------------------------------------#{@current_options}-------------------------------#{@current_entity}"
 		template.nil? ? empty(content) : render(file: template, locals: {content: content, options: options})
 	end
 	
-	#убрать после тестов производительности
-	# def empty(content)
-	# 	atrrs = @attrs.except(:tag).map do |key, value|
-	# 		key.to_s + '=\'' + value.to_s + "'"
-	# 	end
-	# 	"<#{@attrs[:tag]} #{atrrs.join(' ')}>#{content}</#{@attrs[:tag]}>".html_safe
-	# end
-	
 	def empty(content)
 		content_tag bem_tag, content, bem_attrs_without_tag
 	end
 	
 	def bem_tag
-		@attrs[:tag]
+		bem_attrs[:tag]
 	end
 	
 	def bem_attrs
+		if @attrs.nil?
+			@attrs = {class: current_entity_classes.join(' ')}
+			@attrs.merge! @current_options[:attrs] if @current_options[:attrs]
+			data = current_bem_data
+			@attrs['data-bem'] = data.to_json if data
+			@attrs[:tag] = @current_options[:tag] || 'div'
+		end
+
 		@attrs
 	end
 	
 	def bem_attrs_without_tag
-		@attrs.except :tag
+		bem_attrs.except :tag
+	end
+
+
+
+	def set_tag(tag)
+		@current_options[:tag] = tag
+	end
+
+	def set_js(value)
+		@current_options[:js] = value
 	end
 	
 	private
-		
+		def current_bem_data
+			data = {}
+			data.merge! entity_data(current_entity_name, @current_options[:js]) if @current_options[:js]
+			data.merge! mix_data(@current_options[:mix]) if @current_options[:mix]
+
+			return nil if data == {}
+			data
+		end
+
+		def mix_data(mixes)
+			mixes = [mixes] unless mixes.is_a? Array
+			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
+				else
+					raise RailsBlocks::BadMixError if mix[:b].nil?
+					entity_data(block_name(mix[:b]), mix[:js])
+				end
+			end.compact.inject(&:merge) || {}
+		end
+
+		def entity_data(name, data)
+			return {name => data} if data.is_a? Hash
+			return {name => {}} if data == true
+			{}
+		end
+
+		def current_entity_name
+			return block_name(@current_entity[:name]) if @current_entity[:type] == :block
+			element_name(@current_options[:parent_block], @current_entity[:name])
+		end
+
+		def current_entity_classes
+			return block_classes(@current_entity[:name], @current_options) if @current_entity[:type] == :block
+			element_classes(@current_options[:parent_block], @current_entity[:name], @current_options)
+		end
+
 		def blocks_stack
 			@blocks_stack = @blocks_stack || []
 		end

data/lib/rails_blocks/blocks/block.rb

@@ -21,7 +21,7 @@ module RailsBlocks
 			
 			
 			def klass
-				RailsBlocks.config.prefix + @name
+				@name
 			end
 		end
 	end

data/lib/rails_blocks/configuration.rb

@@ -1,6 +1,5 @@
 module RailsBlocks
 	class Configuration
-		attr_accessor :prefix
 		attr_accessor :blocks_dir
 		attr_accessor :levels
 		attr_accessor :template_engine
@@ -15,13 +14,12 @@ module RailsBlocks
 		end
 		
 		def initialize
-			@prefix = 'b-'
 			@blocks_dir = 'app/blocks'
 			@levels = []
 			@template_engine = '.slim'
 			@element_separator = '__'
 			@modifier_separator = '--'
-			@js_class = 'js_bem'
+			@js_class = 'js-bem'
 		end
 	end
 end

data/lib/rails_blocks/names.rb

@@ -2,22 +2,30 @@ module RailsBlocks
 	module Names
 		def element_classes(b_name, e_name, options = {})
 			base_class = element_class b_name, e_name
-			classes(base_class, options)
+			classes(base_class, false, options)
 		end
 		
 		def block_classes(b_name, options = {})
 			base_class = block_class b_name
-			classes(base_class, options)
+			classes(base_class, true, options)
 		end
-		
+
+		def block_name(b_name)
+			b_name.to_s
+		end
+
+		def element_name(b_name, e_name)
+			b_name.to_s + RailsBlocks.config.element_separator + e_name.to_s
+		end
+
 		private
-			def classes(base_class, options = {})
+			def classes(base_class, add_js, options = {})
 				classes = [base_class]
 				classes |= mods_classes(base_class, options[:mods]) unless options[:mods].nil?
 				classes |= mix_classes(options[:mix], options[:parent_block]) if options[:mix]
 				classes |= Array(options[:class]) if options[:class]
-				classes << RailsBlocks.config.js_class if options[:js]
-				classes
+				classes << RailsBlocks.config.js_class if options[:js] && add_js
+				classes.uniq
 			end
 			
 			def mix_classes(mixes, context_block = nil)
@@ -48,13 +56,13 @@ module RailsBlocks
 			def mod_class(key, value)
 				value == true ? key.to_s : key.to_s + '_' + value.to_s
 			end
-			
+
 			def block_class(b_name)
-				RailsBlocks.config.prefix + b_name.to_s
+				block_name(b_name)
 			end
-			
+
 			def element_class(b_name, e_name)
-				block_class(b_name) + RailsBlocks.config.element_separator + e_name.to_s
+				element_name(b_name, e_name)
 			end
 	end
 end

data/lib/rails_blocks/version.rb

@@ -1,3 +1,3 @@
 module RailsBlocks
-	VERSION = "0.5.6".freeze
+	VERSION = "0.6.4".freeze
 end

data/rails_blocks.gemspec

@@ -28,11 +28,4 @@ Gem::Specification.new do |spec|
 	spec.add_development_dependency 'rspec-rails', '~> 3.0'
 	spec.add_development_dependency 'memfs'
 	spec.add_development_dependency 'spring'
-	spec.add_development_dependency 'guard'
-	spec.add_development_dependency 'guard-rspec'
-	spec.add_development_dependency 'pry'
-	spec.add_development_dependency 'pry-remote'
-	spec.add_development_dependency 'pry-nav'
-	spec.add_development_dependency 'terminal-notifier'
-	spec.add_development_dependency 'terminal-notifier-guard'
 end

data/spec/helpers/block_helper_spec.rb

@@ -6,24 +6,44 @@ describe BlockHelper, type: :helper do
 	context ".b" do
 		it "renders empty div with class when called without options" do
 			result = b :test
-			expect(result).to eq '<div class="b-test"></div>'
+			expect(result).to eq '<div class="test"></div>'
 		end
 		
 		it "renders div with content when called with block" do
 			result = b 'test-block' do
 				'test-content'
 			end
-			expect(result).to eq '<div class="b-test-block">test-content</div>'
+			expect(result).to eq '<div class="test-block">test-content</div>'
 		end
 		
 		it "renders empty div with mods class when called with mods" do
 			result = b 'test-block', mods: {test: :one}
-			expect(result).to eq '<div class="b-test-block b-test-block--test_one"></div>'
+			expect(result).to eq '<div class="test-block test-block--test_one"></div>'
 		end
 		
 		it 'renders file when one exists' do
 			result = b 'block1'
-			expect(result).to eq '<div class="b-block1">block1</div>'
+			expect(result).to eq '<div class="block1">block1</div>'
+		end
+
+		it 'ads js-bem class and data-bem when js: true' do
+			result = b 'b1', js: true
+			expect(result).to eq '<div class="b1 js-bem" data-bem="{&quot;b1&quot;:{}}"></div>'
+		end
+
+		it 'ads js-bem class and mixed data-bem when js: true in mix' do
+			result = b 'b1', mix: {b: 'b2', js: true}
+			expect(result).to eq '<div class="b1 b2 js-bem" data-bem="{&quot;b2&quot;:{}}"></div>'
+		end
+
+		it 'ads js-bem class and full data-bem when js: true in mix' do
+			result = b 'b1', js: true, mix: {b: 'b2', js: true}
+			expect(result).to eq '<div class="b1 b2 js-bem" data-bem="{&quot;b1&quot;:{},&quot;b2&quot;:{}}"></div>'
+		end
+
+		it 'ads js-bem class and full custom data-bem when js: true in mix' do
+			result = b 'b1', js: {bb1: 'boo'}, mix: {b: 'b2', js: {bb2: 'boo2'}}
+			expect(result).to eq '<div class="b1 b2 js-bem" data-bem="{&quot;b1&quot;:{&quot;bb1&quot;:&quot;boo&quot;},&quot;b2&quot;:{&quot;bb2&quot;:&quot;boo2&quot;}}"></div>'
 		end
 	end
 	
@@ -35,14 +55,14 @@ describe BlockHelper, type: :helper do
 		it "renders empty element with class when called without options" do
 			b 'test' do
 				result = e :element
-				expect(result).to eq '<div class="b-test__element"></div>'
+				expect(result).to eq '<div class="test__element"></div>'
 			end
 		end
 		
 		it "renders element with mods class when called with mods" do
 			b 'test' do
 				result = e 'element', mods: {test: :boo, test2: true}
-				expect(result).to eq '<div class="b-test__element b-test__element--test_boo b-test__element--test2"></div>'
+				expect(result).to eq '<div class="test__element test__element--test_boo test__element--test2"></div>'
 			end
 		end
 		
@@ -51,8 +71,27 @@ describe BlockHelper, type: :helper do
 				result = e 'element' do
 					"content"
 				end
-				expect(result).to eq '<div class="b-test__element">content</div>'
+				expect(result).to eq '<div class="test__element">content</div>'
+			end
+		end
+
+		it 'ads data-bem, but not js-bem class when js: true' do
+			b 'test' do
+				result = e 'e1', js: {test: 2}
+				expect(result).to eq '<div class="test__e1" data-bem="{&quot;test__e1&quot;:{&quot;test&quot;:2}}"></div>'
 			end
 		end
+
+		it 'ads js-bem class and mixed data-bem when js: true in mix with block' do
+			b 'test' do
+				result = e 'e1', mix: {b: 'b1', js: true}
+				expect(result).to eq '<div class="test__e1 b1 js-bem" data-bem="{&quot;b1&quot;:{}}"></div>'
+			end
+		end
+
+		it 'ads js-bem class and full data-bem when js: true in mix' do
+			result = b 'b1', js: true, mix: {b: 'b2', js: true}
+			expect(result).to eq '<div class="b1 b2 js-bem" data-bem="{&quot;b1&quot;:{},&quot;b2&quot;:{}}"></div>'
+		end
 	end
 end

data/spec/rails_blocks/blocks/block_spec.rb

@@ -5,7 +5,7 @@ describe RailsBlocks::Blocks::Block do
 		b_name = 'test-block'
 		block = RailsBlocks.get_block b_name
 		result = block.render
-		klass = RailsBlocks.config.prefix + b_name
+		klass = b_name
 		expect(result).to match(/<div.*\/div>/) & match(/class=\"#{klass}\"/)
 	end
 end

data/spec/rails_blocks/configuration_spec.rb

@@ -1,18 +1,6 @@
 describe RailsBlocks::Configuration do
 	subject { RailsBlocks::Configuration.new }
-	describe "#prefix" do
-		it "default value is 'b-'" do
-			expect(subject.prefix).to eq 'b-'
-		end
-	end
 
-	describe "#prefix=" do
-		it "can set value" do
-			subject.prefix = 't-'
-			expect(subject.prefix).to eq 't-'
-		end
-	end
-	
 	describe "#ns" do
 		it 'yield new Configuration' do
 			subject.ns :admin do |config|

data/spec/rails_blocks/names_spec.rb

@@ -5,58 +5,58 @@ describe RailsBlocks::Names do
 	context '.element_classes' do
 		it 'returns simple element_classes without options' do
 			classes = element_classes 'block', 'element'
-			expect(classes).to contain_exactly 'b-block__element'
+			expect(classes).to contain_exactly 'block__element'
 		end
 		
 		it 'returns element_class & mods with options[:mods]' do
 			classes = element_classes 'block', 'element', mods: {test: :one}
-			expect(classes).to contain_exactly 'b-block__element', 'b-block__element--test_one'
+			expect(classes).to contain_exactly 'block__element', 'block__element--test_one'
 		end
 	end
 	
 	context '.block_classes' do
 		it 'returns simple block_class without options' do
 			classes = block_classes 'block'
-			expect(classes).to contain_exactly 'b-block'
+			expect(classes).to contain_exactly 'block'
 		end
 		
 		it 'returns block_class & mods with options[:mods]' do
 			classes = block_classes 'block', mods: {test: :one}
-			expect(classes).to contain_exactly 'b-block', 'b-block--test_one'
+			expect(classes).to contain_exactly 'block', 'block--test_one'
 		end
 	end
 	
 	context '.mods_classes' do
 		it 'returns mods classes' do
-			classes = mods_classes 'b-base', {test: :one, boo: :two}
-			expect(classes).to contain_exactly 'b-base--test_one', 'b-base--boo_two'
+			classes = mods_classes 'base', {test: :one, boo: :two}
+			expect(classes).to contain_exactly 'base--test_one', 'base--boo_two'
 		end
 	end
 	
 	context '.mix_classes' do
 		it 'returns element class when one :b & :e exists' do
 			classes = mix_classes b: :block, e: :element
-			expect(classes).to contain_exactly 'b-block__element'
+			expect(classes).to contain_exactly 'block__element'
 		end
 		
 		it 'returns element classes when array :b & :e exists' do
 			classes = mix_classes [{b: :block, e: :element}, {b: 'block2', e: 'element2'}]
-			expect(classes).to contain_exactly 'b-block__element', 'b-block2__element2'
+			expect(classes).to contain_exactly 'block__element', 'block2__element2'
 		end
 		
 		it 'returns blocks classes when only :b exists' do
 			classes = mix_classes b: :block
-			expect(classes).to contain_exactly 'b-block'
+			expect(classes).to contain_exactly 'block'
 		end
 		
 		it 'returns blocks classes when array of :b exists' do
 			classes = mix_classes [{b: :block}, {b: :test}]
-			expect(classes).to contain_exactly 'b-block', 'b-test'
+			expect(classes).to contain_exactly 'block', 'test'
 		end
 		
 		it 'returns blocks classes & element classes when array of :b, :b & :e exists' do
 			classes = mix_classes [{b: :block}, {b: :test, e: :boo}]
-			expect(classes).to contain_exactly 'b-block', 'b-test__boo'
+			expect(classes).to contain_exactly 'block', 'test__boo'
 		end
 		
 		it 'raise error if :b not exists' do

data/spec/rails_blocks_spec.rb

@@ -3,14 +3,7 @@ require 'rails'
 
 describe RailsBlocks do
 	describe ".configure" do
-		it "set prefix for block class" do
-			RailsBlocks.configure do |config|
-				config.prefix = 't-'
-			end
 
-			expect(RailsBlocks.config.prefix).to eq 't-'
-		end
-		
 		it "set path for blocks folder" do
 			RailsBlocks.configure do |config|
 				config.blocks_dir = 'bem'
@@ -63,7 +56,6 @@ describe RailsBlocks do
 	describe ".reset" do
 		before :each do
 			RailsBlocks.configure do |config|
-				config.prefix = 'test-'
 				config.blocks_dir = 'test_path'
 				config.levels = ['common', 'test']
 				config.template_engine = '.haml'
@@ -71,11 +63,6 @@ describe RailsBlocks do
 			end
 		end
 
-		it "resets the configuration prefix" do
-			RailsBlocks.reset
-			expect(RailsBlocks.config.prefix).to eq('b-')
-		end
-		
 		it "resets the configuration block_path" do
 			RailsBlocks.reset
 			expect(RailsBlocks.config.blocks_dir).to eq('app/blocks')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_blocks
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.4
 platform: ruby
 authors:
 - Andrey Potetiurin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -142,104 +142,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-remote
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-nav
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: terminal-notifier
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: terminal-notifier-guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Gem helps build UI with blocks approach
 email:
 - potetiurin@gmail.com
@@ -255,12 +157,14 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- app/assets/javascripts/bem_blocks.coffee
 - app/assets/javascripts/block.coffee
 - app/assets/javascripts/jblocks.coffee
 - app/assets/javascripts/jquery_bem.coffee
 - app/assets/javascripts/jquery_bem_copy.coffee
 - app/assets/javascripts/main.coffee
 - app/assets/javascripts/rails_blocks.js
+- app/assets/javascripts/utils.coffee
 - app/assets/stylesheets/rails_blocks.sass
 - app/helpers/block_helper.rb
 - app/views/rails_blocks/element.slim
@@ -303,7 +207,6 @@ files:
 - spec/internal/config/routes.rb
 - spec/internal/db/schema.rb
 - spec/internal/log/.gitignore
-- spec/internal/log/test.log
 - spec/internal/public/favicon.ico
 - spec/rails_blocks/blocks/block_spec.rb
 - spec/rails_blocks/configuration_spec.rb
@@ -331,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Rails plugin for work with some modification of BEM methodology
@@ -358,7 +261,6 @@ test_files:
 - spec/internal/config/routes.rb
 - spec/internal/db/schema.rb
 - spec/internal/log/.gitignore
-- spec/internal/log/test.log
 - spec/internal/public/favicon.ico
 - spec/rails_blocks/blocks/block_spec.rb
 - spec/rails_blocks/configuration_spec.rb

data/spec/internal/log/test.log

@@ -1,8 +0,0 @@
-  Rendered app/blocks/common/block1/block1.slim (0.6ms)
-  Rendered app/blocks/common/block1/block1.slim (0.5ms)
-  Rendered app/blocks/common/block1/block1.slim (16.8ms)
-  Rendered app/blocks/common/block1/block1.slim (29.1ms)
-  Rendered app/blocks/common/block1/block1.slim (14.3ms)
-  Rendered app/blocks/common/block1/block1.slim (17.0ms)
-  Rendered app/blocks/common/block1/block1.slim (16.0ms)
-  Rendered app/blocks/common/block1/block1.slim (20.0ms)