archetype 0.0.1.pre.10 → 0.0.1.pre.11

data/test/fixtures/stylesheets/archetype/saved/styleguide/fallback_styles.css

@@ -0,0 +1,9 @@
+.fallback-styleguide-test {
+  background: transparent url(/some/img.png) repeat;
+  background: rbga(255, 0, 0, 0.9);
+  white-space: pre-wrap;
+  white-space: -moz-pre-wrap;
+  white-space: -pre-wrap;
+  white-space: -o-pre-wrap;
+  something: valid;
+}

data/test/fixtures/stylesheets/archetype/source/styleguide/buttons.scss

@@ -1,4 +1,4 @@
-@import "archetype";
+@import "archetype"; 
 
 @each $context in container, bristol, punchcut {
   .#{$context} {
@@ -12,7 +12,3 @@
     }
   }
 }
-
-.test-exclude {
-  @include styleguide(small secondary button in a container, $exclude: width height border-radius padding font-size line-height cursor);
-}

data/test/fixtures/stylesheets/archetype/source/styleguide/fallback_styles.scss

@@ -12,7 +12,8 @@ $a-blackhole: styleguide-add-component(fallback-styleguide-test, (), (
     white-space     -pre-wrap,
     white-space     -o-pre-wrap,
     something       invalid,
-    something       valid
+    something       valid,
+    content         $CONTENT_PLACEHOLDER
   )),
   nil
 ), $CONFIG_THEME);

data/test/fixtures/stylesheets/archetype/source/styleguide/nested_styleguides.scss

@@ -3,7 +3,7 @@
 // - nested selectors
 // - nested `styleguide` calls in nested selectors
 
-@import "archetype";
+@import "archetype"; 
 
 @if not styleguide-component-exists(nested-styleguide-test, $CONFIG_THEME) {
 $a-blackhole: styleguide-add-component(nested-styleguide-test, (), (

data/test/fixtures/stylesheets/archetype/source/styleguide/selective_state.scss

@@ -1,4 +1,4 @@
-@import "archetype";
+@import "archetype"; 
 
 .simple-button {
   &.disabled {

data/test/fixtures/stylesheets/archetype/source/ui/glyph_icon.scss

@@ -1,35 +1,5 @@
 @import "archetype";
 
-@include base-glyph();
-
 .simple {
   @include glyph-icon(caret-down);
 }
-
-.false {
-  @include glyph-icon(false, $placement: inline);
-}
-
-.size {
-  @include glyph-icon(caret-down, $size: 20px);
-}
-
-$CONFIG_GENERATED_TAG_INLINE: false;
-.not-inline {
-  @include glyph-icon(caret-down);
-}
-
-.ie-uid {
-  @include glyph-icon(caret-down, $ie-uid: my-custom-id);
-  #{$archetype-glyph-selector} {
-    color: pink;
-  }
-}
-
-.content-block {
-  @include glyph-icon(caret-down) {
-    position: absolute;
-    top: 10px;
-    left: 10px;
-  }
-}

data/test/fixtures/stylesheets/archetype/source/utilities/custom_output_styler.scss

@@ -1,5 +1,3 @@
-@import "archetype";
-
 // define the test function
 @function has-custom-output-styler($property, $value, $method: pre) {
   @if $property == color {
@@ -11,12 +9,13 @@
   }
   @return false;
 }
-
 // define the custom styler
 @mixin custom-output-styler($property, $value, $method: pre) {
   #{$property}: $value; /* #{$method} override */
 }
 
+@import "archetype";
+
 .test {
   @include styleguide(copy);
-}
+}

data/test/fixtures/stylesheets/archetype/source/utilities/targeting/target-browser.scss

@@ -43,7 +43,7 @@
 
 .target-ie-lte-9 {
   @include target-browser(ie lte 9, border-color, #111);
-  @include target-browser(ie lte 9, background, #2c2c2b);
+  @include target-browser(ie lte 9, background, #2c2c2b); 
 }
 
 .target-ie-7-8-9 {
@@ -68,10 +68,3 @@
 .target-opera {
   @include target-browser(opera, width, 82%);
 }
-
-.target-with-content-block {
-  @include target-browser(ie lte 8) {
-    /* testing content block */
-    color: red;
-  };
-}

data/test/helpers/test_case.rb

@@ -24,7 +24,7 @@ module Compass
         assert false, diff_as_string(before.inspect, after.inspect)
       end
     end
-
+    
     module ClassMethods
 
       def let(method, &block)
@@ -51,7 +51,7 @@ module Compass
         end
       end
 
-      private
+      private 
 
       def underscore(string)
         string.gsub(' ', '_')

data/test/integrations/archetype_test.rb

@@ -1,11 +1,9 @@
 # this is all take from Compass because they already did the awesome testing framework
 require 'test_helper'
+require 'fileutils'
 require 'compass'
 require 'compass/logger'
 require 'sass/plugin'
-unless ENV['CI']
-  require 'fileutils'
-end
 
 class ArchetypeTest < Test::Unit::TestCase
 

data/test/units/sass_extensions_test.rb

@@ -4,7 +4,6 @@ require 'archetype'
 class SassExtensionsTest < Test::Unit::TestCase
   setup do
     Compass.reset_configuration!
-    Compass.configuration.testing = true
   end
 
   ## VERSION
@@ -17,20 +16,20 @@ class SassExtensionsTest < Test::Unit::TestCase
     assert_equal "true", evaluate("archetype-version('Compass >= 0.12')")
     assert_equal "false", evaluate("archetype-version('Sass >= 99.0.0')")
     assert_equal "true", evaluate("archetype-version('Sass gt 3.0')")
-    assert_equal "true", evaluate("archetype-version(Archetype ne 99)")
+    assert_equal "false", evaluate("archetype-version(Archetype ne 99)")
   end
 
 
   ## ENVIRONMENT
   # test that archetype-env() is working correctly
   def test_env
-    reset
+    Compass.reset_configuration!
     assert_equal "development", evaluate("archetype-env()")
     Compass.configuration.environment = :production
     assert_equal "production", evaluate("archetype-env()")
     Compass.configuration.environment = :staging
     assert_equal "staging", evaluate("archetype-env()")
-    reset
+    Compass.reset_configuration!
   end
 
 
@@ -50,6 +49,19 @@ class SassExtensionsTest < Test::Unit::TestCase
     # TODO
   end
 
+  # list-sort
+  #def test_list_sort
+  #  assert_equal "1 2 3 4", evaluate("list-sort(2 4 3 1)")
+  #  assert_equal "4 3 2 1", evaluate("list-sort(2 4 3 1, true)")
+  #  assert_equal "a b c d", evaluate("list-sort(d a b c)")
+  #end
+
+  # list-reverse
+  #def test_list_reverse
+  #  assert_equal "4 3 2 1", evaluate("list-reverse(1 2 3 4)")
+  #  assert_equal "d c b a", evaluate("list-reverse(a b c d)")
+  #end
+
   # list-add
   def test_list_add
     assert_equal "2 3 4", evaluate("list-add(1 2 3, 1)")
@@ -115,16 +127,16 @@ class SassExtensionsTest < Test::Unit::TestCase
   ## LOCALE
   # locale
   def test_locale
-    reset
+    Compass.reset_configuration!
     assert_equal "en_US", evaluate("locale()")
     Compass.configuration.locale = "ja_JP"
     assert_equal "ja_JP", evaluate("locale()")
-    reset
+    Compass.reset_configuration!
   end
 
   # lang
   def test_lang
-    reset
+    Compass.reset_configuration!
     assert_equal "true", evaluate("lang(en_US)")
     assert_equal "true", evaluate("lang(fr_FR en_US)")
     assert_equal "false", evaluate("lang(fr_FR)")
@@ -133,7 +145,7 @@ class SassExtensionsTest < Test::Unit::TestCase
     assert_equal "true", evaluate("lang(ja_JP)")
     assert_equal "true", evaluate("lang(CJK)")
     assert_equal "true", evaluate("lang(CJK en_US)")
-    reset
+    Compass.reset_configuration!
   end
 
 
@@ -171,11 +183,11 @@ class SassExtensionsTest < Test::Unit::TestCase
   ## UI
   # test generating unique tokens
   def test_unique
-    assert_equal ".archetype-uid-RANDOM_UID", evaluate("unique(class)")
-    assert_equal ".archetype-uid-RANDOM_UID", evaluate("unique(class)")
-    assert_equal "\#archetype-uid-RANDOM_UID", evaluate("unique(id)")
-    assert_equal "my-prefix-archetype-uid-RANDOM_UID", evaluate("unique(my-prefix-)")
-    assert_equal ".testing-archetype-uid-RANDOM_UID", evaluate("unique('.testing-')")
+    assert_equal ".archetype-uid-1", evaluate("unique(class)")
+    assert_equal ".archetype-uid-2", evaluate("unique(class)")
+    assert_equal "\#archetype-uid-3", evaluate("unique(id)")
+    assert_equal "my-prefix-archetype-uid-4", evaluate("unique(my-prefix-)")
+    assert_equal ".testing-archetype-uid-5", evaluate("unique('.testing-')")
   end
 
   # test pseudo content escaping and formatting for innerHTML
@@ -192,9 +204,4 @@ protected
   def evaluate(value)
     Sass::Script::Parser.parse(value, 0, 0).perform(Sass::Environment.new).to_s
   end
-
-  def reset
-    Compass.reset_configuration!
-    Compass.configuration.testing = true
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: archetype
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.10
+  version: 0.0.1.pre.11
 platform: ruby
 authors:
 - Eugene ONeill
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-29 00:00:00.000000000 Z
+date: 2014-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -79,9 +79,6 @@ files:
 - bin/archetype
 - lib/README.rdoc
 - lib/archetype.rb
-- lib/archetype/actions/help.rb
-- lib/archetype/actions/theme.rb
-- lib/archetype/executor.rb
 - lib/archetype/functions.rb
 - lib/archetype/functions/hash.rb
 - lib/archetype/functions/helpers.rb
@@ -222,29 +219,19 @@ files:
 - test/fixtures/stylesheets/archetype/assets/images/vendor/archetype/sprites/hovercard_tip.png
 - test/fixtures/stylesheets/archetype/config.rb
 - test/fixtures/stylesheets/archetype/saved/b.css
-- test/fixtures/stylesheets/archetype/saved/base.css
 - test/fixtures/stylesheets/archetype/saved/hacks/ie_pseudo.css
-- test/fixtures/stylesheets/archetype/saved/hacks/transparent_focusable.css
-- test/fixtures/stylesheets/archetype/saved/locale.css
+- test/fixtures/stylesheets/archetype/saved/styleguide/buttons.css
+- test/fixtures/stylesheets/archetype/saved/styleguide/fallback_styles.css
 - test/fixtures/stylesheets/archetype/source/b.scss
-- test/fixtures/stylesheets/archetype/source/base.scss
 - test/fixtures/stylesheets/archetype/source/hacks/ie_pseudo.scss
-- test/fixtures/stylesheets/archetype/source/hacks/transparent_focusable.scss
-- test/fixtures/stylesheets/archetype/source/locale.scss
-- test/fixtures/stylesheets/archetype/source/styleguide/alerts.scss
 - test/fixtures/stylesheets/archetype/source/styleguide/buttons.scss
-- test/fixtures/stylesheets/archetype/source/styleguide/drop.scss
-- test/fixtures/stylesheets/archetype/source/styleguide/extend.scss
 - test/fixtures/stylesheets/archetype/source/styleguide/fallback_styles.scss
-- test/fixtures/stylesheets/archetype/source/styleguide/invalid_structures.scss
-- test/fixtures/stylesheets/archetype/source/styleguide/multi_value.scss
 - test/fixtures/stylesheets/archetype/source/styleguide/nested_styleguides.scss
 - test/fixtures/stylesheets/archetype/source/styleguide/selective_state.scss
 - test/fixtures/stylesheets/archetype/source/ui/glyph_icon.scss
 - test/fixtures/stylesheets/archetype/source/ui/hide_element.scss
 - test/fixtures/stylesheets/archetype/source/ui/stroke.scss
 - test/fixtures/stylesheets/archetype/source/ui/triangle.scss
-- test/fixtures/stylesheets/archetype/source/utilities/associative.scss
 - test/fixtures/stylesheets/archetype/source/utilities/custom_output_styler.scss
 - test/fixtures/stylesheets/archetype/source/utilities/if-set.scss
 - test/fixtures/stylesheets/archetype/source/utilities/spacing/horizontal-spacing.scss
@@ -305,29 +292,19 @@ test_files:
 - test/fixtures/stylesheets/archetype/assets/images/vendor/archetype/sprites/hovercard_tip.png
 - test/fixtures/stylesheets/archetype/config.rb
 - test/fixtures/stylesheets/archetype/saved/b.css
-- test/fixtures/stylesheets/archetype/saved/base.css
 - test/fixtures/stylesheets/archetype/saved/hacks/ie_pseudo.css
-- test/fixtures/stylesheets/archetype/saved/hacks/transparent_focusable.css
-- test/fixtures/stylesheets/archetype/saved/locale.css
+- test/fixtures/stylesheets/archetype/saved/styleguide/buttons.css
+- test/fixtures/stylesheets/archetype/saved/styleguide/fallback_styles.css
 - test/fixtures/stylesheets/archetype/source/b.scss
-- test/fixtures/stylesheets/archetype/source/base.scss
 - test/fixtures/stylesheets/archetype/source/hacks/ie_pseudo.scss
-- test/fixtures/stylesheets/archetype/source/hacks/transparent_focusable.scss
-- test/fixtures/stylesheets/archetype/source/locale.scss
-- test/fixtures/stylesheets/archetype/source/styleguide/alerts.scss
 - test/fixtures/stylesheets/archetype/source/styleguide/buttons.scss
-- test/fixtures/stylesheets/archetype/source/styleguide/drop.scss
-- test/fixtures/stylesheets/archetype/source/styleguide/extend.scss
 - test/fixtures/stylesheets/archetype/source/styleguide/fallback_styles.scss
-- test/fixtures/stylesheets/archetype/source/styleguide/invalid_structures.scss
-- test/fixtures/stylesheets/archetype/source/styleguide/multi_value.scss
 - test/fixtures/stylesheets/archetype/source/styleguide/nested_styleguides.scss
 - test/fixtures/stylesheets/archetype/source/styleguide/selective_state.scss
 - test/fixtures/stylesheets/archetype/source/ui/glyph_icon.scss
 - test/fixtures/stylesheets/archetype/source/ui/hide_element.scss
 - test/fixtures/stylesheets/archetype/source/ui/stroke.scss
 - test/fixtures/stylesheets/archetype/source/ui/triangle.scss
-- test/fixtures/stylesheets/archetype/source/utilities/associative.scss
 - test/fixtures/stylesheets/archetype/source/utilities/custom_output_styler.scss
 - test/fixtures/stylesheets/archetype/source/utilities/if-set.scss
 - test/fixtures/stylesheets/archetype/source/utilities/spacing/horizontal-spacing.scss

data/lib/archetype/actions/help.rb

@@ -1,16 +0,0 @@
-description = "Get help on an Archetype action"
-if @description.nil?
-  # do stuff...
-  @help = true
-
-  if not ARGV[1].nil? and ARGV[1] != 'help'
-    action = File.join(@actions_path, ARGV[1])
-    begin
-      load "#{action}.rb"
-    rescue
-      puts "unknown action: #{ARGV[1]}"
-    end
-  end
-else
-  @description = description
-end

data/lib/archetype/actions/theme.rb

@@ -1,73 +0,0 @@
-require 'fileutils'
-description = "Generate a new Archetype theme"
-
-if @description.nil?
-  options = {
-    :extends => 'archetype'
-  }
-  OptionParser.new do |opts|
-    opts.banner = description
-    opts.define_head "Usage: archetype theme [path] [options]"
-    opts.separator ""
-    opts.separator "Example usage:"
-    opts.separator " archetype theme /path/to/scss/ --name=myCustomTheme"
-    opts.separator " archetype theme --name=themes/myExtendedTheme --extends=themes/myBaseTheme"
-
-    opts.on('-n', '--name THEME', 'theme name') do |v|
-      options[:theme] = v
-    end
-
-    opts.on('-x', '--extends THEME', 'theme name to extend') do |v|
-      options[:extends] = v
-    end
-
-    opts.on('-h', '--help', 'shows this help message') do
-      puts opts
-      exit
-    end
-
-    if not @help.nil?
-      puts opts
-      exit
-    end
-  end.parse!
-
-  if not options[:theme].nil?
-    base = ARGV[1] || '.'
-    tmp = '/tmp/theme_' + rand(36**8).to_s(36)
-    theme_template = File.join(File.dirname(__FILE__), '../../../templates/_theme/')
-    theme_path = File.join(base, options[:theme])
-    extends = "#{options[:extends]}"
-    if options[:extends] != 'archetype'
-      extends = "#{extends}/core"
-    end
-    theme_name = File.basename(options[:theme])
-    # copy template files to tmp dir
-    FileUtils.mkdir_p(tmp)
-    FileUtils.cp_r(Dir["#{theme_template}/**"], tmp)
-
-    puts "Creating theme '#{theme_name}' in #{File.expand_path(theme_path)}..."
-    puts "extending from #{options[:extends]}" if options[:extends] != 'archetype'
-
-    # update all placeholders in template files
-    Dir.glob("#{tmp}/**/*.scss") do |filename|
-      out = File.read(filename).gsub(/__THEME_NAME__/, theme_name).gsub(/__THEME_EXTENDS__/, extends)
-      File.open(filename, "w") { |file| file.puts out }
-    end
-
-    # now move all the theme files to their destination
-    FileUtils.mkdir_p(theme_path)
-    FileUtils.cp_r(Dir["#{tmp}/**"], theme_path)
-
-    # create convenience file _<theme>.scss ...
-    File.open(File.join(File.dirname(theme_path), "_#{theme_name}.scss"), "w") { |file| file.puts "// #{theme_name} theme\n@import \"#{theme_name}/core\";\n" }
-
-    # remove tmp dir
-    FileUtils.rm_rf(tmp)
-    puts "Congratulations! Your new theme has been created!"
-    puts "Use @import \"#{options[:theme]}\" in your scss files."
-    exit
-  end
-else
-  @description = description
-end