rbem 0.1.5 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 736da0b495fca2527279fc8d70994d3eb61a2ba9
-  data.tar.gz: 27a10eb42501f9fa68f1ab29336030f93368f2c7
+  metadata.gz: 720d03b5417352538a07c97a1e5fce646a17b671
+  data.tar.gz: 3893b7c30e91d4da744877698f9cc06ef18c0f8c
 SHA512:
-  metadata.gz: 2d6dafc38af764bdec869db5073cc99962e663246df75adf2fcdd62e85c8882d563c623a3c0d9fa5452c8c9f98bdc675f8b5014a9b5c1bb4d78984ec0a60693e
-  data.tar.gz: 9d8a198ebce633f9788cb82ce234e25f8499f6381c1d9f16e3a7c6cd6e5aee01d8fe4f1c0f27062631c2f45c5f6f9bf4d970bbf914c88f04d25aa730320c570f
+  metadata.gz: df9d32c6d3cffdfb53d92fe302314f1be1346f5cdf56215b45ecdd6ca5fde912a0813a66946e02b658ae6ad4249b2356f23a12554d061d656d7e3fd320dc5c23
+  data.tar.gz: e049adf1955637122b9b89fd51075c300ff039968288e7b9fbf90f78a74043bccf9f39a35b9910df4c691ec1f0c091a95b501d9bae85fddcce0c68b71036961c

data/README.md

@@ -60,6 +60,18 @@ end
 / </div>
 ```
 
+Multiple modifiers:
+
+```slim
+= b 'block', 'full hot'
+  = e 'element', 'active fix'
+
+/ == Returns:
+/ <span class="block block_full block_hot">
+/   <a class="block__element block__element_active block__element_fix"></a>
+/ </span>
+```
+
 Set block/element type(`Symbol`):
 
 ```slim
@@ -108,6 +120,18 @@ Inherit block modifier to element `&modifier`:
 / </div>
 ```
 
+Inherit specific block modifier to element `&modifier:block_mod`:
+
+```slim
+= b 'block', 'full hot'
+  = e 'element', '&active:hot'
+
+/ == Returns:
+/ <div class="block block_full block_hot">
+/   <div class="block__element block__element_active block_hot__element_active"></div>
+/ </div>
+```
+
 ## Contributing
 
 1. Fork it ( https://github.com/vadimskrotsky/rbem/fork )

data/lib/rbem.rb

@@ -11,12 +11,12 @@ module Rbem
     _args = parse_args(args)
 
     @block_name = _args[:name]
-    @block_mod  = _args[:mod]
+    @block_mods = _args[:mods]
 
     block_type  = _args[:type]
     block_opts  = _args[:options]
 
-    block_opts[:class] = collect_bem_class(@block_name, @block_mod, block_opts, type: :block)
+    block_opts[:class] = collect_bem_class(@block_name, @block_mods, block_opts, type: :block)
 
     content_tag(block_type, block_given? ? capture(&block) : nil, block_opts)
   end
@@ -25,17 +25,17 @@ module Rbem
     _args = parse_args(args)
 
     el_name = _args[:name]
-    el_mod  = _args[:mod]
+    el_mods = _args[:mods]
 
     el_type = _args[:type]
     el_opts = _args[:options]
 
     el_opts[:class] = collect_bem_class(el_name,
-                                        el_mod,
+                                        el_mods,
                                         el_opts,
-                                        type:         :element,
-                                        inherit_name: _args[:i_name],
-                                        inherit_mod:  _args[:i_mod] )
+                                        type: :element,
+                                        inherit_names: _args[:i_names],
+                                        inherit_mods: _args[:i_mods] )
 
     content_tag(el_type, block_given? ? capture(&block) : nil, el_opts)
   end
@@ -47,20 +47,30 @@ module Rbem
     _type       = args.select{ |e| e.is_a?(Symbol) }
     _options    = args.select{ |e| e.is_a?(Hash) }
     _return     = {}
+
     if _name_mod[0].present?
-      _return[:name]    = _name_mod[0].sub('&','')
-      _return[:i_name]  = _name_mod[0].start_with?('&')
+      _return[:name]    = _name_mod[0].sub('&','').split(':')[0]
+      if _name_mod[0].start_with?('&')
+        _names = _name_mod[0].split(':')
+        _names.shift
+        if _names.empty?
+          _names = @block_mods
+        end
+        _return[:i_names] = _names
+      end
     end
+
     if _name_mod[1].present?
-      _return[:mod]     = _name_mod[1].sub('&','')
-      _return[:i_mod]   = _name_mod[1].start_with?('&')
+      _return[:mods]    = _name_mod[1].split.map { |e| e.sub('&','') }
+      _return[:i_mods]  = _name_mod[1].split.select { |e| e.start_with?('&') }
     end
+
     _return[:type]      = _type[0] || :div
     _return[:options]   = _options[0] || {}
     _return
   end
 
-  def collect_bem_class(name, mod, options, type: nil, inherit_name: nil, inherit_mod: nil)
+  def collect_bem_class(name, mods, options, type: nil, inherit_names: nil, inherit_mods: nil)
     _separ = @@notation
     _separ = '_' unless _separ.is_a?(String)
 
@@ -68,21 +78,46 @@ module Rbem
 
     if type === :block
       _class << "#{name}"
-      if mod.present?
-        _class << "#{name}#{_separ}#{mod}"
+      if mods
+        for mod in mods
+          _class << "#{name}#{_separ}#{mod}"
+        end
       end
     end
 
     if type === :element
+
+      # block__element
       _class << "#{@block_name}__#{name}"
-      if mod.present?
-        _class << "#{@block_name}__#{name}#{_separ}#{mod}"
+
+      # block__element_mod
+      if mods
+        for mod in mods
+          mod = mod.split(':')[0].sub('&','')
+          _class << "#{@block_name}__#{name}#{_separ}#{mod}"
+        end
       end
-      if inherit_name and @block_mod.present?
-        _class << "#{@block_name}#{_separ}#{@block_mod}__#{name}"
+
+      # block_mod__element
+      if inherit_names and @block_mods.present?
+        for inherit_name in inherit_names
+          _class << "#{@block_name}#{_separ}#{inherit_name}__#{name}"
+        end
       end
-      if inherit_mod and @block_mod.present? and mod.present?
-        _class << "#{@block_name}#{_separ}#{@block_mod}__#{name}#{_separ}#{mod}"
+
+      # block_mod__element_mod
+      if inherit_mods and mods and @block_mods.present?
+        for i_mod in inherit_mods
+          el_mod = i_mod.split(':')[0].sub('&','')
+          block_mods = i_mod.split(':')
+          block_mods.shift
+          if block_mods.empty?
+            block_mods = @block_mods
+          end
+          for block_mod in block_mods
+            _class << "#{@block_name}#{_separ}#{block_mod}__#{name}#{_separ}#{el_mod}"
+          end
+        end
       end
     end
 

data/lib/rbem/version.rb

@@ -1,3 +1,3 @@
 module Rbem
-  VERSION = '0.1.5'
+  VERSION = '0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbem
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: '0.2'
 platform: ruby
 authors:
 - Vadim Skrotsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-04 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler