picky 4.17.0 → 4.17.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWY4NDk4ZTVlNThhMDQwZDk5OGJmZTk4MmQ0OGJjNDBmNDQzNDIzMA==
+    YTkyZGMwZGMyNjFiNTVlMjU2Mjg5ZjhmMGY2MzM2N2NlY2M5YmEzMw==
   data.tar.gz: !binary |-
-    NDFhZmZkYmYzYWZiMWZiNjY4OTViNWU4NzZmNDAxZjcxMDY3Y2MwMQ==
+    YmYzMWQ5OTM0YzdiZDVlYjMyMzliZWY5ZDYzZWU4M2JiNmJkNDEwMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZGFhMjViOGEzNDE1Y2FlYzRmNWE1ZTBjYTk5ZmI4NDY4Njg5MTE1MjFhZWRl
-    MGUyODdkMTljZTIzNjg1MThmMGJkOTMwZWJiYWJiZWQzMGJlNjc3ZDNmMTM5
-    ZDNmOWQ4ZjQyYWQ1ZDA1MjQ1NzEwMDJlYzcyYWM3YjkzOTIxYTc=
+    ZmE5NDZlZjVhN2I2OGM2YzUyMmM0ZWFjMGU4Mjc5NzA0MmEwMmU5MTg1ZDg0
+    ZWJiYzhiZTc4MDgzMjY3MGZlM2U3N2QxOTMyZWY2NzQzN2UwZmVkYWRjZWVl
+    YzdkNGFjYjYwZTM5ODdlOGMzZGY4MjljNjk5ZDYzZmU3MzcwMGE=
   data.tar.gz: !binary |-
-    N2Y1MWRkNmZiNWZiNzYzYjU2YWM5ZjI5ZWQzYTIwOGQ2MGM1ZTg2ZjU4ZWQ5
-    OWQ0N2IyMzM4YjRmNTk2ZjY3NTJmMzM0ZTQzOGUwMjRiODI5NmFlMjIzMzUx
-    M2I3MDZjODUxYWQyODBjNTU2YTNhYTdjNTE3YmVlZGU3MWI1MjQ=
+    ZDY1OThhODliOWI4M2VmOTM3MWYzZTVmNjlmMDM4NzhiNmZkY2UzOTdkYTJl
+    MTA0N2U0MjVhYTU4YTYxZDI2ZDBiYjMxNGYzODFkNGUyM2VjMGJiZTI5NDZl
+    OGVlZWJlODhiNzY5YmJjODk3NjMzMTQ5NjBkYWM5MTk0ZmYyOTI=

data/lib/picky/indexers/parallel.rb

@@ -19,7 +19,7 @@ module Picky
         # Prepare a combined object - array.
         #
         combined = categories.map do |category|
-          [category, category.prepared_index_file, [], (category.tokenizer || tokenizer)]
+          [category, category.prepared_index_file, [], category.tokenizer]
         end
 
         # Go through each object in the source.

data/spec/lib/indexers/parallel_spec.rb

@@ -1,28 +1,83 @@
 require 'spec_helper'
 
 describe Picky::Indexers::Parallel do
+  
+  thing = Struct.new :id, :text
 
   before(:each) do
-    @source     = stub :source
-    @index      = stub :index, :name => :some_index, :source => @source
-
-    @categories = stub :categories
-
+    @index = Picky::Index.new(:test) # stub :index, :name => :some_index, :source => @source, :backend => stub(:backend)
     @indexer = described_class.new @index
     @indexer.stub! :timed_exclaim
   end
+  
+  context 'with untokenized category' do
+    
+    before(:each) do
+      @categories = [
+        Picky::Category.new(:text, @index)
+      ]
+      @source = [
+        thing.new(1, "hello"),
+        thing.new(2, "world"),
+      ]
+    end
 
-  describe 'flush' do
-    it 'flushes to joined cache to the file and clears it' do
-      cache = stub :cache
-      file  = stub :file
+    describe 'flush' do
+      it 'flushes to joined cache to the file and clears it' do
+        cache = stub :cache
+        file  = stub :file
 
-      cache.should_receive(:join).once.and_return :joined
-      file.should_receive(:write).once.with(:joined).and_return :joined
-      cache.should_receive(:clear).once
+        cache.should_receive(:join).once.and_return :joined
+        file.should_receive(:write).once.with(:joined).and_return :joined
+        cache.should_receive(:clear).once
 
-      @indexer.flush file, cache
+        @indexer.flush file, cache
+      end
+    end
+  
+    describe 'process' do
+      it 'flushes to joined cache to the file and clears it' do
+        @indexer.process @source, @categories do |file|
+          file.path.should == 'spec/temp/index/test/test/text.prepared.txt'
+        end
+      end
+    end
+    
+  end
+  
+  context 'with tokenized category' do
+    
+    before(:each) do
+      @categories = [
+        Picky::Category.new(:text, @index, tokenize: false)
+      ]
+      @source = [
+        thing.new(1, ["hello"]),
+        thing.new(2, ["world"]),
+      ]
+    end
+
+    describe 'flush' do
+      it 'flushes to joined cache to the file and clears it' do
+        cache = stub :cache
+        file  = stub :file
+
+        cache.should_receive(:join).once.and_return :joined
+        file.should_receive(:write).once.with(:joined).and_return :joined
+        cache.should_receive(:clear).once
+
+        @indexer.flush file, cache
+      end
+    end
+  
+    describe 'process' do
+      it 'flushes to joined cache to the file and clears it' do
+        @indexer.process @source, @categories do |file|
+          file.path.should == 'spec/temp/index/test/test/text.prepared.txt'
+        end
+      end
     end
+    
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 4.17.0
+  version: 4.17.1
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-21 00:00:00.000000000 Z
+date: 2013-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.17.0
+        version: 4.17.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.17.0
+        version: 4.17.1
 - !ruby/object:Gem::Dependency
   name: text
   requirement: !ruby/object:Gem::Requirement