pose 2.0.1 → 2.1.0

data/spec/models/assignment_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module Pose
   describe Assignment do
 
-    describe "delete_class_index" do
+    describe :delete_class_index do
 
       before :each do
         FactoryGirl.create :assignment, posable_id: 1, posable_type: 'PosableOne'
@@ -21,7 +21,7 @@ module Pose
     end
 
 
-    describe "cleanup_orphaned_pose_assignments" do
+    describe :cleanup_orphaned_pose_assignments do
 
       it "deletes the assignment if the posable object doesn't exist" do
         FactoryGirl.create :assignment, posable_id: 2, posable_type: 'PosableOne'

data/spec/models/word_spec.rb

@@ -5,7 +5,7 @@ module Pose
 
     describe 'class methods' do
 
-      describe '::remove_unused_words' do
+      describe :remove_unused_words do
 
         shared_examples 'it properly removes unused words' do
           it 'removes unused words' do

data/spec/pose_api_spec.rb

@@ -15,7 +15,7 @@ module Pose
     end
 
 
-    describe '#update_pose_index' do
+    describe :update_pose_index do
 
       before :each do
         Pose::CONFIGURATION[:perform_search] = perform_search
@@ -45,7 +45,7 @@ module Pose
     end
 
 
-    describe '#update_pose_words' do
+    describe :update_pose_words do
 
       it 'saves the words for search' do
         subject.text = 'foo bar'
@@ -71,7 +71,7 @@ module Pose
     end
 
 
-    describe 'search' do
+    describe :search do
 
       it 'works' do
         pos = PosableOne.create text: 'foo'
@@ -157,22 +157,34 @@ module Pose
 
         context 'with ids and scope' do
           it 'limits the result set to the given number' do
-            result = Pose.search 'foo', PosableOne, result_type: :ids, limit: 1, where: [private: false]
+            result = Pose.search 'foo',
+                                 PosableOne,
+                                 result_type: :ids,
+                                 limit: 1,
+                                 joins: PosableOne,
+                                 where: ["posable_ones.private = ?", false]
             expect(result[PosableOne]).to have(1).item
           end
         end
 
         context 'with classes and no scope' do
           it 'limits the result set to the given number' do
-            result = Pose.search 'foo', PosableOne, limit: 1
+            result = Pose.search 'foo',
+                                 PosableOne,
+                                 limit: 1
             expect(result[PosableOne]).to have(1).item
           end
         end
 
         context 'with classes and scope' do
           it 'limits the result set to the given number' do
-            result = Pose.search 'foo', PosableOne, limit: 1, where: [private: false]
+            result = Pose.search 'foo',
+                                 PosableOne,
+                                 limit: 1,
+                                 joins: PosableOne,
+                                 where: ["posable_ones.private = ?", false]
             expect(result[PosableOne]).to have(1).item
+            expect(result[PosableOne]).to eq [@pos3]
           end
         end
       end
@@ -211,26 +223,30 @@ module Pose
         context 'with result type :classes' do
 
           it 'limits the result set by the given conditions' do
-            result = Pose.search 'foo', PosableOne, where: [ private: true ]
-            expect(result[PosableOne]).to have(1).item
-            expect(result[PosableOne]).to include @one
-          end
-
-          it 'allows to use the hash syntax for queries' do
-            result = Pose.search 'foo', PosableOne, where: [ private: true ]
+            result = Pose.search 'foo',
+                                 PosableOne,
+                                 joins: PosableOne,
+                                 where: ["posable_ones.private = ?", true]
             expect(result[PosableOne]).to have(1).item
             expect(result[PosableOne]).to include @one
           end
 
           it 'allows to use the string syntax for queries' do
-            result = Pose.search 'foo', PosableOne, where: [ ['private = ?', true] ]
+            result = Pose.search 'foo',
+                                 PosableOne,
+                                 joins: PosableOne,
+                                 where: ["posable_ones.private = ?", true]
             expect(result[PosableOne]).to have(1).item
             expect(result[PosableOne]).to include @one
           end
 
           it 'allows to combine several conditions' do
             three = FactoryGirl.create :posable_one, text: 'foo two', private: true
-            result = Pose.search 'foo', PosableOne, where: [ {private: true}, ['text = ?', 'foo two'] ]
+            result = Pose.search 'foo',
+                                 PosableOne,
+                                 joins: PosableOne,
+                                 where: [ ["posable_ones.private = ?", true],
+                                          ['posable_ones.text = ?', 'foo two'] ]
             expect(result[PosableOne]).to have(1).item
             expect(result[PosableOne]).to include three
           end
@@ -239,16 +255,41 @@ module Pose
         context 'with result type :ids' do
 
           it 'limits the result set by the given condition' do
-            result = Pose.search 'foo', PosableOne, result_type: :ids, where: [ private: true ]
+            result = Pose.search 'foo',
+                                 PosableOne,
+                                 result_type: :ids,
+                                 joins: PosableOne,
+                                 where: ["posable_ones.private = ?", true]
             expect(result[PosableOne]).to have(1).item
             expect(result[PosableOne]).to include @one.id
           end
         end
       end
+
+      describe ':joins parameter' do
+
+        before :each do
+          @user_1 = FactoryGirl.create :user, name: 'Jeff'
+          @user_2 = FactoryGirl.create :user, name: 'Jim'
+          @one = FactoryGirl.create :posable_one, text: 'snippet one', user: @user_1
+          @two = FactoryGirl.create :posable_one, text: 'snippet two', user: @user_2
+        end
+
+        it 'allows to use joined tables for queries' do
+          result = Pose.search 'snippet',
+                               PosableOne,
+                               { joins: [ PosableOne,
+                                          "INNER JOIN users on posable_ones.user_id=users.id" ],
+                                 where: ["users.name == 'Jeff'"] }
+          expect(result[PosableOne].map(&:text)).to eql ['snippet one']
+        end
+
+        it 'allows to load data from joined tables'
+      end
     end
 
 
-    describe 'autocomplete_words' do
+    describe :autocomplete_words do
 
       it 'returns words that start with the given phrase' do
         PosableOne.create text: 'great green pine tree'

data/spec/spec_helper.rb

@@ -1,3 +1,8 @@
+if ENV['COVERALLS_CONFIG'] == 'nocoveralls'
+  require 'coveralls'
+  Coveralls.wear!
+end
+
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)

metadata

@@ -1,110 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: pose
 version: !ruby/object:Gem::Version
-  version: 2.0.1
-  prerelease: 
+  version: 2.1.0
 platform: ruby
 authors:
 - Kevin Goslar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-12 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   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: faker
   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: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   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: sqlite3
   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'
 description: Pose ('Polymorphic Search') allows fulltext search for ActiveRecord objects.
@@ -117,15 +118,19 @@ files:
 - app/models/pose/assignment.rb
 - app/models/pose/word.rb
 - db/migrate/20130308144915_pose_install.rb
+- lib/generators/pose/install/install_generator.rb
+- lib/generators/pose/install/templates/install_migration.rb
 - lib/generators/pose/remove/remove_generator.rb
 - lib/generators/pose/remove/templates/remove_migration.rb
 - lib/generators/pose/upgrade/templates/upgrade_migration.rb
 - lib/generators/pose/upgrade/upgrade_generator.rb
 - lib/pose/activerecord_base_additions.rb
 - lib/pose/engine.rb
-- lib/pose/internal_helpers.rb
+- lib/pose/helpers.rb
 - lib/pose/model_class_additions.rb
+- lib/pose/query.rb
 - lib/pose/railtie.rb
+- lib/pose/search.rb
 - lib/pose/static_api.rb
 - lib/pose/version.rb
 - lib/pose.rb
@@ -135,6 +140,7 @@ files:
 - README.md
 - spec/dummy/app/models/posable_one.rb
 - spec/dummy/app/models/posable_two.rb
+- spec/dummy/app/models/user.rb
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml
@@ -154,6 +160,7 @@ files:
 - spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/20130308054001_create_posable_one.rb
 - spec/dummy/db/migrate/20130308054142_create_posable_two.rb
+- spec/dummy/db/migrate/20130708084009_create_users.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/log/development.log
@@ -162,8 +169,12 @@ files:
 - spec/dummy/script/rails
 - spec/factories/assignments.rb
 - spec/factories/posable_one.rb
+- spec/factories/posable_two.rb
+- spec/factories/user.rb
 - spec/factories/words.rb
-- spec/internal_helpers_spec.rb
+- spec/lib/pose/helpers_spec.rb
+- spec/lib/pose/query_spec.rb
+- spec/lib/pose/search_spec.rb
 - spec/models/assignment_spec.rb
 - spec/models/word_spec.rb
 - spec/pose_api_spec.rb
@@ -171,31 +182,39 @@ files:
 - spec/support/matchers.rb
 homepage: http://github.com/kevgo/pose
 licenses: []
-post_install_message: 
+metadata: {}
+post_install_message: |2
+
+  HEADS UP! If you have used Pose 1.x before,
+  you need to update your database tables!
+
+  * run: rails g pose:upgrade
+  * run: rake db:migrate
+
+  For more information, see: https://github.com/kevgo/pose
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A polymorphic, storage-system independent search engine for Ruby on Rails.
 test_files:
 - spec/dummy/app/models/posable_one.rb
 - spec/dummy/app/models/posable_two.rb
+- spec/dummy/app/models/user.rb
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml
@@ -215,6 +234,7 @@ test_files:
 - spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/20130308054001_create_posable_one.rb
 - spec/dummy/db/migrate/20130308054142_create_posable_two.rb
+- spec/dummy/db/migrate/20130708084009_create_users.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/log/development.log
@@ -223,8 +243,12 @@ test_files:
 - spec/dummy/script/rails
 - spec/factories/assignments.rb
 - spec/factories/posable_one.rb
+- spec/factories/posable_two.rb
+- spec/factories/user.rb
 - spec/factories/words.rb
-- spec/internal_helpers_spec.rb
+- spec/lib/pose/helpers_spec.rb
+- spec/lib/pose/query_spec.rb
+- spec/lib/pose/search_spec.rb
 - spec/models/assignment_spec.rb
 - spec/models/word_spec.rb
 - spec/pose_api_spec.rb

data/spec/internal_helpers_spec.rb

@@ -1,176 +0,0 @@
-# encoding: utf-8
-require "spec_helper"
-
-describe Pose::Helpers do
-
-  describe '::get_words_to_add' do
-    let(:one) { Pose::Word.new(text: 'one') }
-    let(:two) { Pose::Word.new(text: 'two') }
-
-    context 'having a new word to be added' do
-      it 'returns an array with strings that need to be added' do
-        Pose::Helpers.get_words_to_add([one, two], %w{one three}).should eql(['three'])
-      end
-    end
-
-    context 'nothing to add' do
-      it 'returns an empty array' do
-        Pose::Helpers.get_words_to_add([one, two], %w{one two}).should be_empty
-      end
-    end
-  end
-
-
-  describe '::get_words_to_remove' do
-    let(:one) { Pose::Word.new(text: 'one') }
-    let(:two) { Pose::Word.new(text: 'two') }
-
-    it "returns an array of word objects that need to be removed" do
-      Pose::Helpers.get_words_to_remove([one, two], %w{one three}).should eql([two])
-    end
-
-    it 'returns an empty array if there are no words to be removed' do
-      Pose::Helpers.get_words_to_remove([one, two], %w{one two}).should be_empty
-    end
-  end
-
-
-  describe 'make_array' do
-
-    it 'converts a single value into an array' do
-      Pose::Helpers.make_array(1).should eq [1]
-    end
-
-    it 'leaves arrays as arrays' do
-      Pose::Helpers.make_array([1]).should eq [1]
-    end
-  end
-
-
-  describe 'merge_search_result_word_matches' do
-    context 'given a new class name' do
-
-      before :each do
-        @result = {}
-      end
-
-      it 'sets the given ids as the ids for this class name' do
-        Pose::Helpers.merge_search_result_word_matches @result, 'class1', [1, 2]
-        @result.should eq({ 'class1' => [1, 2] })
-      end
-    end
-
-    context 'given a class name with already existing ids from another word' do
-
-      before :each do
-        @result = { 'class1' => [1, 2] }
-      end
-
-      it 'only keeps the ids that are included in both sets' do
-        Pose::Helpers.merge_search_result_word_matches @result, 'class1', [1, 3]
-        @result.should eq({ 'class1' => [1] })
-      end
-    end
-  end
-
-
-  describe 'query_terms' do
-    it 'returns all individual words resulting from the given query' do
-      Pose::Helpers.query_terms('foo bar').should eq ['foo', 'bar']
-    end
-
-    it 'converts the individual words into their root form' do
-      Pose::Helpers.query_terms('bars').should eq ['bar']
-    end
-
-    it 'splits complex words into separate terms' do
-      Pose::Helpers.query_terms('one-two').should eq ['one', 'two']
-    end
-
-    it 'removes duplicates' do
-      Pose::Helpers.query_terms('foo-bar foo').should eq ['foo', 'bar']
-    end
-  end
-
-
-  describe 'root_word' do
-
-    it 'converts words into singular' do
-      Pose::Helpers.root_word('bars').should eql(['bar'])
-    end
-
-    it 'removes special characters' do
-      Pose::Helpers.root_word('(bar').should eq ['bar']
-      Pose::Helpers.root_word('bar)').should eq ['bar']
-      Pose::Helpers.root_word('(bar)').should eq ['bar']
-      Pose::Helpers.root_word('>foo').should eq ['foo']
-      Pose::Helpers.root_word('<foo').should eq ['foo']
-      Pose::Helpers.root_word('"foo"').should eq ['foo']
-      Pose::Helpers.root_word('"foo').should eq ['foo']
-      Pose::Helpers.root_word("'foo'").should eq ['foo']
-      Pose::Helpers.root_word("'foo's").should eq ['foo']
-      Pose::Helpers.root_word("foo?").should eq ['foo']
-      Pose::Helpers.root_word("foo!").should eq ['foo']
-      Pose::Helpers.root_word("foo/bar").should eq ['foo', 'bar']
-      Pose::Helpers.root_word("foo-bar").should eq ['foo', 'bar']
-      Pose::Helpers.root_word("foo--bar").should eq ['foo', 'bar']
-      Pose::Helpers.root_word("foo.bar").should eq ['foo', 'bar']
-    end
-
-    it 'removes umlauts' do
-      Pose::Helpers.root_word('fünf').should eq ['funf']
-    end
-
-    it 'splits up numbers' do
-      Pose::Helpers.root_word('11.2.2011').should eq ['11', '2', '2011']
-      Pose::Helpers.root_word('11-2-2011').should eq ['11', '2', '2011']
-      Pose::Helpers.root_word('30:4-5').should eq ['30', '4', '5']
-    end
-
-    it 'converts into lowercase' do
-      Pose::Helpers.root_word('London').should eq ['london']
-    end
-
-    it "stores single-letter words" do
-      Pose::Helpers.root_word('a b').should eq ['a', 'b']
-    end
-
-    it "does't encode external URLs" do
-      Pose::Helpers.root_word('http://web.com').should eq ['http', 'web', 'com']
-    end
-
-    it "doesn't store empty words" do
-      Pose::Helpers.root_word('  one two  ').should eq ['one', 'two']
-    end
-
-    it "removes duplicates" do
-      Pose::Helpers.root_word('one_one').should eq ['one']
-      Pose::Helpers.root_word('one one').should eq ['one']
-    end
-
-    it "splits up complex URLs" do
-      Pose::Helpers.root_word('books?id=p7uyWPcVGZsC&dq=closure%20definitive%20guide&pg=PP1#v=onepage&q&f=false').should eql([
-        "book", "id", "p7uywpcvgzsc", "dq", "closure", "definitive", "guide", "pg", "pp1", "v", "onepage", "q", "f", "false"])
-    end
-  end
-
-
-  describe 'search_classes_and_ids_for_word' do
-
-    it 'returns a hash that contains all the given classes' do
-      result = Pose::Helpers.search_classes_and_ids_for_word 'foo', %w{PosableOne PosableTwo}
-      result.keys.sort.should eq %w{PosableOne PosableTwo}
-    end
-
-    it 'returns the ids of all the posable objects that include the given word' do
-      pos1 = PosableOne.create text: 'one two'
-      pos2 = PosableTwo.create text: 'one three'
-      pos3 = PosableTwo.create text: 'two three'
-
-      result = Pose::Helpers.search_classes_and_ids_for_word 'one', %w{PosableOne PosableTwo}
-
-      result['PosableOne'].should eq [pos1.id]
-      result['PosableTwo'].should eq [pos2.id]
-    end
-  end
-end