bem-constructor 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df231fc76b0bc8615cc5634a72126ccfb3df62f2
-  data.tar.gz: 269f157f0874927226870a5dc473d6631dbc0b7e
+  metadata.gz: 7b9f377ac2844b2e29439656b8ea795caee5e925
+  data.tar.gz: 6522e754bab2703329555864d0edee404cb3e330
 SHA512:
-  metadata.gz: 5b39a0af0f8f1452df90ffdf018c661369c19c51e66cfb495e127d824c39092bb1ea8a62b95c562f2cabf9381158e573a722a58a4b221ef5592279731563f67b
-  data.tar.gz: c5fa49d6e419dc4cb57a570c6e456212dcdf1fce75319458bf8ad8c1c9f08df4ae318a4d6459f75ff05f820c7f2abaa3da0f2643726daccf159a68c3e1970a7d
+  metadata.gz: 338df5a582de055c92b5bb917d6673614da3b9708f8781f0b6ddd680db2a1b563abade48e1f2306fb16bdf9ae48e756f318d553c34b95bede1873c9e49bd180e
+  data.tar.gz: 347ebc42e58d0a8b9da81cfeb1a5e27fd0b8261a9ff89cff97d3a5bf3e196bda1c2dc467520509d1662d19f9cf4e0051071e8fbcff7627569e4233523e235c66

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.0"
+  VERSION = "0.3.2"
   DATE = "2015-03-26"
 end

data/stylesheets/_block.scss

@@ -23,14 +23,23 @@ $bem-block-namespaces: (
     $new-block: _bem-log-block($name);
 
     // Error check
-    $outside-check: should-not-be-called-within('scope', 'block');
+    $outside-check: _should-not-be-called-within('scope', 'block');
+
+    // Return false in case error throwing is disabled
+    @if $outside-check == false {
+        @return false;
+    }
 
     // Set namespace
     $namespace: '';
 
     @if $bem-use-namespaces {
         @if not map-has-key($bem-block-namespaces, $type) {
-            @error '`#{$type}` is not a valid `$type` for `block()`';
+            @if $bem-throw-errors {
+                @error '`#{$type}` is not a valid `$type` for `block()`';
+            }
+
+            @return false;
         }
         $namespace: map-get($bem-block-namespaces, $type) + '-';
     }

data/stylesheets/_element.scss

@@ -13,8 +13,13 @@
     $new-element: _bem-log-element($elements...);
 
     // Error checks
-    $inside-check: should-be-called-within('block');
-    $outside-check: should-not-be-called-within('modifier', 'state', 'element');
+    $inside-check: _should-be-called-within('block');
+    $outside-check: _should-not-be-called-within('modifier', 'state', 'element');
+
+    // Return false in case error throwing is disabled
+    @if $inside-check == false or $outside-check == false {
+        @return false;
+    }
 
     $selector: ();
 

data/stylesheets/_error-checks.scss

@@ -12,20 +12,13 @@
 /// Checks that it's being created within all of the passed $objs...
 @function _should-be-called-within($objs...) {
 
-    $found: false;
-
     @each $obj in $objs {
-        @if map-get($_bem-current-context, $obj) != null {
-            $found: true;
-        }
-    }
-
-    @if not $found {
-        @if ($bem-throw-error) {
-            @error 'It should be called within #{inspect($objs)}';
+        @if map-get($_bem-current-context, $obj) == null {
+            @if $bem-throw-errors {
+                @error 'It should be called within #{inspect($objs)}';
+            }
+            @return false;
         }
-
-        @return false;
     }
 
     @return true;
@@ -39,19 +32,13 @@
 /// Checks that it's being created outside all of the passed $objs...
 @function _should-not-be-called-within($objs...) {
 
-    $found: false;
-
     @each $obj in $objs {
         @if map-get($_bem-current-context, $obj) != null {
-            $found: true;
-        }
-    }
-
-    @if $found {
-        @if ($bem-throw-error) {
-            @error 'It should not be called within #{inspect($objs)}';
+            @if $bem-throw-errors {
+                @error 'It should not be called within #{inspect($objs)}';
+            }
+            @return false;
         }
-        @return false;
     }
 
     @return true;

data/stylesheets/_hack.scss

@@ -10,7 +10,10 @@ $hack-namespace: '_' !default;
     $parsed: selector-parse($selector);
 
     @if length($parsed) > 1 {
-      @error '`#{$selector}` contains #{length($parsed)} selectors and the `_last-simple-selector()`function accepts only 1.';
+        @if $bem-throw-errors {
+            @error '`#{$selector}` contains #{length($parsed)} selectors and the `_last-simple-selector()`function accepts only 1.';
+        }
+        @return false;
     }
     $last-simple-selector: nth(nth($parsed, 1), -1);
 

data/stylesheets/_modifier.scss

@@ -17,6 +17,11 @@
     $inside-check: _should-be-called-within('block');
     $outside-check: _should-not-be-called-within('modifier');
 
+    // Return false in case error throwing is disabled
+    @if $inside-check == false or $outside-check == false {
+        @return false;
+    }
+
     $selector: ();
 
     @each $modifier in $modifiers {

data/stylesheets/_modifies-element.scss

@@ -9,8 +9,12 @@
 
 @function _modifies-element($modified-elements...) {
 
-    $inside-check: should-be-called-within('modifier', 'state');
-    $outside-check: should-not-be-called-within('element');
+    $inside-check: _should-be-called-within('modifier', 'state');
+    $outside-check: _should-not-be-called-within('element');
+
+    @if $inside-check == 'false' or $outside-check == false {
+        @return false;
+    }
 
     $selectors: ();
 

data/stylesheets/logger/_block-logger.scss

@@ -16,7 +16,10 @@
 
     // Check if the block has already been created
     @if block-exists($block) {
-        @error '`#{$block}` block has already been created';
+        @if $bem-throw-errors {
+            @error '`#{$block}` block has already been created';
+        }
+        @return false;
     }
 
     // Initialize a new block map

data/stylesheets/logger/_element-logger.scss

@@ -31,7 +31,11 @@
 
     // Check any $elements has already been defined for the current block
     @if element-exists($elements...) {
-        @error 'One or more elements from `#{inspect($elements)}` have already been created';
+        @if $bem-throw-errors {
+            @error 'One or more elements from `#{inspect($elements)}` have already been created';
+        }
+
+        @return false;
     }
 
     // Find the current block name

data/stylesheets/logger/_modifier-logger.scss

@@ -31,7 +31,11 @@
 
     // Check if the modifier has already been defined for the current block or element
     @if modifier-exists($modifiers...) {
-        @error 'One or more elements from `#{inspect($modifiers)}` have already been created';
+        @if $bem-throw-errors {
+            @error 'One or more elements from `#{inspect($modifiers)}` have already been created';
+        }
+
+        @return false;
     }
 
     // Find the current block name

data/stylesheets/logger/_scope-logger.scss

@@ -16,7 +16,11 @@
 
     // Check if the scope has already been created
     @if scope-exists($scope) {
-        @error '`#{$scope}` scope has already been created';
+        @if $bem-throw-errors {
+            @error '`#{$scope}` scope has already been created';
+        }
+
+        @return false;
     }
 
     // Initialize a new scope map

metadata

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