wice_grid 3.3.1 → 3.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 092a576a254b1d6d2e661f6f5b87f708c858f640
+  data.tar.gz: b742d69270656e4f21e56c0b30b79504da23b015
+SHA512:
+  metadata.gz: 4e65ab3eecc3cbeb363fc3d2cbaf7a36638ef84ed305fb1f4e489f4094613ad5c100dff281a73216392269327f4da7e921daa7bc385381e2fb295fad9b99c923
+  data.tar.gz: e1be30d9b58d59bd9f4c03a000276921c1f56cacf85d1ed9a595533dbbf6516c516943aa29458e57d708ed5f40eae3e0e6e9d192dd6e37ed15ced71579f978c9

data/README.rdoc

@@ -1,17 +1,27 @@
 = WiceGrid
 
-Version:: 3.3.1
+Version:: 3.4.0
 Author::  Yuri Leikind
 Sources:: https://github.com/leikind/wice_grid/
 Examples online:: http://wicegrid.herokuapp.com
 News:: http://leikind.org/pages/wicegrid/
 Email::   "Yuri Leikind" <yuri.leikind at gmail dot com>
 
-FOR RAILS 3 USE VERSION 3.x
-
 FOR RAILS 2 USE VERSION 0.6 (https://github.com/leikind/wice_grid/tree/master).
 
+FOR RAILS 3 USE VERSION 3.3.x
+
+FOR RAILS 4 USE VERSION 3.4.x. However with WiceGrid 3.4.0 Rails 4 produdes 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/wice_grid_misc.rb

@@ -55,12 +55,23 @@ module Wice
     end
 
     module ClassMethods #:nodoc:
+
+      def _sanitize_sql_hash_for_conditions(attrs, default_table_name = self.table_name)
+        attrs = expand_hash_conditions_for_aggregates(attrs)
+
+        table = Arel::Table.new(table_name, arel_engine).alias(default_table_name)
+        ActiveRecord::PredicateBuilder.build_from_hash(self, attrs, table).map { |b|
+          connection.visitor.accept b
+        }.join(' AND ')
+      end
+
+
       def merge_conditions(*conditions) #:nodoc:
         segments = []
 
         conditions.each do |condition|
           unless condition.blank?
-            sql = sanitize_sql(condition)
+            sql = condition.is_a?(Hash) ? _sanitize_sql_hash_for_conditions(condition) : sanitize_sql_array(condition)
             segments << sql unless sql.blank?
           end
         end

data/lib/wice/wice_grid_serialized_queries_controller.rb

@@ -8,14 +8,27 @@ module Wice
     # Read section "Saving Queries How-To" in README for more details.
     def define_routes(map, controller)
       controller = controller.to_s
+      # if Rails.version[0..1] == '3.'
 
-      map.match '/wice_grid_serialized_queries/:grid_name',
-        :to => "#{controller}#create",
-        :as => 'create_serialized_query'
+      #   map.match '/wice_grid_serialized_queries/:grid_name',
+      #     :to => "#{controller}#create",
+      #     :as => 'create_serialized_query'
 
-      map.match '/wice_grid_serialized_queries/:grid_name/:id',
-        :to => "#{controller}#delete",
-        :as => 'delete_serialized_query'
+      #   map.match '/wice_grid_serialized_queries/:grid_name/:id',
+      #     :to => "#{controller}#delete",
+      #     :as => 'delete_serialized_query'
+
+      # else
+
+        map.post '/wice_grid_serialized_queries/:grid_name',
+          :to => "#{controller}#create",
+          :as => 'create_serialized_query'
+
+        map.post '/wice_grid_serialized_queries/:grid_name/:id',
+          :to => "#{controller}#delete",
+          :as => 'delete_serialized_query'
+
+      # end
     end
   end
 
@@ -46,7 +59,11 @@ module Wice
       end
       query_params.delete(:page)
 
-      @saved_query = @query_store_model.new(:grid_name => @grid_name, :name => params[:query_name], :query => query_params)
+      @saved_query = @query_store_model.new
+
+      @saved_query.grid_name = @grid_name
+      @saved_query.name      = params[:query_name]
+      @saved_query.query     = query_params
 
       @saved_query.attributes = params[:extra] unless params[:extra].blank?
 

data/lib/wice/wice_grid_serialized_query.rb

@@ -9,7 +9,7 @@ class WiceGridSerializedQuery < ActiveRecord::Base  #:nodoc:
 
   def self.list(name, controller)
     conditions = {:grid_name => name}
-    self.find(:all, :conditions => conditions)
+    self.where(conditions).load
   end
 
-end
+end

data/lib/wice_grid.rb

@@ -257,6 +257,7 @@ module Wice
       end
 
       @ar_options[:conditions] = klass.send(:merge_conditions, @status[:conditions], * @table_column_matrix.conditions )
+
       # conditions processed
 
       if (! opts[:skip_ordering]) && @status[:order]
@@ -402,7 +403,7 @@ module Wice
 
     # with this variant we get even those values which do not appear in the resultset
     def distinct_values_for_column(column)  #:nodoc:
-      res = column.model.find(:all, :select => "distinct #{column.name}", :order => "#{column.name} asc").collect{|ar|
+      res = column.model.select("distinct #{column.name}").order("#{column.name} asc").collect{|ar|
         ar[column.name]
       }.reject{|e| e.blank?}.map{|i|[i,i]}
     end
@@ -526,10 +527,10 @@ module Wice
     def resultset_without_paging_without_user_filters  #:nodoc:
       form_ar_options
       @klass.unscoped do
-        @relation.find(:all, :joins => @ar_options[:joins],
-                          :include => @ar_options[:include],
-                          :group => @ar_options[:group],
-                          :conditions => @options[:conditions])
+        @relation.joins(@ar_options[:joins]).
+                  includes(@ar_options[:include]).
+                  group(@ar_options[:group]).
+                  where(@options[:conditions])
       end
     end
 
@@ -548,7 +549,7 @@ module Wice
 
     def resultset_without_paging_with_user_filters  #:nodoc:
       @klass.unscoped do
-        active_relation_for_resultset_without_paging_with_user_filters.find(:all)
+        active_relation_for_resultset_without_paging_with_user_filters.load
       end
     end
 

data/vendor/assets/javascripts/wice_grid_init.js.coffee

@@ -1,5 +1,4 @@
-jQuery ->
-  initWiceGrid()
+$(document).on 'page:load ready', -> initWiceGrid()
 
 initWiceGrid = ->
 

data/vendor/assets/javascripts/wice_grid_saved_queries_init.js.coffee

@@ -1,5 +1,5 @@
-jQuery ->
-  savedQueriesInit()
+$(document).on 'page:load ready', -> savedQueriesInit()
+
 
 savedQueriesInit = ->
 

data/wice_grid.gemspec

@@ -1,10 +1,11 @@
 Gem::Specification.new do |s|
   s.name          = 'wice_grid'
-  s.version       = '3.3.1'
+  s.version       = '3.4.0'
   s.homepage      = 'https://github.com/leikind/wice_grid'
-  s.date          = '2013-08-04'
+  s.date          = '2013-10-11'
   s.summary       = 'A Rails grid plugin to create grids with sorting, pagination, and (automatically generated) filters.'
-  s.description   = 'One of the goals of this plugin was to allow the programmer to define the contents of the cell by himself, '  +
+  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, '  +
                     'just like one does when rendering a collection via a simple table (and this is what differentiates WiceGrid ' +
                     'from various scaffolding solutions), but automate implementation of filters, ordering, paginations, CSV '     +
                     'export, and so on. Ruby blocks provide an elegant means for this.'

metadata

@@ -1,37 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: wice_grid
 version: !ruby/object:Gem::Version
-  version: 3.3.1
-  prerelease: 
+  version: 3.4.0
 platform: ruby
 authors:
 - Yuri Leikind
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-04 00:00:00.000000000 Z
+date: 2013-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.13.0
-description: One of the goals of this plugin was to allow the programmer to define
-  the contents of the cell by himself, just like one does when rendering a collection
-  via a simple table (and this is what differentiates WiceGrid from various scaffolding
-  solutions), but automate implementation of filters, ordering, paginations, CSV export,
-  and so on. Ruby blocks provide an elegant means for this.
+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, just like one does when rendering a
+  collection via a simple table (and this is what differentiates WiceGrid from various
+  scaffolding solutions), but automate implementation of filters, ordering, paginations,
+  CSV export, and so on. Ruby blocks provide an elegant means for this.
 email: yuri.leikind@gmail.com
 executables: []
 extensions: []
@@ -106,25 +104,24 @@ files:
 homepage: https://github.com/leikind/wice_grid
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 3
 summary: A Rails grid plugin to create grids with sorting, pagination, and (automatically