dashy 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f00a1bf21b2a312b22a76c281eb8baefab10e532
-  data.tar.gz: f2c80c1c86bdf524bcbe639a2fdd4a3e54fdfa28
+  metadata.gz: 7c08b11379b7751916a6e456a4e7c435ef52c998
+  data.tar.gz: 40e2f13a9566ab716975a357d6a8b2dce5bfc0a3
 SHA512:
-  metadata.gz: 2c86ae1d952fbfd586dca71b94f97cca13342704ba10b9618a6f6082c81963fd4c16bd113ffa39ea9c3c0388cb7b6984071073ecb28e208b0b40ff10f7ea3f1f
-  data.tar.gz: e187aaa08aca674ef10379dd8d4a896f77b32353b1af1d334922e5b07f0867aa0d64903b53c745b014419ed1b258b52b5016ea9e64e8d2cbace59634c2dd3b7b
+  metadata.gz: 82451fa0a98c000f3e4427df0e6f937f36d21e422f5f3cf1774b54f3ca2aebd22a9104ca4803cadec59a3aa43a420b28f51f3045492a956710b87489ccebae3c
+  data.tar.gz: f0e7fd2f26d29801eb65e58603dd7ccb6e6a45359d3a256d2f8f0135a313db82f6a1d019732a2a2647b346ff6a59d313b44ac4e18b3350bb7c481ceb40117d8c

data/app/assets/stylesheets/_dashy.scss

@@ -1,14 +1,14 @@
-@import "dash/color";
-@import "dash/corner";
-@import "dash/default";
-@import "dash/define";
-@import "dash/direction";
-@import "dash/font-family";
-@import "dash/is";
-@import "dash/line-height";
-@import "dash/list";
-@import "dash/number";
-@import "dash/opposite";
-@import "dash/select";
-@import "dash/set";
-@import "dash/side";
+@import "dashy/color";
+@import "dashy/corner";
+@import "dashy/default";
+@import "dashy/define";
+@import "dashy/direction";
+@import "dashy/font-family";
+@import "dashy/is";
+@import "dashy/line-height";
+@import "dashy/list";
+@import "dashy/number";
+@import "dashy/opposite";
+@import "dashy/select";
+@import "dashy/set";
+@import "dashy/side";

data/app/assets/stylesheets/dashy/_define.scss

@@ -111,7 +111,8 @@
 
 $define-grid-span-widths:
     (008.33% ("1/12"))
-    (009.09% ("1/11"))
+    (009.09% ("1/10"))
+    (010.00% ("1/11"))
     (011.11% ("1/9"))
     (012.50% ("1/8"))
     (014.29% ("1/7"))

data/lib/dashy/version.rb

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

data/lib/dashy.rb

@@ -8,6 +8,8 @@ unless defined?(Sass)
   require 'sass'
 end
 
+require "sass/script/functions/dashy"
+
 module Dashy
   if defined?(Rails) && defined?(Rails::Engine)
     class Engine < ::Rails::Engine

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

@@ -0,0 +1,287 @@
+require 'sass/script/functions'
+
+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! /(?<!\\)(?=[\=\$\%\/\?\!\.])/, "\\"
+
+          end
+        }
+      end
+
+      def select_escaped_string selector
+        select_escaped! select_string selector
+      end
+
+      def select_escaped_identifier selector
+        select_escaped! select_identifier selector
+      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
+
+        # $form: select-class($form);
+
+        # $left:  select($input select-general-siblings($form));
+        # $right: select($form select-class($name $value));
+
+        # @return select-either($left, $right);
+      end
+
+      def select_lists *selectors
+        select_either select_ordered_lists(*selectors), select_unordered_lists(*selectors)
+      end
+
+      def select_ordered_lists *selectors
+        select select_identifier('ol'), *selectors
+      end
+
+      def select_unordered_lists *selectors
+        select select_identifier('ul'), *selectors
+      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
+
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dashy
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Alex Goldsmith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-27 00:00:00.000000000 Z
+date: 2014-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -103,7 +103,7 @@ files:
 - lib/dashy/engine.rb
 - lib/dashy/generator.rb
 - lib/dashy/version.rb
-- lib/sass/script/functions.rb
+- lib/sass/script/functions/dashy.rb
 - lib/tasks/install.rake
 - package.json
 - sache.json

data/lib/sass/script/functions.rb

@@ -1,275 +0,0 @@
-require 'sass/script/functions'
-
-Sass::Script::Value = Sass::Script unless Sass::Script.const_defined? :Value, false
-
-class Sass::Script::Value::String
-
-   prepend Module.new {
-
-     def to_s opt = {}
-       return @value# if :selector == @type
-     end
-
-   }
-
-end
-module Sass::Script::Functions
-
-  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_spaced_attribute
-    raise 'bwoon'
-  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.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, :identifier
-  end
-
-  def select_escaped! thing
-    thing.tap { |t|
-      case thing
-
-      when String
-        t.gsub! /(?<!\\)(?=[\=\$\%\/\?\!\.])/, "\\"
-
-      when Sass::Script::Value::String
-        select_escaped! t.value
-
-      end
-    }
-  end
-
-  def select_escaped_string selector
-    select_escaped! select_string selector
-  end
-
-  def select_escaped_identifier selector
-    select_escaped! select_identifier selector
-  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
-
-    # $form: select-class($form);
-
-    # $left:  select($input select-general-siblings($form));
-    # $right: select($form select-class($name $value));
-
-    # @return select-either($left, $right);
-  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 :select_children, [:list], :var_args => true
-
-end
-
-# Gem structure adapted from thoughtbot/bourbon...