pose 1.1.0 → 1.1.1

data/README.md

@@ -1,4 +1,4 @@
-# Pose [![Build Status](https://secure.travis-ci.org/kevgo/pose.png)](http://travis-ci.org/#!/kevgo/pose)
+# Pose <a href="http://travis-ci.org/#!/kevgo/pose" target="_blank"><img src="https://secure.travis-ci.org/kevgo/pose.png" alt="Build status"></a>
 
 Pose  ("Polymorphic Search") allows fulltext search for ActiveRecord objects.
 
@@ -118,8 +118,8 @@ Happy searching!  :)
 ```ruby
 result = Pose.search 'foo',
                      MyClass,
-                     :limit => 3,            # Limit the result count to 3.
-                     :result_type => :ids    # Don't load the resulting objects, return just their ids instead.
+                     limit: 3,            # Limit the result count to 3.
+                     result_type: :ids    # Don't load the resulting objects, return just their ids.
 ```
 
 
@@ -153,6 +153,15 @@ Or, clone the repository, make your changes, and submit a pull request.
 
 ## Run the unit tests for the Pose Gem
 
+Pose uses Postgresql for tests, since it is the most strict database.
+To run tests, first, create a test database.
+
+```bash
+createdb pose_test
+```
+
+Then run the tests.
+
 ```bash
 $ rake spec
 ```

data/lib/generators/templates/migration.rb

@@ -2,16 +2,16 @@ class AddPoseTables < ActiveRecord::Migration
 
   def self.up
     create_table "pose_assignments" do |t|
-      t.integer "pose_word_id",               :null => false
-      t.integer "posable_id",                 :null => false
-      t.string  "posable_type", :limit => 40, :null => false
+      t.integer "pose_word_id",            null: false
+      t.integer "posable_id",              null: false
+      t.string  "posable_type", limit: 40, null: false
     end
 
     add_index "pose_assignments", :pose_word_id
     add_index "pose_assignments", :posable_id
 
     create_table "pose_words" do |t|
-      t.string "text", :limit => 80, :null => false
+      t.string "text", limit: 80, null: false
     end
 
     add_index "pose_words", :text

data/lib/pose/model_additions.rb

@@ -4,8 +4,8 @@ module Pose
     extend ActiveSupport::Concern
 
     included do
-      has_many :pose_assignments, :as => :posable, :dependent => :delete_all
-      has_many :pose_words, :through => :pose_assignments
+      has_many :pose_assignments, as: :posable, dependent: :delete_all
+      has_many :pose_words, through: :pose_assignments
 
       after_save :update_pose_index
       before_destroy :delete_pose_index

data/lib/pose/models/pose_assignment.rb

@@ -1,7 +1,7 @@
 # Assigns searchable objects to words in the search index.
 class PoseAssignment < ActiveRecord::Base
   belongs_to :pose_word
-  belongs_to :posable, :polymorphic => true
+  belongs_to :posable, polymorphic: true
 
   # Removes all PoseAssignments for the given class.
   def self.delete_class_index clazz
@@ -10,7 +10,7 @@ class PoseAssignment < ActiveRecord::Base
 
   # Removes all PoseAssignments that aren't used anymore.
   def self.cleanup_orphaned_pose_assignments progress_bar = nil
-    PoseAssignment.find_each(:include => [:posable, :pose_word], :batch_size => 5000) do |assignment|
+    PoseAssignment.find_each(include: [:posable, :pose_word], batch_size: 5000) do |assignment|
       progress_bar.inc if progress_bar
 
       # Delete the assignment if the posable object no longer exists.

data/lib/pose/models/pose_word.rb

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

data/lib/pose/static_helpers.rb

@@ -4,11 +4,12 @@ module Pose
 
   # By default, doesn't run in tests.
   # Set this to true to test the search functionality.
-  CONFIGURATION = { :search_in_tests => false }
+  CONFIGURATION = { search_in_tests: false }
 
   class <<self
 
-    # Asks if model should perform search.
+    # Returns whether Pose is configured to perform search.
+    # This setting exists to disable search in tests.
     #
     # @return [false, true]
     def perform_search?
@@ -102,7 +103,8 @@ module Pose
 
       # Get the ids of the results.
       result_classes_and_ids = {}
-      query.split(' ').each do |query_word|
+      query_words = query.split(' ').map{|query_word| Pose.root_word query_word}.flatten
+      query_words.each do |query_word|
         current_word_classes_and_ids = {}
         classes.each { |clazz| current_word_classes_and_ids[clazz.name] = [] }
         query = PoseAssignment.joins(:pose_word) \
@@ -110,7 +112,7 @@ module Pose
                               .where('pose_words.text LIKE ?', "#{query_word}%") \
                               .where('posable_type IN (?)', classes_names)
         PoseAssignment.connection.select_all(query.to_sql).each do |pose_assignment|
-          current_word_classes_and_ids[pose_assignment['posable_type']] << pose_assignment['posable_id']
+          current_word_classes_and_ids[pose_assignment['posable_type']] << pose_assignment['posable_id'].to_i
         end
         # This is the old ActiveRecord way. Removed for performance reasons.
         # query.each do |pose_assignment|
@@ -133,7 +135,7 @@ module Pose
 
           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)
+            result[result_class] = options[:result_type] == :ids ? ids : result_class.where(id: ids)
           else
             result[result_class] = []
           end

data/lib/pose/version.rb

@@ -1,3 +1,3 @@
 module Pose
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/spec/factories.rb

@@ -1,12 +1,15 @@
-Factory.define :pose_word do |word|
-  word.text { Faker::Lorem.words(1).first }
-end
+FactoryGirl.define do
 
-Factory.define :pose_assignment do |assignment|
-  assignment.association :pose_word
-  assignment.association :posable, :factory => :posable_one
-end
+  factory :pose_word do
+    text { Faker::Lorem.words(1).first }
+  end
+
+  factory :pose_assignment do
+    pose_word
+    posable factory: :posable_one
+  end
 
-Factory.define :posable_one do |posable|
-  posable.text { Faker::Lorem.words(3).join ' ' }
+  factory :posable_one do
+    text { Faker::Lorem.words(3).join ' ' }
+  end
 end

data/spec/pose_assignment_spec.rb

@@ -9,31 +9,31 @@ describe PoseAssignment do
   describe "delete_class_index" do
     
     before :each do
-      FactoryGirl.create :pose_assignment, :posable_id => 1, :posable_type => 'PosableOne'
-      FactoryGirl.create :pose_assignment, :posable_id => 2, :posable_type => 'PosableTwo'
+      FactoryGirl.create :pose_assignment, posable_id: 1, posable_type: 'PosableOne'
+      FactoryGirl.create :pose_assignment, posable_id: 2, posable_type: 'PosableTwo'
       PoseAssignment.delete_class_index PosableOne
     end
     
     it "deletes all PoseAssignments for the given class" do
-      PoseAssignment.where(:posable_type => 'PosableOne').should have(0).items
+      PoseAssignment.where(posable_type: 'PosableOne').should have(0).items
     end
     
     it "doesn't delete PoseAssignments for other classes" do
-      PoseAssignment.where(:posable_type => 'PosableTwo').should have(1).items
+      PoseAssignment.where(posable_type: 'PosableTwo').should have(1).items
     end
   end
     
   describe "cleanup_orphaned_pose_assignments" do
     
     it "deletes the assignment if the posable object doesn't exist" do
-      FactoryGirl.create :pose_assignment, :posable_id => 2, :posable_type => 'PosableOne'
+      FactoryGirl.create :pose_assignment, posable_id: 2, posable_type: 'PosableOne'
       PoseAssignment.count.should > 0
       PoseAssignment.cleanup_orphaned_pose_assignments
       PoseAssignment.should have(0).items
     end
     
     it "deletes the assignment if the pose_word doesn't exist" do
-      assignment = FactoryGirl.create :pose_assignment, :pose_word => nil, :pose_word_id => 27
+      assignment = FactoryGirl.create :pose_assignment, pose_word: nil, pose_word_id: 27
       PoseAssignment.cleanup_orphaned_pose_assignments
       PoseAssignment.find_by_id(assignment.id).should be_nil
     end

data/spec/pose_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+ActiveRecord::Base.establish_connection adapter: 'postgresql', database: 'pose_test', min_messages: 'WARNING'
 
 describe Pose do
   subject { PosableOne.new }
@@ -17,7 +17,7 @@ describe Pose do
   describe 'associations' do
     it 'allows to access the associated words of a posable object directly' do
       subject.should have(0).pose_words
-      subject.pose_words << PoseWord.new(:text => 'one')
+      subject.pose_words << PoseWord.new(text: 'one')
       subject.should have_pose_words(['one'])
     end
   end
@@ -88,8 +88,8 @@ describe Pose do
   describe 'get_words_to_remove' do
 
     it "returns an array of word objects that need to be removed" do
-      word1 = PoseWord.new :text => 'one'
-      word2 = PoseWord.new :text => 'two'
+      word1 = PoseWord.new text: 'one'
+      word2 = PoseWord.new text: 'two'
       existing_words = [word1, word2]
       new_words = ['one', 'three']
 
@@ -99,8 +99,8 @@ describe Pose do
     end
 
     it 'returns an empty array if there are no words to be removed' do
-      word1 = PoseWord.new :text => 'one'
-      word2 = PoseWord.new :text => 'two'
+      word1 = PoseWord.new text: 'one'
+      word2 = PoseWord.new text: 'two'
       existing_words = [word1, word2]
       new_words = ['one', 'two']
 
@@ -113,8 +113,8 @@ describe Pose do
   describe 'get_words_to_add' do
 
     it 'returns an array with strings that need to be added' do
-      word1 = PoseWord.new :text => 'one'
-      word2 = PoseWord.new :text => 'two'
+      word1 = PoseWord.new text: 'one'
+      word2 = PoseWord.new text: 'two'
       existing_words = [word1, word2]
       new_words = ['one', 'three']
 
@@ -124,8 +124,8 @@ describe Pose do
     end
 
     it 'returns an empty array if there is nothing to be added' do
-      word1 = PoseWord.new :text => 'one'
-      word2 = PoseWord.new :text => 'two'
+      word1 = PoseWord.new text: 'one'
+      word2 = PoseWord.new text: 'two'
       existing_words = [word1, word2]
       new_words = ['one', 'two']
 
@@ -199,7 +199,7 @@ describe Pose do
   describe 'search' do
 
     it 'works' do
-      pos1 = PosableOne.create :text => 'one'
+      pos1 = PosableOne.create text: 'one'
 
       result = Pose.search 'one', PosableOne
 
@@ -210,8 +210,8 @@ describe Pose do
 
     describe 'classes parameter' do
       it 'returns all different classes by default' do
-        pos1 = PosableOne.create :text => 'foo'
-        pos2 = PosableTwo.create :text => 'foo'
+        pos1 = PosableOne.create text: 'foo'
+        pos2 = PosableTwo.create text: 'foo'
 
         result = Pose.search 'foo', [PosableOne, PosableTwo]
 
@@ -221,8 +221,8 @@ describe Pose do
       end
 
       it 'allows to provide different classes to return' do
-        pos1 = PosableOne.create :text => 'foo'
-        pos2 = PosableTwo.create :text => 'foo'
+        pos1 = PosableOne.create text: 'foo'
+        pos2 = PosableTwo.create text: 'foo'
 
         result = Pose.search 'foo', [PosableOne, PosableTwo]
 
@@ -232,8 +232,8 @@ describe Pose do
       end
 
       it 'returns only instances of the given classes' do
-        pos1 = PosableOne.create :text => 'one'
-        pos2 = PosableTwo.create :text => 'one'
+        pos1 = PosableOne.create text: 'one'
+        pos2 = PosableTwo.create text: 'one'
 
         result = Pose.search 'one', PosableOne
 
@@ -245,7 +245,7 @@ describe Pose do
     describe 'query parameter' do
 
       it 'returns an empty array if nothing matches' do
-        pos1 = PosableOne.create :text => 'one'
+        pos1 = PosableOne.create text: 'one'
 
         result = Pose.search 'two', PosableOne
 
@@ -253,9 +253,9 @@ describe Pose do
       end
 
       it 'returns only objects that match all given query words' do
-        pos1 = PosableOne.create :text => 'one two'
-        pos2 = PosableOne.create :text => 'one three'
-        pos3 = PosableOne.create :text => 'two three'
+        pos1 = PosableOne.create text: 'one two'
+        pos2 = PosableOne.create text: 'one three'
+        pos3 = PosableOne.create text: 'two three'
 
         result = Pose.search 'two one', PosableOne
 
@@ -264,24 +264,33 @@ describe Pose do
       end
 
       it 'returns nothing if searching for a non-existing word' do
-        pos1 = PosableOne.create :text => 'one two'
+        pos1 = PosableOne.create text: 'one two'
 
         result = Pose.search 'one zonk', PosableOne
 
         result.should have(1).items
         result[PosableOne].should == []
       end
+
+      it 'works if the query is given in uppercase' do
+        pos1 = PosableOne.create text: 'one two'
+
+        result = Pose.search 'OnE TwO', PosableOne
+
+        result.should have(1).items
+        result[PosableOne].should == [pos1]
+      end
     end
 
     describe "'limit' parameter" do
 
       it 'works' do
-        FactoryGirl.create :posable_one, :text => 'foo one'
-        FactoryGirl.create :posable_one, :text => 'foo two'
-        FactoryGirl.create :posable_one, :text => 'foo three'
-        FactoryGirl.create :posable_one, :text => 'foo four'
+        FactoryGirl.create :posable_one, text: 'foo one'
+        FactoryGirl.create :posable_one, text: 'foo two'
+        FactoryGirl.create :posable_one, text: 'foo three'
+        FactoryGirl.create :posable_one, text: 'foo four'
 
-        result = Pose.search 'foo', PosableOne, :limit => 3
+        result = Pose.search 'foo', PosableOne, limit: 3
 
         result[PosableOne].should have(3).items
       end
@@ -290,7 +299,7 @@ describe Pose do
     describe "'result_type' parameter" do
 
       before :each do
-        @foo_one = FactoryGirl.create :posable_one, :text => 'foo one'
+        @foo_one = FactoryGirl.create :posable_one, text: 'foo one'
       end
 
       describe 'default behavior' do
@@ -302,7 +311,7 @@ describe Pose do
 
       context ':ids given' do
         it 'returns ids instead of objects' do
-          result = Pose.search 'foo', PosableOne, :result_type => :ids
+          result = Pose.search 'foo', PosableOne, result_type: :ids
           result[PosableOne][0].should == @foo_one.id
         end
       end
@@ -312,7 +321,7 @@ describe Pose do
   describe 'autocomplete_words' do
 
     it 'returns words that start with the given phrase' do
-      PosableOne.create :text => 'great green pine tree'
+      PosableOne.create text: 'great green pine tree'
 
       result = Pose.autocomplete_words 'gr'
 
@@ -322,7 +331,7 @@ describe Pose do
     end
 
     it 'returns words that match the given phrase exactly' do
-      PoseWord.create :text => 'cat'
+      PoseWord.create text: 'cat'
 
       result = Pose.autocomplete_words 'cat'
 
@@ -330,7 +339,7 @@ describe Pose do
     end
 
     it 'stems the search query' do
-      PosableOne.create :text => 'car'
+      PosableOne.create text: 'car'
 
       result = Pose.autocomplete_words 'cars'
 
@@ -339,7 +348,7 @@ describe Pose do
     end
 
     it 'returns nothing if the search query is empty' do
-      PosableOne.create :text => 'foo bar'
+      PosableOne.create text: 'foo bar'
       result = Pose.autocomplete_words ''
       result.should have(0).words
     end

data/spec/spec_helper.rb

@@ -13,7 +13,7 @@ FactoryGirl.find_definitions
 
 # Configure Rails Environment
 ENV["RAILS_ENV"] = "test"
-Rails = Hashie::Mash.new({:env => 'test'})
+Rails = Hashie::Mash.new({env: 'test'})
 
 # We have no Railtie in these tests --> load Pose manually.
 ActiveRecord::Base.send :extend, Pose::BaseAdditions
@@ -88,7 +88,7 @@ end
 #
 
 def setup_db
-  ActiveRecord::Schema.define(:version => 1) do
+  ActiveRecord::Schema.define(version: 1) do
 
     create_table 'posable_ones' do |t|
       t.string 'text'
@@ -99,13 +99,13 @@ def setup_db
     end
 
     create_table "pose_assignments" do |t|
-      t.integer "pose_word_id",               :null => false
-      t.integer "posable_id",                 :null => false
-      t.string  "posable_type", :limit => 20, :null => false
+      t.integer "pose_word_id",            null: false
+      t.integer "posable_id",              null: false
+      t.string  "posable_type", limit: 20, null: false
     end
 
     create_table "pose_words" do |t|
-      t.string "text", :limit => 80, :null => false
+      t.string "text", limit: 80, null: false
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pose
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-04 00:00:00.000000000 Z
+date: 2012-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70182202899340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70182202899340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70182202897100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70182202897100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
-  requirement: &70182202895340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70182202895340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70182202890340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70182202890340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &70182202708040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70182202708040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70182202704860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70182202704860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70182202700960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70182202700960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: &70182202696980 !ruby/object:Gem::Requirement
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +133,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70182202696980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Pose ('Polymorphic Search') allows fulltext search for ActiveRecord objects.
 email:
 - kevin.goslar@gmail.com
@@ -164,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A polymorphic, storage-system independent search engine for Ruby on Rails.