removed name from headaer

tsonntag · Mar 14, 2012 · 0430a85 · 0430a85
1 parent 1cb965e
commit 0430a85
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/lib/gitter/column.rb b/lib/gitter/column.rb
@@ -23,10 +23,10 @@ def initialize grid, name, opts = {}, &block
              content = header_opt
              h_opts = {}
            end
-           Header.new grid, name, content, h_opts.merge(:column => self)
+           Header.new grid, content, h_opts.merge(:column => self)
         end
       else
-        @headers = [Header.new(grid, name, nil, opts.merge(:column => self))]
+        @headers = [Header.new(grid, name, opts.merge(:column => self))]
       end
     end
 

diff --git a/lib/gitter/header.rb b/lib/gitter/header.rb
@@ -5,20 +5,21 @@ def self.blank
       new :blank, false
     end
 
-    attr_reader :grid, :name, :content, :html_options, :column
+    attr_reader :grid, :content, :html_options, :column
 
     def initialize grid, *args
       opts = args.extract_options!
+      raise ArgumentError, 'too many arguments' if args.size > 1
       @grid = grid
-      @name, @content = *args
+      @content = args.first
       @column = opts.delete(:column){nil}
       @html_options = opts
     end
 
     def label
       @label ||= case content
 	when false then ''
-	when nil then grid.translate(:headers, name)
+	when Symbol then grid.translate(:headers, name)
         else content
       end
     end
@@ -31,6 +32,10 @@ def link *args
       end
     end
 
+    def name
+      @name ||= Symbol === content ? content : 'n/a'
+    end
+
     def to_s
       "Header(#{name},html_options=#{html_options},#{column ? ',col':''},label=#{label})"
     end