picky 0.10.5 → 0.11.0

data/spec/lib/query/full_spec.rb

@@ -3,16 +3,13 @@ require 'spec_helper'
 describe Query::Full do
 
   before(:each) do
-    @index = stub :index
+    @type  = stub :type
+    @index = stub :index, :index => @type
   end
 
   describe 'result_type' do
     before(:each) do
-      @tokens = [
-          Query::Token.processed('some'),
-          Query::Token.processed('query')
-        ]
-      @query = Query::Full.new @tokens, @index
+      @query = Query::Full.new @index
     end
     it "should return a specific type" do
       @query.result_type.should == Results::Full

data/spec/lib/query/live_spec.rb

@@ -5,12 +5,13 @@ describe Query::Live do
   before(:each) do
     # @category1  = Index::Category.new
     # @type_index = Index::Type.new :some_name, :some_result_type, @category1
-    @index = stub :index
+    @type  = stub :type
+    @index = stub :index, :index => @type
   end
 
   describe 'result_type' do
     before(:each) do
-      @query = Query::Live.new 'some query', 0, @index
+      @query = Query::Live.new @index
     end
     it "should return a specific type" do
       @query.result_type.should == Results::Live
@@ -40,7 +41,7 @@ describe Query::Live do
   describe "results_from" do
     describe "with empty ids" do
       before(:each) do
-        @query = Query::Live.new 'some query', @index
+        @query = Query::Live.new @index
         @allocations = stub :allocations, :total => 0, :ids => [], :to_result => :some_results, :process! => nil
       end
       it "should generate a result" do

data/spec/lib/sources/wrappers/base_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe Sources::Wrappers::Base do
+  
+  context "with backend" do
+    it "doesn't fail" do
+      lambda { Sources::Wrappers::Base.new(:something) }.should_not raise_error
+    end
+    before(:each) do
+      @backend = stub :backend
+      @wrapper = Sources::Wrappers::Base.new @backend
+    end
+    it "delegates harvest" do
+      @backend.should_receive(:harvest).once.with :some_type, :some_field
+      
+      @wrapper.harvest :some_type, :some_field
+    end
+    it "delegates take_snapshot" do
+      @backend.should_receive(:take_snapshot).once.with :some_type
+      
+      @wrapper.take_snapshot :some_type
+    end
+    it "delegates connect_backend" do
+      @backend.should_receive(:connect_backend).once.with # nothing
+      
+      @wrapper.connect_backend
+    end
+  end
+  context "without backend" do
+    it "fails" do
+      lambda { Sources::Wrappers::Base.new }.should raise_error(ArgumentError)
+    end
+  end
+  
+end

data/spec/lib/sources/wrappers/location_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+describe Sources::Wrappers::Location do
+  
+  context "with backend" do
+    before(:each) do
+      @backend = stub :backend
+    end
+    context "without grid option" do
+      it "fails" do
+        lambda { Sources::Wrappers::Location.new(:something) }.should raise_error
+      end
+    end
+    context "with grid option" do
+      before(:each) do
+        @wrapper = Sources::Wrappers::Location.new @backend, grid:10
+      end
+      it "uses a default of 1 on the precision" do
+        @wrapper.precision.should == 1
+      end
+      it "delegates harvest" do
+        @backend.should_receive(:harvest).once.with :some_type, :some_field
+        
+        @wrapper.harvest :some_type, :some_field
+      end
+      it "delegates take_snapshot" do
+        @backend.should_receive(:take_snapshot).once.with :some_type
+        
+        @wrapper.take_snapshot :some_type
+      end
+      it "delegates connect_backend" do
+        @backend.should_receive(:connect_backend).once.with # nothing
+        
+        @wrapper.connect_backend
+      end
+    end
+    context "with grid and precision option" do
+      before(:each) do
+        @wrapper = Sources::Wrappers::Location.new @backend, grid:4, precision:2
+      end
+      it "uses the given precision" do
+        @wrapper.precision.should == 2
+      end
+      
+      describe "locations_for" do
+        before(:each) do
+          @wrapper.instance_variable_set :@min, -3
+          @wrapper.marginize
+        end
+        it "returns the right array" do
+          @wrapper.locations_for(17).should == [13, 14, 15, 16, 17] # TODO Correct?
+        end
+        it "returns the right array" do
+          @wrapper.locations_for(-3).should == [0, 1, 2, 3, 4]
+        end
+        it "returns the right array" do
+          @wrapper.locations_for(20).should == [14, 15, 16, 17, 18]
+        end
+      end
+    end
+  end
+  context "without backend" do
+    it "fails" do
+      lambda { Sources::Wrappers::Location.new }.should raise_error(ArgumentError)
+    end
+  end
+  
+end

data/spec/lib/tokenizers/index_spec.rb

@@ -39,11 +39,7 @@ describe Tokenizers::Index do
 
   describe "reject!" do
     it "should reject tokens if blank" do
-      t1 = stub(:token, :to_s => '')
-      t2 = stub(:token, :to_s => 'not blank')
-      t3 = stub(:token, :to_s => '')
-      
-      @tokenizer.reject([t1, t2, t3]).should == [t2]
+      @tokenizer.reject(['', 'not blank', '']).should == ['not blank']
     end
   end
   
@@ -68,6 +64,7 @@ describe Tokenizers::Index do
       #
       it_should_tokenize_token "splitting on \\s", [:splitting, :on, :"\\s"]
       it_should_tokenize_token 'und', [:und]
+      it_should_tokenize_token '7',   [:'7']
     end
   end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 10
-  - 5
-  version: 0.10.5
+  - 11
+  - 0
+  version: 0.11.0
 platform: ruby
 authors: 
 - Florian Hanke
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-03 00:00:00 +01:00
+date: 2010-11-08 00:00:00 +01:00
 default_executable: picky
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,7 +42,9 @@ files:
 - lib/bundling.rb
 - lib/constants.rb
 - lib/deployment.rb
+- lib/picky/alias_instances.rb
 - lib/picky/application.rb
+- lib/picky/bundle.rb
 - lib/picky/cacher/convenience.rb
 - lib/picky/cacher/generator.rb
 - lib/picky/cacher/partial/default.rb
@@ -60,11 +62,11 @@ files:
 - lib/picky/cacher/weights/strategy.rb
 - lib/picky/cacher/weights_generator.rb
 - lib/picky/character_substitution/european.rb
-- lib/picky/configuration/field.rb
 - lib/picky/configuration/indexes.rb
 - lib/picky/configuration/queries.rb
 - lib/picky/configuration/type.rb
 - lib/picky/cores.rb
+- lib/picky/ext/maybe_compile.rb
 - lib/picky/ext/ruby19/extconf.rb
 - lib/picky/extensions/array.rb
 - lib/picky/extensions/hash.rb
@@ -76,6 +78,7 @@ files:
 - lib/picky/helpers/gc.rb
 - lib/picky/helpers/measuring.rb
 - lib/picky/index/bundle.rb
+- lib/picky/index/categories.rb
 - lib/picky/index/category.rb
 - lib/picky/index/file/basic.rb
 - lib/picky/index/file/json.rb
@@ -83,14 +86,18 @@ files:
 - lib/picky/index/file/text.rb
 - lib/picky/index/files.rb
 - lib/picky/index/type.rb
+- lib/picky/index/types.rb
 - lib/picky/index/wrappers/exact_first.rb
 - lib/picky/indexers/base.rb
 - lib/picky/indexers/default.rb
 - lib/picky/indexers/field.rb
 - lib/picky/indexers/no_source_specified_error.rb
 - lib/picky/indexers/solr.rb
-- lib/picky/indexes.rb
-- lib/picky/initializers/ext.rb
+- lib/picky/indexing/bundle.rb
+- lib/picky/indexing/categories.rb
+- lib/picky/indexing/category.rb
+- lib/picky/indexing/type.rb
+- lib/picky/indexing/types.rb
 - lib/picky/loader.rb
 - lib/picky/loggers/search.rb
 - lib/picky/query/allocation.rb
@@ -98,7 +105,6 @@ files:
 - lib/picky/query/base.rb
 - lib/picky/query/combination.rb
 - lib/picky/query/combinations.rb
-- lib/picky/query/combinator.rb
 - lib/picky/query/full.rb
 - lib/picky/query/live.rb
 - lib/picky/query/qualifiers.rb
@@ -119,9 +125,13 @@ files:
 - lib/picky/sources/csv.rb
 - lib/picky/sources/db.rb
 - lib/picky/sources/delicious.rb
+- lib/picky/sources/wrappers/base.rb
+- lib/picky/sources/wrappers/location.rb
 - lib/picky/tokenizers/base.rb
 - lib/picky/tokenizers/index.rb
 - lib/picky/tokenizers/query.rb
+- lib/picky/type.rb
+- lib/picky/types.rb
 - lib/picky-tasks.rb
 - lib/picky.rb
 - lib/tasks/application.rake
@@ -161,9 +171,7 @@ files:
 - spec/lib/cacher/weights/logarithmic_spec.rb
 - spec/lib/cacher/weights_generator_spec.rb
 - spec/lib/character_substitution/european_spec.rb
-- spec/lib/configuration/field_spec.rb
 - spec/lib/configuration/indexes_spec.rb
-- spec/lib/configuration/type_spec.rb
 - spec/lib/cores_spec.rb
 - spec/lib/extensions/array_spec.rb
 - spec/lib/extensions/hash_spec.rb
@@ -174,7 +182,6 @@ files:
 - spec/lib/helpers/cache_spec.rb
 - spec/lib/helpers/gc_spec.rb
 - spec/lib/helpers/measuring_spec.rb
-- spec/lib/index/bundle_partial_generation_speed_spec.rb
 - spec/lib/index/bundle_spec.rb
 - spec/lib/index/category_spec.rb
 - spec/lib/index/file/basic_spec.rb
@@ -186,6 +193,11 @@ files:
 - spec/lib/index/wrappers/exact_first_spec.rb
 - spec/lib/indexers/base_spec.rb
 - spec/lib/indexers/field_spec.rb
+- spec/lib/indexing/bundle_partial_generation_speed_spec.rb
+- spec/lib/indexing/bundle_spec.rb
+- spec/lib/indexing/categories_spec.rb
+- spec/lib/indexing/category_spec.rb
+- spec/lib/indexing/type_spec.rb
 - spec/lib/loader_spec.rb
 - spec/lib/loggers/search_spec.rb
 - spec/lib/query/allocation_spec.rb
@@ -193,7 +205,6 @@ files:
 - spec/lib/query/base_spec.rb
 - spec/lib/query/combination_spec.rb
 - spec/lib/query/combinations_spec.rb
-- spec/lib/query/combinator_spec.rb
 - spec/lib/query/full_spec.rb
 - spec/lib/query/live_spec.rb
 - spec/lib/query/qualifiers_spec.rb
@@ -210,6 +221,8 @@ files:
 - spec/lib/sources/csv_spec.rb
 - spec/lib/sources/db_spec.rb
 - spec/lib/sources/delicious_spec.rb
+- spec/lib/sources/wrappers/base_spec.rb
+- spec/lib/sources/wrappers/location_spec.rb
 - spec/lib/tokenizers/base_spec.rb
 - spec/lib/tokenizers/index_spec.rb
 - spec/lib/tokenizers/query_spec.rb
@@ -260,9 +273,7 @@ test_files:
 - spec/lib/cacher/weights/logarithmic_spec.rb
 - spec/lib/cacher/weights_generator_spec.rb
 - spec/lib/character_substitution/european_spec.rb
-- spec/lib/configuration/field_spec.rb
 - spec/lib/configuration/indexes_spec.rb
-- spec/lib/configuration/type_spec.rb
 - spec/lib/cores_spec.rb
 - spec/lib/extensions/array_spec.rb
 - spec/lib/extensions/hash_spec.rb
@@ -273,7 +284,6 @@ test_files:
 - spec/lib/helpers/cache_spec.rb
 - spec/lib/helpers/gc_spec.rb
 - spec/lib/helpers/measuring_spec.rb
-- spec/lib/index/bundle_partial_generation_speed_spec.rb
 - spec/lib/index/bundle_spec.rb
 - spec/lib/index/category_spec.rb
 - spec/lib/index/file/basic_spec.rb
@@ -285,6 +295,11 @@ test_files:
 - spec/lib/index/wrappers/exact_first_spec.rb
 - spec/lib/indexers/base_spec.rb
 - spec/lib/indexers/field_spec.rb
+- spec/lib/indexing/bundle_partial_generation_speed_spec.rb
+- spec/lib/indexing/bundle_spec.rb
+- spec/lib/indexing/categories_spec.rb
+- spec/lib/indexing/category_spec.rb
+- spec/lib/indexing/type_spec.rb
 - spec/lib/loader_spec.rb
 - spec/lib/loggers/search_spec.rb
 - spec/lib/query/allocation_spec.rb
@@ -292,7 +307,6 @@ test_files:
 - spec/lib/query/base_spec.rb
 - spec/lib/query/combination_spec.rb
 - spec/lib/query/combinations_spec.rb
-- spec/lib/query/combinator_spec.rb
 - spec/lib/query/full_spec.rb
 - spec/lib/query/live_spec.rb
 - spec/lib/query/qualifiers_spec.rb
@@ -309,6 +323,8 @@ test_files:
 - spec/lib/sources/csv_spec.rb
 - spec/lib/sources/db_spec.rb
 - spec/lib/sources/delicious_spec.rb
+- spec/lib/sources/wrappers/base_spec.rb
+- spec/lib/sources/wrappers/location_spec.rb
 - spec/lib/tokenizers/base_spec.rb
 - spec/lib/tokenizers/index_spec.rb
 - spec/lib/tokenizers/query_spec.rb

data/lib/picky/configuration/field.rb

@@ -1,73 +0,0 @@
-module Configuration
-  
-  # Describes the configuration of a "field", a category
-  # (title is a category of a books index, for example).
-  #
-  class Field
-    attr_reader :name, :indexed_name, :virtual, :tokenizer
-    attr_accessor :type # convenience TODO Still needed?
-    def initialize name, options = {}
-      @name            = name.to_sym
-      @tokenizer       = options[:tokenizer] || Tokenizers::Index.default
-      
-      # TODO Dup the options?
-      
-      @source          = options.delete :source
-      
-      @indexer_class   = options.delete(:indexer)   || Indexers::Default
-      
-      @indexed_name    = options.delete(:indexed_field) || name # TODO Rename to indexed_as?
-      @virtual         = options.delete(:virtual)       || false
-      
-      qualifiers = generate_qualifiers_from options
-      Query::Qualifiers.add(name, qualifiers) if qualifiers
-      
-      # @remove          = options[:remove]        || false
-      # @filter          = options[:filter]        || true
-      
-      @options = options
-    end
-    def generate_qualifiers_from options
-      options[:qualifiers] || options[:qualifier] && [options[:qualifier]] || [name]
-    end
-    def source
-      @source || type.source
-    end
-    def generate
-      Index::Category.new self.name, type, @options
-    end
-    # TODO Duplicate code in bundle. Move to application.
-    #
-    # TODO Move to type, and use in bundle from there.
-    #
-    def search_index_root
-      File.join PICKY_ROOT, 'index'
-    end
-    # TODO Move to config. Duplicate Code in field.rb.
-    #
-    def cache_directory
-      File.join search_index_root, PICKY_ENVIRONMENT, type.name.to_s
-    end
-    def search_index_file_name
-      File.join cache_directory, "prepared_#{name}_index.txt"
-    end
-    def index
-      prepare_cache_directory
-      indexer.index
-    end
-    def prepare_cache_directory
-      FileUtils.mkdir_p cache_directory
-    end
-    def cache
-      prepare_cache_directory
-      generate.generate_caches
-    end
-    def indexer
-      @indexer || @indexer = @indexer_class.new(type, self)
-    end
-    def virtual?
-      !!virtual
-    end
-  end
-
-end

data/lib/picky/indexes.rb

@@ -1,179 +0,0 @@
-# TODO I should really do a Types collector class which does all this!
-#
-module Indexes
-
-  mattr_accessor :configuration, :types, :type_mapping
-
-  # Takes a snapshot of the originating table.
-  #
-  def self.take_snapshot *args
-    configuration.take_snapshot *args
-  end
-  # Runs the indexers in parallel (index + cache).
-  #
-  def self.index randomly = true
-    Indexes.take_snapshot
-
-    # Run in parallel.
-    #
-    # TODO Make option to also use non-random.
-    #      rake index:random (default)
-    #      rake index:ordered
-    #
-    timed_exclaim "INDEXING USING #{Cores.max_processors} PROCESSORS, IN #{randomly ? 'RANDOM' : 'GIVEN'} ORDER."
-    Cores.forked self.fields, { randomly: randomly } do |field, cores|
-      field.index
-      field.cache
-    end
-    timed_exclaim "INDEXING FINISHED."
-  end
-  def self.index_solr
-    configuration.index_solr
-  end
-  
-  # Returns an array of fields.
-  #
-  # TODO Rewrite.
-  #
-  def self.fields
-    result = []
-    configuration.types.each do |type|
-      type.fields.inject(result) do |total, field|
-        total << field
-      end
-    end
-    result
-  end
-  
-  #
-  #
-  # TODO Rewrite.
-  #
-  def self.find type_name, field_name
-    type_name  = type_name.to_sym
-    field_name = field_name.to_sym
-    configuration.types.each do |type|
-      next unless type.name == type_name
-      type.fields.each do |field|
-        next unless field.name == field_name
-        return field
-      end
-    end
-  end
-  
-  # Backup / Restore.
-  #
-  def self.backup_caches
-    each_category do |category|
-      category.exact.backup
-      category.partial.backup
-    end
-  end
-  def self.restore_caches
-    each_category do |category|
-      category.exact.restore
-      category.partial.restore
-    end
-  end
-  
-  # Use these if you need to index / cache a single index.
-  #
-  def self.generate_index_only type_name, field_name
-    Indexes.configuration.types.each do |type|
-      next unless type_name == type.name
-      type.fields.each do |field|
-        field.index if field_name == field.name
-      end
-    end
-  end
-  def self.generate_cache_only type_name, category_name
-    Indexes.each do |type|
-      next unless type_name == type.name
-      type.categories.each do |category|
-        category.generate_caches if category_name == category.name
-      end
-    end
-  end
-  
-  # Runs the index cache generation.
-  #
-  # TODO Needed?
-  #
-  def self.generate_caches
-    each &:generate_caches
-  end
-  # Loads all indexes from the caches.
-  #
-  # TODO Rename load_indexes.
-  #
-  def self.load_from_cache
-    each &:load_from_cache
-  end
-  def self.reload
-    load_from_cache
-  end
-  
-  # Checks if the caches are there.
-  #
-  def self.check_caches
-    each do |type|
-      type.categories.each do |category|
-        category.exact.raise_unless_cache_exists
-        category.partial.raise_unless_cache_exists
-      end
-    end
-  end
-  
-  # Removes the cache files.
-  #
-  def self.clear_caches
-    each_bundle do |exact, partial|
-      exact.delete
-      partial.delete
-    end
-  end
-
-  # Creates the directory structure for the indexes.
-  #
-  # TODO Should be on type?
-  #
-  def self.create_directory_structure
-    each_bundle do |exact, partial|
-      exact.create_directory
-      partial.create_directory
-    end
-  end
-
-  # 
-  #
-  def self.clear
-    self.types = [] # TODO self.types = Types.new
-  end
-  
-  
-  def self.each &block
-    types.each &block
-  end
-  def self.each_category &block
-    each do |type|
-      type.categories.each &block
-    end
-  end
-  def self.each_bundle
-    each_category do |category|
-      yield category.exact, category.partial
-    end
-  end
-  
-  def self.add type
-    self.type_mapping ||= {}
-    self.types        ||= []
-    
-    self.type_mapping[type.name] = type
-    self.types << type
-  end
-  def self.[] type_name
-    self.type_mapping[type_name]
-  end
-  
-end

data/lib/picky/initializers/ext.rb

@@ -1 +0,0 @@
-require File.expand_path '../../ext/ruby19/performant', __FILE__