toolkit 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df8c8ffd469543f522411e8ea8cac2fd816fec30
-  data.tar.gz: 92d969ed345bfd5fce07563a093605d0da54e52d
+  metadata.gz: 9f0690a530cb961438b4723850e0d0a17fb312bd
+  data.tar.gz: 923bd9783bd21f67be7e05ec5aeb7396995b452c
 SHA512:
-  metadata.gz: 99db0b4a7d89740fbfb492d1a3b03905cdc215a59004c4caba20fb7b212582653f4c8f2fdbcf5e123f6f7690ce57b48cfe10eac7e853d31b91d361191a667aa3
-  data.tar.gz: 0e065047a13d1a9c31577eb0d5e0fe4f10985484ef808857c4ccf59a180514a44e4525e73d056cdf076cc295adcc5d2d44c0973310eca02b44d8ab7ef5ec55fd
+  metadata.gz: 303c12c0e1e718ca0b092f30f98ee8b36bc99f6e18fc74f03adf4bf46865546c09ea5e48d70572e4087076049d6285d58ee6fc675562644d1c6eebe6644007c5
+  data.tar.gz: 9728ca74c6b863044de4e22d3fb8de16995117a890f194148bb91fd84b9f99e12bf93432eee6c3e597c73a583959e21b1172c5bb88e199b87eaf64c1da4419e8

data/lib/toolkit.rb

@@ -6,6 +6,6 @@ if (defined? Compass)
 end
 
 module Toolkit
-  VERSION = "2.4.0"
-  DATE = "2014-06-12"
+  VERSION = "2.5.0"
+  DATE = "2014-06-25"
 end

data/stylesheets/toolkit/_settings.scss

@@ -1,5 +1,5 @@
 //////////////////////////////
-// Default Settings
+// Toolkit Settings
 //////////////////////////////
 $Toolkit-Settings: (
   'clearfix extend': false,
@@ -52,15 +52,18 @@ $Toolkit-Settings: (
 );
 
 //////////////////////////////
-// User Settings
+// New Settings module
 //////////////////////////////
-$toolkit: () !default;
+// Global
+$GlobalSettings: $Toolkit-Settings !default;
+// User
+$UserSettings: () !default;
 
 //////////////////////////////
-// Has Setting
+// User Setting Exists
 //////////////////////////////
-@function toolkit-has($setting) {
-  @if map-has-key($toolkit, $setting) {
+@function user-setting-exists($setting) {
+  @if map-has-key($UserSettings, $setting) {
     @return true;
   }
   @else {
@@ -68,51 +71,146 @@ $toolkit: () !default;
   }
 }
 
+@function user-setting-exists-multiple($settings...) {
+  $Return: ();
+  @each $setting in $settings {
+    $Return: map-merge($Return, ($setting: user-setting-exists($setting)));
+  }
+  @return $Return;
+}
+
+// Toolkit Version
+@function toolkit-has($setting) {
+  @return user-setting-exists($setting);
+}
+
 //////////////////////////////
-// Get Settings
+// Setting Get
 //////////////////////////////
-@function toolkit-get($setting) {
-  @if toolkit-has($setting) {
-    @return map-get($toolkit, $setting);
+@function setting-get($setting) {
+  @if user-setting-exists($setting) {
+    @return map-get($UserSettings, $setting);
   }
   @else {
-    @return map-get($Toolkit-Settings, $setting);
+    @return map-get($GlobalSettings, $setting);
+  }
+}
+
+@function setting-get-multiple($settings...) {
+  $values: ();
+  @each $setting in $settings {
+    $values: map-merge($values, ($setting: setting-get($setting)));
   }
+  @return $values;
+}
+
+// Toolkit Version
+@function toolkit-get($setting) {
+  @return setting-get($setting);
 }
 
+
 //////////////////////////////
-// Set Settings
+// Settings Set
 //////////////////////////////
-@function toolkit-set($setting, $value) {
-  @if (str-index($setting, '-') or str-index($setting, '_')) and str-index($setting, ' ') == null {
-    @warn "Words in Singularity settings should be spaces, not dashes or underscores. Please replace dashes and underscores between words with spaces. Settings will not work as expected until changed.";
-  }
-  $toolkit: map-merge($toolkit, ($setting: $value)) !global;
+@function setting-set($setting, $value) {
+  $UserSettings: map-merge($UserSettings, ($setting: $value)) !global;
   @return true;
 }
 
+@function setting-set-multiple($settings) {
+  $UserSettings: map-merge($UserSettings, $settings) !global;
+  @return true;
+}
+
+@mixin setting-set($setting, $value) {
+  $setting-setter: setting-set($setting, $value) !global;
+}
+
+@mixin setting-change($setting, $value) {
+  @include setting-set($setting, $value);
+}
+
+@mixin setting-set-multiple($settings) {
+  $setting-setter: setting-set-multiple($settings) !global;
+}
+
+@mixin setting-change-multiple($settings) {
+  @include setting-set-multiple($settings);
+}
+
+// Toolkit Version
+@function toolkit-set($setting, $value) {
+  @return setting-set($setting, $value);
+}
+
 @mixin toolkit-change($setting, $value) {
-  $toolkit-change: toolkit-set($setting, $value);
+  @include setting-set($setting, $value);
 }
 
 @mixin toolkit-set($setting, $value) {
-  $toolkit-change: toolkit-set($setting, $value);
+  @include setting-set($setting, $value);
 }
 
 //////////////////////////////
 // Remove Setting
 //////////////////////////////
-@function toolkit-reset($setting) {
+@function setting-clear($setting) {
   $Return: ();
 
-  @each $Key, $Value in $toolkit {
+  @each $Key, $Value in $UserSettings {
     $Return: if($setting == $Key, $Return, map-merge($Return, ($Key: $Value)));
   }
 
-  $toolkit: $Return !global;
+  $UserSettings: $Return !global;
+  @return true;
+}
+
+@function setting-clear-multiple($settings...) {
+  @each $setting in $settings {
+    $clear-the-settings: setting-clear($setting);
+  }
   @return true;
 }
 
+@function setting-reset() {
+  $UserSettings: () !global;
+  @return true;
+}
+
+@mixin setting-clear($setting) {
+  $setting-clearer: setting-clear($setting);
+}
+
+@mixin setting-clear-multiple($settings...) {
+  $setting-clearer: setting-clear-multiple($settings);
+}
+
+@mixin setting-reset() {
+  $setting-clearer: setting-reset();
+}
+
+// Toolkit Version
+@function toolkit-reset($setting) {
+  @return setting-clear($setting);
+}
+
 @mixin toolkit-reset($setting) {
-  $toolkit-reset: toolkit-reset($setting);
+  @include setting-clear($setting);
+}
+
+//////////////////////////////
+// Setting Pick
+//////////////////////////////
+@function setting-pick($setting, $input) {
+  @return if($input != null, $input, setting-get($setting));
+}
+
+@function setting-pick-multiple($settings) {
+  $Return: ();
+  @each $setting, $input in $settings {
+    $Return: map-merge($Return, ($setting: setting-pick($input, $setting)));
+  }
+
+  @return $Return;
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toolkit
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Sam Richard
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass