fulltext_searchable 0.1.0 → 0.1.1

data/app/models/fulltext_index.rb

@@ -80,17 +80,8 @@ class FulltextIndex < ActiveRecord::Base
     # 結果を取得し、インデックス元モデルの配列に変換。
     #
     def items(*args)
-      begin
-        # ActiveRecordの参照テーブル判定処理がおかしいので、SQLクエリ内にピリオドが現れる際に
-        # ピリオドの前の文字列を参照テーブル名と誤認し、eager loadをjoinの方針に切り替えて
-        # polymorphic associationをjoinでeager loadできず例外を吐く。
-        # なのでrescueしてeager loadなしで再度クエリを試みておく。
-        select('`_id`, `item_type`, `item_id`').
-          includes(:item).all(*args).map{|i| i.item }
-      rescue ActiveRecord::EagerLoadPolymorphicError
-        # eager loadなしで試みる
-        select('`_id`, `item_type`, `item_id`').all(*args).map{|i| i.item }
-      end
+      select('`_id`, `item_type`, `item_id`').
+        preload(:item).all(*args).map{|i| i.item }.compact
     end
     ##
     # 特定レコードの更新をインデックスに非同期で反映する。
@@ -102,7 +93,7 @@ class FulltextIndex < ActiveRecord::Base
           next unless record.item
           record.text = record.item.fulltext_keywords
           record.save
-          end
+        end
       end
       if FulltextSearchable::Engine.config.respond_to?(:async) &&
         FulltextSearchable::Engine.config.async

data/lib/fulltext_searchable/version.rb

@@ -1,3 +1,3 @@
 module FulltextSearchable
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/models/fulltext_index_spec.rb

@@ -75,9 +75,14 @@ describe FulltextIndex do
       FulltextIndex.match('天気', :with => [@taro, @jiro], :model => [Blog, User]).items.count.should == 5
     end
     
-    it "should perform workaround with ActiveRecord's string-followed-by-period bug" do
+    it "should not break with ActiveRecord's eager loading behavior" do
       FulltextIndex.match('ab.').items.should_not raise_error ActiveRecord::EagerLoadPolymorphicError
     end
+
+    it "should not contain nil in items" do
+      Blog.delete_all :id => @jiro.blogs.map(&:id)
+      FulltextIndex.match('天気').items.should_not include(nil)
+    end
   end
 
   context "optimization" do

data/spec/models/news_spec.rb

@@ -60,7 +60,7 @@ describe News do
     end
   end
 
-  context "deletion",f:true do
+  context "deletion" do
     before do
       @news = FactoryGirl.create(:taisyaku)
     end

data/spec/spec_helper.rb

@@ -39,6 +39,5 @@ RSpec.configure do |config|
   end
   config.before(:each){ DatabaseCleaner.clean }
   # filtering
-  config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fulltext_searchable
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -296,12 +296,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2065254535944603589
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2065254535944603589
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25