qui-index-table 0.0.4 → 0.0.6

data/Rakefile

@@ -9,7 +9,7 @@ begin
     gemspec.email = "marcin@saepia.net"
     gemspec.homepage = "http://q.saepia.net"
     gemspec.authors = ["Marcin Lewandowski"]
-    gemspec.version = "0.0.4"
+    gemspec.version = "0.0.6"
     gemspec.files = Rake::FileList.new [ "MIT-LICENSE", "Rakefile",  "public/stylesheets/qui/*", "lib/*", "rails/*", "README.rdoc" ]
   end
 rescue LoadError

data/lib/qui-index-table-main-helper.rb

@@ -6,8 +6,7 @@ module QUI
         raise RuntimeError, "@index_table_count must be integer" unless @index_table_count.is_a? Fixnum
 
         options[:headers] ||= []
-        default_id = "index_table_#{@index_table_count}"
-        options[:id] ||= default_id
+        options[:id] ||= "index_table_#{@index_table_count}"
 
         concat pagination(data) if data.is_a? WillPaginate::Collection if defined?(WillPaginate) and defined?(pagination)
 
@@ -18,22 +17,32 @@ module QUI
           h = { nil => { :width => :oneicon } } if h == :oneicon or h == :check
           
           if h.is_a? Symbol
-          
             # If first character of column identifier is a dot, we assume it's attribute name.
             # Try to lookup i18n translation. 
-            if not data.nil? and data.respond_to?(:first) and h.to_s[0] == 46              
+            if not data.nil? and data.respond_to?(:first) and h.to_s[0] == 46
               # If there's no records, we would try to assume class name from controller name.
-              # Of course if it's not overriden by :klass option.
+              # Of course if it's not overriden by :class_name option.
               
-              if options[:klass]
-                klass = options[:klass]
+              if options[:class_name] and options[:class_name].respond_to? :ancestors and options[:class_name].ancestors.include? ActiveRecord::Base
+                logger.info "1"
+                klass = options[:class_name]
+
               elsif data.first.nil?
+                logger.info "2"
                 klass = controller.class.to_s.demodulize.gsub("Controller", "").singularize.constantize
-              else
+              elsif data.first.class.respond_to? :human_attribute_name
+                logger.info "3"
+
                 klass = data.first.class
               end
               
-              concat content_tag(:th, klass.human_attribute_name(h.to_s[1..-1]))
+              logger.info klass.inspect
+              
+              if klass
+                concat content_tag(:th, klass.human_attribute_name(h.to_s[1..-1]))
+              else
+                concat content_tag(:th, t(h))
+              end
             else
               concat content_tag(:th, t(h))
             end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: qui-index-table
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Marcin Lewandowski
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-09 00:00:00 +02:00
+date: 2010-08-10 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -44,23 +45,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: "qUI: rails helpers for generating index tables"