magic_grid 0.12.1 → 0.12.2

data/lib/magic_grid/collection.rb

@@ -222,11 +222,14 @@ module MagicGrid
       @sorts.each do |ordering|
         collection = collection.order(ordering)
       end
-      @filter_callbacks.each do |callback|
-        collection = callback.call(collection)
-      end
-      @filters.each do |hsh|
-        collection = collection.where(hsh)
+      if @filter_callbacks.empty?
+        @filters.each do |hsh|
+          collection = collection.where(hsh)
+        end
+      else
+        @filter_callbacks.each do |callback|
+          collection = callback.call(collection)
+        end
       end
       @searches.each do |query|
         collection = perform_search(collection, query)

data/lib/magic_grid/version.rb

@@ -1,3 +1,3 @@
 module MagicGrid
-  VERSION = "0.12.1"
+  VERSION = "0.12.2"
 end

data/spec/definition_spec.rb

@@ -151,24 +151,57 @@ describe MagicGrid::Definition do
     end
   end
 
-  context "filtering with a callback" do
+  context "filtering" do
     data = [1,56,7,21,1]
     filter = Proc.new do |c|
       c.select { |i| i > 10 }
     end
     let(:controller) {
       controller = double.tap do |c|
-        c.stub(:params) { HashWithIndifferentAccess.new({f1: 1}) }
+        c.stub(:params) { HashWithIndifferentAccess.new({column_name: 1}) }
       end
     }
-    let(:collection) {
-      data
-    }
-    subject { MagicGrid::Definition.new([{sql: "foo"}],
+    let(:collection) { data }
+
+    it "should use a listener_hanlder callback when given one" do
+      options = {
+        id: :grid,
+        listener_handler: filter
+      }
+      grid = MagicGrid::Definition.new([{sql: "foo"}],
                                         collection,
                                         controller,
-                                        id: :grid, listener_handler: filter) }
-    its(:collection) { should == [56, 21] }
+                                        options)
+      grid.collection.should == [56, 21]
+    end
+
+    it "should use listeners as where filters when given and set" do
+      options = {
+        id: :grid,
+        listeners: { input_id: :column_name }
+      }
+      collection.should_receive(:where).with("column_name" => 1).and_return([1,2,3])
+      grid = MagicGrid::Definition.new([{sql: "foo"}],
+                                        collection,
+                                        controller,
+                                        options)
+      grid.collection.should == [1,2,3]
+    end
+
+    it "should ignore listener params when a listener_hanlder callback is given" do
+      options = {
+        id: :grid,
+        listener_handler: filter,
+        listeners: { input_id: :column_name }
+      }
+      collection.should_not_receive(:where)
+      grid = MagicGrid::Definition.new([{sql: "foo"}],
+                                        collection,
+                                        controller,
+                                        options)
+      grid.collection.should == [56, 21]
+    end
+
   end
 
   pending "test listening on a dumb collection"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magic_grid
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
   prerelease: 
 platform: ruby
 authors:
@@ -215,7 +215,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -380472518145958618
+      hash: 1453942600846998467
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -224,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -380472518145958618
+      hash: 1453942600846998467
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23