aub-record_filter 0.9.10 → 0.9.11

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 9
-:patch: 10
+:patch: 11

data/lib/record_filter/active_record.rb

@@ -98,7 +98,7 @@ module RecordFilter
 
     module AssociationInstanceMethods
       def filter(&block)
-        Filter.new(@reflection.klass, nil, &block)
+        Filter.new(self, @finder_sql, &block)
       end
     end
   end

data/lib/record_filter/filter.rb

@@ -10,11 +10,17 @@ module RecordFilter
       end
     end
 
-    def initialize(clazz, named_filter, *args, &block) # :nodoc:
-      @current_scoped_methods = clazz.send(:current_scoped_methods)
-      @clazz = clazz
+    def initialize(clazz, filter, *args, &block) # :nodoc:
+      if clazz.is_a?(Class)
+        @current_scoped_methods = clazz.send(:current_scoped_methods)
+        @clazz = clazz
+      elsif clazz.is_a?(Array) && clazz.respond_to?(:proxy_reflection)
+        @current_scoped_methods = { :create => {}, :find => { :conditions => filter } }
+        @clazz = clazz.proxy_reflection.klass
+        filter = nil
+      end
 
-      @query = Query.new(@clazz, named_filter, *args, &block)
+      @query = Query.new(@clazz, filter, *args, &block)
     end
 
     def first(*args) # :nodoc:

data/record_filter.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{record_filter}
-  s.version = "0.9.10"
+  s.version = "0.9.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aubrey Holland", "Mat Brown"]
-  s.date = %q{2009-08-09}
+  s.date = %q{2009-08-11}
   s.description = %q{RecordFilter is a Pure-ruby criteria API for building complex queries in ActiveRecord. It supports queries that are built on the fly as well as named filters that can be added to objects and chained to create complex queries. It also gets rid of the nasty hard-coded SQL that shows up in most ActiveRecord code with a clean API that makes queries simple and intuitive to build.}
   s.email = %q{aubreyholland@gmail.com}
   s.extra_rdoc_files = [
@@ -69,7 +69,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/aub/record_filter/tree/master}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.3}
   s.summary = %q{An ActiveRecord query API for replacing SQL with awesome}
   s.test_files = [
     "spec/active_record_spec.rb",

data/spec/restrictions_spec.rb

@@ -242,9 +242,10 @@ describe 'RecordFilter restrictions' do
   end
 
   it 'should properly filter when filter is applied to an association' do
+    Post.create
     Post.first.comments.filter do
       with(:offensive, true)
     end.inspect
-    Comment.last_find.should == { :readonly => false, :conditions => [%q("comments".offensive = ?), true] }
+    Comment.last_find.should == { :readonly => false, :conditions => "(\"comments\".offensive = 't') AND (\"comments\".post_id = #{Post.first.id})" }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aub-record_filter
 version: !ruby/object:Gem::Version 
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors: 
 - Aubrey Holland
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-09 00:00:00 -07:00
+date: 2009-08-11 00:00:00 -07:00
 default_executable: 
 dependencies: []