magic_grid 0.11.0 → 0.11.1

data/lib/magic_grid/collection.rb

@@ -17,7 +17,7 @@ module MagicGrid
       @paginations = []
     end
 
-    delegate :map, :count, :to => :collection
+    delegate :quoted_table_name, :map, :count, :to => :collection
 
     attr_accessor :grid
     attr_reader :current_page, :original_count, :total_pages
@@ -31,6 +31,10 @@ module MagicGrid
       end
     end
 
+    def column_names
+      @collection.table.columns.map {|c| c.name}
+    end
+
     def quote_column_name(col)
       @collection.connection.quote_column_name(col.to_s)
     end
@@ -75,6 +79,7 @@ module MagicGrid
     end
 
     def apply_sort(col, dir)
+      @reduced_collection = nil
       @sorts << "#{col} #{dir}"
       self
     end
@@ -84,6 +89,7 @@ module MagicGrid
     end
 
     def apply_search(q)
+      @reduced_collection = nil
       @searches << q
       self
     end
@@ -101,6 +107,7 @@ module MagicGrid
 
     def apply_filter(filters = {})
       if @collection.respond_to? :where
+        @reduced_collection = nil
         @filters << filters
       end
       self
@@ -108,6 +115,7 @@ module MagicGrid
 
     def apply_filter_callback(callback)
       if callback.respond_to? :call
+        @reduced_collection = nil
         @filter_callbacks << callback
       end
       self
@@ -118,12 +126,14 @@ module MagicGrid
     end
 
     def apply_post_filter
+      @reduced_collection = nil
       @post_filters << :post_filter
       self
     end
 
     def apply_pagination(current_page, per_page)
       if per_page
+        @reduced_collection = nil
         @paginations << {:current_page => current_page, :per_page => per_page}
       end
       self

data/lib/magic_grid/definition.rb

@@ -6,6 +6,10 @@ module MagicGrid
     attr_reader :columns, :magic_id, :options, :params,
       :current_sort_col, :current_order, :default_order, :per_page
 
+    def magic_collection
+      @collection
+    end
+
     def collection
       @collection.collection
     end
@@ -64,9 +68,10 @@ module MagicGrid
       begin
         #if @collection.respond_to? :table
         table_name = @collection.quoted_table_name
-        table_columns = @collection.table.columns.map {|c| c.name}
+        table_columns = @collection.column_names
       rescue
-        MagicGrid.logger.debug "Given collection doesn't respond to :table well"
+        msg = "Given collection doesn't respond to :quoted_table_name or :table well: "
+        MagicGrid.logger.debug("#{msg} - #{$!}")
         table_name = nil
         table_columns = @columns.each_index.to_a
       end
@@ -81,7 +86,7 @@ module MagicGrid
         c[:id] = i
         i += 1
         if c.key?(:col) and c[:col].is_a?(Symbol) and table_columns.include?(c[:col])
-          c[:sql] = "#{table_name}.#{@collection.connection.quote_column_name(c[:col].to_s)}" unless c.key?(:sql)
+          c[:sql] = "#{table_name}.#{@collection.quote_column_name(c[:col].to_s)}" unless c.key?(:sql)
         end
         c[:label] = c[:col].to_s.titleize if not c.key? :label
         hash << c[:label]

data/lib/magic_grid/helpers.rb

@@ -227,11 +227,11 @@ module MagicGrid
     def magic_paginate(collection, opts={})
       if respond_to? :will_paginate
         # WillPaginate
-        will_paginate collection, opts
+        will_paginate collection.collection, opts
         #alias_method :magic_paginate, :will_paginate
       elsif respond_to? :paginate
         #Kaminari, or something else..
-        paginate collection, opts
+        paginate collection.collection, opts
         #alias_method :magic_paginate, :paginate
       else
         ("<!-- page #{collection.current_page} of #{collection.total_pages} -->" +
@@ -243,7 +243,7 @@ module MagicGrid
       content_tag('tr') do
         content_tag('td', :class => 'full-width ui-widget-header magic-pager',
                     :colspan => grid.columns.count) do
-          pager = magic_paginate(grid.collection,
+          pager = magic_paginate(grid.magic_collection,
                                 :param_name => grid.param_key(:page),
                                 :params => base_params
                                )

data/lib/magic_grid/version.rb

@@ -1,3 +1,3 @@
 module MagicGrid
-  VERSION = "0.11.0"
+  VERSION = "0.11.1"
 end

data/spec/helpers_spec.rb

@@ -20,15 +20,27 @@ def fake_connection
   end
 end
 
-def fake_active_record_collection(table_name = 'some_table')
+def fake_active_record_collection(table_name = 'some_table',
+                                  columns = [:name, :description])
+
+  columns = columns.map { |c|
+    double.tap do |col|
+      col.stub(:name) { c }
+    end
+  }
   (1..1000).to_a.tap do |c|
     c.stub(:connection => fake_connection)
+    c.stub(:quoted_table_name => table_name)
     c.stub(:table_name => table_name)
     c.stub(:where) { c }
+    c.stub(:table) {
+            double.tap do |t|
+              t.stub(:columns) { columns }
+            end
+          }
   end
 end
 
-
 describe MagicGrid::Helpers do
 
   # Let's use the helpers the way they're meant to be used!
@@ -252,6 +264,52 @@ describe MagicGrid::Helpers do
         end
       end
     end
+
+    context "sorting" do
+      let(:sortable_collection) {
+        columns = column_list.map { |c|
+          double.tap do |col|
+            col.stub(:name) { c }
+          end
+        }
+        collection = fake_active_record_collection.tap do |c|
+          c.stub(:table) {
+            double.tap do |t|
+              t.stub(:columns) { columns }
+            end
+          }
+        end
+      }
+      it "should render sortable column headers when a collection is sortable" do
+        grid = magic_grid(sortable_collection, column_list)
+        grid.should match_select("thead>tr>th.sorter>a>span.ui-icon", column_list.count)
+      end
+
+      # context "when a sort column is given" do
+      #   let(:search_param) { 'foobar' }
+      #   let(:controller) {
+      #     make_controller.tap { |c|
+      #       c.stub(:params) { {:grid_id_col => 1} }
+      #     }
+      #   }
+      # end
+      # context "when a sort order is given" do
+      #   let(:controller) {
+      #     make_controller.tap { |c|
+      #       c.stub(:params) { {:grid_id_order => 1} }
+      #     }
+      #   }
+      # end
+      # context "when a sort order and column are given" do
+      #   let(:search_param) { 'foobar' }
+      #   let(:controller) {
+      #     make_controller.tap { |c|
+      #       c.stub(:params) { {:grid_id_q => 1} }
+      #     }
+      #   }
+      # end
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magic_grid
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
   prerelease: 
 platform: ruby
 authors:
@@ -211,7 +211,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3180457643805959296
+      hash: 4254976689102437121
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -220,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3180457643805959296
+      hash: 4254976689102437121
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23