palette 0.0.4 → 0.0.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    palette (0.0.3)
+    palette (0.0.4)
       sass (= 3.1.0.alpha.23)
 
 GEM

data/features/cli.feature

@@ -80,3 +80,18 @@ Feature: Run palette from the command line
     When I run "palette invalid_scheme"
     Then the exit status should be 1
     And the output should contain "Please check the syntax of your palette file"
+
+  Scenario: Process a file with Ruby constants
+    Given a file named "valid_theme" with:
+      """
+      vim_colors "ruby constants" do
+        String "000", "FFF"
+        Float  "FFF", "000"
+      end
+      """
+    When I run "palette valid_theme"
+    Then the output should contain:
+      """
+      hi String guifg=#000000 ctermfg=16  guibg=#FFFFFF ctermbg=231
+      hi Float  guifg=#FFFFFF ctermfg=231 guibg=#000000 ctermbg=16
+      """

data/lib/palette/color_scheme.rb

@@ -33,9 +33,7 @@ module Palette
     %w(darken lighten saturate desaturate).each do |sass_method|
       class_eval <<-EOM
         def #{sass_method}(hex, number)
-          rgb = Palette::Color.hex_to_decimal(Palette::Color.parse(hex))
-          sass_context.#{sass_method}(Sass::Script::Color.new(rgb),
-                      Sass::Script::Number.new(number)).tap{|c| c.options = {}}.inspect.gsub(/#/, "")
+          sass_evaluator(:#{sass_method}, hex_to_sass_color(hex), Sass::Script::Number.new(number))
         end
       EOM
     end
@@ -43,19 +41,16 @@ module Palette
     %w(grayscale complement invert).each do |sass_method|
       class_eval <<-EOM
         def #{sass_method}(hex)
-          rgb = Palette::Color.hex_to_decimal(Palette::Color.parse(hex))
-          sass_context.#{sass_method}(Sass::Script::Color.new(rgb)).tap{|c| c.options = {}}.inspect.gsub(/#/, "")
+          sass_evaluator(:#{sass_method}, hex_to_sass_color(hex))
         end
       EOM
     end
 
-    def sass_context
-      @context ||= Sass::Script::Functions::EvaluationContext.new({})
-    end
-
-    def String(*args)
-      @rules ||= []
-      @rules << Palette::Rule.new("String", *args)
+    %w(String Float).each do |constant|
+      define_method(constant) do |*args|
+        @rules ||= []
+        @rules << Palette::Rule.new(constant, *args)
+      end
     end
 
     def to_s
@@ -124,5 +119,19 @@ endif
       instance.instance_eval(&block)
       instance.to_s
     end
+
+    private
+
+    def sass_evaluator(method, *arguments)
+      sass_context.send(method, *arguments).tap {|c| c.options = {}}.inspect.gsub(/#/, "")
+    end
+
+    def hex_to_sass_color(hex)
+      Sass::Script::Color.new(Palette::Color.hex_to_decimal(Palette::Color.parse(hex)))
+    end
+
+    def sass_context
+      @context ||= Sass::Script::Functions::EvaluationContext.new({})
+    end
   end
 end

data/lib/palette/version.rb

@@ -1,3 +1,3 @@
 module Palette
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: palette
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Josh Clayton
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-04 00:00:00 -04:00
+date: 2010-11-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency