bemer 0.3.0 → 0.4.0

data/lib/bemer/configuration.rb

@@ -18,8 +18,10 @@ module Bemer
     def initialize # rubocop:disable Metrics/MethodLength
       @asset_paths              = []
       @bem                      = false
+      # https://github.com/heartcombo/devise/blob/b52e642c0131f7b0d9f2dd24d8607a186f18223e/lib/devise.rb#L301
       # Gem::Version.new('0.4.1') > Gem::Version.new('0.10.1')
       # Здесь вроде также используют https://github.com/rspec/rspec-rails/blob/9b7ab39c027a8cb25e2ebe9e0e985756025b0549/Gemfile#L45
+      # https://github.com/JuanitoFatas/fast-ruby/blob/38f49f95fc7574d929de60b71791d09129c2588c/code/string/%3D%3D%3D-vs-%3D~-vs-match.rb#L20
       @can_use_new_matcher      = RUBY_VERSION >= '2.4.0'
       @default_block_tag        = :div
       @default_element_tag      = :div

data/lib/bemer/entity.rb

@@ -59,7 +59,7 @@ module Bemer
       @bem_cascade = options.delete(:bem_cascade)
       @css_classes = [options.delete(:class), options.delete(:cls)]
       @js          = options.delete(:js)
-      @mixins      = MixinList.new(options.delete(:mix))
+      @mixins      = Mixes.new(options.delete(:mix))
       @modifiers   = ModifierList.new(block, element, options.delete(:mods))
       @tag         = build_tag(options.delete(:tag))
       @html_attrs  = options

data/lib/bemer/entity_builder.rb

@@ -4,14 +4,20 @@ require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/string/filters'
 
 module Bemer
-  class EntityBuilder < Entity
+  class EntityBuilder < Entity # rubocop:disable Metrics/ClassLength
+    DATA_BEM_KEY = :'data-bem'
+
     def attrs
       attributes         = Hash[super]
       attributes[:class] = cls if cls.present?
 
       return attributes unless bem?
 
-      attributes.merge!(js)
+      data_bem = js
+
+      data_bem[DATA_BEM_KEY] = data_bem[DATA_BEM_KEY].to_json if data_bem.key?(DATA_BEM_KEY)
+
+      attributes.merge!(data_bem)
     end
 
     def attrs=(new_attrs, save = true)
@@ -39,9 +45,9 @@ module Bemer
     def cls
       return super unless bem?
 
-      js_class = 'i-bem' if @js.present? && bem_class.present?
+      i_bem = 'i-bem' if need_data_bem? || need_mixed_data_bem?
 
-      [bem_class, mods, mix, super, js_class].join(' ').squish
+      [bem_class, mods, mix, super, i_bem].flatten.reject(&:blank?).uniq.join(' ')
     end
 
     def cls=(new_cls, save = true)
@@ -55,11 +61,18 @@ module Bemer
     end
 
     def js
-      return {} if @js.blank? || bem_class.blank?
+      need_data_bem       = need_data_bem?
+      need_mixed_data_bem = need_mixed_data_bem?
 
-      js_attrs = @js.instance_of?(TrueClass) ? {} : super
+      return {} unless need_data_bem || need_mixed_data_bem
 
-      { 'data-bem': { name => js_attrs }.to_json }
+      if !need_data_bem && need_mixed_data_bem
+        mixed_data_bem
+      else
+        data_bem = @js.instance_of?(TrueClass) ? {} : super
+
+        { DATA_BEM_KEY => { name => data_bem }.merge!(mixed_data_bem[DATA_BEM_KEY]) }
+      end
     end
 
     def js=(new_js, save = true)
@@ -67,9 +80,15 @@ module Bemer
     end
 
     def mix=(new_mix, save = true)
-      new_mix = MixinList.new(new_mix).to_a
+      new_mixes = Mixes.new(new_mix)
+      new_mix   = new_mixes.to_a
 
-      save ? @mix = new_mix : new_mix
+      if save
+        @mixins = new_mixes
+        @mix    = new_mix
+      else
+        new_mix
+      end
     end
 
     def mods
@@ -93,8 +112,24 @@ module Bemer
       save ? @tag = new_tag : new_tag
     end
 
+    def need_data_bem?
+      bem? && @js.present? && bem_class.present?
+    end
+
+    def need_mixed_data_bem?
+      bem? && mixins.entities.any?(&:need_data_bem?)
+    end
+
     protected
 
+    def mixed_data_bem
+      mixins.entities.each_with_object(DATA_BEM_KEY => {}) do |entity, data_bem|
+        next unless entity.need_data_bem?
+
+        data_bem[DATA_BEM_KEY][entity.name] = entity.js[DATA_BEM_KEY][entity.name]
+      end
+    end
+
     def bem_via_option?
       !@bem.nil?
     end

data/lib/bemer/helpers.rb

@@ -12,13 +12,16 @@ module Bemer
 
     # Использовать mix
     # Использовать mixs
+    # mixes
     # Использовать bemer_mix
     def bem_mix(*mix)
-      Bemer::MixinList.new(mix).to_s
+      Bemer::Mixes.new(mix).to_s
     end
 
     # Использовать mods
     # Использовать mod
+    # modifier
+    # modifiers
     # Использовать bemer_mods
     def bem_mods(*block_and_element, mods)
       block, element = *block_and_element
@@ -51,5 +54,11 @@ module Bemer
     def component_partial_path(name)
       Bemer::PathResolver.new(self).resolve(name, true)
     end
+
+    def bem_attrs_for(block = '', element = nil, **options)
+      js = options[:js].nil? ? true : options.delete(:js)
+
+      Bemer::EntityBuilder.new(block, element, options.merge(bem: true, js: js)).attrs
+    end
   end
 end

data/lib/bemer/mixes.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/array/wrap'
+require 'active_support/core_ext/hash/slice'
+
+module Bemer
+  class Mixes
+    def initialize(*mixes)
+      @mixes = Array.wrap(mixes).flatten
+    end
+
+    def to_a
+      @to_a ||= entities.map { |e| [e.bem_class, e.mods] }.flatten.reject(&:blank?).uniq
+    end
+
+    def to_s
+      @to_s ||= to_a.join(' ')
+    end
+
+    def entities # rubocop:disable Metrics/MethodLength
+      @entities ||= mixes.flat_map do |mix|
+        if mix.is_a?(Hash)
+          options = mix.extract!(:js, :mods)
+
+          mix.flat_map do |block, elems|
+            if elems.nil?
+              EntityBuilder.new(block, **options, bem: true)
+            else
+              Array(elems).map { |elem| EntityBuilder.new(block, elem, **options, bem: true) }
+            end
+          end
+        else
+          Array(mix).flat_map { |block| EntityBuilder.new(block) }
+        end
+      end
+    end
+
+    protected
+
+    attr_reader :mixes
+  end
+end

data/lib/bemer/predicate.rb

@@ -7,7 +7,7 @@ module Bemer
       @condition = options[:condition].nil? ? true : options[:condition]
       @element   = options[:elem]
       @mask      = build_mask(options[:block], options[:elem])
-      @mixins    = MixinList.new(options[:mix])
+      @mixins    = Mixes.new(options[:mix])
       @modifiers = ModifierList.new(:block, :elem, options[:mods])
       @wildcard  = nil
     end

data/lib/bemer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bemer
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/spec/action_view/helpers/bem_attrs_for_spec.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+RSpec.describe 'bem_attrs_for helper' do
+  delegate :bem_attrs_for, to: :view
+
+  context 'when a block and element have no name' do
+    it { expect(bem_attrs_for).to be_empty }
+  end
+
+  context 'when only a block name is specified' do
+    it { expect(bem_attrs_for(:block)).to include(class: 'block i-bem', 'data-bem': '{"block":{}}') }
+    it { expect(bem_attrs_for(:block, mods: :enabled)).to include(class: 'block block_enabled i-bem', 'data-bem': '{"block":{}}') }
+    it { expect(bem_attrs_for(:block, mix: { block1: :elem })).to include(class: 'block block1__elem i-bem', 'data-bem': '{"block":{}}') }
+    it { expect(bem_attrs_for(:block, js: { key: :val })).to include(class: 'block i-bem', 'data-bem': '{"block":{"key":"val"}}') }
+    it { expect(bem_attrs_for(:block, js: false)).to include(class: 'block') }
+
+    ['', false].each do |elem|
+      it { expect(bem_attrs_for(:block, elem)).to be_empty }
+    end
+  end
+
+  context 'when only an element name is specified' do
+    ['', nil, false].each do |block|
+      it { expect(bem_attrs_for(block, :elem)).to be_empty }
+    end
+  end
+
+  context 'when a name is specified for a block and element' do
+    it { expect(bem_attrs_for(:block, :elem)).to include(class: 'block__elem i-bem', 'data-bem': '{"block__elem":{}}') }
+    it { expect(bem_attrs_for(:block, :elem, mods: :enabled)).to include(class: 'block__elem block__elem_enabled i-bem', 'data-bem': '{"block__elem":{}}') }
+    it { expect(bem_attrs_for(:block, :elem, mix: :block_2)).to include(class: 'block__elem block-2 i-bem', 'data-bem': '{"block__elem":{}}') }
+    it { expect(bem_attrs_for(:block, :elem, js: { key: :val })).to include(class: 'block__elem i-bem', 'data-bem': '{"block__elem":{"key":"val"}}') }
+    it { expect(bem_attrs_for(:block, :elem, js: false)).to include(class: 'block__elem') }
+  end
+end

data/spec/action_view/helpers/block_tag_spec.rb

@@ -38,7 +38,7 @@ RSpec.describe 'block_tag helper' do
           # it_behaves_like 'a BEM entity', '<div></div>'
           # it_behaves_like 'a block entity builder method', 'Helloo', :yeyeye
           # it_behaves_like 'an entity builder method', 'html'
-          it_behaves_like 'an HTML entity tree builder method', :hello, { tag: :strong }, 'html'
+          # it_behaves_like 'an HTML entity tree builder method', :hello, { tag: :strong }, 'html'
         end
       end
 

data/spec/action_view/helpers/elem_tag_spec.rb

@@ -0,0 +1,166 @@
+# frozen_string_literal: true
+
+RSpec.describe 'elem_tag helper' do
+  delegate :elem_tag, to: :view
+
+  context 'when the `default_element_tag` is set to `span`' do
+    before do
+      Bemer.config.default_element_tag = :span
+    end
+
+    it { expect(elem_tag(:block, :elem)).to have_empty_tag(:span, with: { class: 'block__elem' }, count: 1) }
+  end
+
+  context 'when the `element_name_separator` is set to `___`' do
+    before do
+      Bemer.config.element_name_separator = '___'
+    end
+
+    it { expect(elem_tag(:block, :elem)).to have_empty_tag(:div, with: { class: 'block___elem' }, count: 1) }
+  end
+
+  context 'when the `modifier_name_separator` is set to `--`' do
+    before do
+      Bemer.config.modifier_name_separator = '--'
+    end
+
+    it { expect(elem_tag(:block, :elem, mods: :enabled)).to have_empty_tag(:div, with: { class: 'block__elem block__elem--enabled' }, count: 1) }
+  end
+
+  context 'when the `modifier_value_separator` is set to `___`' do
+    before do
+      Bemer.config.modifier_value_separator = '___'
+    end
+
+    it { expect(elem_tag(:block, :elem, mods: { theme: :gray })).to have_empty_tag(:div, with: { class: 'block__elem block__elem_theme___gray' }, count: 1) }
+  end
+
+  # The bem parameter from the configuration does not affect the operation of elem_tag in any way.
+  [true, false].each do |bem|
+    context "when the `bem` is globally set to `#{bem}`" do
+      before do
+        Bemer.config.bem = bem
+      end
+
+      context 'when a block and element have no name' do
+        it { expect(elem_tag).to(have_empty_tag(:div, count: 1)) { without_tag 'div[class]' } }
+        it { expect(elem_tag(bem: true)).to(have_empty_tag(:div, count: 1)) { without_tag 'div[class]' } }
+        it { expect(elem_tag(js: true)).to(have_empty_tag(:div, without: { class: 'i-bem' }, count: 1)) { without_tag 'div[data-bem]' } }
+
+        ['', nil, false].repeated_permutation(2).each do |block, elem|
+          it { expect(elem_tag(block, elem, bem: true)).to(have_empty_tag(:div, count: 1)) { without_tag 'div[class]' } }
+          it { expect(elem_tag(block, elem, js: true)).to(have_empty_tag(:div, without: { class: 'i-bem' }, count: 1)) { without_tag 'div[data-bem]' } }
+        end
+      end
+
+      context 'when only a block name is specified' do
+        it { expect(elem_tag(:block, nil, bem: true)).to have_empty_tag(:div, with: { class: 'block' }, count: 1) }
+        it { expect(elem_tag(:block, nil, js: true)).to have_empty_tag(:div, with: { class: 'block i-bem', 'data-bem': '{"block":{}}' }, count: 1) }
+
+        ['', false].each do |elem|
+          it { expect(elem_tag(:block, elem, bem: true)).to(have_empty_tag(:div, count: 1)) { without_tag 'div[class]' } }
+          it { expect(elem_tag(:block, elem, js: true)).to(have_empty_tag(:div, without: { class: 'i-bem' }, count: 1)) { without_tag 'div[data-bem]' } }
+        end
+      end
+
+      context 'when only an element name is specified' do
+        ['', nil, false].each do |block|
+          it { expect(elem_tag(block, :elem)).to(have_empty_tag(:div, count: 1)) { without_tag 'div[class]' } }
+          it { expect(elem_tag(block, :elem, bem: true)).to(have_empty_tag(:div, count: 1)) { without_tag 'div[class]' } }
+          it { expect(elem_tag(block, :elem, js: true)).to(have_empty_tag(:div, without: { class: 'i-bem' }, count: 1)) { without_tag 'div[data-bem]' } }
+        end
+      end
+
+      context 'when a name is specified for a block and element' do
+        # Entity name
+        it { expect(elem_tag(:block_name, :elem_name)).to have_empty_tag(:div, with: { class: 'block-name__elem-name' }, count: 1) }
+        it { expect(elem_tag('Block_Name', 'Elem_Name')).to have_empty_tag(:div, with: { class: 'Block_Name__Elem_Name' }, count: 1) }
+        it { expect(elem_tag(:Block_Name, :Elem_Name)).to have_empty_tag(:div, with: { class: 'Block-Name__Elem-Name' }, count: 1) }
+        it { expect(elem_tag('BlockName', 'ElemName')).to have_empty_tag(:div, with: { class: 'BlockName__ElemName' }, count: 1) }
+
+        # bem parameter
+        it { expect(elem_tag(:block, :elem, mix: :css_mixin, mods: :enabled, js: true, cls: :css_class)).to have_empty_tag(:div, with: { class: 'block__elem block__elem_enabled css-mixin css-class i-bem', 'data-bem': '{"block__elem":{}}' }, count: 1) }
+        it { expect(elem_tag(:block, :elem, bem: true, mix: :css_mixin, mods: :enabled, js: true, cls: :css_class)).to have_empty_tag(:div, with: { class: 'block__elem block__elem_enabled css-mixin css-class i-bem', 'data-bem': '{"block__elem":{}}' }, count: 1) }
+        it { expect(elem_tag(:block, :elem, bem: false, mix: :css_mixin, mods: :enabled, js: true, cls: :css_class)).to(have_empty_tag(:div, with: { class: 'css-class' }, without: { class: 'block__elem block__elem_enabled css-mixin i-bem' }, count: 1)) { without_tag 'div[data-bem]' } }
+
+        # bem_cascade parameter
+        it { expect(elem_tag(:block, :elem, bem_cascade: false)).to(have_empty_tag(:div, count: 1)) { without_tag 'div[class]' } }
+        it { expect(elem_tag(:block, :elem, bem: true, bem_cascade: false)).to have_empty_tag(:div, with: { class: 'block__elem' }, count: 1) }
+        it { expect(elem_tag(:block, :elem, bem: false, bem_cascade: true)).to(have_empty_tag(:div, count: 1)) { without_tag 'div[class]' } }
+
+        # cls and class parameters
+        it { expect(elem_tag(:block, :elem, cls: :css_class)).to have_empty_tag(:div, with: { class: 'block__elem css-class' }, count: 1) }
+        it { expect(elem_tag(:block, :elem, class: :css_class)).to have_empty_tag(:div, with: { class: 'block__elem css-class' }, count: 1) }
+        it { expect(elem_tag(:block, :elem, class: :css_class1, cls: :css_class2)).to have_empty_tag(:div, with: { class: 'block__elem css-class1 css-class2' }, count: 1) }
+        it { expect(elem_tag(:block, :elem, class: 'css_class1', cls: 'css_class2')).to have_empty_tag(:div, with: { class: 'block__elem css_class1 css_class2' }, count: 1) }
+        it { expect(elem_tag(:block, :elem, class: ['css_class1', :css_class2])).to have_empty_tag(:div, with: { class: 'block__elem css_class1 css-class2' }, count: 1) }
+        it { expect(elem_tag(:block, :elem, cls: ['css_class1', :css_class2])).to have_empty_tag(:div, with: { class: 'block__elem css_class1 css-class2' }, count: 1) }
+
+        # js parameter
+        it { expect(elem_tag(:block, :elem, js: true)).to have_empty_tag(:div, with: { class: 'block__elem i-bem', 'data-bem': '{"block__elem":{}}' }, count: 1) }
+        it { expect(elem_tag(:block, :elem, js: [1, 2])).to have_empty_tag(:div, with: { class: 'block__elem i-bem', 'data-bem': '{"block__elem":[1,2]}' }, count: 1) }
+        it { expect(elem_tag(:block, :elem, js: { key: :val })).to have_empty_tag(:div, with: { class: 'block__elem i-bem', 'data-bem': '{"block__elem":{"key":"val"}}' }, count: 1) }
+
+        # mix parameter
+        it { expect(elem_tag(:block, :elem, mix: :css_mixin)).to have_empty_tag(:div, with: { class: 'block__elem css-mixin' }, count: 1) }
+        it { expect(elem_tag(:block, :elem, mix: ['css_mixin', :block_name, block2: :elem])).to have_empty_tag(:div, with: { class: 'block__elem css_mixin block-name block2__elem' }, count: 1) }
+        it { expect(elem_tag(:block, :elem, mix: { block_name: :elem })).to have_empty_tag(:div, with: { class: 'block__elem block-name__elem' }, count: 1) }
+        it { expect(elem_tag(:block, :elem, mix: { block_name: :elem, js: true })).to have_empty_tag(:div, with: { class: 'block__elem block-name__elem i-bem', 'data-bem': '{"block-name__elem":{}}' }, count: 1) }
+        it { expect(elem_tag(:block, :elem, js: true, mix: { block_1: :elem, js: { key: :val } })).to have_empty_tag(:div, with: { class: 'block__elem block-1__elem i-bem', 'data-bem': '{"block__elem":{},"block-1__elem":{"key":"val"}}' }, count: 1) }
+        it { expect(elem_tag(:block, :elem, js: true, mix: { block: :elem, js: { key: :val } })).to have_empty_tag(:div, with: { class: 'block__elem i-bem', 'data-bem': '{"block__elem":{"key":"val"}}' }, count: 1) }
+        it { expect(elem_tag(:block, :elem, mix: { block_name: :elem, mods: :enabled })).to have_empty_tag(:div, with: { class: 'block__elem block-name__elem block-name__elem_enabled' }, count: 1) }
+        it { expect(elem_tag(:block, :elem, mix: [:mix, block_name: :elem, js: true])).to have_empty_tag(:div, with: { class: 'block__elem mix block-name__elem i-bem', 'data-bem': '{"block-name__elem":{}}' }, count: 1) }
+        it { expect(elem_tag(:block, :elem, mix: [{ block_1: nil, mods: :enabled, js: { key: :val } }, { block_name: :elem, js: true }])).to have_empty_tag(:div, with: { class: 'block__elem block-1 block-1_enabled block-name__elem i-bem', 'data-bem': '{"block-1":{"key":"val"},"block-name__elem":{}}' }, count: 1) }
+        it { expect(elem_tag(:block, :elem, mix: [:block_1, block2: %i[elem1 elem2], js: true])).to have_empty_tag(:div, with: { class: 'block__elem block-1 block2__elem1 block2__elem2 i-bem', 'data-bem': '{"block2__elem1":{},"block2__elem2":{}}' }, count: 1) }
+        it { expect(elem_tag(:block, :elem, mix: { block2: %i[elem1 elem2], js: true })).to have_empty_tag(:div, with: { class: 'block__elem block2__elem1 block2__elem2 i-bem', 'data-bem': '{"block2__elem1":{},"block2__elem2":{}}' }, count: 1) }
+
+        # mods parameter
+        it { expect(elem_tag(:block, :elem, mods: :enabled)).to have_empty_tag(:div, with: { class: 'block__elem block__elem_enabled' }, count: 1) }
+        it { expect(elem_tag(:block, :elem, mods: { enabled: true })).to have_empty_tag(:div, with: { class: 'block__elem block__elem_enabled' }, count: 1) }
+        it { expect(elem_tag(:block, :elem, mods: { enabled: 'true' })).to have_empty_tag(:div, with: { class: 'block__elem block__elem_enabled_true' }, count: 1) }
+        it { expect(elem_tag(:block, :elem, mods: { enabled: false })).to have_empty_tag(:div, with: { class: 'block__elem' }, without: { class: 'block__elem_enabled' }, count: 1) }
+        it { expect(elem_tag(:block, :elem, mods: { enabled: 'false' })).to have_empty_tag(:div, with: { class: 'block__elem block__elem_enabled_false' }, count: 1) }
+        it { expect(elem_tag(:block, :elem, mods: { enabled: '' })).to have_empty_tag(:div, with: { class: 'block__elem' }, without: { class: 'block__elem_enabled' }, count: 1) }
+        it { expect(elem_tag(:block, :elem, mods: { enabled: nil })).to have_empty_tag(:div, with: { class: 'block__elem' }, without: { class: 'block__elem_enabled' }, count: 1) }
+        it { expect(elem_tag(:block, :elem, mods: { enabled: 'nil' })).to have_empty_tag(:div, with: { class: 'block__elem block__elem_enabled_nil' }, count: 1) }
+        it { expect(elem_tag(:block, :elem, mods: [:enabled, size: :small])).to have_empty_tag(:div, with: { class: 'block__elem block__elem_enabled block__elem_size_small' }, count: 1) }
+        it { expect(elem_tag(:block, :elem, mods: [:enabled, %i[size small], %i[size large]])).to have_empty_tag(:div, with: { class: 'block__elem block__elem_enabled block__elem_size_large' }, count: 1) }
+
+        # tag parameter
+        it { expect(elem_tag(:block, :elem, tag: :span)).to have_empty_tag(:span, with: { class: 'block__elem' }, count: 1) }
+        it { expect(elem_tag(:block, :elem, tag: '', content: 'Content')).to eq 'Content' }
+        it { expect(elem_tag(:block, :elem, tag: '', content: '')).to eq '' }
+        # got: nil
+        # it { expect(elem_tag(:block, :elem, tag: '')).to eq '' }
+        it { expect(elem_tag(:block, :elem, tag: false, content: 'Content')).to eq 'Content' }
+        it { expect(elem_tag(:block, :elem, tag: false, content: '')).to eq '' }
+        # got: nil
+        # it { expect(elem_tag(:block, :elem, tag: false)).to eq '' }
+        it { expect(elem_tag(:block, :elem, tag: nil, content: 'Content')).to have_tag(:div, with: { class: 'block__elem' }, text: 'Content', count: 1) }
+
+        # attributes
+        it { expect(elem_tag(:block, :elem, data: { key: :val })).to have_empty_tag(:div, with: { class: 'block__elem', 'data-key': 'val' }, count: 1) }
+        it { expect(elem_tag(:block, :elem, 'data-key': :val)).to have_empty_tag(:div, with: { class: 'block__elem', 'data-key': 'val' }, count: 1) }
+        it { expect(elem_tag(:block, :elem, data: { key: :val }, 'data-key2': :val)).to have_empty_tag(:div, with: { class: 'block__elem', 'data-key': 'val', 'data-key2': 'val' }, count: 1) }
+        it { expect(elem_tag(:block, :elem, tag: :a, href: '#')).to have_empty_tag(:a, with: { class: 'block__elem', href: '#' }, count: 1) }
+
+        # content parameter
+        it { expect(elem_tag(:block, :elem, content: 'Content')).to have_tag(:div, with: { class: 'block__elem' }, text: 'Content', count: 1) }
+
+        it do # rubocop:disable RSpec/ExampleLength
+          html = elem_tag :block, :elem do
+            elem_tag :block, :elem1, content: 'Content' do
+              '<div></div>'.html_safe
+            end
+          end
+
+          expect(html).to have_tag(:div, with: { class: 'block__elem' }, count: 1) do
+            with_tag :div, with: { class: 'block__elem1' }, count: 1 do
+              with_tag :div, without: { class: 'block__elem1' }, blank: true, count: 1
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/rails_helper.rb

@@ -7,6 +7,7 @@ require_relative 'dummy/config/environment'
 require 'rspec/rails'
 require 'spec_helper'
 require 'fuubar'
+require 'rspec-html-matchers'
 
 RSpec.configure do |config|
   # RSpec Rails can automatically mix in different behaviours to your tests
@@ -36,4 +37,5 @@ RSpec.configure do |config|
   end
 
   config.include Bemer::Test::ConfigurationHelpers
+  config.include RSpecHtmlMatchers
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bemer
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Alexander Grigorev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-01 00:00:00.000000000 Z
+date: 2020-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.0
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.0
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.9.0
+- !ruby/object:Gem::Dependency
+  name: rspec-html-matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -142,28 +142,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.64.0
+        version: 0.68.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.68.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.64.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.32.0
+        version: 1.38.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.32.0
+        version: 1.38.1
 - !ruby/object:Gem::Dependency
   name: wwtd
   requirement: !ruby/object:Gem::Requirement
@@ -192,7 +206,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.22
-description: Build reusable UI components for Rails applications using the BEM methodology.
+description: Build reusable UI components for Rails applications with the ability
+  to use the BEM methodology.
 email: vill@rubyinventory.org
 executables: []
 extensions: []
@@ -205,6 +220,7 @@ extra_rdoc_files:
 - docs/Режимы.md
 - docs/Создание-и-использование-UI-компонент.md
 - docs/Файловая-структура.md
+- docs/Хелпер-bem_attrs_for.md
 - docs/Хелпер-bem_mix.md
 - docs/Хелпер-bem_mods.md
 - docs/Хелпер-block_tag.md
@@ -228,6 +244,7 @@ files:
 - docs/Режимы.md
 - docs/Создание-и-использование-UI-компонент.md
 - docs/Файловая-структура.md
+- docs/Хелпер-bem_attrs_for.md
 - docs/Хелпер-bem_mix.md
 - docs/Хелпер-bem_mods.md
 - docs/Хелпер-block_tag.md
@@ -260,7 +277,7 @@ files:
 - lib/bemer/entity.rb
 - lib/bemer/entity_builder.rb
 - lib/bemer/helpers.rb
-- lib/bemer/mixin_list.rb
+- lib/bemer/mixes.rb
 - lib/bemer/modifier_list.rb
 - lib/bemer/path_resolver.rb
 - lib/bemer/pipeline.rb
@@ -280,10 +297,11 @@ files:
 - lib/bemer/tree/node.rb
 - lib/bemer/tree/text_node.rb
 - lib/bemer/version.rb
+- spec/action_view/helpers/bem_attrs_for_spec.rb
 - spec/action_view/helpers/block_tag_spec.rb
+- spec/action_view/helpers/elem_tag_spec.rb
 - spec/bemer/entity_builder_spec.rb
 - spec/bemer/entity_spec.rb
-- spec/bemer/mixin_list_spec.rb
 - spec/bemer/modifier_list_spec.rb
 - spec/bemer/railtie_spec.rb
 - spec/bemer_spec.rb
@@ -301,7 +319,6 @@ files:
 - spec/rails_helper.rb
 - spec/spec_helper.rb
 - spec/support/bemer.rb
-- spec/support/shared_examples/an_html_entity_tree_builder_method.rb
 homepage: 
 licenses:
 - MIT
@@ -325,16 +342,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.2.0
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Build reusable UI components for Rails applications using the BEM methodology.
+summary: Build reusable UI components for Rails applications with the ability to use
+  the BEM methodology.
 test_files:
+- spec/action_view/helpers/bem_attrs_for_spec.rb
 - spec/action_view/helpers/block_tag_spec.rb
+- spec/action_view/helpers/elem_tag_spec.rb
 - spec/bemer/entity_builder_spec.rb
 - spec/bemer/entity_spec.rb
-- spec/bemer/mixin_list_spec.rb
 - spec/bemer/modifier_list_spec.rb
 - spec/bemer/railtie_spec.rb
 - spec/bemer_spec.rb
@@ -352,4 +370,3 @@ test_files:
 - spec/rails_helper.rb
 - spec/spec_helper.rb
 - spec/support/bemer.rb
-- spec/support/shared_examples/an_html_entity_tree_builder_method.rb