archetype 0.0.1.pre.3.6ed259b → 0.0.1.pre.3.55c4182

data/CHANGELOG.md

@@ -11,29 +11,14 @@
 - 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,7 +54,7 @@ private
   #
   def self.list_to_hash(list, depth = 0, nest = [], additives = [])
     list = list.to_a
-    hsh = Archetype::Hash.new
+    hsh = {}
     list.each do |item|
       item = item.to_a
       # convert the key to a string and strip off quotes

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)
@@ -71,6 +71,38 @@ module Archetype::SassExtensions::Lists
   Sass::Script::Functions.declare :list_insert, [:list, :idx, :value]
   Sass::Script::Functions.declare :list_insert, [: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
   #
@@ -213,32 +245,6 @@ module Archetype::SassExtensions::Lists
   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
-
 private
   def helpers
     @helpers ||= Archetype::Functions::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

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

@@ -17,7 +17,7 @@ module Archetype::SassExtensions::Styleguide
   SPECIAL     = %w(states selectors)
   # these are unique CSS keys that can be exploited to provide fallback functionality by providing a second value
   # e.g color: red; color: rgba(255,0,0, 0.8);
-  FALLBACKS   = %w(background background-image background-color border border-bottom border-bottom-color border-color border-left border-left-color border-right border-right-color border-top border-top-color clip color layer-background-color outline outline-color white-space extend)
+  FALLBACKS   = %w(background background-image background-color border border-bottom border-bottom-color border-color border-left border-left-color border-right border-right-color border-top border-top-color clip color layer-background-color outline outline-color white-space)
   ADDITIVES   = FALLBACKS + [DROP, INHERIT, STYLEGUIDE]
   @@archetype_styleguide_mutex = Mutex.new
   # :startdoc:
@@ -76,7 +76,7 @@ module Archetype::SassExtensions::Styleguide
       extensions = theme[:extensions]
       return Sass::Script::Bool.new(false) if component_exists(id, theme, extension, force)
       extensions.push(extension)
-      components[id] = (components[id] ||= Archetype::Hash.new).rmerge(helpers.list_to_hash(data, 1, SPECIAL, ADDITIVES))
+      components[id] = (components[id] ||= {}).rmerge(helpers.list_to_hash(data, 1, SPECIAL, ADDITIVES))
       return Sass::Script::Bool.new(true)
     end
   end
@@ -223,17 +223,16 @@ private
   #
   def extract_styles(id, modifiers, strict = false, theme = nil, context = nil)
     theme = get_theme(theme)
-    context ||= theme[:components][id] || Archetype::Hash.new
+    context ||= theme[:components][id] || {}
     modifiers = helpers.to_str(modifiers)
-    return Archetype::Hash.new if context.nil? or context.empty?
+    return {} if context.nil? or context.empty?
     # push on the defaults first
-    out = (strict ? resolve_dependents(id, context[modifiers], theme[:name], context) : context[DEFAULT]) || Archetype::Hash.new
+    out = (strict ? resolve_dependents(id, context[modifiers], theme[:name], context) : context[DEFAULT]) || {}
     out = out.clone
     # if it's not strict, find anything that matched
     if not strict
       modifiers = modifiers.split
-      context.each do |key, definition|
-        definition = [key, definition]
+      context.each do |definition|
         modifier = definition[0]
         if modifier != DEFAULT
           match = true
@@ -255,8 +254,8 @@ private
     SPECIAL.each do |special_key|
       if out.is_a? Hash
         special = out[special_key]
-        tmp = Archetype::Hash.new
-        (special || Archetype::Hash.new).each { |key, value| tmp[key] = extract_styles(key, key, true, theme[:name], special) }
+        tmp = {}
+        (special || {}).each { |key, value| tmp[key] = extract_styles(key, key, true, theme[:name], special) }
         out[special_key] = tmp if not tmp.empty?
       end
     end
@@ -290,7 +289,7 @@ private
       # check for dropped styles
       drop = value[DROP]
       if not drop.nil?
-        tmp = Archetype::Hash.new
+        tmp = {}
         if %w(all true).include?(helpers.to_str(drop)) and not keys.nil? and not keys.empty?
           keys.each do |key|
             tmp[key] = 'nil'
@@ -308,7 +307,7 @@ private
       inherit = value[INHERIT]
       if inherit and not inherit.empty?
         # create a temporary object and extract the nested styles
-        tmp = Archetype::Hash.new
+        tmp = {}
         inherit.each { |related| tmp = tmp.rmerge(extract_styles(id, related, true, theme, context)) }
         # remove the inheritance key and update the styles
         value.delete(INHERIT)
@@ -350,7 +349,7 @@ private
   def get_styles(description, theme = nil, state = 'false')
     state = helpers.to_str(state)
     description = description.to_a
-    styles = Archetype::Hash.new
+    styles = {}
     description.each do |sentence|
       # get the grammar from the sentence
       id, modifiers, token = grammar(sentence, theme, state)

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

@@ -21,8 +21,7 @@ module Archetype::SassExtensions::UI
     prefix = helpers.to_str(prefix, ' ', :quotes)
     prefix = '.' if prefix == 'class'
     prefix = '#' if prefix == 'id'
-    suffix = Compass.configuration.testing ? "RANDOM_UID" : "#{Time.now.to_i}-#{rand(36**8).to_s(36)}-#{uid}"
-    return Sass::Script::String.new("#{prefix}archetype-uid-#{suffix}")
+    return Sass::Script::String.new("#{prefix}archetype-uid-#{uid}")
   end
 
   #

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

@@ -8,7 +8,7 @@ require 'sass/version'
 #
 module Archetype::SassExtensions::Version
   # :stopdoc:
-  COMPARATOR_PATTERN  = /(\s[neqglt]+\s|[><=!]+)/
+  COMPARATOR_PATTERN  = /([neglt]+|[><=!]+)/
   VERSION_PATTERN     = /\d+(\.\d+)*(\.[x|\*])?/
   # :startdoc:
 
@@ -60,7 +60,7 @@ private
     # check for wild cards
     wild = version.index('x')
     # check the comparison
-    comparator = ((comparator || [])[0] || 'eq').strip
+    comparator = (comparator || [])[0] || 'eq'
     eq = comparator =~ /(e|=)/
     lt = comparator =~ /(l|<)/
     gt = comparator =~ /(g|>)/

data/lib/archetype/version.rb

@@ -10,7 +10,7 @@ module Archetype
     # Method borrowed from Compass. All credit goes to Chris Eppstein and other contributors
     # https://github.com/chriseppstein/compass/blob/stable/lib/compass/version.rb
     # \(This method swiped from Haml and then modified, some credit goes to Nathan Weizenbaum\)
-    #
+    # 
     # *Returns*:
     # - {String} the version of Archetype
     #
@@ -30,7 +30,7 @@ module Archetype
     def read_version
       require 'yaml'
       begin
-        @version = YAML.load(File.read(scope('VERSION.yml')))
+        @version = YAML::load(File.read(scope('VERSION.yml')))
         @version[:teeny] = @version[:patch]
         @version[:string] = "#{@version[:major]}.#{@version[:minor]}"
         @version[:string] << ".#{@version[:patch]}" if @version[:patch]