activerecord_finder 0.1.1 → 0.1.2

data/lib/activerecord_finder/where.rb

@@ -11,9 +11,12 @@ 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])
+      if block
+        finder = create_finder(&block)
+        scoped_where << finder.arel
+      end
+      arel = Arel::Nodes::And.new(scoped_where)
       ActiveRecordFinder::Finder.new(arel_table, arel)
     end
 

data/spec/activerecord_finder/where_spec.rb

@@ -33,4 +33,10 @@ describe ActiveRecordFinder::Where do
     result = Person.restrict(new_finder)
     result.should == [boo]
   end
+
+  it 'creates a new finder without a block, using only current scope' do
+    person = Person.where(age: 17).where('name LIKE ?', 'B%')
+    new_finder = person.new_finder
+    Person.restrict(new_finder).should == [bar]
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_finder
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors: