picky 4.0.0 → 4.0.1

data/lib/picky/bundle.rb

@@ -92,7 +92,7 @@ module Picky
     #
     def initialize_backends
       @inverted      = @backend_inverted.initial
-      @weights       = @weight_strategy.saved? ? @backend_weights.initial : @weight_strategy
+      @weights       = @weight_strategy.respond_to?(:saved?) && !@weight_strategy.saved? ? @weight_strategy : @backend_weights.initial
       @similarity    = @backend_similarity.initial
       @configuration = @backend_configuration.initial
       @realtime      = @backend_realtime.initial
@@ -102,11 +102,11 @@ module Picky
     # internal backend instance.
     #
     def empty
-      @inverted = @backend_inverted.empty
-      @weights = @weight_strategy.saved? ? @backend_weights.empty : @weight_strategy
-      @similarity = @backend_similarity.empty
+      @inverted      = @backend_inverted.empty
+      @weights       = @weight_strategy.respond_to?(:saved?) && !@weight_strategy.saved? ? @weight_strategy : @backend_weights.empty
+      @similarity    = @backend_similarity.empty
       @configuration = @backend_configuration.empty
-      @realtime = @backend_realtime.empty
+      @realtime      = @backend_realtime.empty
     end
 
     # Delete all index files.
@@ -115,10 +115,10 @@ module Picky
       @backend_inverted.delete       if @backend_inverted.respond_to? :delete
       # THINK about this. Perhaps the strategies should implement the backend methods?
       #
-      @backend_weights.delete        if @backend_weights.respond_to?(:delete) && @weight_strategy.saved?
+      @backend_weights.delete        if @backend_weights.respond_to?(:delete) && @weight_strategy.respond_to?(:saved?) && @weight_strategy.saved?
       @backend_similarity.delete     if @backend_similarity.respond_to? :delete
       @backend_configuration.delete  if @backend_configuration.respond_to? :delete
-      @backend_realtime.delete  if @backend_realtime.respond_to? :delete
+      @backend_realtime.delete       if @backend_realtime.respond_to? :delete
     end
 
     # Get a list of similar texts.

data/lib/picky/bundle_indexed.rb

@@ -79,12 +79,12 @@ module Picky
     # Loads the weights index.
     #
     def load_weights
-      self.weights = @backend_weights.load if @weight_strategy.saved?
+      self.weights = @backend_weights.load unless @weight_strategy.respond_to?(:saved?) && !@weight_strategy.saved?
     end
     # Loads the similarity index.
     #
     def load_similarity
-      self.similarity = @backend_similarity.load if @similarity_strategy.saved?
+      self.similarity = @backend_similarity.load unless @similarity_strategy.respond_to?(:saved?) && !@similarity_strategy.saved?
     end
     # Loads the configuration.
     #

data/lib/picky/bundle_indexing.rb

@@ -34,8 +34,8 @@ module Picky
       @backend_inverted.dump @inverted
       # THINK about this. Perhaps the strategies should implement the backend methods? Or only the internal index ones?
       #
-      @backend_weights.dump @weights if @weight_strategy.saved?
-      @backend_similarity.dump @similarity if @similarity_strategy.saved?
+      @backend_weights.dump @weights if @weight_strategy.respond_to?(:saved?) && @weight_strategy.saved?
+      @backend_similarity.dump @similarity if @similarity_strategy.respond_to?(:saved?) && @similarity_strategy.saved?
       @backend_configuration.dump @configuration
       @backend_realtime.dump @realtime
     end

data/lib/picky/search.rb

@@ -19,7 +19,8 @@ module Picky
 
     include Helpers::Measuring
 
-    attr_reader   :indexes
+    attr_reader :indexes,
+                :ignore_unassigned
     attr_accessor :tokenizer,
                   :boosts
 
@@ -44,7 +45,6 @@ module Picky
 
       @tokenizer ||= Tokenizer.searching # THINK Not dynamic. Ok?
       @boosts    ||= Query::Boosts.new
-      @ignore_unassigned = false if @ignore_unassigned.nil?
 
       self
     end
@@ -156,14 +156,14 @@ module Picky
     #
     # Example:
     #   search = Search.new(books_index, dvd_index, mp3_index) do
-    #     ignore_unassigned_tokens true
+    #     ignore_unassigned_tokens
     #   end
     #
-    # With this set to true, if in "Peter Flunder", "Flunder"
+    # With this set (to true), if in "Peter Flunder", "Flunder"
     # couldn't be assigned to any category, it will simply be
     # ignored. This is done for each categorization.
     #
-    def ignore_unassigned_tokens value
+    def ignore_unassigned_tokens value = true
       @ignore_unassigned = value
     end
 

data/spec/lib/search_spec.rb

@@ -111,6 +111,39 @@ describe Picky::Search do
     end
   end
 
+  describe 'ignore_unassigned_tokens' do
+    let(:search) { described_class.new @index }
+    context 'by default' do
+      it 'is falsy' do
+        search.ignore_unassigned.should be_false
+      end
+    end
+    context 'set to nothing' do
+      before(:each) do
+        search.ignore_unassigned_tokens
+      end
+      it 'is truey' do
+        search.ignore_unassigned.should be_true
+      end
+    end
+    context 'set to true' do
+      before(:each) do
+        search.ignore_unassigned_tokens true
+      end
+      it 'is truey' do
+        search.ignore_unassigned.should be_true
+      end
+    end
+    context 'set to false' do
+      before(:each) do
+        search.ignore_unassigned_tokens false
+      end
+      it 'is falsy' do
+        search.ignore_unassigned.should be_false
+      end
+    end
+  end
+
   describe 'initializer' do
     context 'with tokenizer' do
       before(:each) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70136859666820 !ruby/object:Gem::Requirement
+  requirement: &70196698946200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70136859666820
+  version_requirements: *70196698946200
 - !ruby/object:Gem::Dependency
   name: picky-client
-  requirement: &70136859665980 !ruby/object:Gem::Requirement
+  requirement: &70196698945640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.0.1
   type: :development
   prerelease: false
-  version_requirements: *70136859665980
+  version_requirements: *70196698945640
 - !ruby/object:Gem::Dependency
   name: text
-  requirement: &70136859663880 !ruby/object:Gem::Requirement
+  requirement: &70196698961460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70136859663880
+  version_requirements: *70196698961460
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70136859663340 !ruby/object:Gem::Requirement
+  requirement: &70196698960800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70136859663340
+  version_requirements: *70196698960800
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70136859662720 !ruby/object:Gem::Requirement
+  requirement: &70196698959920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70136859662720
+  version_requirements: *70196698959920
 - !ruby/object:Gem::Dependency
   name: procrastinate
-  requirement: &70136859661300 !ruby/object:Gem::Requirement
+  requirement: &70196698958960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70136859661300
+  version_requirements: *70196698958960
 - !ruby/object:Gem::Dependency
   name: rack_fast_escape
-  requirement: &70136859660460 !ruby/object:Gem::Requirement
+  requirement: &70196698957940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70136859660460
+  version_requirements: *70196698957940
 description: Fast Ruby semantic text search engine with comfortable single field interface.
 email: florian.hanke+picky@gmail.com
 executables: