dusen 0.3.0 → 0.4.0

data/.travis.yml

@@ -3,6 +3,9 @@ rvm:
   - "1.8.7"
   - "1.9.3"
   - ree
+services:
+  - mysql
+before_script: rake travis_ci:prepare
 script: rake all:bundle all:spec
 notifications:
   email:

data/README.md

@@ -187,8 +187,6 @@ We now need to your model which text to index. We do this using the `search_text
         [name, street, city, email]
       end
 
-      end
-
     end
 
 You can return any object or array of objects. Dusen will stringify the return value and index those words. Note that indexed words do not need to be fields of your model:
@@ -210,10 +208,11 @@ Also note that if you migrated an existing table to FULLTEXT search, you need to
 
 If you migrated an existing table to FULLTEXT search, you must build the index for all existing records:
 
-    Model.all.each(&index_search_text)
+    Model.all.each(&:index_search_text)
 
 You only need to do this once. Dusen will automatically index all further changes to your records.
 
+
 ### Indexing changes in associated records
 
 Dusen lets you index words from associated models. When you do this you need to reindex the indexed model whenever an associated record changes, or else the indexed text will be out of date.
@@ -247,6 +246,28 @@ To make sure contacts will reindex when the organization changes its name, use t
 All records returned by `part_of_search_text_for` will be reindexed when the organization is changed or destroyed.
 
 
+### Obtaining the currently indexed words
+
+To access a string of words that is indexed for a record, call `#search_text`:
+
+    contact = Contact.create!(:email => 'foo@bar.com', :city => 'Foohausen')
+    context.search_text # => "foo@bar.com Foohausen"
+
+This can be practical if you want to index a record under the same words as its association:
+
+    class Contact < ActiveRecord::Base
+
+      belongs_to :organization
+
+      search_syntax
+
+      search_text do
+        [name, email, organization.search_text]
+      end
+
+    end
+
+
 Programmatic access without DSL
 -------------------------------
 

data/Rakefile

@@ -4,6 +4,27 @@ require 'bundler/gem_tasks'
 desc 'Default: Run all specs.'
 task :default => 'all:spec'
 
+namespace :travis_ci do
+
+  desc 'Things to do before Travis CI begins'
+  task :prepare do
+    Rake::Task['travis_ci:create_database'].invoke &&
+    Rake::Task['travis_ci:create_database_yml'].invoke
+  end
+
+  desc 'Creates a test database'
+  task :create_database do
+    system("mysql -e 'create database dusen_test;'")
+  end
+
+  desc 'Creates a database.yml'
+  task :create_database_yml do
+    config_dir = "spec/shared/app_root/config"
+    system("cp #{config_dir}/database.sample.yml #{config_dir}/database.yml")
+  end
+
+end
+
 namespace :all do
 
   desc "Run specs on all spec apps"

data/lib/dusen/active_record/base_ext.rb

@@ -28,30 +28,34 @@ module Dusen
 
           @has_search_text = true
 
-          has_one :search_text, :as => :source, :dependent => :destroy, :class_name => '::Dusen::ActiveRecord::SearchText', :inverse_of => :source
+          has_one :search_text_record, :as => :source, :dependent => :destroy, :class_name => '::Dusen::ActiveRecord::SearchText', :inverse_of => :source
 
-          after_create :create_search_text
+          after_create :create_initial_search_text_record
 
           after_update :invalidate_search_text
 
-          define_method :index_search_text do
+          define_method :search_text do
             new_text = instance_eval(&text)
             new_text = Array.wrap(new_text).flatten.collect(&:to_s).join(' ').gsub(/\s+/, ' ').strip
-            search_text || build_search_text
-            search_text.update_words!(new_text)
+            new_text
+          end
+
+          define_method :index_search_text do
+            search_text_record.present? or build_search_text_record
+            search_text_record.update_words!(search_text)
             true
           end
 
           define_method :invalidate_search_text do
-            search_text.invalidate!
+            search_text_record.invalidate!
             true
           end
 
           private
 
-          define_method :create_search_text do
-            build_search_text(:stale => true)
-            search_text.save!
+          define_method :create_initial_search_text_record do
+            build_search_text_record(:stale => true)
+            search_text_record.save!
           end
 
           search_syntax do

data/lib/dusen/active_record/search_text.rb

@@ -4,7 +4,7 @@ module Dusen
 
       self.table_name = 'search_texts'
 
-      belongs_to :source, :polymorphic => true, :inverse_of => :search_text
+      belongs_to :source, :polymorphic => true, :inverse_of => :search_text_record
 
       def update_words!(words)
         update_attributes!(:words => words, :stale => false)

data/lib/dusen/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Dusen
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/spec/shared/spec/dusen/active_record/base_ext_spec.rb

@@ -94,7 +94,7 @@ describe ActiveRecord::Base do
       Dusen::ActiveRecord::SearchText.count.should be_zero
     end
 
-    describe 'indexing fields from associated records'
+    describe 'indexing fields from associated records' do
 
       it 'should allow to index fields from an associated record' do
         category = Recipe::Category.create!(:name => 'Rice')
@@ -133,6 +133,18 @@ describe ActiveRecord::Base do
 
       end
 
+    end
+
+    describe '#search_text' do
+
+      it 'should return the currently indexable words for this record' do
+        category = Recipe::Category.create!(:name => 'Rice')
+        recipe = Recipe.create!(:name => 'Martini Chicken', :category => category)
+        recipe.search_text.should == "Martini Chicken Rice"
+      end
+
+    end
+
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dusen
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Henning Koch
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-10 00:00:00 +01:00
+date: 2012-12-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency