filternator 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d22429121aad479f8d792514084bd1c8acfe74d
-  data.tar.gz: 8838cee850318633224c5ab008bfef59ea9eccf2
+  metadata.gz: a9532beae77803dc540e0aea17cd94c59f249012
+  data.tar.gz: b640afec728316cae2a4e9494770a4cbdbddc68b
 SHA512:
-  metadata.gz: 9e9cf6ad40c9615dde262f23ca9ee377fd6f160db9cb2435ecbb900257df7c55f2151b9fd474c83f5c7e28241356687f102f07d0cb430272980a3f8e6f77d648
-  data.tar.gz: 7ff7ae605d2af28ba557f6a4c97ab8d18c63530b5903b4c38f9d5bdd4773dbf153b6422f7f56bec01df5e8a3f3de0b28b6c59c6ba85ab4a5dcf47565efade4b0
+  metadata.gz: ef551844012da8879baacad9ba6afa518acbca0860e813cad34edca68b6a7492efd02ed32098d330d14a411c4e6d7101c292ecbf88b58bfa85bb89de37d3f307
+  data.tar.gz: 47e44181a00ef9e7b89a8f51aa6fcc14556beb3d4f06edfa843fa1bcee3d17f9a5c43e257d9e1659eceec9f446f96bf7061119db5e4d2ed652afc82c517097c7

data/lib/filternator/apply_filter.rb

@@ -46,7 +46,12 @@ module Filternator
 
     def filtered_scope
       if valid_filter?
-        scope.public_send(filter)
+        # ignore 'all' on relations
+        if scope.is_a?(::ActiveRecord::Relation) && filter.to_s == "all"
+          scope
+        else
+          scope.public_send(filter)
+        end
       else
         scope
       end

data/lib/filternator/version.rb

@@ -1,3 +1,3 @@
 module Filternator
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/integration_spec.rb

@@ -13,6 +13,9 @@ class Widget < ActiveRecord::Base
     %w(all busy)
   end
   scope :busy, -> { where state: "busy" }
+  def self.ordered
+    order("state DESC")
+  end
 end
 
 describe Filternator do
@@ -24,7 +27,7 @@ describe Filternator do
   example "a basic filter" do
     Widget.create! id: 1, state: "idle"
     Widget.create! id: 2, state: "busy"
-    filter = Filternator.new(scope: Widget)
+    filter = Filternator.new(scope: Widget.ordered)
     result = filter.apply(filter: "busy")
     expect(result.as_json).to eq(
       {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filternator
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - iain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-30 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord