picky 3.5.3 → 3.5.4

data/lib/picky/backends/internal.rb

@@ -0,0 +1,23 @@
+module Picky
+
+  module Backends
+
+    module Internal
+
+      # Nothing needs to be deleted from it.
+      #
+      def delete _
+
+      end
+
+      # It does not need to be cleared.
+      #
+      def clear
+
+      end
+
+    end
+
+  end
+
+end

data/lib/picky/bundle_indexed.rb

@@ -69,7 +69,7 @@ module Picky
     # Loads the similarity index.
     #
     def load_similarity
-      self.similarity = @backend_similarity.load
+      self.similarity = @backend_similarity.load if @similarity_strategy.saved?
     end
     # Loads the configuration.
     #

data/lib/picky/bundle_indexing.rb

@@ -58,9 +58,9 @@ module Picky
     # Dumps the similarity index.
     #
     def dump_similarity
-      @backend_similarity.dump @similarity
+      @backend_similarity.dump @similarity if @similarity_strategy.saved?
     end
-    # Dumps the similarity index.
+    # Dumps the configuration.
     #
     def dump_configuration
       @backend_configuration.dump @configuration

data/lib/picky/category_indexing.rb

@@ -19,9 +19,10 @@ module Picky
     # Indexes, creates the "prepared_..." file.
     #
     def prepare
-      empty
+      categories = Categories.new
+      categories << self
       with_data_snapshot do
-        indexer.index [self]
+        indexer.index categories
       end
     end
 

data/lib/picky/generators/similarity/none.rb

@@ -14,12 +14,6 @@ module Picky
           nil
         end
 
-        # Returns an empty index.
-        #
-        def generate_from index
-          {}
-        end
-
         # Returns if this strategy's generated file is saved.
         #
         def saved?

data/lib/picky/index_indexing.rb

@@ -73,10 +73,8 @@ module Picky
     # Only use where the category does have a #each source defined.
     #
     def index_in_parallel
-      categories.empty
       indexer = Indexers::Parallel.new self
       indexer.index categories
-      categories.cache
     end
 
     # Returns the installed tokenizer or the default.

data/lib/picky/indexers/base.rb

@@ -19,9 +19,11 @@ module Picky
       # Starts the indexing process.
       #
       def index categories
+        categories.empty
         process categories do |file|
           notify_finished file
         end
+        categories.cache
       end
 
       def notify_finished file

data/lib/picky/rack/harakiri.rb

@@ -1,61 +1,58 @@
-module Picky
+module Rack # :nodoc:
+
+  # Simple Rack Middleware to kill Unicorns after X requests.
+  #
+  # Use as follows in e.g. your rackup File:
+  #
+  #   Rack::Harakiri.after = 100
+  #   use Rack::Harakiri
+  #
+  # Then the Unicorn will commit suicide after 100 requests (50 is the default).
+  #
+  # The Master Unicorn process forks a new child Unicorn to replace the old one.
+  #
+  class Harakiri
+
+    # Set the amount of requests before the Unicorn commits Harakiri.
+    #
+    class << self
+      attr_accessor :after
+    end
 
-  module Rack # :nodoc:
+    def initialize app
+      @app = app
 
-    # Simple Rack Middleware to kill Unicorns after X requests.
+      @requests            = 0
+      @quit_after_requests = self.class.after || 50
+    end
+
+    # #call interface method.
     #
-    # Use as follows in e.g. your rackup File:
+    # Harakiri is a middleware, so it delegates the the app or
+    # the next middleware after checking if it is time to honorably retire.
     #
-    #   Rack::Harakiri.after = 100
-    #   use Rack::Harakiri
+    def call env
+      harakiri
+      @app.call env
+    end
+
+    # Checks to see if it is time to honorably retire.
     #
-    # Then the Unicorn will commit suicide after 100 requests (50 is the default).
+    # If yes, kills itself (Unicorn will answer the request, honorably).
     #
-    # The Master Unicorn process forks a new child Unicorn to replace the old one.
+    # Note: Sends its process a QUIT signal if it is time.
     #
-    class Harakiri
-
-      # Set the amount of requests before the Unicorn commits Harakiri.
-      #
-      class << self
-        attr_accessor :after
-      end
-
-      def initialize app
-        @app = app
-
-        @requests            = 0
-        @quit_after_requests = self.class.after || 50
-      end
-
-      # #call interface method.
-      #
-      # Harakiri is a middleware, so it delegates the the app or
-      # the next middleware after checking if it is time to honorably retire.
-      #
-      def call env
-        harakiri
-        @app.call env
-      end
-
-      # Checks to see if it is time to honorably retire.
-      #
-      # If yes, kills itself (Unicorn will answer the request, honorably).
-      #
-      # Note: Sends its process a QUIT signal if it is time.
-      #
-      def harakiri
-        @requests = @requests + 1
-        Process.kill(:QUIT, Process.pid) if harakiri?
-      end
-
-      # Is it time to honorably retire?
-      #
-      def harakiri?
-        @requests >= @quit_after_requests
-      end
+    def harakiri
+      @requests = @requests + 1
+      Process.kill(:QUIT, Process.pid) if harakiri?
+    end
 
+    # Is it time to honorably retire?
+    #
+    def harakiri?
+      @requests >= @quit_after_requests
     end
+
   end
 
 end

data/spec/lib/category_indexing_spec.rb

@@ -151,7 +151,7 @@ describe Picky::Category do
         category.stub! :indexer => @indexer
       end
       it "tells the indexer to index" do
-        @indexer.should_receive(:index).once.with [category]
+        @indexer.should_receive(:index).once
 
         category.prepare
       end

data/spec/lib/generators/similarity/none_spec.rb

@@ -7,23 +7,17 @@ describe Picky::Generators::Similarity::None do
   before(:each) do
     @similarity = described_class.new
   end
-  
+
   describe "saved?" do
     it "returns the right answer" do
       @similarity.saved?.should == false
     end
   end
-  
+
   describe 'encode' do
     it 'should always return nil' do
       @similarity.encoded(:whatever).should == nil
     end
   end
 
-  describe 'generate_from' do
-    it 'should return an empty hash, always' do
-      @similarity.generate_from(:anything).should == {}
-    end
-  end
-
 end

data/spec/lib/indexed/bundle_spec.rb

@@ -7,8 +7,8 @@ describe Picky::Bundle do
     @category     = Picky::Category.new :some_category, @index
 
     @weights      = stub :weights, :saved? => true
-    @partial      = stub :partial
-    @similarity   = stub :similarity
+    @partial      = stub :partial, :saved? => true
+    @similarity   = stub :similarity, :saved? => true
     @bundle       = described_class.new :some_name, @category, Picky::Backends::Memory.new, @weights, @partial, @similarity
   end
 
@@ -159,7 +159,8 @@ describe Picky::Bundle do
       @category = Picky::Category.new :some_category, @index
 
       @weights = stub :weights, :saved? => true
-      @bundle = described_class.new :some_name, @category, Picky::Backends::Memory.new, @weights, :partial, :similarity
+      @partial = stub :partial, :saved? => true
+      @bundle = described_class.new :some_name, @category, Picky::Backends::Memory.new, @weights, @partial, :similarity
     end
     it 'should initialize the index correctly' do
       @bundle.backend_inverted.should be_kind_of(Picky::Backends::Memory::JSON)

data/spec/lib/indexers/base_spec.rb

@@ -21,9 +21,21 @@ describe Picky::Indexers::Base do
 
   describe 'index' do
     it 'processes' do
-      indexer.should_receive(:process).once.with :categories
+      categories = stub :categories, :empty => nil, :cache => nil
 
-      indexer.index :categories
+      indexer.should_receive(:process).once.with categories
+
+      indexer.index categories
+    end
+    it 'calls the right methods on the categories' do
+      indexer.stub! :process
+
+      categories = stub :categories
+
+      categories.should_receive(:empty).once.ordered
+      categories.should_receive(:cache).once.ordered
+
+      indexer.index categories
     end
   end
 

data/spec/lib/rack/harakiri_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe Picky::Rack::Harakiri do
+describe Rack::Harakiri do
   before(:each) do
     @app = stub :app
     Process.stub! :kill # not taking any chances
@@ -16,24 +16,24 @@ describe Picky::Rack::Harakiri do
     describe 'harakiri?' do
       it "should be true after 50 harakiri calls" do
         50.times { @ronin.harakiri }
-        
+
         @ronin.harakiri?.should == true
       end
       it "should not be true after just 49 harakiri calls" do
         49.times { @ronin.harakiri }
-        
+
         @ronin.harakiri?.should == false
       end
     end
     describe "harakiri" do
       it "should kill the process after 50 harakiri calls" do
         Process.should_receive(:kill).once
-        
+
         50.times { @ronin.harakiri }
       end
       it "should not kill the process after 49 harakiri calls" do
         Process.should_receive(:kill).never
-        
+
         49.times { @ronin.harakiri }
       end
     end
@@ -44,12 +44,12 @@ describe Picky::Rack::Harakiri do
       end
       it "calls harakiri" do
         @ronin.should_receive(:harakiri).once.with
-        
+
         @ronin.call :env
       end
       it "calls the app" do
         @app.should_receive(:call).once.with :env
-        
+
         @ronin.call :env
       end
     end
@@ -66,5 +66,5 @@ describe Picky::Rack::Harakiri do
       @ronin.instance_variable_get(:@quit_after_requests).should == 100
     end
   end
-  
+
 end

data/spec/specific/dynamic_weights_spec.rb

@@ -6,39 +6,37 @@ describe "Weights" do
 
   # This tests the weights option.
   #
-  context 'various cases' do
-    it 'stopwords destroy ids (final: id reference on attribute)' do
-      index = Picky::Index.new :dynamic_weights do
-        source { [] }
-        category :text1, weights: Picky::Weights::Constant.new
-        category :text2, weights: Picky::Weights::Constant.new(3.14)
-        category :text3, weights: Picky::Weights::Dynamic.new { |str_or_sym| str_or_sym.size }
-        category :text4 # Default
-      end
-
-      require 'ostruct'
-
-      thing = OpenStruct.new id: 1, text1: "ohai", text2: "hello", text3: "world", text4: "kthxbye"
-      other = OpenStruct.new id: 2, text1: "",     text2: "",      text3: "",      text4: "kthxbye"
-
-      index.add thing
-      index.add other
-
-      try = Picky::Search.new index
-
-      try.search("text1:ohai").allocations.first.score.should    == 0.0
-      try.search("text2:hello").allocations.first.score.should   == 3.14
-      try.search("text3:world").allocations.first.score.should   == 5
-      try.search("text4:kthxbye").allocations.first.score.should == 0.6931471805599453
-
-      try_with_boosts = Picky::Search.new index do
-        boost [:text1] => +7.65,
-              [:text2] => +1.86
-      end
-
-      try_with_boosts.search("text1:ohai").allocations.first.score.should  == 7.65
-      try_with_boosts.search("text2:hello").allocations.first.score.should == 5.00
+  it 'can handle dynamic weights' do
+    index = Picky::Index.new :dynamic_weights do
+      source { [] }
+      category :text1, weights: Picky::Weights::Constant.new
+      category :text2, weights: Picky::Weights::Constant.new(3.14)
+      category :text3, weights: Picky::Weights::Dynamic.new { |str_or_sym| str_or_sym.size }
+      category :text4 # Default
     end
+
+    require 'ostruct'
+
+    thing = OpenStruct.new id: 1, text1: "ohai", text2: "hello", text3: "world", text4: "kthxbye"
+    other = OpenStruct.new id: 2, text1: "",     text2: "",      text3: "",      text4: "kthxbye"
+
+    index.add thing
+    index.add other
+
+    try = Picky::Search.new index
+
+    try.search("text1:ohai").allocations.first.score.should    == 0.0
+    try.search("text2:hello").allocations.first.score.should   == 3.14
+    try.search("text3:world").allocations.first.score.should   == 5
+    try.search("text4:kthxbye").allocations.first.score.should == 0.6931471805599453
+
+    try_with_boosts = Picky::Search.new index do
+      boost [:text1] => +7.65,
+            [:text2] => +1.86
+    end
+
+    try_with_boosts.search("text1:ohai").allocations.first.score.should  == 7.65
+    try_with_boosts.search("text2:hello").allocations.first.score.should == 5.00
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 3.5.3
+  version: 3.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70187634558200 !ruby/object:Gem::Requirement
+  requirement: &70194764507240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70187634558200
+  version_requirements: *70194764507240
 - !ruby/object:Gem::Dependency
   name: picky-client
-  requirement: &70187634557140 !ruby/object:Gem::Requirement
+  requirement: &70194764520160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.5.3
+        version: 3.5.4
   type: :development
   prerelease: false
-  version_requirements: *70187634557140
+  version_requirements: *70194764520160
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70187634555420 !ruby/object:Gem::Requirement
+  requirement: &70194764515800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70187634555420
+  version_requirements: *70194764515800
 - !ruby/object:Gem::Dependency
   name: rack_fast_escape
-  requirement: &70187634532400 !ruby/object:Gem::Requirement
+  requirement: &70194764527800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70187634532400
+  version_requirements: *70194764527800
 - !ruby/object:Gem::Dependency
   name: text
-  requirement: &70187638728080 !ruby/object:Gem::Requirement
+  requirement: &70194764523720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70187638728080
+  version_requirements: *70194764523720
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70187638724840 !ruby/object:Gem::Requirement
+  requirement: &70194764538580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70187638724840
+  version_requirements: *70194764538580
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70187638709600 !ruby/object:Gem::Requirement
+  requirement: &70194764536640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70187638709600
+  version_requirements: *70194764536640
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70187638708380 !ruby/object:Gem::Requirement
+  requirement: &70194764534940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70187638708380
+  version_requirements: *70194764534940
 - !ruby/object:Gem::Dependency
   name: unicorn
-  requirement: &70187638707640 !ruby/object:Gem::Requirement
+  requirement: &70194764534200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70187638707640
+  version_requirements: *70194764534200
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70187638706260 !ruby/object:Gem::Requirement
+  requirement: &70194764533260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70187638706260
+  version_requirements: *70194764533260
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70187638704300 !ruby/object:Gem::Requirement
+  requirement: &70194764532140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70187638704300
+  version_requirements: *70194764532140
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &70187638701660 !ruby/object:Gem::Requirement
+  requirement: &70194764544080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70187638701660
+  version_requirements: *70194764544080
 description: Fast Ruby semantic text search engine with comfortable single field interface.
 email: florian.hanke+picky@gmail.com
 executables:
@@ -163,6 +163,7 @@ files:
 - lib/picky/backends/file/json.rb
 - lib/picky/backends/file.rb
 - lib/picky/backends/helpers/file.rb
+- lib/picky/backends/internal.rb
 - lib/picky/backends/memory/basic.rb
 - lib/picky/backends/memory/json.rb
 - lib/picky/backends/memory/marshal.rb