html_tables 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: deb98de4641af8daaf0649e633f1a76b38f96d78
-  data.tar.gz: b6ca66edd261de6ea51f2d6f210a441e285067f9
+  metadata.gz: 00bbe3d09e255e86b9a2e5317394df3ce66d9fc1
+  data.tar.gz: a8651091f16dcff9b92e24ccedb950a1dc562df0
 SHA512:
-  metadata.gz: b2e547ebb34b0f2d00b29ca4bf65f2df77302587525a5073af5e79f4623d95956cd3ed33702b9f9a66650cffa9d546cbd600b0c0a237ef2c9d238e7de68f028b
-  data.tar.gz: 0f2e1e3bf088d925b3923830b9ef457ceb72c553d16ea51c832f26684885f4dd29b2cc34243516b44ba04fe7d4593a2588e0571e0cb70e1f92a201489161a3fe
+  metadata.gz: 66ad98813aed0275709e7beeb1b84601ed4d92e64033c01ea378c646b0a0f062e56c16f405a34c89900d49b17e32e62a64f7e5814286b7e03c763b17af3eac67
+  data.tar.gz: 7f8e2452b0f543989f876862e24db2a3d37e602e3beadc3c89923d04bf6eb3cc614355378efd6fe4b6838c98457d177c7e7a0ee62d37cb09ba49950411ac774d

data/lib/html_tables/data_table.rb

@@ -21,11 +21,20 @@ module HtmlTables
     end
 
     def model
-      @model ||= collection.model_name.constantize if collection.respond_to?(:model_name)
+      @model ||= begin
+        n = collection.model_name.constantize if collection.respond_to?(:model_name)
+        n = n.name if n.is_a?(ActiveModel::Name)
+        n
+      end
       @model ||= collection.first.try(:class)
       @model ||= options[:name].to_s.singularize.constantize
     end
 
+    def model_name
+      @model_name ||= collection.model_name if collection.respond_to?(:model_name)
+      @model_name ||= model.model_name
+    end
+
     def model_columns
       @model_columns ||= ActiveSupport::HashWithIndifferentAccess[*model.columns.map { |c| [c.name, c] }.flatten]
     end
@@ -44,7 +53,7 @@ module HtmlTables
       return @builder.content_tag(:i, nil, class: 'icon-check') if columns[column_id][:checkbox]
       v ||= I18n.t(column_id, scope: [:tables, options[:name] || :default], raise: true) rescue nil
       v ||= I18n.t(column_id, scope: [:tables, :default], raise: true) rescue nil
-      v ||= I18n.t(column_id, scope: [:activerecord, :attributes, model.model_name.underscore], raise: true) rescue nil
+      v ||= I18n.t(column_id, scope: [:activerecord, :attributes, model_name.underscore], raise: true) rescue nil
       v ||= I18n.t(column_id, scope: [:attributes], raise: true) rescue nil
       v ||= model_columns[column_id].human_name rescue nil
 

data/lib/html_tables/version.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
 module HtmlTables
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html_tables
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Fábio David Batista
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-06 00:00:00.000000000 Z
+date: 2013-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n