base.sass 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5196ecc5e76b30bedc2a493397fb4cd871ca6d68
-  data.tar.gz: 95d0e1bb92cd0a25682d61fb397336368e6d29d7
+  metadata.gz: 2f1d195e6a52cb50dbd31f9a401dfaf1e686d182
+  data.tar.gz: b4a174b36a7f61faa0d63b56a62193d85818562a
 SHA512:
-  metadata.gz: 5018bd64cc72ef5ec0238edd5deca2e7aa7a0d2ebb5c4cf8d8af0b0ce5ba00e2e628a140b1738b03ef5f724bea42282827591e503bb4fae22590d03709df8d72
-  data.tar.gz: 6a5fb1eee707df5b80c9eac2a7a2a48da5aa24a7ae7009bc3704c1f6fc3f086b880f33d5e326c9dd6904039ea458e6ad17cd41df1db6807166fa36399d0a7895
+  metadata.gz: 7d8f72b9bba990f74cae21bd9cb7821a06e0ca73b84d4a51df5eaefb75aa440e24fef112dd04b71948ad02e7034ffda687baeb64463a5e7c8bf1bb6c1ca6191a
+  data.tar.gz: 24832fd86a78a1175f60d57cab1a2b180256ddce534859ecf3fd332045754066e159417e8fc45758bbcca459195ca10ff1c93ff51b148b76d60866557e4a0afd

data/Changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.2.0
+
+### Upgrades `app-config()`
+
 ## v1.1.0
 
 ### Overrides official map functions to support nest keys
@@ -16,7 +20,7 @@
 
 ## v1.0.1
 
-- Fix font url in `font-face()` for ie9
+### Fix font url in `font-face()` for ie9
 
 ## v1.0.0
 

data/Readme.md

@@ -10,7 +10,7 @@
 In your [`Gemfile`](http://bundler.io/v1.6/gemfile.html):
 
 ```ruby
-gem 'base.sass', '~> 1.1'
+gem 'base.sass', '~> 1.2'
 ```
 
 Or in command line:
@@ -21,7 +21,7 @@ $ gem install base.sass
 
 ## Usage
 
-In your Sass file:
+At top of your Sass file:
 
 ```scss
 @import 'base.sass/*';
@@ -30,7 +30,7 @@ In your Sass file:
 And then in command line:
 
 ```sh
-$ sass -r base.sass --watch src:dist
+$ sass --watch -r base.sass src:dist
 ```
 
 Or in `config.rb`:
@@ -41,12 +41,12 @@ require 'base.sass'
 
 ## Features
 
-### Read environment variable (case insensitive)
+### Read environment variables (case insensitive)
 
 When you run:
 
 ```sh
-$ SASS_ENV=production sass -r base.sass --update src:dist
+$ SASS_ENV=production sass --update -r base.sass src:dist
 ```
 
 Then you can use `env()` in a Sass file to get the value:

data/lib/base.sass/env.rb

@@ -1,6 +1,6 @@
 module Sass::Script::Functions
 
-  # Returns the value for environment variable name as a string.
+  # Returns the value of environment variable associated with the given name.
   # Returns null if the named variable does not exist.
   #
   # Examples:
@@ -12,16 +12,31 @@ module Sass::Script::Functions
     ruby_to_sass(ENV[name.value.gsub('-', '_').upcase])
   end
 
-  # Get the configurations of current app.
-  # Returns null if the named configuration does not exist.
+  # Returns the config associated with the given name.
+  # Configs are be grouped by `SASS_ENV` environment.
   #
   # Examples:
-  # $app-config: (timestamp: '1.0.0');
-  # app-config(timestamp) => 1.0.0
+  # $app-config: (
+  #   development: (
+  #     foo: bar
+  #   ),
+  #   production: (
+  #     foo: baz
+  #   )
+  # );
+  #
+  # $ sass --watch -r base.sass src:dist
+  # app-config(foo) => bar
+  #
+  # $ SASS_ENV=production sass --watch -r base.sass src:dist
+  # app-config(foo) => baz
   def app_config(name)
     assert_type name, :String
+
     config = environment.global_env.var('app-config')
-    config.is_a?(Sass::Script::Value::Map) && config.to_h[name] || null
+    return null unless config.is_a? Sass::Script::Value::Map
+
+    map_get(config, *[env(identifier('sass-env')), name])
   end
 
 end

data/lib/base.sass/map.rb

@@ -96,7 +96,7 @@ module Sass::Script::Functions
 
     map2.each do |k, v|
       orig = map1[k]
-      map1[k] = get_value(orig, v)
+      map1[k] = compare_value(orig, v)
     end
 
     map(map1)
@@ -113,7 +113,7 @@ module Sass::Script::Functions
     (keys.empty? ? map : map_get(map, *keys)).to_h.dup
   end
 
-  def get_value(oldVal, newVal)
+  def compare_value(oldVal, newVal)
     if oldVal.is_a?(Sass::Script::Value::Map) && newVal.is_a?(Sass::Script::Value::Map)
       map_merge(oldVal, newVal, bool(true))
     elsif oldVal.is_a?(Sass::Script::Value::List) && newVal.is_a?(Sass::Script::Value::List)

data/stylesheets/base.sass/_*.scss

@@ -1,12 +1,8 @@
-$app-config: () !default;
-$browser-supports: parse-rules('last 1 version') !default;
-
+@import 'functions/support';
+@import 'functions/list';
+@import 'mixins/placeholder-wrapper';
 @import 'mixins/clearfix';
 @import 'mixins/ellipsis-overflow';
-@import 'mixins/float';
 @import 'mixins/font-face';
 @import 'mixins/inline-block';
-@import 'mixins/placeholder-wrapper';
-
-@import 'functions/list';
-@import 'functions/support';
+@import 'mixins/float';

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: base.sass
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - junjun.zhang