base.sass 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7d0748e57310baaa88bc57919939822bf241fe7
-  data.tar.gz: b1d5d29fd722de9bc21568131fc0759dff2c78ac
+  metadata.gz: 5196ecc5e76b30bedc2a493397fb4cd871ca6d68
+  data.tar.gz: 95d0e1bb92cd0a25682d61fb397336368e6d29d7
 SHA512:
-  metadata.gz: b9850d92515e0db589d7c639574c55706972d27cfde34c69feeb710dfd8f1c185b043f64f3f7bda1ee24150886236010d527dcc087540041b3e7b048873dce04
-  data.tar.gz: 3c80361d85683dbe1f490971b93cf44bdc7a261018b5adddc0a792cd52567a24f149d2396331f8f4cdbde9df553b545f4323535ec075b34cd2940168bb9959bc
+  metadata.gz: 5018bd64cc72ef5ec0238edd5deca2e7aa7a0d2ebb5c4cf8d8af0b0ce5ba00e2e628a140b1738b03ef5f724bea42282827591e503bb4fae22590d03709df8d72
+  data.tar.gz: 6a5fb1eee707df5b80c9eac2a7a2a48da5aa24a7ae7009bc3704c1f6fc3f086b880f33d5e326c9dd6904039ea458e6ad17cd41df1db6807166fa36399d0a7895

data/Changelog.md

@@ -0,0 +1,55 @@
+# Changelog
+
+## v1.1.0
+
+### Overrides official map functions to support nest keys
+
+- map-get($map, $key-router...)
+- map-remove($map, $key-router...)
+- map-has-key($map, $key-router...)
+- map-merge($map1, $map2, $deep: false)
+
+### Removes legacy functions
+
+- map-deep-merge($map1, $map2)
+- map-find($map, $keys)
+
+## v1.0.1
+
+- Fix font url in `font-face()` for ie9
+
+## v1.0.0
+
+**Milestone Release**
+
+### Extensions
+
+- env($name)
+- app-config($name)
+- parse-json($path)
+- strftime([$format])
+- parse-rules($rules...)
+- browsers()
+- browser-versions($browser, [$include-future])
+- url($paths...)
+- nest($selectors...)
+- append-selector($selector, $to-append)
+- enumerate($prefix, $from, $through, [$separator])
+- headings([$from], [$to])
+
+### Functions
+
+- comma-list([$list])
+- slice($list, [$min], [$max])
+- map-deep-merge($map1, $map2)
+- map-find($map, $keys)
+- support-browser($browser [$version])
+
+### Mixins
+
+- placeholder-wrapper($name)
+- clearfix
+- ellipsis-overflow
+- inline-block
+- float($side, [$important])
+- font-face($font-family, $paths...)

data/Readme.md

@@ -0,0 +1,206 @@
+# Awesome Extensions For Sass :kiss:
+
+[![Build Status](https://travis-ci.org/jsw0528/base.sass.svg?branch=master)](https://travis-ci.org/jsw0528/base.sass)
+[![Gem Version](https://badge.fury.io/rb/base.sass.svg)](http://badge.fury.io/rb/base.sass)
+
+> Requires Sass >= 3.3
+
+## Installation
+
+In your [`Gemfile`](http://bundler.io/v1.6/gemfile.html):
+
+```ruby
+gem 'base.sass', '~> 1.1'
+```
+
+Or in command line:
+
+```sh
+$ gem install base.sass
+```
+
+## Usage
+
+In your Sass file:
+
+```scss
+@import 'base.sass/*';
+```
+
+And then in command line:
+
+```sh
+$ sass -r base.sass --watch src:dist
+```
+
+Or in `config.rb`:
+
+```ruby
+require 'base.sass'
+```
+
+## Features
+
+### Read environment variable (case insensitive)
+
+When you run:
+
+```sh
+$ SASS_ENV=production sass -r base.sass --update src:dist
+```
+
+Then you can use `env()` in a Sass file to get the value:
+
+```scss
+env(SASS_ENV) //=> production
+env(sass_env) //=> production
+env(sass-env) //=> production
+```
+
+You can use any `KEY=value` if you want.
+
+### Parse local json file
+
+Returns a map, and the result will be cached per process.
+
+```scss
+$map: parse-json('~/Desktop/example.json');
+$pkg: parse-json('package.json');
+
+// Then, you can:
+map-keys($map)
+map-get($pkg, 'sass')
+```
+
+Now you can use the same configurations both in js and css.
+
+### Parse browser supports (case insensitive)
+
+All supported browsers: `chrome`, `firefox`, `safari`, `ie`, `opera`, `ios`, `android`.
+
+> Rules data are from [Can I Use](http://beta.caniuse.com/).
+
+**Rules:**
+
+- `last 1 version` is last versions for each browser.
+- `last 2 Chrome versions` is last versions of the specified browser.
+- `IE > 8` is IE versions newer than 8.
+- `IE >= 8` is IE version 8 or newer.
+- `iOS 7` to set browser version directly.
+
+```scss
+// You can use one param
+parse-rules('last 1 version')
+
+// Or multi params
+parse-rules('last 1 version', 'IE >= 8')
+
+// Or a list
+$rules: 'last 1 version', 'IE >= 8';
+parse-rules($rules)
+```
+
+[See example](https://github.com/jsw0528/base.sass/wiki/Parse-browser-supports).
+
+### Enhanced `url()`
+
+If you want to activate the enhanced `url()`, you should wrap paths with quotes.
+
+```scss
+url(http://a.com/b.png)
+//=> url(http://a.com/b.png) # Did nothing
+
+url('http://a.com/b.png')
+//=> url(http://a.com/b.png?1399394203)
+
+url('a.png', 'b.png')
+//=> url(a.png?1399394203), url(b.png?1399394203)
+
+url('a.eot#iefix', 'b.woff')
+//=> url(a.eot?1399394203#iefix) format('embedded-opentype'), url(b.woff?1399394203) format('woff')
+```
+
+The timestamp be added automatically by default, but you can remove it, or change it to whatever string you wanted.
+
+```scss
+url('a.png', $timestamp: false)
+//=> url(a.png)
+
+url('a.png', $timestamp: '1.0.0')
+//=> url(a.png?1.0.0)
+```
+
+Also, you can defined timestamp as a global setting in `app-config` namespace:
+
+```scss
+$app-config: (timestamp: '1.0.0');
+
+url('a.png')
+//=> url(a.png?1.0.0)
+```
+
+The data uri is also be supported. Must be! :blush:
+
+```scss
+url('a.png', $base64: true)
+//=> url(data:image/png;base64,iVBORw...)
+
+url('a.eot', 'b.woff', $base64: true)
+//=> url(data:application/vnd.ms-fontobject;base64,HAcAA...), url(data:application/font-woff;base64,d09GR...)
+```
+
+### Enhanced map functions
+
+**Overrides official map functions to support nest keys.**
+
+```scss
+map-get($map, a)
+map-get($map, a, b, c)
+
+map-remove($map, a)
+map-remove($map, a, b, c)
+
+map-has-key($map, a)
+map-has-key($map, a, b, c)
+
+map-merge($map1, $map2)
+map-merge($map1, $map2, true) // deep merge
+```
+
+### Placeholder-style mixins
+
+If you want to let css contents appear in the place where it used first time, this is yours! :sunglasses:
+
+Please refer to [ellipsis-overflow](stylesheets/base.sass/mixins/_ellipsis-overflow.scss) mixin.
+
+```scss
+.foo {
+  @include ellipsis-overflow;
+}
+
+.bar {
+  @include ellipsis-overflow;
+}
+```
+
+Compiles to:
+
+```css
+.foo, .bar {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+```
+
+### [Read more in Wiki](https://github.com/jsw0528/base.sass/wiki)
+
+## Test
+
+```sh
+$ git clone https://github.com/jsw0528/base.sass && cd base.sass && rake
+```
+
+## License
+
+Licensed under the [MIT License](http://www.opensource.org/licenses/mit-license.php).

data/lib/base.sass.rb

@@ -7,6 +7,7 @@ require 'base.sass/caniuse'
 require 'base.sass/ruby-to-sass'
 require 'base.sass/sass-to-ruby'
 require 'base.sass/env'
+require 'base.sass/map'
 require 'base.sass/parse-json'
 require 'base.sass/strftime'
 require 'base.sass/support'

data/lib/base.sass/env.rb

@@ -21,7 +21,7 @@ module Sass::Script::Functions
   def app_config(name)
     assert_type name, :String
     config = environment.global_env.var('app-config')
-    config.is_a?(Sass::Script::Value::Map) && config.value[name] || null
+    config.is_a?(Sass::Script::Value::Map) && config.to_h[name] || null
   end
 
 end

data/lib/base.sass/map.rb

@@ -0,0 +1,126 @@
+# Overrides official map functions to support nest keys.
+module Sass::Script::Functions
+
+  # Returns the value in a map associated with the given keys.
+  #
+  # Examples:
+  # $map: (a: (b: (c: 1)));
+  # map-get($map, a)          => (b: (c: 1))
+  # map-get($map, a, b)       => (c: 1)
+  # map-get($map, a, b, c)    => 1
+  # map-get($map, x)          => null
+  # map-get($map, a, x, c)    => null
+  # map-get($map, a, b, c, x) => null
+  # map-get((), x)            => null
+  def map_get(map, *keys)
+    assert_type map, :Map
+    assert_args_number(keys)
+
+    hash, target = map.to_h, keys.pop
+
+    keys.each do |key|
+      # Each parent node must be a map
+      unless hash[key].is_a? Sass::Script::Value::Map
+        hash = {}
+        break
+      end
+      hash = hash[key].value
+    end
+
+    hash[target] || null
+  end
+
+  # Returns a new map with keys removed.
+  #
+  # Examples:
+  # $map: (a: (b: (c: 1)));
+  # map-remove($map, a)          => ()
+  # map-remove($map, a, b)       => (a: ())
+  # map-remove($map, a, b, c)    => (a: (b: ()))
+  # map-remove($map, x)          => (a: (b: (c: 1)))
+  # map-remove($map, a, x, c)    => (a: (b: (c: 1)))
+  # map-remove($map, a, b, c, x) => (a: (b: (c: 1)))
+  def map_remove(map, *keys)
+    return map unless map_has_key(map, *keys).to_bool
+
+    target, hash = keys.pop, get_hash(map, keys)
+    hash.delete target
+
+    while keys.size > 0
+      target = keys.pop
+      _hash, hash = map(hash), get_hash(map, keys)
+      hash[target] = _hash
+    end
+
+    map(hash)
+  end
+
+  # Returns whether a map has a value associated with a given keys.
+  #
+  # Examples:
+  # $map: (a: (b: (c: 1)));
+  # map-has-key($map, a)          => true
+  # map-has-key($map, a, b)       => true
+  # map-has-key($map, a, c)       => false
+  # map-has-key($map, a, b, c)    => true
+  # map-has-key($map, a, x, c)    => false
+  # map-has-key($map, a, b, c, x) => false
+  def map_has_key(map, *keys)
+    assert_type map, :Map
+    assert_args_number(keys)
+
+    hash = map.to_h
+
+    keys.each do |key|
+      # Each parent node must be a map
+      return bool(false) unless hash.is_a?(Hash) && hash.key?(key)
+      hash = hash[key].value
+    end
+
+    bool(true)
+  end
+
+  # Merges two maps together into a new map recursively.
+  #
+  # Examples:
+  # $map1: (a: (b: (c: 1 2, d: foo, e: baz)));
+  # $map2: (a: (b: (c: 3 4, d: bar)));
+  # map-merge($map1, $map2)       => (a: (b: (c: 3 4,     d: bar)))
+  # map-merge($map1, $map2, true) => (a: (b: (c: 1 2 3 4, d: bar, e: baz)))
+  def map_merge(map1, map2, deep = bool(false))
+    assert_type map1, :Map
+    assert_type map2, :Map
+
+    map1, map2 = map1.to_h.dup, map2.to_h
+    return map(map1.merge(map2)) unless deep.to_bool
+
+    map2.each do |k, v|
+      orig = map1[k]
+      map1[k] = get_value(orig, v)
+    end
+
+    map(map1)
+  end
+
+
+  private
+
+  def assert_args_number(keys)
+    raise ArgumentError.new('wrong number of arguments (1 for 2+)') if keys.empty?
+  end
+
+  def get_hash(map, keys)
+    (keys.empty? ? map : map_get(map, *keys)).to_h.dup
+  end
+
+  def get_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)
+      join(oldVal, newVal)
+    else
+      newVal
+    end
+  end
+
+end

data/lib/base.sass/sass-to-ruby.rb

@@ -10,14 +10,14 @@ module Sass::Script::Functions
   end
 
   def to_ruby_hash(sass_map)
-    sass_map.value.inject({}) do |memo, (k, v)|
+    sass_map.to_h.inject({}) do |memo, (k, v)|
       memo[k.to_s] = sass_to_ruby(v)
       memo
     end
   end
 
   def to_ruby_array(sass_list)
-    sass_list.value.map do |item|
+    sass_list.to_a.map do |item|
       sass_to_ruby(item)
     end
   end

data/lib/base.sass/selector.rb

@@ -42,11 +42,9 @@ module Sass::Script::Functions
   def headers(from = nil, to = nil)
     if from && !to
       if from.is_a?(Sass::Script::Value::String) && from.value == 'all'
-        from = number(1)
-        to = number(6)
+        to, from = number(6), number(1)
       else
-        to = from
-        from = number(1)
+        to, from = from, number(1)
       end
     else
       from ||= number(1)

data/lib/base.sass/support.rb

@@ -44,22 +44,6 @@ module Sass::Script::Functions
     ruby_to_sass(versions)
   end
 
-  # Grep feature names according to caniuse by regex.
-  #
-  # Examples:
-  # grep-features('^css3?')     => /^css3?/
-  # grep-features('box sizing') => /box|sizing/
-  # grep-features('box-sizing') => /box|sizing/
-  # def grep_features(regex)
-  #   assert_type regex, :String
-
-  #   regex = regex.value.strip.sub(/^-+|-+$/, '')
-  #   regex = regex.gsub(/\s+|-+/, '|') if regex =~ /^[\w\s-]+$/
-  #   regex = Regexp.new(regex, Regexp::IGNORECASE)
-
-  #   ruby_to_sass(CanIUse.instance.supports.keys.select { |k| k =~ regex }.sort)
-  # end
-
 
   private
 

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

@@ -9,5 +9,4 @@ $browser-supports: parse-rules('last 1 version') !default;
 @import 'mixins/placeholder-wrapper';
 
 @import 'functions/list';
-@import 'functions/map';
 @import 'functions/support';

data/stylesheets/base.sass/mixins/_placeholder-wrapper.scss

@@ -1,7 +1,7 @@
-$-registered-placeholders: ();
+$anonymous-placeholders: ();
 
 @mixin placeholder-wrapper($name) {
-  $times: map-get($-registered-placeholders, $name) or 0;
+  $times: map-get($anonymous-placeholders, $name) or 0;
 
   @if $times == 0 {
     @at-root %-#{$name} {
@@ -10,5 +10,5 @@ $-registered-placeholders: ();
   }
 
   @extend %-#{$name};
-  $-registered-placeholders: map-merge($-registered-placeholders, ($name: $times + 1)) !global;
+  $anonymous-placeholders: map-merge($anonymous-placeholders, ($name: $times + 1)) !global;
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: base.sass
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - junjun.zhang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -30,16 +30,19 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.5'
-description: A lot of powerful Sass functions.
+description: Awesome features that you wanted
 email: i@mrzhang.me
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- Changelog.md
+- Readme.md
 - data/browsers.json
 - lib/base.sass.rb
 - lib/base.sass/caniuse.rb
 - lib/base.sass/env.rb
+- lib/base.sass/map.rb
 - lib/base.sass/parse-json.rb
 - lib/base.sass/ruby-to-sass.rb
 - lib/base.sass/sass-to-ruby.rb
@@ -49,7 +52,6 @@ files:
 - lib/base.sass/url.rb
 - stylesheets/base.sass/_*.scss
 - stylesheets/base.sass/functions/_list.scss
-- stylesheets/base.sass/functions/_map.scss
 - stylesheets/base.sass/functions/_support.scss
 - stylesheets/base.sass/mixins/_clearfix.scss
 - stylesheets/base.sass/mixins/_ellipsis-overflow.scss
@@ -80,5 +82,5 @@ rubyforge_project:
 rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
-summary: The beginning of your stylesheets.
+summary: Awesome Extensions For Sass
 test_files: []

data/stylesheets/base.sass/functions/_map.scss

@@ -1,55 +0,0 @@
-// Example:
-//
-// $map1: ( a: (x: 'x') );
-// $map2: ( a: (y: 'y') );
-//
-// map-deep-merge($map1, $map2)
-// => ( a: (x: 'x', y: 'y') )
-@function map-deep-merge($map, $sub-map) {
-  @if type-of($map) != map or type-of($sub-map) != map {
-    @warn 'Params for `map-deep-merge` require map data';
-    @return null;
-  }
-
-  @each $key, $value in $sub-map {
-    $original: map-get($map, $key);
-
-    @if type-of($original) == map and type-of($value) == map {
-      $value: map-deep-merge($original, $value);
-    }
-
-    $map: map-merge($map, ($key: $value));
-  }
-
-  @return $map;
-}
-
-
-// Example:
-//
-// $map: (
-//   a: (
-//     b: (
-//       c: 'Good job!'
-//     )
-//   )
-// );
-//
-// Before: map-get(map-get(map-get($map, a), b), c)
-// After: map-find($map, 'a.b.c')
-@function map-find($map, $keys) {
-  @while str-index($keys, '.') {
-    $index: str-index($keys, '.');
-
-    // Child elements
-    $map: map-get($map, str-slice($keys, 0, $index - 1));
-    @if type-of($map) != map {
-      @return null;
-    }
-
-    // Rest keys
-    $keys: str-slice($keys, $index + 1);
-  }
-
-  @return map-get($map, $keys);
-}