table_sortable 1.0.0.pre.alpha.13 → 1.0.0.pre.alpha.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9759388df136fc01767628b691d9c6b03b375d0
-  data.tar.gz: 33ab2ec5d49f15591566fc6b649efd3df5d5f852
+  metadata.gz: e7a82828045598ce128b6a87cf868658298439bb
+  data.tar.gz: c0259c3b6d5656afcd0ee912c632e3e0a03e3f9e
 SHA512:
-  metadata.gz: e6f90cd6380bbea36f0db6e8e4c9d4fcf921e85f12aff688fda8deccf031c7e22824ccab768b46eb988b6e5df1a30597b5945b55a4720188349e870fbba4d2cc
-  data.tar.gz: 01e168d4a139ae89106d1b984026e300f1d477c9b68da574a10956e26d4f983a4b1245e97e537de4aa2694074872ca32bcbaa92bda03136837c0f695003f8577
+  metadata.gz: a8cc0ea7a17b998735c303b081e43f47393c20ba7014d3912c570a7f6811a5d2a0e231fff76631c2a891c2b9769813bc3a3ec0e16fd1ab0dae6433a98c50282f
+  data.tar.gz: 0c748c81881144e60ce79385a992c6b339671124f48123b98ccfba14a7d3b7bd2ad6e0646cc4579b942c4a0480738f3d33b0c7f93dd0b1f0deddb76d696eb5a3

data/lib/table_sortable/column.rb

@@ -16,7 +16,7 @@ module TableSortable
       template = options[:template] || col_name
       column_options = options[:options] || {}
       includes = options[:includes] || []
-      scope = options[:scope]
+      scope = options[:scope].is_a?(Symbol) ? (-> { send(options[:scope]) }) : options[:scope]
       visible = options[:visible].nil? ? true : options[:visible]
 
       @name = col_name.to_sym

data/lib/table_sortable/core.rb

@@ -68,6 +68,15 @@ module TableSortable
       scope
     end
 
+    def include_and_scope(scope)
+      includes = columns.map{|rc| rc.includes}.flatten.compact.uniq
+      the_scope = scope.includes(includes)
+      columns.map{|rc| rc.scope}.flatten.compact.uniq.each do |scope_proc|
+        the_scope = the_scope.instance_exec(&scope_proc)
+      end
+      the_scope
+    end
+
     def initialize_table_sortable
       @columns = TableSortable::Columns.new
       define_column_offset 0

data/lib/table_sortable/version.rb

@@ -1,3 +1,3 @@
 module TableSortable
-  VERSION = "1.0.0.pre.alpha.13"
+  VERSION = "1.0.0.pre.alpha.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: table_sortable
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.alpha.13
+  version: 1.0.0.pre.alpha.14
 platform: ruby
 authors:
 - Oded Davidov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-05 00:00:00.000000000 Z
+date: 2017-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler