dashy 0.0.2 → 0.0.3

data/app/assets/stylesheets/dashy/set/column/_gap.scss

@@ -0,0 +1,6 @@
+@mixin set-column-gap($gap)
+{
+	-webkit-column-gap: $gap;
+	   -moz-column-gap: $gap;
+	        column-gap: $gap;
+}

data/app/assets/stylesheets/dashy/set/column/break/_inside.scss

@@ -0,0 +1,6 @@
+@mixin set-column-break-inside($break)
+{
+	-webkit-column-break-inside: $break;
+	   -moz-column-break-inside: $break;
+	        column-break-inside: $break;
+}

data/app/assets/stylesheets/dashy/set/font/_size.scss

@@ -0,0 +1,4 @@
+@mixin set-font-size($size)
+{
+	@include set-rem(font-size, $size);
+}

data/app/assets/stylesheets/dashy/set/font/_style.scss

@@ -0,0 +1,4 @@
+@mixin set-font-style($style)
+{
+	@include set(font-style, $style);
+}

data/app/assets/stylesheets/dashy/set/font/_weight.scss

@@ -0,0 +1,4 @@
+@mixin set-font-weight($weight)
+{
+	@include set(font-weight, $weight);
+}

data/app/assets/stylesheets/dashy/set/line/_height.scss

@@ -0,0 +1,4 @@
+@mixin set-line-height($line-height)
+{
+	@include set-rem(line-height, $line-height);
+}

data/app/assets/stylesheets/dashy/set/max/_height.scss

@@ -0,0 +1,4 @@
+@mixin set-max-height($height)
+{
+	@include set-rem(max-height, $height);
+}

data/app/assets/stylesheets/dashy/set/max/_width.scss

@@ -0,0 +1,4 @@
+@mixin set-max-width($width)
+{
+	@include set-rem(max-width, $width);
+}

data/app/assets/stylesheets/dashy/set/min/_height.scss

@@ -0,0 +1,7 @@
+@mixin set-min-height($min-height)
+{
+	@if is-rem($min-height) { @include set-min-height(to-px($min-height)) }
+	min-height: #{ $min-height };
+	height:auto !important;
+	height: #{ $min-height };
+}

data/app/assets/stylesheets/dashy/set/min/_width.scss

@@ -0,0 +1,4 @@
+@mixin set-min-width($min-width)
+{
+	@include set-rem(min-width, $min-width);
+}

data/app/assets/stylesheets/dashy/set/text/_align.scss

@@ -0,0 +1,4 @@
+@mixin set-text-align($align)
+{
+	@include set(text-align, $align);
+}

data/app/assets/stylesheets/dashy/set/text/_color.scss

@@ -0,0 +1,4 @@
+@mixin set-text-color($color)
+{
+	@include set(color, $color);
+}

data/app/assets/stylesheets/dashy/set/text/_decoration.scss

@@ -0,0 +1,4 @@
+@mixin set-text-decoration($decoration)
+{
+	@include set(text-decoration, $decoration);
+}

data/app/assets/stylesheets/dashy/set/text/_transform.scss

@@ -0,0 +1,4 @@
+@mixin set-text-transform($transform)
+{
+	@include set(text-transform, $transform);
+}

data/app/assets/stylesheets/dashy/set/vertical/_align.scss

@@ -0,0 +1,4 @@
+@mixin set-vertical-align($align)
+{
+	@include set(vertical-align, $align);
+}

data/app/assets/stylesheets/dashy/string/_hyphenate.scss

@@ -0,0 +1,4 @@
+@function string-hyphenate($strs)
+{
+	@return string-join($strs, "-");
+}

data/app/assets/stylesheets/dashy/to/_dimension.scss

@@ -0,0 +1,11 @@
+$to-dimension-from-orientation: (horizontal width) (vertical height);
+
+@function to-dimension-from-orientation($orientation)
+{
+	@return map-get($to-dimension-from-orientation, $orientation);
+}
+
+@function to-dimension($arg)
+{
+	@if is-orientation($arg) { @return to-dimension-from-orientation($arg); }
+}

data/app/assets/stylesheets/dashy/to/_fraction.scss

@@ -0,0 +1,12 @@
+// @function to-fraction-from-number defined in Sass::Script::Functions::Dashy
+
+@function to-fraction-from-percentage($per)
+{
+	@return to-fraction-from-number(to-number-from-percentage($per));
+}
+
+@function to-fraction($arg)
+{
+	@if is-number($arg)      { @return to-fraction-from-number($arg); }
+	@if is-percentage($arg)  { @return to-fraction-from-percentage($arg); }
+}

data/app/assets/stylesheets/dashy/to/_number.scss

@@ -0,0 +1,9 @@
+@function to-number-from-percentage($per)
+{
+	@return $per / 100%;
+}
+
+@function to-number($arg)
+{
+	@if is-percentage($arg) { @return to-number-from-percentage(arg / 100%); }
+}

data/app/assets/stylesheets/dashy/to/_orientation.scss

@@ -0,0 +1,11 @@
+$to-orientation-from-dimension: (width: horizontal, height: vertical);
+
+@function to-orientation-from-dimension($dimension)
+{
+	@return map-get($to-orientation-from-dimension, $dimension);
+}
+
+@function to-orientation($arg)
+{
+	@if is-dimension($arg) { @return to-orientation-from-dimension($arg); }
+}

data/app/assets/stylesheets/dashy/to/_percentage.scss

@@ -0,0 +1,9 @@
+@function to-percentage-from-unitless($num)
+{
+	@return $num * 100%;
+}
+
+@function to-percentage($arg)
+{
+	@if is-unitless($arg) { @return to-percentage-from-unitless($arg); }
+}

data/app/assets/stylesheets/dashy/to/_px.scss

@@ -0,0 +1,9 @@
+@function to-px-from-rem($rem)
+{
+    @return $font-size-default * $rem / 1rem;
+}
+
+@function to-px($num)
+{
+    @if is-rem($num) { @return to-px-from-rem($num); }
+}

data/app/assets/stylesheets/dashy/to/_unitless.scss

@@ -0,0 +1,4 @@
+@function to-unitless($amt)
+{
+    @return $amt / number-one($amt); // remove the units by dividing them out...
+}

data/lib/dashy/version.rb

@@ -1,5 +1,5 @@
 module Dashy
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end
 
 # Gem structure adapted from thoughtbot/bourbon...

data/lib/dashy.rb

@@ -8,6 +8,7 @@ unless defined?(Sass)
   require 'sass'
 end
 
+require "sass/script/value/string/dashy"
 require "sass/script/functions/dashy"
 
 module Dashy

data/lib/sass/script/functions/dashy.rb

@@ -1,287 +1,96 @@
-require 'sass/script/functions'
+module Sass::Script::Functions
+  module Dashy
 
-class Sass::Script::Value::String
-
-   prepend Module.new {
-
-     def to_s opt = {}
-       return @value.gsub(/(?<!\\)(?=[\$\%\/\?\!])/, "\\") if :selector == @type
-       return super
-     end
-
-   }
-
-end
-
-module Sass
-  module Script
-    module Functions
-
-      # Defined directly on `Functions` so we can use `declare`.
-
-      def is_wildcard value
-        '*' == value.to_s
-      end
-
-      def select *selectors
-        this = select_identifier ""
-        select_as this, *selectors
-      end
-      declare :select, [], :var_args => true
-
-      def select_as separator, *selectors
-        unquote   = method :unquote
-        separator = separator.value
-        selectors = selectors.first if 1 == selectors.length
-        selectors = selectors.to_a.map { |selector| selector.to_a.map &unquote }
-        selectors = selectors.shift.product *selectors
-        Sass::Script::Value::List.new selectors.map! { |selector|
-         # selector = selector.reject &method(:is_wildcard) unless 1 == selector.length && is_wildcard(selector.first)
-          selector = selector.join separator
-          selector.gsub! /(?<=[\w\-\]])\*/, ''  # Remove any wildcards after any words or attributes.
-          selector.gsub! /\*(?=[\w\.\#\[])/, '' # Remove any wildcards before any tags, classes, ids or attributes.
-          select_identifier selector
-        }, :comma
-      end
-      declare :select_with, [:string], :var_args => true
-
-      def select_as_descendants *selectors
-        descendants = select_identifier " "
-        select_as descendants, *selectors
-      end
-      declare :select_as_descendants, [], :var_args => true
-
-      def select_as_children *selectors
-        children = select_identifier ">"
-        select_as children, *selectors
-      end
-      declare :select_as_children, [], :var_args => true
-
-      def select_as_adjacent_siblings *selectors
-        adjacent_siblings = select_identifier "+"
-        select_as adjacent_siblings, *selectors
-      end
-      declare :select_as_adjacent_siblings, [], :var_args => true
-
-      def select_as_general_siblings *selectors
-        general_siblings = select_identifier "~"
-        select_as general_siblings, *selectors
-      end
-      declare :select_as_general_siblings, [], :var_args => true
-
-      def select_descendants selector = select_any
-        descendants = select_identifier " "
-        select descendants, selector
-      end
-      declare :select_descendants, [:string], :var_args => true
-
-      def select_children selector = select_any
-        children = select_identifier ">"
-        select children, selector
-      end
-      declare :select_children, [:string], :var_args => true
-
-      def select_adjacent_siblings selector = select_any
-        adjacent_siblings = select_identifier "+"
-        select adjacent_siblings, selector
-      end
-      declare :select_adjacent_siblings, [:string], :var_args => true
-
-      def select_general_siblings selector = select_any
-        general_siblings = select_identifier "~"
-        select general_siblings, selector
-      end
-      declare :select_general_siblings, [:string], :var_args => true
-
-      def select_either *selectors
-        selectors = selectors.first if 1 == selectors.length
-        selectors = selectors.map &:to_a
-        Sass::Script::Value::List.new selectors.flatten, :comma
-      end
-      declare :select_either, [], :var_args => true
-
-      def select_attribute attribute, *selectors
-        selectors = selectors.first if 1 == selectors.length
-        selectors = selectors.to_a.map { |selector| select_string "[#{ attribute }=\'#{ select_escaped! selector }\']" }
-        Sass::Script::Value::List.new selectors, :comma
-      end
-     
-      def select_attribute_prefix attribute, *selectors
-        selectors = selectors.first if 1 == selectors.length
-        selectors = selectors.to_a.map { |selector|
-          [
-            (select_string "[#{ attribute }^=\'#{  select_escaped! selector }\']"),
-            (select_string "[#{ attribute }*=\' #{ select_escaped! selector }\']")
-          ]
-        }
-        Sass::Script::Value::List.new selectors.flatten, :comma
-      end
-
-      def select_attribute_suffix attribute, *selectors
-        selectors = selectors.first if 1 == selectors.length
-        selectors = selectors.to_a.map { |selector|
-          [
-            (select_string "[#{ attribute }$=\'#{ select_escaped! selector }\']"),
-            (select_string "[#{ attribute }*=\'#{ select_escaped! selector } \']")
-          ]
-        }
-        Sass::Script::Value::List.new selectors.flatten, :comma
-      end
-
-      def select_class_prefix *selectors
-        attribute = select_identifier "class"
-        select_attribute_prefix attribute, *selectors
-      end
-
-      def select_class_suffix *selectors
-        attribute = select_identifier "class"
-        select_attribute_suffix attribute, *selectors
-      end
-
-      def select_class selector
-        selectors = selector.to_a.map &:to_a
-        selectors = selectors.shift.product *selectors
-        selectors.map! { |selector| select_identifier "." + select_escaped!(selector.to_a.map { |s| s.to_s(quote: :none).gsub(/(?<!\\)(?=[.\$\%\/\?\!])/, "\\") }.join "-") }
-        Sass::Script::Value::List.new selectors, :comma
-      end
-
-      def select_classes *selectors
-        select_either *(selectors.map! &(method :select_class))
-      end
-
-      def select_pseudoclass selector
-        select_identifier ":" + (selector.to_a.join "-")
-      end
-
-      def select_pseudoclasses *selectors
-        select_either *(selectors.map! &(method :select_pseudoclass))
-      end
-
-      def select_quasiclass selector
-        select_either select_class(selector), select_pseudoclass(selector)
-      end
-
-      def select_quasiclasses *selectors
-        select_either *(selectors.map! &(method :select_quasiclass))
-      end
-
-      def select_adjacent_odd_siblings limit, *selectors
-        selectors.push select_identifier '*' if selectors.empty?
-        selectors = selectors.first if 1 == selectors.length
-        selectors = (0 .. limit.value).select { |i| 1 == i % 2 }.map { |i| select select_identifier(" + * " * i + " + "),  *selectors }
-        select_either *selectors
-      end
-
-      def select_odd_siblings limit, *selectors
-        select_either select_first_sibling, select(select_first_sibling, select_adjacent_odd_siblings(limit, *selectors))
-      end
-
-      def select_odd_children limit, *selectors
-        select_children select_odd_siblings(limit, *selectors)
-      end
-
-      def select_adjacent_even_siblings limit, *selectors
-        selectors.push select_identifier '*' if selectors.empty?
-        selectors = selectors.first if 1 == selectors.length
-        selectors = (0 .. limit.value).select { |i| 0 == i % 2 }.map { |i| select select_identifier(" + * " * i + " + "),  *selectors }
-        select_either *selectors
-      end
-
-      def select_even_siblings limit, *selectors
-        select select_first_sibling, select_adjacent_even_siblings(limit, *selectors)
-      end
-
-      def select_even_children limit, *selectors
-        select_children select_even_siblings(limit, *selectors)
-      end
-
-      def select_first_child
-        select_children select_first_sibling
-      end
-
-      def select_first_sibling
-        select_identifier ":first_child"
-      end
-
-      def select_any
-        select_identifier "*"
-      end
-
-      def select_string selector
-        Sass::Script::Value::String.new selector.to_s, :string
-      end
-
-      def select_identifier selector
-        Sass::Script::Value::String.new selector.to_s, :selector
-      end
-
-      def select_escaped! thing
-        thing.tap { |t|
-          case thing
-
-          when Sass::Script::Value::String
-            select_escaped! t.value
-
-          when String
-            t.gsub! /(?<!\\)(?=[\=\$\%\/\?\!\.])/, "\\"
+    def select *selectors
+      select_as unquoted_string(""), *selectors
+    end
 
-          end
-        }
-      end
+    def select_new selector
+      string_new selector, :selector
+    end
 
-      def select_escaped_string selector
-        select_escaped! select_string selector
-      end
+    private :select_new
+
+    def select_as separator, *selectors
+      unquote   = method :unquote
+      separator = separator.value
+      selectors = selectors.first if 1 == selectors.length
+      selectors = selectors.to_a.map { |selector| selector.to_a.map &unquote }
+      
+      selectors = selectors.shift.product *selectors
+      selectors.map! do |selector|
+        selector = selector.join separator
+        
+        selector.gsub! %r{                 [*] (?=[\\\w\-\.\#\[]) }x, '' # Remove any wildcards before any tags, classes, ids or attributes.
+        selector.gsub! %r{ (?<=[\\\w\-\]]) [*]                    }x, '' # Remove any wildcards after any words or attributes.
+
+        select_new selector
+      end
+      
+      list_new selectors
+    end
 
-      def select_escaped_identifier selector
-        select_escaped! select_identifier selector
-      end
+    def select_either *selectors
+      list_new selectors.map(&:to_a).flatten
+    end
 
-      def select_arguments namespace, *name_value_pairs
-        inputs = name_value_pairs.map { |name_value_pair|
-          name, value = name_value_pair.to_a
-          select select_identifier('input:checked'), select_attribute('form',  namespace),
-                                                     select_attribute('name',  name),
-                                                     select_attribute('value', value)
-        }
-        select_as_general_siblings *inputs
+    def string_new string, type = :string
+      Sass::Script::Value::String.new string, type
+    end
 
-        # $form: select-class($form);
+    private :string_new
 
-        # $left:  select($input select-general-siblings($form));
-        # $right: select($form select-class($name $value));
+    def string_join strings, separator
+      strings = strings.to_a
+      type = strings.first.type
+      strings = strings.map { |string| string.to_s quote: :none }
+      separator = separator.to_s quote: :none
+      string_new strings.join(separator), type
+    end
 
-        # @return select-either($left, $right);
-      end
+    def number_new number, numerator_units = nil, denominator_units = nil
+      Sass::Script::Value::Number.new number, numerator_units, denominator_units
+    end
 
-      def select_lists *selectors
-        select_either select_ordered_lists(*selectors), select_unordered_lists(*selectors)
-      end
+    private :number_new
 
-      def select_ordered_lists *selectors
-        select select_identifier('ol'), *selectors
-      end
+    def list_new list, separator = :comma
+      Sass::Script::Value::List.new list, :comma
+    end
 
-      def select_unordered_lists *selectors
-        select select_identifier('ul'), *selectors
-      end
+    private :list_new
+
+    def list_series *lists
+      lists.map! do |list|
+        list = list.to_a
+        sentinel = list.first
+
+        first, second, operator, *rest, last = list.map &:value
+        next list unless Numeric === last &&
+                         Numeric === first &&
+                         Numeric === second &&
+                         /^_+$/ === operator &&
+                         rest.all?(&Numeric.method(:===))
+
+        delta = second - first
+        case operator
+        when "_"  then (first..  last)
+        when "__" then (first... last)
+        end.step(delta).map do |value|
+          number_new value, sentinel.numerator_units, sentinel.denominator_units
+        end
+      end
+      list_new lists.flatten, :comma
+    end
 
-      def list_of *lists
-        Sass::Script::Value::List.new lists.map { |list|
-          list                                 = list.to_a
-          number                               = list.first
-          first, second, operator, *rest, last = list.map &:value
-          this                                 = first
-          delta                                = second - first
-          case operator
-          when "_"  then [].tap { |list| while this <= last; list << this; this += delta; end }
-          when "__" then [].tap { |list| while this <  last; list << this; this += delta; end }
-          else list
-          end.map { |value| Sass::Script::Value::Number.new value, number.numerator_units, number.denominator_units }
-        }.flatten, :comma
-      end
-      declare :list_of, [:list], :var_args => true
+    def to_number_from_fraction str
+      number_new eval "1.0 * #{ str.value }" if %r{ ^ [0-9]+ / [0-9]+ $ }x === str.value
+    end
 
+    def to_fraction_from_number num
+      string_new Rational(num.value).rationalize(0.0001).to_s, :identifier
     end
+
   end
+  prepend Dashy
 end

data/lib/sass/script/value/string/dashy.rb

@@ -0,0 +1,25 @@
+class Sass::Script::Value::String
+  module Dashy
+
+    def to_s *sig
+      return super unless :selector === type
+      selector = self.value.dup
+
+      # Escape...
+      # 
+      # ...decimals:
+      # 
+      selector.gsub! %r{ (?<=[0-9])                             (?=[.][0-9]) }x, '\\' # Escape any unescaped decimal points...
+      selector.gsub! %r{ (?<=[0-9]) ( [\\][.] [0-9]{2} ) [0-9]+              }x, '\1' # Remove extra precision (> 2).
+      selector.gsub! %r{ (?<=[0-9]) ( [\\][.] [0-9]*?  )   [0]+   (?=[^0-9]) }x, '\1' # Remove trailing zeroes.
+      selector.gsub! %r{ (?<=[0-9]) ( [\\][.]          )          (?=[^0-9]) }x, ''   # Remove trailing dot.
+      #
+      # ...punctuation:
+      #
+      selector.gsub! %r{ (?<!\\) (?=[/%$?!]) }x, "\\" # Escape any unescaped punctuation...
+      selector
+    end
+
+  end
+  prepend Dashy
+end