wice_grid 3.4.5 → 3.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e913c8334e69dc2a9c578d383753beb7fcc6cdb
-  data.tar.gz: 515fa3c1e45512d7f386126ea5e809acb17caf91
+  metadata.gz: 90ee3cc8cd5f0d12ec80f8823a319ec859ea4a9f
+  data.tar.gz: 3f0b2ff578c99d36e6dfbfdc948bb08cfe281c03
 SHA512:
-  metadata.gz: 2a083e373ad835ce7f4a05831434bd5dff65a61f721c4c6673c2494d857687f992ea7fc61662099d30daa30e4844bd1d78f441e718ba687a847849354c572ece
-  data.tar.gz: 644ff92522639112d09017e532c30137803112bff1bed615c8fdcf3b9911ce28c44256cebf852f3a2ec382712ab098874ea9afeb1ed55003d46fc31465706124
+  metadata.gz: 99b0d994de925b26019f399f789cd783391999b3e0163d9e93a7135b03b1740c5aab7b33e266b491b6cd25605b4ea4f26d5b724d2df7d7cfb7dffe9a284fa9aa
+  data.tar.gz: 4431cecfcaccf0b9d80c16d75e30e7298ce347dbff1568d5efe62999c46497de85cd534a12c435c1edd1c7479862186fe0ed644e5d4190dc13e304c648661ff3

data/README.rdoc

@@ -1,6 +1,6 @@
 = WiceGrid
 
-Version:: 3.4.2
+Version:: 3.4.6
 Author::  Yuri Leikind
 Sources:: https://github.com/leikind/wice_grid/
 Examples online:: http://wicegrid.herokuapp.com
@@ -14,19 +14,6 @@ For rails 2 use the +master+ branch:  https://github.com/leikind/wice_grid/tree/
 
 Rails 4 is supported beginning with version 3.4.x.
 
-However, with WiceGrid 3.4.0 Rails 4 produces the following deprecation message:
-
-  DEPRECATION WARNING: It looks like you are eager loading table(s) (one of: tasks, statuses) that are referenced in a string SQL snippet. For example:
-
-  Post.includes(:comments).where("comments.title = 'foo'")
-
-  Currently, Active Record recognizes the table in the string, and knows to JOIN the comments table to the query, rather than loading comments in a separate query. However, doing this without writing a full-blown SQL parser is inherently flawed. Since we don't want to write an SQL parser, we are removing this functionality. From now on, you must explicitly tell Active Record when you are referencing a table from a string:
-
-  Post.includes(:comments).where("comments.title = 'foo'").references(:comments)
-
-This will be fixed in future versions of WiceGrid.
-
-
 
 == Intro
 

data/lib/wice_grid.rb

@@ -279,12 +279,19 @@ module Wice
     end
 
 
+    def add_references relation   #:nodoc:
+      if @ar_options[:include] && relation.respond_to?(:references)
+        refs = [@ar_options[:include]] unless @ar_options[:include].is_a?(Array)
+        relation =  relation.references(* @ar_options[:include])
+      end
+      relation
+    end
+
     # TO DO: what to do with other @ar_options values?
     def read  #:nodoc:
       form_ar_options
       @klass.unscoped do
         @resultset = if self.output_csv? || all_record_mode?
-          # @relation.find(:all, @ar_options)
           @relation.
             includes(@ar_options[:include]).
             joins(   @ar_options[:joins]).
@@ -301,9 +308,7 @@ module Wice
             order(   @ar_options[:order]).
             where(   @ar_options[:conditions])
 
-          if relation.respond_to?(:references)
-            relation = relation.references(@ar_options[:include])
-          end
+          relation = add_references relation
 
           relation
         end
@@ -532,10 +537,14 @@ module Wice
     def resultset_without_paging_without_user_filters  #:nodoc:
       form_ar_options
       @klass.unscoped do
-        @relation.joins(@ar_options[:joins]).
-                  includes(@ar_options[:include]).
-                  group(@ar_options[:group]).
-                  where(@options[:conditions])
+        relation = @relation.joins(@ar_options[:joins]).
+          includes(@ar_options[:include]).
+          group(@ar_options[:group]).
+          where(@options[:conditions])
+
+        relation = add_references relation
+
+        relation
       end
     end
 
@@ -554,7 +563,7 @@ module Wice
 
     def resultset_without_paging_with_user_filters  #:nodoc:
       @klass.unscoped do
-        active_relation_for_resultset_without_paging_with_user_filters.all
+        active_relation_for_resultset_without_paging_with_user_filters.to_a
       end
     end
 
@@ -567,6 +576,8 @@ module Wice
           joins(@ar_options[:joins]).
           includes(@ar_options[:include]).
           order(@ar_options[:order])
+
+        relation = add_references relation
       end
       relation
     end

data/wice_grid.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name          = 'wice_grid'
-  s.version       = '3.4.5'
+  s.version       = '3.4.6'
   s.homepage      = 'https://github.com/leikind/wice_grid'
-  s.date          = '2014-08-23'
+  s.date          = '2014-08-25'
   s.summary       = 'A Rails grid plugin to create grids with sorting, pagination, and (automatically generated) filters.'
   s.description   = 'A Rails grid plugin to create grids with sorting, pagination, and (automatically generated) filters.' +
                     'One of the goals of this plugin was to allow the programmer to define the contents of the cell by himself, '  +

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wice_grid
 version: !ruby/object:Gem::Version
-  version: 3.4.5
+  version: 3.4.6
 platform: ruby
 authors:
 - Yuri Leikind
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-23 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kaminari