pose 1.2.1 → 1.2.2

data/lib/pose/static_api.rb

@@ -57,12 +57,12 @@ module Pose
             if options[:result_type] == :ids
               # Ids requested for result.
 
-              if options[:scope].blank?
+              if options[:where].blank?
                 # No scope.
                 result[result_class] = ids
               else
                 # We have a scope.
-                options[:scope].each do |scope|
+                options[:where].each do |scope|
                   query = result_class.select('id').where('id IN (?)', ids).where(scope).to_sql
                   result[result_class] = result_class.connection.select_values(query).map(&:to_i)
                 end
@@ -72,8 +72,8 @@ module Pose
               # Classes requested for result.
 
               result[result_class] = result_class.where(id: ids)
-              if options.has_key? :scope
-                options[:scope].each do |scope|
+              unless options[:where].blank?
+                options[:where].each do |scope|
                   result[result_class] = result[result_class].where('id IN (?)', ids).where(scope)
                 end
               end

data/lib/pose/version.rb

@@ -1,3 +1,3 @@
 module Pose
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/spec/pose_api_spec.rb

@@ -45,7 +45,6 @@ describe Pose do
       end
     end
 
-    # TODO(REMOVE).
     context "in the 'production' environment' do" do
       before :each do
         @old_env = Rails.env
@@ -197,7 +196,7 @@ describe Pose do
     end
 
 
-    describe "'scopes' parameter" do
+    describe "'where' parameter" do
 
       before :each do
         @one = FactoryGirl.create :posable_one, text: 'foo one', private: true
@@ -207,27 +206,27 @@ describe Pose do
 
       context 'with result type :classes' do
 
-        it 'limits the result set by the given scope' do
-          result = Pose.search 'foo', PosableOne, scope: [ private: true ]
+        it 'limits the result set by the given conditions' do
+          result = Pose.search 'foo', PosableOne, where: [ private: true ]
           result[PosableOne].should have(1).item
           result[PosableOne].should include @one
         end
 
         it 'allows to use the hash syntax for queries' do
-          result = Pose.search 'foo', PosableOne, scope: [ private: true ]
+          result = Pose.search 'foo', PosableOne, where: [ private: true ]
           result[PosableOne].should have(1).item
           result[PosableOne].should include @one
         end
 
         it 'allows to use the string syntax for queries' do
-          result = Pose.search 'foo', PosableOne, scope: [ ['private = ?', true] ]
+          result = Pose.search 'foo', PosableOne, where: [ ['private = ?', true] ]
           result[PosableOne].should have(1).item
           result[PosableOne].should include @one
         end
 
-        it 'allows to combine several scopes' do
+        it 'allows to combine several conditions' do
           @three = FactoryGirl.create :posable_one, text: 'foo two', private: true
-          result = Pose.search 'foo', PosableOne, scope: [ {private: true}, ['text = ?', 'foo two'] ]
+          result = Pose.search 'foo', PosableOne, where: [ {private: true}, ['text = ?', 'foo two'] ]
           result[PosableOne].should have(1).item
           result[PosableOne].should include @three
         end
@@ -235,8 +234,8 @@ describe Pose do
 
       context 'with result type :ids' do
 
-        it 'limits the result set by the given scope' do
-          result = Pose.search 'foo', PosableOne, result_type: :ids, scope: [ private: true ]
+        it 'limits the result set by the given condition' do
+          result = Pose.search 'foo', PosableOne, result_type: :ids, where: [ private: true ]
           result[PosableOne].should have(1).item
           result[PosableOne].should include @one.id
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pose
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors: