archetype 0.0.1.pre.3.90263a7 → 0.0.1.pre.3.811928f

data/CHANGELOG.md

@@ -4,36 +4,13 @@
 
 - initial public release
 
-## 0.0.1.pre.3 (pre-released)
+## 0.0.1.pre.3 (unreleased)
 
 ### New Features:
 
 - added `styleguide-component-exists()` method to check if a component/extension has already been registered in the theme
 - added `memoize` compiler configuration to allow enabling/disabling the internal styleguide memoizer
-- `glyph-icon()` can now take `false` as an icon name and not output anything
-- added `unstyled-button()` method to remove default styling from a `<button>` element
-- added `prefixed-tag()` method for consistency when generating tag names
-- added Chinese font stacks
-- added wildcard support to `locale()` function (e.g. `locale(en_ ja_JP _DE)`)
-- added `transparent-focusable()` mixin for transparent background support in older IE
-- added ability to customize `output-style()` with `custom-output-styler()` mixin and `has-custom-output-styler()` function (NEEDS DOCUMENTATION)
-- added better support for targeting IE6/7 glyphs and `ie-pseudo()` generated elements (NEEDS DOCUMENTATION)
-- making `unique()` generated IDs genuinely unique
-- adding support for a `testing` config flag
-- adding support for `@extend` from a styleguide component
-
-### Resolved Issues:
-
-- quotes on strings passed to `associative()` weren't being stripped correctly
-- fixed some minor glyph issues
-- out-of-order CSS issues in Ruby 1.8.7 are fixed using `Hashery::OrderedHash`
-- fixed issue with `archetype-version()` incorrectly matching comparators
-
-### Tests:
-
 - added test case for fallback CSS properties
-- added test case for generating loading spinner keyframe animations
-- updated test cases for minor changes
 
 ## 0.0.1.pre.2 (unreleased)
 

data/LICENSE

@@ -1,5 +1,5 @@
 Archetype
-Copyright (c) 2013 LinkedIn Corp.  All rights reserved.
+Copyright (c) 2012 LinkedIn
 Apache Software License 2.0
 
 

data/README.md

@@ -1,6 +1,6 @@
 # Archetype
 
-[![Build Status](https://travis-ci.org/linkedin/archetype.png)](https://travis-ci.org/linkedin/archetype) [![Gem Version](https://badge.fury.io/rb/archetype.png)](http://badge.fury.io/rb/archetype)
+[![Build Status](https://travis-ci.org/eoneill/archetype.png)](https://travis-ci.org/eoneill/archetype)
 
 Archetype is a UI pattern and component library for quickly iterating on and maintaining scalable web interfaces.
 

data/VERSION.yml

@@ -3,4 +3,4 @@
 :minor: 0
 :build: 1
 :state: pre
-:iteration: 3
+:iteration: 3

data/lib/archetype.rb

@@ -33,10 +33,6 @@ module Archetype
     Compass::Configuration.add_configuration_property(:memoize, "should the memoizer be used to improve compilation speed") do
       not (Compass.configuration.environment || :development).to_s.include?('dev')
     end
-    # testing (for running unit tests)
-    Compass::Configuration.add_configuration_property(:testing, "is this a testing environment") do
-      ENV['CI']
-    end
   end
 end
 

data/lib/archetype/functions/hash.rb

@@ -1,8 +1,6 @@
 # :stopdoc:
 # This module extends the native Ruby Hash class to support deep merging
 # and comparing the difference between hashes.
-# This functionality mimics that found in ActiveSupport
-# @see https://github.com/rails/rails/blob/master/activesupport/lib/active_support/core_ext/hash/deep_merge.rb
 #
 module Archetype::Functions::Hash
   #
@@ -13,10 +11,13 @@ module Archetype::Functions::Hash
   # *Returns*:
   # - {Hash} a new hash containing the contents of other_hash and the contents of hsh, deep merged
   #
-  def rmerge(other_hash, &block)
-    dup.rmerge!(other_hash, &block)
+  def rmerge(other_hash)
+    new_hash = {}
+    merge(other_hash) do |key, oldval, newval|
+      new_hash[key] = oldval.class == self.class ? oldval.rmerge(newval) : newval
+    end
   end
-
+  
   #
   # adds the contents of other_hash to hsh, deep merged
   #
@@ -25,16 +26,10 @@ module Archetype::Functions::Hash
   # *Returns*:
   # - {Hash} the original hash with the addition of the contents of other_hash
   #
-  def rmerge!(other_hash, &block)
-    other_hash.each_pair do |k,v|
-      tv = self[k]
-      if tv.is_a?(Hash) && v.is_a?(Hash)
-        self[k] = tv.rmerge(v, &block)
-      else
-        self[k] = block && tv ? block.call(k, tv, v) : v
-      end
+  def rmerge!(other_hash)
+    merge!(other_hash) do |key, oldval, newval|
+      oldval.class == self.class ? oldval.rmerge!(newval) : newval
     end
-    return self
   end
 
   #
@@ -46,7 +41,7 @@ module Archetype::Functions::Hash
   # - {Hash} a representation of the difference between the two hashes
   #
   def diff(other_hash)
-    (self.keys + other_hash.keys).uniq.inject(Archetype::Hash.new) do |tmp, key|
+    (self.keys + other_hash.keys).uniq.inject({}) do |tmp, key|
       # special comparison for gradients
       are_gradients = self[key].is_a?(Compass::SassExtensions::Functions::GradientSupport::LinearGradient) and other_hash[key].is_a?(Compass::SassExtensions::Functions::GradientSupport::LinearGradient)
       eq_gradients = are_gradients ? (self[key].to_s == other_hash[key].to_s) : true
@@ -133,17 +128,6 @@ private
   end
 end
 
-# this shims the Hash functionality to ensure we have an ordered hash guarantee
-module Archetype
-  if RUBY_VERSION < '1.9'
-    require 'hashery/ordered_hash'
-    class Hash < Hashery::OrderedHash
-      include Archetype::Functions::Hash
-    end
-  else
-    class Hash < ::Hash
-      include Archetype::Functions::Hash
-    end
-  end
+class Hash
+  include Archetype::Functions::Hash
 end
-

data/lib/archetype/functions/helpers.rb

@@ -24,8 +24,7 @@ private
   def self.hash_to_list(hsh, depth = 0, separator = :comma)
     if hsh.is_a? Hash
       list = []
-      hsh.each do |key, item|
-        item = [key, item]
+      hsh.each do |item|
         # if its a hash, convert it to a List
         if item.is_a? Hash or item.is_a? Array
           tmp = []
@@ -55,66 +54,30 @@ private
   #
   def self.list_to_hash(list, depth = 0, nest = [], additives = [])
     list = list.to_a
-    previous = nil
-    hsh = Archetype::Hash.new
+    hsh = {}
     list.each do |item|
       item = item.to_a
-
-      # if a 3rd item exists, we probably forgot a comma or parens somewhere
-      if previous.nil? and not item[2].nil?
-        msg = "you're likely missing a comma or parens in your data structure"
-        begin
-          logger.record(:warning, "#{msg}: #{item}")
-        rescue
-          logger.record(:warning, msg)
-        end
-      end
-
       # convert the key to a string and strip off quotes
-      key = to_str(item[0], ' ' , :quotes)
-      # capture the value
+      key = to_str(item[0]).gsub(/\A"|"\Z/, '')
       value = item[1]
-
       if key != 'nil'
-        if is_value(value, :blank)
-          if previous.nil?
-            previous = key
-            next
-          else
-            value = item[0]
-            key = previous
-            previous = nil
-          end
-        elsif not previous.nil?
-          # if we got here, something is wrong with the structure
-          list.shift if to_str(list[0]) == previous # remove the first item if it's the previous key, which is now the parent key
-          list = list[0].to_a # now the remaining items were munged, so split them out
-          hsh = Archetype::Hash.new
-          hsh[previous] = list_to_hash(list, depth - 1, nest, additives)
-          return hsh
-        end
-      end
-
-      # update the hash if we have a valid key and hash
-      if key != 'nil' and not is_value(value, :blank)
         # check if if it's a nesting hash
         nested = nest.include?(key)
         # if it's nested or we haven't reached out depth, recurse
         if nested or depth > 0
           value = list_to_hash(value, nested ? depth + 1 : depth - 1, nest, additives)
         end
-
-        if additives.include?(key)
-          hsh[key] ||= []
-          hsh[key].push(value)
-        else
-          hsh[key] = value
+        # update the hash key
+        if not is_value(value, :blank)
+          if additives.include?(key)
+            hsh[key] ||= []
+            hsh[key].push(value)
+          else
+            hsh[key] = value
+          end
         end
       end
     end
-
-    logger.record(:warning, "one of your data structures is ambiguous, please double check near `#{previous}`") if not previous.nil?
-
     return hsh
   end
 
@@ -127,12 +90,8 @@ private
   # *Returns*:
   # - {String} the converted String
   #
-  def self.to_str(value, separator = ' ', strip = nil)
-    if not value.is_a?(String)
-      value = ((value.to_a).each{ |i| i.nil? ? 'nil' : (i.is_a?(String) ? i : i.value) }).join(separator || '')
-    end
-    strip = /\A"|"\Z/ if strip == :quotes
-    return strip.nil? ? value : value.gsub(strip, '')
+  def self.to_str(value, separator = ' ')
+    return value.is_a?(String) ? value : ((value.to_a).each{ |i| i.is_a?(String) ? i : i.value }).join(separator || '')
   end
 
   #
@@ -150,13 +109,11 @@ private
     when :blank
       is_it = false
       value = value.value if value.is_a?(Sass::Script::String)
-      is_it = value.nil?
       is_it = value.empty? if value.is_a?(String)
       is_it = value.to_a.empty? if value.is_a?(Sass::Script::List) or value.is_a?(Array)
     when :nil
       is_it = false
       value = value.value if value.is_a?(Sass::Script::String)
-      is_it = value.nil?
       is_it = value == 'nil' if value.is_a?(String)
       is_it = to_str(value) == 'nil' if value.is_a?(Sass::Script::List) or value.is_a?(Array)
     end

data/lib/archetype/functions/styleguide_memoizer.rb

@@ -50,7 +50,7 @@ private
   end
 
   #
-  # invalidate the memoizer for the theme
+  # invalidate the entire memoizer for the theme
   #
   # *Parameters*:
   # - <tt>theme</tt> {String} the theme name
@@ -58,12 +58,4 @@ private
   def self.clear(theme)
     @components[theme] = {}
   end
-
-
-  #
-  # resets the entire memoizer
-  #
-  def self.reset!
-    @components = {}
-  end
 end

data/lib/archetype/sass_extensions.rb

@@ -4,4 +4,3 @@ module Archetype::SassExtensions
 end
 
 require 'archetype/sass_extensions/functions'
-require 'archetype/sass_extensions/monkey_patches'

data/lib/archetype/sass_extensions/functions/lists.rb

@@ -6,7 +6,7 @@ require 'archetype/functions/helpers'
 module Archetype::SassExtensions::Lists
   #
   # replace an index in a list
-  #
+  # 
   # *Parameters*:
   # - <tt>$list</tt> {List} the list to replace from
   # - <tt>$value</tt> {\*} the value to replace (if nil, it's a removal)
@@ -47,8 +47,8 @@ module Archetype::SassExtensions::Lists
   def list_remove(list, idx = false, separator = nil)
     return list_replace(list, idx, nil, separator)
   end
-  Sass::Script::Functions.declare :list_remove, [:list, :idx]
-  Sass::Script::Functions.declare :list_remove, [:list, :idx, :separator]
+  Sass::Script::Functions.declare :list_replace, [:list, :idx]
+  Sass::Script::Functions.declare :list_replace, [:list, :idx, :separator]
 
   #
   # insert an item into a list
@@ -67,9 +67,41 @@ module Archetype::SassExtensions::Lists
     return list if (not idx or idx == Sass::Script::Bool.new(false)) or value.nil?
     return list_replace(list, idx, value, separator, -1)
   end
-  Sass::Script::Functions.declare :list_insert, [:list, :idx]
-  Sass::Script::Functions.declare :list_insert, [:list, :idx, :value]
-  Sass::Script::Functions.declare :list_insert, [:list, :idx, :value, :separator]
+  Sass::Script::Functions.declare :list_replace, [:list, :idx]
+  Sass::Script::Functions.declare :list_replace, [:list, :idx, :value]
+  Sass::Script::Functions.declare :list_replace, [:list, :idx, :value, :separator]
+
+  #
+  # sort a list
+  #
+  # *Parameters*:
+  # - <tt>$list</tt> {List} the list to sort
+  # - <tt>$reverse</tt> {Boolean} sort the list in reverse order
+  # *Returns*:
+  # - {List} the sorted list
+  #
+  # TODO - this is failing, fix this
+  #def list_sort(list, reverse = false)
+  #  separator = list.separator if list.is_a?(Sass::Script::List)
+  #  list = list.to_a.sort
+  #  list = list.reverse if (reverse == Sass::Script::Bool.new(true))
+  #  return Sass::Script::List.new(list, separator)
+  #end
+
+  #
+  # reverse order a list
+  #
+  # *Parameters*:
+  # - <tt>$list</tt> {List} the list to reverse
+  # *Returns*:
+  # - {List} the reversed list
+  #
+  # TODO - this is failing, fix this
+  #def list_reverse(list)
+  #  separator = list.separator if list.is_a?(Sass::Script::List)
+  #  list = list.to_a.reverse
+  #  return Sass::Script::List.new(list, separator)
+  #end
 
   #
   # add values(s) to a list
@@ -185,7 +217,7 @@ module Archetype::SassExtensions::Lists
   def associative(list, key, strict = false)
     separator = list.separator if list.is_a?(Sass::Script::List)
     list = helpers.list_to_hash(list)
-    item = list[helpers.to_str(key, ' ' , :quotes)]
+    item = list[helpers.to_str(key)]
     item ||= list.first[1] if not strict
     return Sass::Script::List.new([], separator) if item.nil?
     return helpers.hash_to_list(item, 0, separator) if item.is_a?(Array) or item.is_a?(Hash)
@@ -211,33 +243,7 @@ module Archetype::SassExtensions::Lists
     list = list.rmerge(extender)
     return helpers.hash_to_list(list, 0, separator)
   end
-  Sass::Script::Functions.declare :associative_merge, [:list, :extender]
-
-  #
-  # given a string of styles, convert it into a key-value pair list
-  #
-  # *Parameters*:
-  # - <tt>$string</tt> {String} the string to convert
-  # *Returns*:
-  # - <tt>$list</tt> {List} the converted list of styles
-  #
-  def _style_string_to_list(string = '')
-    # convert to string and strip all comments
-    string = helpers.to_str(string, ' ').gsub(/\/\*[^\*\/]*\*\//, '')
-    # then split it on each rule
-    tmp = string.split(';')
-    styles = []
-    # and for each rule break it into it's key-value pairs
-    tmp.each do |rule|
-      kvp = []
-      rule.split(':').each do |str|
-        kvp.push Sass::Script::String.new(str)
-      end
-      styles.push Sass::Script::List.new(kvp, :comma)
-    end
-    # the recompose the list
-    return Sass::Script::List.new(styles, :comma)
-  end
+  Sass::Script::Functions.declare :list_extend, [:list, :extender]
 
 private
   def helpers

data/lib/archetype/sass_extensions/functions/locale.rb

@@ -3,36 +3,17 @@
 #
 module Archetype::SassExtensions::Locale
   #
-  # get the current locale specified in config or test a list of locales against the current locale
+  # get the current locale specified in config
   #
-  # *Parameters*:
-  # - <tt>$locales</tt> {List} the list of locales to test
   # *Returns*:
-  # - {String|Boolean} the current locale or whether or not the current locale is in the test set
+  # - {String} the current locale
   #
-  def locale(locales = nil)
-    locale = (Compass.configuration.locale || 'en_US').to_s
-    # if the locales are nil, just return the current locale
-    return Sass::Script::String.new(locale) if locales.nil?
-    locales = locales.to_a.collect{|i| i.to_s}
-    # add wild card support for language or territory
-    match = locale.match(LOCALE_PATTERN)
-    # language with wildcard territory
-    language = match[1] + '_'
-    # territory with wildcard language
-    territory = '_' + match[2]
-    # for each item, look it up in the alias list
-    locales.each do |key|
-      if a = locale_aliases[key]
-        locales.delete(key)
-        locales.concat(a)
-      end
-    end
-    return Sass::Script::Bool.new(locales.include?(locale) || locales.include?(language) || locales.include?(territory))
+  def locale
+    return Sass::Script::String.new(Compass.configuration.locale || 'en_US')
   end
 
   #
-  # test a list of locales against the current locale (this is now just an alias for locales(), for back-compat)
+  # test a list of locales against the current locale (supports an alias map)
   #
   # *Parameters*:
   # - <tt>$locales</tt> {List} the list of locales to test
@@ -40,9 +21,16 @@ module Archetype::SassExtensions::Locale
   # - {Boolean} is the current locale in the list or not
   #
   def lang(locales)
-    return locale(locales)
+    locales = locales.to_a.collect{|i| i.to_s}
+    locales.each do |key|
+      if a = locale_aliases[key]
+        locales.delete(key)
+        locales.concat(a)
+      end
+    end
+    return Sass::Script::Bool.new(locales.include?(locale.to_s))
   end
-
+  
   #
   # get the current reading direction
   #
@@ -55,9 +43,6 @@ module Archetype::SassExtensions::Locale
   end
 
 private
-
-  LOCALE_PATTERN = /([a-z]{2})[-_]?([a-z]{2}?)/i
-
   #
   # provides an alias mapping for locale names
   #
@@ -67,9 +52,8 @@ private
   # TODO - make this easily extensible
   def locale_aliases
     if @locale_aliases.nil?
-      a = {
-        'CJK' => ['ja_JP', 'ko_KR', 'zh_TW', 'zh_CN']
-      }
+      a = {}
+      a['CJK'] = ['ja_JP', 'ko_KR', 'zh_TW', 'zh_CN']
       @locale_aliases = a
     end
     return @locale_aliases