tabulatr2 0.9.37 → 0.9.38

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 53dad1e2c59e15c866b409f8865792fccef046d3
4
- data.tar.gz: 5c4be7ebbb61b317706be92d5f2b38690257a98c
2
+ SHA256:
3
+ metadata.gz: 5fed58d0f324fcdad7814934b71ad0d1d98bb645f1cd3d11556c6cb78e59cd10
4
+ data.tar.gz: 8490c3dd434a56a6861332d40263c8e09433381b43df97a3487d8ff01c0b6c9b
5
5
  SHA512:
6
- metadata.gz: 9f99fe355295d552b97d96d917344d4511eb72fe99d5720c034152be772de2ade98d412cf705905351ff0a0fa6205b871af29490ab987bf7b68f1919c62d0f44
7
- data.tar.gz: f8dbe093d43d35b9f3e5dcb4fbe26c94aabeeab2f1925635b763d51266ceeb587ea735048b449eadf5976a908d493f1f4c7aed7193b4632f770858fe459b1fcc
6
+ metadata.gz: 8c815d8cac08355567a8744909fc56de7968b54ab0378cb0726d97b90e71ca7a3563b9c3aa6d0fe40679a86f2ecf738bb6915519338b86dc10857f5e76101d95
7
+ data.tar.gz: 4b98da8ab572435d9eb1926a6d7489da794c1398d0d601159db912203fb422b7a19c2b4ae09710d2b435b78d9834e7db308b548261e1f890bd9127dd1e519245
@@ -48,7 +48,8 @@ module Tabulatr::Data::DSL
48
48
  def association(assoc, name, opts = {}, &block)
49
49
  @table_columns ||= []
50
50
  assoc_klass = main_class.reflect_on_association(assoc.to_sym)
51
- sql_options = determine_sql(opts, assoc_klass.try(:quoted_table_name), name)
51
+ tname = assoc_klass.try(:quoted_table_name) || assoc_klass.try(:klass).try(:quoted_table_name)
52
+ sql_options = determine_sql(opts, tname, name)
52
53
  opts = {
53
54
  sort_sql: sql_options[:sort_sql],
54
55
  filter_sql: sql_options[:filter_sql]}.merge(opts)
@@ -22,5 +22,5 @@
22
22
  #++
23
23
 
24
24
  module Tabulatr
25
- VERSION = "0.9.37"
25
+ VERSION = "0.9.38"
26
26
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tabulatr2
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.37
4
+ version: 0.9.38
5
5
  platform: ruby
6
6
  authors:
7
7
  - Peter Horn
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2017-12-05 00:00:00.000000000 Z
13
+ date: 2018-06-14 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rails
@@ -280,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
280
280
  version: '0'
281
281
  requirements: []
282
282
  rubyforge_project:
283
- rubygems_version: 2.6.14
283
+ rubygems_version: 2.7.6
284
284
  signing_key:
285
285
  specification_version: 4
286
286
  summary: A tight DSL to build tables of ActiveRecord models with sorting, pagination,