effective_datatables 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 414d2116620a9a9fc13a0bc1834558b06d962d45
-  data.tar.gz: 23396e31fee70831e41f9e90aec1d269c9009248
+  metadata.gz: 86c4a4ce9bbbe51c5b6a37624ab041e0150130a7
+  data.tar.gz: 5601231c343b39b14aeb87b5e5e04c7086f26c4d
 SHA512:
-  metadata.gz: abb7a4c4b53a0c3218ac24d07cea39fb245eac48d7c8f3764a1362005c7bd012fc20107fd8c6f81b82efcac168e0e6f6c5eee30754b009bc69a66c1a6f003a25
-  data.tar.gz: 80a229f44939b2d4762d53e412217443c3f8402fd3be82523e7013809530e517867252800d97e049ab93b19ad9afc4a63b9e98aa80bf11147adabf74940a7450
+  metadata.gz: c4a50e770e239cbef09f544414d4f18a78471140e456309536672e61e40e192de1c2e5ad25d7e98ae9d4fc8e1964c4c3e3a8649e639fb8cb4442b14eb87bd65e
+  data.tar.gz: 8edc669655778534cddfc4e74e31811740759574d0f0597b2e2b033211084014a397340e14a9b48177f499c02009538658d4c883ccb7682ac65f5b9ff30857ea

data/README.md

@@ -184,11 +184,25 @@ or (complex example):
 
 ```ruby
 def collection
-  User.unscoped.uniq
-    .joins('LEFT JOIN customers ON customers.user_id = users.id')
-    .select('users.*')
-    .select('customers.stripe_customer_id AS stripe_customer_id')
-    .includes(:addresses)
+  collection = Effective::Order.unscoped.purchased
+    .joins(:user)
+    .joins(:order_items)
+    .group('users.email')
+    .group('orders.id')
+    .select('users.email AS email')
+    .select('orders.*')
+    .select("#{query_total} AS total")
+    .select("string_agg(order_items.title, '!!OI!!') AS order_items")
+
+  if attributes[:user_id].present?
+    collection.where(:user_id => attributes[:user_id])
+  else
+    collection
+  end
+end
+
+def query_total
+  "SUM((order_items.price * order_items.quantity) + (CASE order_items.tax_exempt WHEN true THEN 0 ELSE ((order_items.price * order_items.quantity) * order_items.tax_rate) END))"
 end
 ```
 

data/app/controllers/effective/datatables_controller.rb

@@ -6,7 +6,7 @@ module Effective
       @datatable = Effective::Datatable.find(params[:id], params[:attributes])
       @datatable.view = view_context if @datatable.present?
 
-      EffectiveDatatables.authorized?(self, :index, @datatable.collection_class)
+      EffectiveDatatables.authorized?(self, :index, @datatable.try(:collection_class) || Effective::Datatable)
 
       respond_to do |format|
         format.html

data/app/models/effective/datatable.rb

@@ -164,13 +164,13 @@ module Effective
       col = collection
 
       if active_record_collection?
-        self.total_records = (col.select('*').reorder(nil).count rescue 1)
+        self.total_records = (collection_class.connection.execute("SELECT COUNT(*) FROM (#{col.to_sql}) AS datatables_count").first['count'] rescue 1)
 
         col = table_tool.order(col)
         col = table_tool.search(col)
 
         if table_tool.search_terms.present? && array_tool.search_terms.blank?
-          self.display_records = (col.select('*').reorder(nil).count rescue 1)
+          self.display_records = (collection_class.connection.execute("SELECT COUNT(*) FROM (#{col.to_sql}) AS datatables_count").first['count'] rescue 1)
         end
       else
         self.total_records = col.size

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2014-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Uniquely powerful server-side searching, sorting and filtering of any ActiveRecord