effective_resources 0.3.12 → 0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e08db419b1fd1d98f096c728b8f2d9c63e344a93
-  data.tar.gz: d25316c81e2d263d98a5f7f128387f641d3d6000
+  metadata.gz: eab2acea54c68e25f1d066485fb00763295982e8
+  data.tar.gz: beebb25a6052cbd33d9bfcb67bea42c8124c6a6e
 SHA512:
-  metadata.gz: f3d0ed78a2b52b575d41221c862c40b048621215baaed5b439103e44e4df52ac0872700b5e1cbf705249bfa6ca9057e4a0faae450533527bce12e2a9a3ed64ea
-  data.tar.gz: 3cf544d682c6433fb86fa0885b3aadb570bedbe741d40b428f5a6bccd134bb1fde982b7d121e2608ef307dc2ad9a01f0308d42278014ca8c068d290c63dc315b
+  metadata.gz: 173ea246c8e6dca6f05a31d0d0a715f9273682b04ce2d779a9e50c5aef12b6549193eda7cc36c0198642d68a5b3e6a66f86134fc4ae4d62df94cc0ae88fdb5e7
+  data.tar.gz: d987ab50595f08fc4465af85dfabdbf0f5cd971cf029b403a4792995c7625c4d179991404b613b0b54b8fbe18ef5439f40204f02bc33250e6cfda34606dfda1d

data/app/models/effective/resources/sql.rb

@@ -36,8 +36,9 @@ module Effective
       end
 
       # This is for EffectiveDatatables (col as:)
+      # Might be :name, or 'users.name'
       def sql_type(name)
-        name = name.to_s
+        name = name.to_s.split('.').first
 
         if belongs_to_polymorphic(name)
           :belongs_to_polymorphic
@@ -66,7 +67,10 @@ module Effective
 
       # This tries to figure out the column we should order this collection by.
       # Whatever would match up with the .to_s
+      # Unless it's set from outside by datatables...
       def sort_column
+        return @_sort_column if @_sort_column
+
         ['name', 'title', 'label', 'subject', 'full_name', 'first_name', 'email', 'description'].each do |name|
           return name if column_names.include?(name)
         end
@@ -74,12 +78,24 @@ module Effective
         klass.primary_key
       end
 
+      def sort_column=(name)
+        raise "unknown sort column: #{name}" unless column_names.include?(name)
+        @_sort_column = name
+      end
+
       # Any string or text columns
       # TODO: filter out _type columns for polymorphic
       def search_columns
+        return @_search_columns if @_search_columns
         columns.map { |column| column.name if [:string, :text].include?(column.type) }.compact
       end
 
+      def search_columns=(name)
+        names = Array(name)
+        names.each { |name| raise "unknown search column: #{name}" unless column_names.include?(name) }
+        @_search_columns = names
+      end
+
       private
 
       def postgres?

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.3.12'.freeze
+  VERSION = '0.3.13'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-07 00:00:00.000000000 Z
+date: 2017-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails