vic 0.0.5 → 0.0.6

data/lib/vic/color.rb

@@ -79,8 +79,9 @@ module Vic
     #
     # @param [String] subject the string in question
     # @return [Match
-    def hex_color?(subject)
-      subject.match(/#[\da-f]{6}/) ? true : false
+    def is_hexadecimal?(subject)
+      return false unless subject.respond_to? :match
+      subject.match(/#?[\da-f]{6}/i) ? true : false
     end
   end
 end

data/lib/vic/color_error.rb

@@ -1,7 +1,7 @@
 module Vic
   class ColorError < StandardError
-    def initialize
-      super('invalid color')
+    def initialize(message)
+      super(message)
     end
   end
 end

data/lib/vic/colorscheme/highlight.rb

@@ -1,6 +1,5 @@
 module Vic
   class Colorscheme::Highlight
-    include Vic::Color
 
     attr_accessor :group
 
@@ -11,7 +10,8 @@ module Vic
     # @param [Hash] args the arguments to set
     # @return [Vic::Colorscheme::Highlight] the new highlight
     def initialize(group, args={})
-      @group = group
+      # Convert to group name to symbol to ensure consistency
+      @group = group.to_sym
       update_arguments!(args)
     end
 
@@ -34,9 +34,6 @@ module Vic
             arg = Argument.new(m, val)
             argument_set.add arg
           end
-
-          # Return self for chaining
-          self
         end
       end
     end
@@ -45,22 +42,32 @@ module Vic
     # the 256 color code for ctermfg.
     #
     # @param [String] hex a hexidecimal color
-    def fg=(hex)
-      self.guifg = hex
-      self.ctermfg = Color.hex_to_256(hex)
+    def fg=(color)
+      if color == 'NONE'
+        self.ctermfg = color
+      elsif Color.is_hexadecimal?(color)
+        self.ctermfg = Color.hex_to_256(color)
+      else
+        raise ColorError.new "invalid hexadecimal color #{color}"
+      end
 
-      # Return self for chaining
-      self
+      self.guifg = color
     end
 
     # Sets guibg and ctermbg simultaneously. `hex` is automatically converted to
     # the 256 color code for ctermbg.
-    def bg=(hex)
-      self.guibg = hex
-      self.ctermbg = Color.hex_to_256(hex)
+    #
+    # @param [String] hex a hexidecimal color
+    def bg=(color)
+      if color == 'NONE'
+        self.ctermbg = color
+      elsif Color.is_hexadecimal?(color)
+        self.ctermbg = Color.hex_to_256(color)
+      else
+        raise ColorError.new "invalid hexadecimal color #{color}"
+      end
 
-      # Return self for chaining
-      self
+      self.guibg = color
     end
 
     # Updates/sets the current highlight's arguments.

data/lib/vic/colorscheme/highlight_set.rb

@@ -28,7 +28,7 @@ module Vic
     # @param [String] group the group name
     # @return [Colorscheme::Highlight,nil] the highlight
     def find_by_group(group)
-      find {|h| h.group == group }
+      find {|h| h.group == group.to_sym }
     end
   end
 end

data/lib/vic/colorscheme.rb

@@ -61,7 +61,7 @@ module Vic
     end
     alias_method :highlights, :highlight_set
 
-    # Creates a new highlight or updates one if it exists.
+    # Creates a new highlight
     #
     # If inside of a language block the langauge name is automatcially prepended
     # to the group name of the new highlight.
@@ -69,32 +69,21 @@ module Vic
     # @see Vic::Highlight
     # @return [Vic::Highlight] the new highlight
     def highlight(group, args={})
-      hilight = highlight_set.find_by_group(group)
-      no_args = args.empty?
+      return if args.empty?
 
-      # If the highlight doesn't exist or no args were passed, create the
-      # highlight. This enables more flexible syntax for situations where you
-      # may need to create or update a highlight using this syntax:
-      #
-      #   `hi('Normal').gui('bold')
-      #
-      # Note: If a highlight has no arguments it isn't rendered.
-      if not hilight and no_args
-        hilight = Highlight.new("#{language}#{group}")
-        highlight_set.add(hilight)
-      elsif hilight and no_args
-        return hilight
-      elsif hilight
-        hilight.update_arguments!(args)
+      if h = find_highlight(group)
+        h.update_arguments! args
       else
-        hilight = Highlight.new("#{language}#{group}", args)
-        highlight_set.add(hilight)
+        h = Highlight.new "#{language}#{group}", args
+        highlight_set.add h
       end
-
-      hilight
     end
     alias_method :hi, :highlight
 
+    def find_highlight(group)
+      highlight_set.find_by_group(group)
+    end
+
     # Sets the current language to name. Any new highlights created will have
     # the language name automatically prepended.
     #

data/lib/vic.rb

@@ -1,5 +1,5 @@
 module Vic
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end
 
 require 'vic/color'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vic
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-13 00:00:00.000000000Z
+date: 2012-02-22 00:00:00.000000000Z
 dependencies: []
 description: Create Vim colorschemes with Ruby
 email: cjholdbrooks@gmail.com