bem-constructor 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b9f377ac2844b2e29439656b8ea795caee5e925
-  data.tar.gz: 6522e754bab2703329555864d0edee404cb3e330
+  metadata.gz: d11930fa21da375d2a8a296532b5f291c0efe5d0
+  data.tar.gz: f7e1a7c6ff487e57ce0cc2e75ae2772e80cb32d2
 SHA512:
-  metadata.gz: 338df5a582de055c92b5bb917d6673614da3b9708f8781f0b6ddd680db2a1b563abade48e1f2306fb16bdf9ae48e756f318d553c34b95bede1873c9e49bd180e
-  data.tar.gz: 347ebc42e58d0a8b9da81cfeb1a5e27fd0b8261a9ff89cff97d3a5bf3e196bda1c2dc467520509d1662d19f9cf4e0051071e8fbcff7627569e4233523e235c66
+  metadata.gz: ffe52aba896baedcc044316b7ecc253e6ec5ab453272441accda4848eddce79701d878dc959f59b08fb996f9095b3e5f8079d7da227a85b76f9da793ad4e35c3
+  data.tar.gz: 4e5e72fd167fa8f9eeaeed0c00db110b4b31985c86111e96b613e2a6b6a799f38eee2d82246faeec8bb74ad4d3880c79157183adcd0952f9b00206d79d8ca850

data/lib/bem-constructor.rb

@@ -3,6 +3,6 @@ extension_path = File.expand_path(File.join(File.dirname(__FILE__), ".."))
 Compass::Frameworks.register('bem-constructor', :path => extension_path)
 
 module BEMConstructor
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
   DATE = "2015-03-26"
 end

data/stylesheets/_error-checks.scss

@@ -13,15 +13,16 @@
 @function _should-be-called-within($objs...) {
 
     @each $obj in $objs {
-        @if map-get($_bem-current-context, $obj) == null {
-            @if $bem-throw-errors {
-                @error 'It should be called within #{inspect($objs)}';
-            }
-            @return false;
+        @if map-get($_bem-current-context, $obj) != null {
+            @return true;
         }
     }
 
-    @return true;
+    @if $bem-throw-errors {
+        @error 'It should be called within #{inspect($objs)}';
+    }
+
+    @return false;
 }
 
 

data/stylesheets/_modifies-element.scss

@@ -9,10 +9,11 @@
 
 @function _modifies-element($modified-elements...) {
 
-    $inside-check: _should-be-called-within('modifier', 'state');
+    $inside-check: _should-be-called-within('modifier', 'state', 'theme');
     $outside-check: _should-not-be-called-within('element');
 
-    @if $inside-check == 'false' or $outside-check == false {
+    // Return false in case error throwing is disabled
+    @if $inside-check == false or $outside-check == false {
         @return false;
     }
 
@@ -23,7 +24,9 @@
         $selectors: append($selectors, $element, 'comma');
     }
 
-    $selector: selector-nest(&, $selectors);
+    $block: selector-append(&...);
+
+    $selector: selector-nest($block, '>', $selectors);
 
     $set-current: set-current-context('modifies-element', $modified-elements, $selector);
 

data/stylesheets/_scope.scss

@@ -17,10 +17,13 @@ $bem-scope-namespace: 's';
     // Log new block
     $new-scope: _bem-log-scope($scope);
 
-    // Check it's not called inside another scope
-    // and it's called at the root-level
-    $recursive-check: should-not-be-called-recursively('scope');
-    $outside-check: should-not-be-called-within('block');
+    // Error checks
+    $outside-check: _should-not-be-called-within('block', 'scope');
+
+    // Return false in case error throwing is disabled
+    @if $outside-check == false {
+        @return false;
+    }
 
     $namespace: if($bem-use-namespaces, $bem-scope-namespace + '-', '');
     $selector: '.' + $namespace + $scope;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bem-constructor
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Daniel Guillan