activerecord_finder 0.1.0 → 0.1.1

data/lib/activerecord_finder/where.rb

@@ -3,7 +3,7 @@ module ActiveRecordFinder
     def restrict(finder = nil, &block)
       raise ArgumentError, 'wrong number of arguments (0 for 1)' if block.nil? && finder.nil?
       if block
-        where(new_finder(&block).arel)
+        where(create_finder(&block).arel)
       else
         where(finder.arel)
       end
@@ -11,6 +11,13 @@ module ActiveRecordFinder
     alias :condition :restrict
 
     def new_finder(&block)
+      finder = create_finder(&block)
+      scoped_where = scoped.arel.where_clauses.map { |w| Arel.sql(w) }
+      arel = Arel::Nodes::And.new([*scoped_where, finder.arel])
+      ActiveRecordFinder::Finder.new(arel_table, arel)
+    end
+
+    def create_finder(&block)
       activerecord_finder = ActiveRecordFinder::Finder.new(arel_table)
       if block.arity == 1
         block.call(activerecord_finder)
@@ -18,5 +25,6 @@ module ActiveRecordFinder
         activerecord_finder.instance_eval(&block)
       end
     end
+    private :create_finder
   end
 end

data/spec/activerecord_finder/where_spec.rb

@@ -26,13 +26,11 @@ describe ActiveRecordFinder::Where do
     result.should == [seventeen]
   end
 
-  it 'concatenates arel conditions' do
-    pending
-    finder1 = Person.where(name: "Foo").arel
-    finder2 = Person.new_finder { age == 17 }
-    result = Person.where((finder2 & finder1).arel)
-    result.should == [seventeen]
-    result = Person.where((finder1 & finder2).arel)
-    result.should == [seventeen]
+  it 'concatenates scoped conditions' do
+    boo = Person.create!(name: "Boo", age: 17)
+    person = Person.where(age: 17).where('name LIKE ?', 'B%')
+    new_finder = person.new_finder { name == 'Boo' }
+    result = Person.restrict(new_finder)
+    result.should == [boo]
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_finder
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord