trk_datatables 0.1.18 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 206ca38dbabdc5c5efc6977db4c34ee6300336e7162479a7c7b8a94f3fb74b8c
-  data.tar.gz: db45ebc154b0da6a653c785eee388128bfc3d982750fd3dd296e77c120932740
+  metadata.gz: 6b70dfeaa82979653c2cf84807fffe3bd41803c9d156f42886f374d8b89ffea9
+  data.tar.gz: 9e0f18c46d97d61db46ffeded483c3c3628b2a7ae4be8dbe3e4f04dcb74a1ac2
 SHA512:
-  metadata.gz: 15ecc3cc4c9c0fb978bb76cdc9f136d7907956d6c4c7c464f5d4d5d6298147be91b00ed6e9314ef9b32318fd2772600067003da937c634585f687b0e27b3e3c4
-  data.tar.gz: ccf49ae9953ca13b9c0f850b67eb38f03cd7429a780ed46c15b078eea1028116a1ee19a29115474e3954cafb021c685e2ccf214e169f1c7b447fce34770e43a0
+  metadata.gz: 0bfb35f05f38a4717324930d66551f24ca4f7848666b44cd275028368e03e7c1613ae2b3bae0ba3a296db53e58fe7a71732b2cd14bf29d78c4bdb74b1cf46975
+  data.tar.gz: 8a16bc9d2fd8cc2d59677f1106a53b1bca5479f1e4508a298cc7559188862936eedeab3241ab867c5f6c5c349c16f85f477f0dfbfc066c72a117ab6d8896f0fc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trk_datatables (0.1.18)
+    trk_datatables (0.1.19)
       activesupport
 
 GEM

data/README.md

@@ -47,6 +47,7 @@ You need to create a class that inherits from `TrkDatatables::ActiveRecord` (you
 can use Rails generator)
 
 ```
+rails g trk_datatables user
 ```
 
 ## Usage example in Ruby on Rails

data/lib/trk_datatables/column_key_options.rb

@@ -90,7 +90,8 @@ module TrkDatatables
           column_options[SEARCH_OPTION] = false
           column_options[ORDER_OPTION] = false
         else
-          table_class = table_name.singularize.camelcase.constantize
+          table_class = _determine_table_class table_name
+
           column_type_in_db = _determine_db_type_for_column(table_class, column_name) unless column_options[SEARCH_OPTION] == false && column_options[ORDER_OPTION] == false
         end
         arr << {
@@ -106,10 +107,26 @@ module TrkDatatables
       end
     end
 
+    def _determine_table_class(table_name)
+      # post_users -> PostUser
+      # but also check if admin_posts -> Admin::Post
+      # https://github.com/duleorlovic/rails/blob/master/activesupport/lib/active_support/inflector/methods.rb#L289
+      if [table_name.classify].inject(Object) { |c, n| c.const_defined? n }
+        table_name.classify.constantize
+      else
+        module_name, *class_name = table_name.split('_')
+        if module_name.present? && [module_name.classify].inject(Object) { |c, n| c.const_defined? n }
+          "#{module_name.classify}::#{class_name.join('_').classify}".constantize
+        else
+          table_name.classify.constantize
+        end
+      end
+    end
+
     def _set_global_search_cols(global_search_cols)
       @global_search_cols = global_search_cols.each_with_object([]) do |column_key, arr|
         table_name, column_name = column_key.to_s.split '.'
-        table_class = table_name.singularize.camelcase.constantize
+        table_class = _determine_table_class table_name
         column_type_in_db = _determine_db_type_for_column(table_class, column_name)
         arr << {
           column_key: column_key.to_sym,
@@ -206,7 +223,6 @@ module TrkDatatables
       end
       res
     end
-
   end
   # rubocop:enable ClassLength
 end

data/lib/trk_datatables/version.rb

@@ -1,3 +1,3 @@
 module TrkDatatables
-  VERSION = '0.1.18'.freeze
+  VERSION = '0.1.19'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trk_datatables
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
 platform: ruby
 authors:
 - Dusan Orlovic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-18 00:00:00.000000000 Z
+date: 2019-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Gem that simplify using datatables with Ruby on Rails and Sinatra.