wice_grid 3.0.0 → 3.0.1

data/CHANGELOG

@@ -1,3 +1,12 @@
+3.0.1
+
+Fixed the "Cannot modify SafeBuffer in place" problem and thus Rails 3.0.8 and 3.0.9
+Support for ActiveRecord::Relation
+
+3.0.0 
+
+Rails 3 support
+
 0.6
 
 wice_grid_custom_filter_params used to be a view helper, not it is also accessible from the controller, to be used in cases like redirect_to(my_resource_path(wice_grid_custom_filter_params(...)))

data/README.rdoc

@@ -1,6 +1,6 @@
 = WiceGrid
 
-Version:: 3.0.0
+Version:: 3.0.1
 Author::  Yuri Leikind
 Homepage:: http://leikind.org/pages/wicegrid
 Examples online:: http://grid.leikind.org
@@ -65,7 +65,7 @@ Rails version 3.0 or newer.
 
 Add the following to your Gemfile:
 
-  gem "wice_grid", '3.0.0.pre1'
+  gem "wice_grid", '3.0.1'
 
 and run the <tt>bundle</tt> command.
 
@@ -128,6 +128,10 @@ Controller:
 
   @tasks_grid = initialize_grid(Task)
 
+It is also possible to use an  ActiveRecord::Relation instance as the first argument:
+
+  @tasks_grid = initialize_grid(Task.where(:active => true))
+
 View:
 
   <%= grid(@tasks_grid) do |g|
@@ -160,6 +164,8 @@ The return value of the block is the table cell content.
 In the above view code five columns were defined, all without names, no sorting or filtering is available. Still, pagination becomes active if
 the number of all extracted records exceeds the default number of rows per page.
 
+
+
 Column names are defined with parameter <tt>:column_name</tt>:
 
   <%= grid(@tasks_grid) do |g|
@@ -324,6 +330,16 @@ with WiceGrid code:
 
   @user_groups_grid = initialize_grid(UserGroup, :conditions => ['portal_application_id = ?', @portal_application])
 
+Alternatively, instead of a Class object as the first parameter, you can use  ActiveRecord::Relation:
+
+
+  @tasks_grid = initialize_grid(Task.
+    where(:archived => false, :projects => {:active => true}).
+    joins(:project)
+  )
+
+
+  Task
 
 === Queries with join tables
 

data/VERSION

@@ -1 +1 @@
-3.0.0
+3.0.1

data/lib/wice_grid.rb

@@ -62,11 +62,15 @@ module Wice
 
     # core workflow methods START
 
-    def initialize(klass, controller, opts = {})  #:nodoc:
+    def initialize(klass_or_relation, controller, opts = {})  #:nodoc:
       @controller = controller
 
+      @relation = klass_or_relation
+      @klass = klass_or_relation.is_a?(ActiveRecord::Relation) ?
+        klass_or_relation.klass :
+        klass_or_relation
 
-      unless klass.kind_of?(Class) && klass.ancestors.index(ActiveRecord::Base)
+      unless @klass.kind_of?(Class) && @klass.ancestors.index(ActiveRecord::Base)
         raise WiceGridArgumentError.new("ActiveRecord model class (second argument) must be a Class derived from ActiveRecord::Base")
       end
 
@@ -124,8 +128,6 @@ module Wice
       end
       raise WiceGridArgumentError.new("name of the grid can only contain alphanumeruc characters") unless @name =~ /^[a-zA-Z\d_]*$/
 
-      @klass = klass
-
       @table_column_matrix = TableColumnMatrix.new
       @table_column_matrix.default_model_class = @klass
 
@@ -151,7 +153,7 @@ module Wice
 
       @ar_options_formed = false
 
-      @method_scoping = @klass.send(:scoped_methods)[-1]
+      @method_scoping = @relation.send(:scoped_methods)[-1]
     end
 
     # A block executed from within the plugin to process records of the current page.
@@ -281,7 +283,7 @@ module Wice
     def read  #:nodoc:
       form_ar_options
       with_exclusive_scope do
-        @resultset = self.output_csv? ?  @klass.find(:all, @ar_options) : @klass.paginate(@ar_options)
+        @resultset = self.output_csv? ?  @relation.find(:all, @ar_options) : @relation.paginate(@ar_options)
       end
       invoke_resultset_callbacks
     end
@@ -372,7 +374,7 @@ module Wice
 
     def count  #:nodoc:
       form_ar_options(:skip_ordering => true, :forget_generated_options => true)
-      @klass.count(:conditions => @ar_options[:conditions], :joins => @ar_options[:joins], :include => @ar_options[:include], :group => @ar_options[:group])
+      @relation.count(:conditions => @ar_options[:conditions], :joins => @ar_options[:joins], :include => @ar_options[:include], :group => @ar_options[:group])
     end
 
     alias_method :size, :count
@@ -464,7 +466,7 @@ module Wice
 
     def with_exclusive_scope #:nodoc:
       if @method_scoping
-        @klass.send(:with_exclusive_scope, @method_scoping) do
+        @relation.send(:with_exclusive_scope, @method_scoping) do
           yield
         end
       else
@@ -521,7 +523,7 @@ module Wice
     def resultset_without_paging_without_user_filters  #:nodoc:
       form_ar_options
       with_exclusive_scope do
-        @klass.find(:all, :joins => @ar_options[:joins],
+        @relation.find(:all, :joins => @ar_options[:joins],
                           :include => @ar_options[:include],
                           :group => @ar_options[:group],
                           :conditions => @options[:conditions])
@@ -531,7 +533,7 @@ module Wice
     def count_resultset_without_paging_without_user_filters  #:nodoc:
       form_ar_options
       with_exclusive_scope do
-        @klass.count(
+        @relation.count(
           :joins => @ar_options[:joins],
           :include => @ar_options[:include],
           :group => @ar_options[:group],
@@ -544,7 +546,7 @@ module Wice
     def resultset_without_paging_with_user_filters  #:nodoc:
       form_ar_options
       with_exclusive_scope do
-        @klass.find(:all, :joins      => @ar_options[:joins],
+        @relation.find(:all, :joins      => @ar_options[:joins],
                           :include    => @ar_options[:include],
                           :group      => @ar_options[:group],
                           :conditions => @ar_options[:conditions],

data/lib/wice_grid_controller.rb

@@ -23,7 +23,7 @@ module Wice
     # if in other parameters a column name is mentioned without the name of the table, this table is implied.
     # Just like in an ordinary ActiveRecord <tt>find</tt> you can use <tt>:joins</tt>, <tt>:include</tt>, and <tt>:conditions</tt>.
     #
-    # The first parameter is an ActiveRecord class name. The generated ActiveRecord call will use it as the
+    # The first parameter is an ActiveRecord class name or an  ActiveRecord::Relation instance. The generated ActiveRecord call will use it as the
     # receiver of the <tt>paginate</tt> method: <tt>klass.paginate(...)</tt>
     #
     # The second parameters is a hash of parameters:
@@ -114,7 +114,7 @@ module Wice
         template_name = opts[grid.name] || opts[grid.name.intern]
         template_name ||= grid.name + '_grid'
         temp_filename = render_to_string(:partial => template_name)
-        temp_filename.strip!
+        temp_filename = temp_filename.strip
         filename = (grid.csv_file_name || grid.name ) + '.csv'
         grid.csv_tempfile.close
         send_file_rails2 temp_filename, :filename => filename, :type => 'text/csv'

data/wice_grid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wice_grid}
-  s.version = "3.0.0"
+  s.version = "3.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yuri Leikind"]
-  s.date = %q{2011-06-28}
+  s.date = %q{2011-07-03}
   s.description = %q{A Rails grid plugin to create grids with sorting, pagination, and (automatically generated) filters }
   s.email = %q{yuri.leikind@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wice_grid
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 3
   - 0
-  - 0
-  version: 3.0.0
+  - 1
+  version: 3.0.1
 platform: ruby
 authors: 
 - Yuri Leikind
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-28 00:00:00 +02:00
+date: 2011-07-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency