smurfville 0.0.6 → 0.1.0

data/test/unit/color_variable_parser_test.rb

@@ -9,10 +9,10 @@ class ColorVariablesTest < ActiveSupport::TestCase
     parser.parse_variable_usage "#{File.dirname(__FILE__)}/sass/colors_01.sass"
 
     variable_counts = [
-      ["$green",   2],
-      ["$white",   2],
-      ["$special", 4],
-      ["$foo",     nil]
+      ["green",   2],
+      ["white",   2],
+      ["special", 4],
+      ["foo",     nil]
     ]
 
     variable_counts.each do |count_pair|
@@ -25,17 +25,16 @@ class ColorVariablesTest < ActiveSupport::TestCase
     parser.parse_sass_file "#{File.dirname(__FILE__)}/sass/colors_01.sass"
 
     assert_equal({
-      "#008000" => ["$green"],
-      "#ffffff" => ["$white", "$another-white"],
-      "#000000" => ["$black"],
-      "shade($special, 10%)" => ["$function-generated"]
+      "green" => { :variables => ["green"], :alternate_values=>["#008000"] },
+      "white" => { :variables => ["white", "another-white"], :alternate_values => ["#ffffff"] },
+      "black" => { :variables => ["black"], :alternate_values=>["#000000"] },
     }, parser.colors)
 
     assert_equal({
-      "$white" => ["$light-color"],
-      "$black" => ["$dark-color"],
-      "$green" => ["$special"],
-      "$special" => ["$more_special"]
+      "white" => ["light-color"],
+      "black" => ["dark-color"],
+      "green" => ["special"],
+      "special" => ["more_special"]
     }, parser.variable_mappings)
   end
 
@@ -47,33 +46,4 @@ class ColorVariablesTest < ActiveSupport::TestCase
     assert_equal 1, parser.print_variable_usage_count_for("$special")
     assert_equal 0, parser.print_variable_usage_count_for("$foo")
   end
-
-  # ---- parse_color ----
-
-  test "parse_color with valid colors" do
-    equal_colors = [
-      ["#000000", "#000"],
-      ["#ff0000", "red"],
-      ["#000000", "black"],
-      ["#ffffff", "white"]
-    ]
-    equal_colors.each do |color_pair|
-      assert_equal color_pair[0], Smurfville::ColorVariableParser.parse_color(color_pair[1]).html
-    end
-  end
-
-  test "parse_color with invalid colors" do
-    invalid_colors = [nil, "", true, "#0001", "gruen", "####", "#12", "#ffffff7", "(1, 2, 3)"]  # didn't work:  "#0xy000"
-    invalid_colors.each do |color|
-      assert_equal false, Smurfville::ColorVariableParser.parse_color(color)
-    end
-  end
-
-  test 'is_sass_color_function?' do
-    # real sass color functions
-    assert  Smurfville::ColorVariableParser.is_sass_color_function?("tint(#ccc, 27%)")
-    assert  Smurfville::ColorVariableParser.is_sass_color_function?("shade($other-color, 0%)")
-    # other expressions
-    assert !Smurfville::ColorVariableParser.is_sass_color_function?("13px + 37px")
-  end
-end
+end

data/test/unit/helpers/smurf/styleguide_helper_test.rb

@@ -6,17 +6,17 @@ module Smurfville
   class StyleguideHelperTest < ActionView::TestCase
     test 'foreground_color' do
       # dark colors
-      assert_equal "white", foreground_color("red")
       assert_equal "white", foreground_color("#012123")
       assert_equal "white", foreground_color("#000")
 
       # bright colors
       assert_equal "black", foreground_color("#efefef")
       assert_equal "black", foreground_color("white")
+      assert_equal "black", foreground_color("red")
 
       # non-colors
       # => black = default
-      assert_equal "black", foreground_color("türkis")
+      assert_equal "black", foreground_color("schmuddelgelb")
       assert_equal "black", foreground_color(nil)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smurfville
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-24 00:00:00.000000000 Z
+date: 2013-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: color
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -88,6 +88,7 @@ extra_rdoc_files: []
 files:
 - app/views/smurfville/styleguide/typography.html.haml
 - app/views/smurfville/styleguide/colors.html.haml
+- app/views/smurfville/styleguide/_typography_classes.erb
 - app/views/smurfville/styleguide/_color_var.html.haml
 - app/views/layouts/smurfville/application.html.erb
 - app/controllers/smurfville/application_controller.rb
@@ -97,12 +98,10 @@ files:
 - app/assets/images/smurfville/smurf.png
 - app/assets/javascripts/smurfville/application.js
 - app/assets/stylesheets/smurfville/application.css.sass
-- app/assets/stylesheets/smurfville/typography.css.sass.erb
 - config/routes.rb
 - lib/smurfville.rb
 - lib/smurfville/version.rb
 - lib/smurfville/color_variable_parser.rb
-- lib/smurfville/sass_visitor.rb
 - lib/smurfville/typography_parser.rb
 - lib/smurfville/engine.rb
 - lib/tasks/smurfville_tasks.rake
@@ -120,12 +119,15 @@ files:
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/assets/javascripts/application.js
+- test/dummy/app/assets/stylesheets/_scss_partial.css.scss
 - test/dummy/app/assets/stylesheets/_typography.sass
 - test/dummy/app/assets/stylesheets/application.css.sass
-- test/dummy/tmp/pids/server.pid
 - test/dummy/tmp/cache/assets/C55/E50/sprockets%2Fc7707635524d769f850d0052fd2626b4
+- test/dummy/tmp/cache/assets/D41/DA0/sprockets%2F4fa8e1d6a63a13923b9196e76fec3a15
 - test/dummy/tmp/cache/assets/D76/310/sprockets%2Fe637960fec03ed305c18c27e0ffbf676
 - test/dummy/tmp/cache/assets/D09/FD0/sprockets%2F18fa0451fff833061f0b9902baa4759c
+- test/dummy/tmp/cache/assets/E93/8D0/sprockets%2F585cb1ceee30feaa7acf7b993f1fd6be
+- test/dummy/tmp/cache/assets/E44/290/sprockets%2F3eb5e7d41dbddceae0faa1b02185fa15
 - test/dummy/tmp/cache/assets/D21/AE0/sprockets%2Fa4b75eade53b1f02d320bc720513a645
 - test/dummy/tmp/cache/assets/D73/630/sprockets%2F78ad329b32ade44bbea292b9e05f9728
 - test/dummy/tmp/cache/assets/DC2/3F0/sprockets%2Fe83ce5c8393ea833ad2a2eab114bd82c
@@ -172,7 +174,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1352383566039874073
+      hash: 1558584876731474371
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -181,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1352383566039874073
+      hash: 1558584876731474371
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -201,12 +203,15 @@ test_files:
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/assets/javascripts/application.js
+- test/dummy/app/assets/stylesheets/_scss_partial.css.scss
 - test/dummy/app/assets/stylesheets/_typography.sass
 - test/dummy/app/assets/stylesheets/application.css.sass
-- test/dummy/tmp/pids/server.pid
 - test/dummy/tmp/cache/assets/C55/E50/sprockets%2Fc7707635524d769f850d0052fd2626b4
+- test/dummy/tmp/cache/assets/D41/DA0/sprockets%2F4fa8e1d6a63a13923b9196e76fec3a15
 - test/dummy/tmp/cache/assets/D76/310/sprockets%2Fe637960fec03ed305c18c27e0ffbf676
 - test/dummy/tmp/cache/assets/D09/FD0/sprockets%2F18fa0451fff833061f0b9902baa4759c
+- test/dummy/tmp/cache/assets/E93/8D0/sprockets%2F585cb1ceee30feaa7acf7b993f1fd6be
+- test/dummy/tmp/cache/assets/E44/290/sprockets%2F3eb5e7d41dbddceae0faa1b02185fa15
 - test/dummy/tmp/cache/assets/D21/AE0/sprockets%2Fa4b75eade53b1f02d320bc720513a645
 - test/dummy/tmp/cache/assets/D73/630/sprockets%2F78ad329b32ade44bbea292b9e05f9728
 - test/dummy/tmp/cache/assets/DC2/3F0/sprockets%2Fe83ce5c8393ea833ad2a2eab114bd82c

data/lib/smurfville/sass_visitor.rb

@@ -1,45 +0,0 @@
-module Smurfville
-  class SassVisitor < Sass::Tree::Visitors::Base
-
-    def visit_import(node)
-      if path = node.css_import?
-        return Sass::Tree::CssImportNode.resolved("url(#{path})")
-      end
-      file = node.imported_file
-      handle_import_loop!(node) if @stack.any? {|e| e[:filename] == file.options[:filename]}
-
-      @stack.push(:filename => node.filename, :line => node.line)
-      root = file.to_tree
-      Sass::Tree::Visitors::CheckNesting.visit(root)
-      node.children = root.children.map {|c| visit(c)}.flatten
-      node
-    rescue Sass::SyntaxError => e
-      e.modify_backtrace(:filename => node.imported_file.options[:filename])
-      e.add_backtrace(:filename => node.filename, :line => node.line)
-      raise e
-    ensure
-      @stack.pop unless path
-    end
-
-    protected
-
-      def initialize
-        # Stack trace information, including mixin includes and imports.
-        @stack = []
-      end
-
-      def handle_import_loop!(node)
-        msg = "An @import loop has been found:"
-        files = @stack.map {|s| s[:filename]}.compact
-        if node.filename == node.imported_file.options[:filename]
-          raise Sass::SyntaxError.new("#{msg} #{node.filename} imports itself")
-        end
-
-        files << node.filename << node.imported_file.options[:filename]
-        msg << "\n" << Sass::Util.enum_cons(files, 2).map do |m1, m2|
-          "    #{m1} imports #{m2}"
-        end.join("\n")
-        raise Sass::SyntaxError.new(msg)
-      end
-  end
-end

data/test/dummy/tmp/pids/server.pid

@@ -1 +0,0 @@
-7109