cheveret 2.0.0.rc1 → 2.0.0.rc2

data/cheveret.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cheveret}
-  s.version = "2.0.0.rc1"
+  s.version = "2.0.0.rc2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Caldwell"]
-  s.date = %q{2010-09-29}
+  s.date = %q{2010-10-01}
   s.description = %q{Generating HTML tables of data in the views of your Rails
 application is not very DRY even for the simpler of cases. Cheveret allows you to more
 clearly separate logic and templating and reduce the amount of code in your views.}

data/lib/cheveret/dsl.rb

@@ -76,7 +76,7 @@ module Cheveret
       end
 
       if @columns[name].present?
-        options.each { |k, v| @column[name].send(:"#{k}=", v) }
+        options.each { |k, v| @columns[name].send(:"#{k}=", v) }
       else
         @columns[name] = Column.new(name, options)
       end

data/lib/cheveret/filtering.rb

@@ -24,7 +24,7 @@
 module Cheveret
   module Filtering
     def config(new_config)
-      except, only = new_config[:except], new_config[:only]
+      except, only = new_config.delete(:except), new_config.delete(:only)
       if (except || only)
         @columns.reject! { |k, v| !only.include?(k) } if only
         # todo: support use of except

data/lib/cheveret/rendering.rb

@@ -34,17 +34,17 @@ module Cheveret
     def header(options={})
       row  = @columns.values.map do |column|
         cell(:th, column) do
-          if column.sortable?
+          if column.sortable? # todo: abstract out sortable stuff
             content_tag(:a, column.label)
           else
-            column.label
+            content_tag(:span, column.label)
           end
         end
       end
 
-      content_tag(:div, row, {
-        :class => 'thead'
-      })
+      content_tag(:div, :class => 'thead') do
+        content_tag(:div, row, :class => 'tr')
+      end
     end
 
     def body(collection, options={})

data/lib/cheveret/resizing.rb

@@ -41,7 +41,7 @@ module Cheveret
     end
 
     def config(new_config={})
-      self.width = new_config[:width] if new_config[:width]
+      self.width = new_config.delete(:width) || self.width
       super
     end
 

data/lib/cheveret/version.rb

@@ -26,7 +26,7 @@ module Cheveret
     MAJOR = 2
     MINOR = 0
     PATCH = 0
-    BUILD = 'rc1'
+    BUILD = 'rc2'
 
     STRING = [ MAJOR, MINOR, PATCH, BUILD ].join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: cheveret
 version: !ruby/object:Gem::Version 
-  hash: 977940590
+  hash: 977940591
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
-  - rc1
-  version: 2.0.0.rc1
+  - rc2
+  version: 2.0.0.rc2
 platform: ruby
 authors: 
 - Ben Caldwell
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-29 00:00:00 +10:00
+date: 2010-10-01 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency