pose 1.1.3 → 1.2.0

data/lib/pose/models/pose_assignment.rb

@@ -5,6 +5,9 @@ class PoseAssignment < ActiveRecord::Base
   attr_accessible :pose_word, :posable
 
 
+  attr_accessible :pose_word, :posable
+
+
   # Removes all PoseAssignments for the given class.
   def self.delete_class_index clazz
     PoseAssignment.delete_all(['posable_type=?', clazz.name])

data/lib/pose/models/pose_word.rb

@@ -3,6 +3,8 @@ class PoseWord < ActiveRecord::Base
   has_many :pose_assignments
   attr_accessible :text
 
+  attr_accessible :text
+
   def self.remove_unused_words progress_bar = nil
     PoseWord.find_each(include: [:pose_assignments], batch_size: 5000) do |pose_word|
       pose_word.delete if pose_word.pose_assignments.size == 0

data/lib/pose/static_helpers.rb

@@ -133,11 +133,38 @@ module Pose
         result_classes_and_ids.each do |class_name, ids|
           result_class = Kernel.const_get class_name
 
-          if ids.any? && classes.include?(result_class)
-            ids = ids.slice(0, options[:limit]) if options[:limit]
-            result[result_class] = options[:result_type] == :ids ? ids : result_class.where(id: ids)
-          else
+          if ids.size == 0
+            # Handle no results.
             result[result_class] = []
+
+          else
+            # Here we have results.
+
+            # Limit.
+            ids = ids.slice(0, options[:limit]) if options[:limit]
+
+            if options[:result_type] == :ids
+              # Ids requested for result.
+
+              if options.has_key? :scope
+                # We have a scope.
+                options[:scope].each do |scope|
+                  result[result_class] = result_class.select('id').where(scope).map(&:id)
+                end
+              else
+                result[result_class] = ids
+              end
+
+            else
+              # Classes requested for result.
+
+              result[result_class] = result_class.where(id: ids)
+              if options.has_key? :scope
+                options[:scope].each do |scope|
+                  result[result_class] = result[result_class].where(scope)
+                end
+              end
+            end
           end
         end
       end

data/lib/pose/version.rb

@@ -1,3 +1,3 @@
 module Pose
-  VERSION = "1.1.3"
+  VERSION = "1.2.0"
 end

data/spec/pose_spec.rb

@@ -316,6 +316,51 @@ describe Pose do
         end
       end
     end
+
+    describe "'scopes' parameter" do
+
+      before :each do
+        @one = FactoryGirl.create :posable_one, text: 'foo one', private: true
+        @two = FactoryGirl.create :posable_one, text: 'foo two', private: false
+      end
+
+      context 'with result type :classes' do
+
+        it 'limits the result set by the given scope' do
+          result = Pose.search 'foo', PosableOne, scope: [ 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[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[PosableOne].should have(1).item
+          result[PosableOne].should include @one
+        end
+
+        it 'allows to combine several scopes' do
+          @three = FactoryGirl.create :posable_one, text: 'foo two', private: true
+          result = Pose.search 'foo', PosableOne, scope: [ {private: true}, ['text = ?', 'foo two'] ]
+          result[PosableOne].should have(1).item
+          result[PosableOne].should include @three
+        end
+      end
+
+      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 ]
+          result[PosableOne].should have(1).item
+          result[PosableOne].should include @one.id
+        end
+      end
+    end
   end
 
   describe 'autocomplete_words' do

data/spec/spec_helper.rb

@@ -92,10 +92,12 @@ def setup_db
 
     create_table 'posable_ones' do |t|
       t.string 'text'
+      t.boolean 'private'
     end
 
     create_table 'posable_twos' do |t|
       t.string 'text'
+      t.boolean 'private'
     end
 
     create_table "pose_assignments" do |t|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pose
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-23 00:00:00.000000000 Z
+date: 2012-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: autotest-standalone
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement