base.sass 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f1d195e6a52cb50dbd31f9a401dfaf1e686d182
-  data.tar.gz: b4a174b36a7f61faa0d63b56a62193d85818562a
+  metadata.gz: a777f11b0ec5eca1853ef7a54af4f3d6c7c77b88
+  data.tar.gz: 1f9cdcf73842dcf6ee94e8b6b27e29238dfbad0f
 SHA512:
-  metadata.gz: 7d8f72b9bba990f74cae21bd9cb7821a06e0ca73b84d4a51df5eaefb75aa440e24fef112dd04b71948ad02e7034ffda687baeb64463a5e7c8bf1bb6c1ca6191a
-  data.tar.gz: 24832fd86a78a1175f60d57cab1a2b180256ddce534859ecf3fd332045754066e159417e8fc45758bbcca459195ca10ff1c93ff51b148b76d60866557e4a0afd
+  metadata.gz: 850350f005243911f36d7a07f81a2200e89214c146eb6d150689ed433204eb49ccb15a97adc832f2ff95c68cdbd93ef5c3968fbd7566112ba6d6d855718f8372
+  data.tar.gz: 2f482394fed7d0009161a7419bdcb502169cbeec313b770374bfd764329d7fd504df1645a3bd5b2e73ef37509a6035329338f671e2269b23040b2e2fcec71a9c

data/Changelog.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## v1.3.0
+
+### Adds a multifunctional helper
+
+- caniuse($cond)
+
+### Removes legacy functions
+
+- browsers()
+- browser-versions($browser, [$include-future])
+
 ## v1.2.0
 
 ### Upgrades `app-config()`

data/Readme.md

@@ -10,7 +10,7 @@
 In your [`Gemfile`](http://bundler.io/v1.6/gemfile.html):
 
 ```ruby
-gem 'base.sass', '~> 1.2'
+gem 'base.sass', '~> 1.3'
 ```
 
 Or in command line:
@@ -27,7 +27,7 @@ At top of your Sass file:
 @import 'base.sass/*';
 ```
 
-And then in command line:
+Then, use `-r` option in command line:
 
 ```sh
 $ sass --watch -r base.sass src:dist
@@ -39,6 +39,10 @@ Or in `config.rb`:
 require 'base.sass'
 ```
 
+## Examples
+
+Please refer to [wiki](https://github.com/jsw0528/base.sass/wiki) page.
+
 ## Features
 
 ### Read environment variables (case insensitive)
@@ -49,7 +53,7 @@ When you run:
 $ SASS_ENV=production sass --update -r base.sass src:dist
 ```
 
-Then you can use `env()` in a Sass file to get the value:
+Then you can use `env()` in Sass files to get the value:
 
 ```scss
 env(SASS_ENV) //=> production
@@ -57,7 +61,7 @@ env(sass_env) //=> production
 env(sass-env) //=> production
 ```
 
-You can use any `KEY=value` if you want.
+> You can use any `KEY=value` if you want.
 
 ### Parse local json file
 
@@ -69,10 +73,10 @@ $pkg: parse-json('package.json');
 
 // Then, you can:
 map-keys($map)
-map-get($pkg, 'sass')
+map-get($pkg, 'some key')
 ```
 
-Now you can use the same configurations both in js and css.
+> Now you can use the same configurations both in js and css.
 
 ### Parse browser supports (case insensitive)
 
@@ -89,18 +93,22 @@ All supported browsers: `chrome`, `firefox`, `safari`, `ie`, `opera`, `ios`, `an
 - `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')
+// You can use multi params
+$browser-supports: parse-rules('last 1 version', 'IE >= 8');
 
 // Or a list
 $rules: 'last 1 version', 'IE >= 8';
-parse-rules($rules)
-```
+$browser-supports: parse-rules($rules);
 
-[See example](https://github.com/jsw0528/base.sass/wiki/Parse-browser-supports).
+// Then, you can:
+@if support-browser(Android) {
+  // ...
+}
+
+@if not support-browser(ie 8) {
+  // ...
+}
+```
 
 ### Enhanced `url()`
 
@@ -130,16 +138,24 @@ 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:
+Also, you can defined timestamp as a global configuration in `app-config` namespace:
 
 ```scss
-$app-config: (timestamp: '1.0.0');
+$app-config: (
+  development: (
+    timestamp: '1.1.0.alpha'
+  ),
+  production: (
+    timestamp: '1.0.0'
+  )
+);
 
 url('a.png')
-//=> url(a.png?1.0.0)
+//=> url(a.png?1.1.0.alpha) if SASS_ENV is development
+//=> url(a.png?1.0.0) if SASS_ENV is production
 ```
 
-The data uri is also be supported. Must be! :blush:
+The data uri is also be supported.
 
 ```scss
 url('a.png', $base64: true)
@@ -149,9 +165,9 @@ 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
+### Powerful map functions
 
-**Overrides official map functions to support nest keys.**
+> Overrides official map functions to support nest keys.
 
 ```scss
 map-get($map, a)
@@ -193,8 +209,6 @@ Compiles to:
 }
 ```
 
-### [Read more in Wiki](https://github.com/jsw0528/base.sass/wiki)
-
 ## Test
 
 ```sh

data/lib/base.sass.rb

@@ -4,12 +4,12 @@ ENV['SASS_PATH'] = [ENV['SASS_PATH'], load_path].compact.join(File::PATH_SEPARAT
 ENV['SASS_ENV'] ||= 'development'
 
 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'
+require 'base.sass/parse-rules'
+require 'base.sass/ruby-to-sass'
+require 'base.sass/sass-to-ruby'
 require 'base.sass/selector'
+require 'base.sass/strftime'
 require 'base.sass/url'

data/lib/base.sass/caniuse.rb

@@ -4,19 +4,48 @@ class CanIUse
   include Singleton
   include Sass::Script::Functions
 
-  DATA_DIR = File.join(File.dirname(__FILE__), '..', '..', 'data')
-
   def initialize
-    @caniuse_browsers = load_json(File.join(DATA_DIR, 'browsers.json'))
-    # @caniuse_supports = load_json(File.join(DATA_DIR, 'supports.json'))
+    @data = load_json(File.join(File.dirname(__FILE__), '..', '..', 'data', 'browsers.json'))
   end
 
   def browsers
-    @caniuse_browsers
+    @data.keys.sort
+  end
+
+  def versions(browser, include_future)
+    return [] unless @data.key? browser
+
+    versions = @data[browser]['versions']
+    return versions unless include_future
+
+    versions + @data[browser]['future'].to_a
   end
 
-  # def supports
-  #   @caniuse_supports
-  # end
+end
+
+
+module Sass::Script::Functions
+
+  # Returns the data in CanIUse which base.sass used.
+  #
+  # Examples:
+  # caniuse(browsers)
+  # caniuse(Chrome versions)
+  # caniuse(Chrome all versions)
+  def caniuse(cond)
+    cond = [sass_to_ruby(cond)].flatten.map { |w| w.downcase }
+
+    output = if cond.first == 'browsers'
+      caniuse_browsers
+    elsif cond.last == 'versions'
+      browser = cond.first
+      assert_valid_browser(browser)
+      caniuse_versions(browser, cond.include?('all'))
+    else
+      raise Sass::SyntaxError, "Unknown condition.\nYou can try `caniuse(browsers)` or `caniuse(Chrome versions)`"
+    end
+
+    ruby_to_sass(output)
+  end
 
 end

data/lib/base.sass/parse-rules.rb

@@ -0,0 +1,114 @@
+module Sass::Script::Functions
+
+  # Returns the specified browsers and versions associated with the given rules.
+  #
+  # Rules:
+  # 1. last 1 version         is last versions for each browser.
+  # 2. last 2 Chrome versions is last versions of the specified browser.
+  # 3. IE > 8                 is ie versions newer than 8.
+  # 4. IE >= 8                is ie version 8 or newer.
+  # 5. iOS 7                  to set browser version directly.
+  def parse_rules(*rules)
+    rules = rules.map { |r| sass_to_ruby(r) }.flatten.uniq
+
+    # Parse
+    selected = rules.map { |r| rules_parser(r.downcase) }.compact
+    # Merge
+    selected = selected.inject { |memo, p|
+      memo.merge(p) { |k, orig, added| orig + added }
+    }
+    # Uniq & Sort
+    selected.each { |k, v|
+      v.uniq!
+      v.sort!
+    }
+
+    ruby_to_sass(selected)
+  end
+
+
+  protected
+
+  def caniuse_browsers
+    @browsers ||= CanIUse.instance.browsers
+  end
+
+  def caniuse_versions(browser, include_future)
+    @versions ||= {}
+    k = browser.to_s + include_future.to_s
+    @versions[k] ||= CanIUse.instance.versions(browser, include_future)
+  end
+
+  def assert_valid_browser(browser, version = nil)
+    unless caniuse_browsers.include? browser
+      raise Sass::SyntaxError, "Unknown browser name: #{browser}\nYou can find all valid names according to `caniuse(browsers)`"
+    end
+
+    unless version.nil? || caniuse_versions(browser, true).include?(version)
+      raise Sass::SyntaxError, "Unknown version for #{browser}: #{version}\nYou can find all valid versions according to `caniuse(#{browser} all versions)`"
+    end
+  end
+
+
+  private
+
+  def rules_parser(rule)
+    case rule
+
+    # match `last 1 version`
+    when /^last (\d+) versions?$/
+      last_versions_parser($1)
+
+    # match `last 3 chrome versions`
+    when /^last (\d+) (\w+) versions?$/
+      last_browser_versions_parser($1, $2, true)
+
+    # match `ie > 9`
+    when /^(\w+) (>=?) ([\d\.]+)$/
+      newer_then_parser($1, $2, $3)
+
+    # match `ios 7`
+    when /^(\w+) ([\d\.]+)$/
+      direct_parser($1, $2)
+
+    else
+      raise Sass::SyntaxError, "Unknown rule: `#{rule}`"
+    end
+  end
+
+  def last_versions_parser(num)
+    caniuse_browsers.map { |browser|
+      last_browser_versions_parser(num, browser, false)
+    }.inject :merge
+  end
+
+  def last_browser_versions_parser(num, browser, assert)
+    assert_valid_browser(browser) if assert
+    Hash[browser, caniuse_versions(browser, false).last(num.to_i)]
+  end
+
+  def newer_then_parser(browser, sign, version)
+    assert_valid_browser(browser)
+
+    versions = caniuse_versions(browser, false)
+    versions = case sign
+      when '>='
+        versions.select { |n| n >= version.to_f }
+      when '>'
+        versions.select { |n| n > version.to_f }
+      end
+
+    versions.empty? ? nil : Hash[browser, versions]
+  end
+
+  def direct_parser(browser, version)
+    version = to_if(version)
+    assert_valid_browser(browser, version)
+    Hash[browser, [version]]
+  end
+
+  def to_if(s)
+    s.include?('.') ? s.to_f : s.to_i
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: base.sass
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - junjun.zhang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -44,11 +44,11 @@ files:
 - lib/base.sass/env.rb
 - lib/base.sass/map.rb
 - lib/base.sass/parse-json.rb
+- lib/base.sass/parse-rules.rb
 - lib/base.sass/ruby-to-sass.rb
 - lib/base.sass/sass-to-ruby.rb
 - lib/base.sass/selector.rb
 - lib/base.sass/strftime.rb
-- lib/base.sass/support.rb
 - lib/base.sass/url.rb
 - stylesheets/base.sass/_*.scss
 - stylesheets/base.sass/functions/_list.scss
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Awesome Extensions For Sass

data/lib/base.sass/support.rb

@@ -1,120 +0,0 @@
-module Sass::Script::Functions
-
-  # Which browsers you wanted support?
-  #
-  # `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.
-  def parse_rules(*rules)
-    rules = rules.map { |rule| sass_to_ruby(rule) }.flatten.uniq
-
-    @browsers ||= CanIUse.instance.browsers
-    selected_browsers =
-      rules.map { |rule| rules_parser(rule.downcase) }.compact
-           .inject { |memo, versions|
-             memo.merge(versions) { |k, orig, added| orig + added }
-           }
-
-    ruby_to_sass(selected_browsers.each { |k, v| v.uniq!; v.sort! })
-  end
-
-  # Returns `(android, chrome, firefox, ie, ios, opera, safari)`.
-  def browsers
-    ruby_to_sass(CanIUse.instance.browsers.keys.sort)
-  end
-
-  # Returns the versions by the given browser.
-  def browser_versions(browser, include_future = bool(true))
-    assert_type browser, :String
-
-    @browsers ||= CanIUse.instance.browsers
-    browser = browser.value.downcase
-    assert_valid_browser(browser)
-
-    versions = @browsers[browser]['versions']
-    versions += @browsers[browser]['future'].to_a if include_future.to_bool
-
-    ruby_to_sass(versions)
-  end
-
-
-  private
-
-  def assert_valid_browser(browser, version = nil)
-    unless @browsers.key? browser
-      raise Sass::SyntaxError, "Unknown browser name: #{browser}\nYou can find all valid names according to `browsers()`"
-    end
-
-    unless version.nil? || sass_to_ruby(browser_versions(identifier(browser))).include?(version)
-      raise Sass::SyntaxError, "Unknown version for #{browser}: #{version}\nYou can find all valid versions according to `browser-versions(#{browser})`"
-    end
-  end
-
-  def rules_parser(rule)
-    case rule
-
-    # match `last 1 version`
-    when /^last (\d+) versions?$/
-      last_versions_parser($1)
-
-    # match `last 3 chrome versions`
-    when /^last (\d+) (\w+) versions?$/
-      last_browser_versions_parser($1, $2)
-
-    # match `ie > 9`
-    when /^(\w+) (>=?) ([\d\.]+)$/
-      newer_then_parser($1, $2, $3)
-
-    # match `ios 7`
-    when /^(\w+) ([\d\.]+)$/
-      direct_parser($1, $2)
-
-    else
-      raise Sass::SyntaxError, "Unknown rule: `#{rule}`"
-    end
-  end
-
-  def last_versions_parser(num)
-    @browsers.inject({}) do |memo, (k, v)|
-      memo[k] = v['versions'].last(num.to_i)
-      memo
-    end
-  end
-
-  def last_browser_versions_parser(num, browser)
-    assert_valid_browser(browser)
-    Hash[browser, @browsers[browser]['versions'].last(num.to_i)]
-  end
-
-  def newer_then_parser(browser, sign, version)
-    assert_valid_browser(browser)
-
-    versions = @browsers[browser]['versions']
-    versions = case sign
-      when '>='
-        versions.select { |n| n >= version.to_f }
-      when '>'
-        versions.select { |n| n > version.to_f }
-      end
-
-    versions.empty? ? nil : Hash[browser, versions]
-  end
-
-  def direct_parser(browser, version)
-    version = to_if(version)
-    assert_valid_browser(browser, version)
-    Hash[browser, [version]]
-  end
-
-  def to_if(s)
-    s.include?('.') ? s.to_f : s.to_i
-  end
-
-end