picky 1.4.3 → 1.5.0

data/lib/picky/internals/index/redis/basic.rb

@@ -13,15 +13,20 @@ module Internals
       #
       class Basic
       
-        attr_reader :namespace
+        attr_reader :namespace, :backend
       
         # An index cache takes a path, without file extension,
         # which will be provided by the subclasses.
         #
         def initialize namespace
           @namespace = namespace
-        
-          @backend   = ::Redis.new
+          
+          # TODO Turn this inside out such that people can pass in
+          # their own Redis instance.
+          # 
+          # TODO Make the :db a real option.
+          #
+          @backend = ::Redis.new :db => 15
         end
       
         # Does nothing.

data/lib/picky/internals/index/redis/string_hash.rb

@@ -9,8 +9,9 @@ module Internals
         # Writes the hash into Redis.
         #
         def dump hash
+          redis = backend
           hash.each_pair do |key, value|
-            @backend.hset namespace, key, value
+            redis.hset namespace, key, value
           end
         end
       
@@ -23,7 +24,7 @@ module Internals
         # Get a single value.
         #
         def member sym
-          @backend.hget namespace, sym
+          backend.hget namespace, sym
         end
       
       end

data/lib/picky/internals/index/redis.rb

@@ -20,7 +20,7 @@ module Internals
       # Delegate to the right collection.
       #
       def ids sym
-        @index.collection sym
+        index.collection sym
       end
     
       # Delegate to the right member value.
@@ -28,13 +28,13 @@ module Internals
       # Note: Converts to float.
       #
       def weight sym
-        @weights.member(sym).to_f
+        weights.member(sym).to_f
       end
     
       # Delegate to a member value.
       #
       def setting sym
-        @configuration.member sym
+        configuration.member sym
       end
     
     end

data/lib/picky/sources/wrappers/location.rb

@@ -32,10 +32,6 @@ module Sources
         options[:precision] || 1
       end
       
-      def reset
-        @min = 1.0/0
-      end
-      
       # Yield the data (id, text for id) for the given type and category.
       #
       def harvest type, category

data/spec/lib/indexing/indexes_spec.rb

@@ -45,9 +45,9 @@ describe Indexing::Indexes do
           indexes.should_receive(:find).once.with(:index, :category).and_return @index1
         end
         it 'indexes' do
-          @index1.should_receive(:index).once.with
+          @index1.should_receive(:generate_caches).once.with
           
-          indexes.generate_index_only :index, :category
+          indexes.generate_cache_only :index, :category
         end
       end
       context 'with index not found' do
@@ -55,9 +55,9 @@ describe Indexing::Indexes do
           indexes.should_receive(:find).once.with(:index, :category).and_return nil
         end
         it 'indexes' do
-          @index1.should_receive(:index).never
+          @index1.should_receive(:generate_caches).never
           
-          indexes.generate_index_only :index, :category
+          indexes.generate_cache_only :index, :category
         end
       end
     end

data/spec/lib/internals/generators/partial/none_spec.rb

@@ -2,6 +2,9 @@ require 'spec_helper'
 
 describe Internals::Generators::Partial::None do
   
+  it 'is not saved' do
+    described_class.new.saved?.should == false
+  end
   it "has the right superclass" do
     described_class.should < Internals::Generators::Partial::Strategy
   end

data/spec/lib/internals/index/redis/string_hash_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe Internals::Index::Redis::StringHash do
+  
+  let(:index) { described_class.new :some_namespace }
+    
+  describe 'collection' do
+    it 'raises' do
+      expect { index.collection :anything }.to raise_error("Can't retrieve a collection from a StringHash. Use Index::Redis::ListHash.")
+    end
+  end
+  describe 'member' do
+    before(:each) do
+      @backend = stub :backend
+      index.stub! :backend => @backend
+    end
+    it 'delegates to the backend' do
+      @backend.should_receive(:hget).once.with :some_namespace, :some_symbol
+      
+      index.member :some_symbol
+    end
+    it 'returns whatever it gets from the backend' do
+      @backend.should_receive(:hget).any_number_of_times.and_return :some_result
+      
+      index.member(:anything).should == :some_result
+    end
+  end
+  
+end

data/spec/lib/internals/index/redis_spec.rb

@@ -0,0 +1,74 @@
+require 'spec_helper'
+
+describe Internals::Index::Redis do
+  
+  let(:config) do
+    index    = stub :index, :name => :some_index
+    category = stub :category, :name => :some_category
+    Configuration::Index.new index, category
+  end
+  let(:redis) { described_class.new :some_name, config }
+  
+  describe 'setting' do
+    it 'delegates to the configuration' do
+      configuration = stub :configuration
+      redis.stub! :configuration => configuration
+
+      configuration.should_receive(:member).once.with :some_sym
+
+      redis.setting :some_sym
+    end
+    it 'returns the value' do
+      configuration = stub :configuration
+      redis.stub! :configuration => configuration
+
+      configuration.should_receive(:member).any_number_of_times.and_return "some config"
+
+      redis.setting(:any).should == "some config"
+    end
+  end
+  describe 'weight' do
+    it 'delegates to the weights' do
+      weights = stub :weights
+      redis.stub! :weights => weights
+
+      weights.should_receive(:member).once.with :some_sym
+
+      redis.weight :some_sym
+    end
+    it 'returns a floated value' do
+      weights = stub :weights
+      redis.stub! :weights => weights
+
+      weights.should_receive(:member).any_number_of_times.and_return "1.0"
+
+      redis.weight(:any).should == 1.0
+    end
+    it 'returns a floated value' do
+      weights = stub :weights
+      redis.stub! :weights => weights
+
+      weights.should_receive(:member).any_number_of_times.and_return 1
+
+      redis.weight(:any).should == 1.0
+    end
+  end
+  describe 'ids' do
+    it 'delegates to the index' do
+      index = stub :index
+      redis.stub! :index => index
+
+      index.should_receive(:collection).once.with :some_sym
+
+      redis.ids :some_sym
+    end
+    it 'returns the value' do
+      index = stub :index
+      redis.stub! :index => index
+
+      index.should_receive(:collection).any_number_of_times.and_return [1,2,3]
+
+      redis.ids(:any).should == [1,2,3]
+    end
+  end
+end

data/spec/lib/query/tokens_spec.rb

@@ -132,6 +132,27 @@ describe Internals::Query::Tokens do
     end
   end
 
+  describe 'possible_combinations_in' do
+    before(:each) do
+      @token1 = stub :token1
+      @token2 = stub :token2
+      @token3 = stub :token3
+      
+      @tokens = described_class.new [@token1, @token2, @token3]
+    end
+    it 'should work correctly' do
+      @token1.should_receive(:possible_combinations_in).once.with(:some_index).and_return [:combination11, :combination12]
+      @token2.should_receive(:possible_combinations_in).once.with(:some_index).and_return [:combination21]
+      @token3.should_receive(:possible_combinations_in).once.with(:some_index).and_return [:combination31, :combination32, :combination33]
+
+      @tokens.possible_combinations_in(:some_index).should == [
+        [:combination11, :combination12],
+        [:combination21],
+        [:combination31, :combination32, :combination33]
+      ]
+    end
+  end
+
   describe 'to_s' do
     before(:each) do
       @tokens = described_class.new [

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

@@ -9,12 +9,12 @@ describe Sources::Wrappers::Location do
     end
     context "without grid option" do
       it "fails" do
-        lambda { Sources::Wrappers::Location.new(:something) }.should raise_error
+        lambda { described_class.new(:something) }.should raise_error
       end
     end
     context "with grid option" do
       before(:each) do
-        @wrapper = Sources::Wrappers::Location.new @category, grid:10
+        @wrapper = described_class.new @category, grid:10
       end
       it "uses a default of 1 on the precision" do
         @wrapper.precision.should == 1
@@ -39,7 +39,7 @@ describe Sources::Wrappers::Location do
     end
     context "with grid and precision option" do
       before(:each) do
-        @wrapper = Sources::Wrappers::Location.new @category, grid:4, precision:2
+        @wrapper = described_class.new @category, grid:4, precision:2
       end
       it "uses the given precision" do
         @wrapper.precision.should == 2
@@ -60,7 +60,7 @@ describe Sources::Wrappers::Location do
   end
   context "without backend" do
     it "fails" do
-      lambda { Sources::Wrappers::Location.new }.should raise_error(ArgumentError)
+      lambda { described_class.new }.should raise_error(ArgumentError)
     end
   end
   

metadata

@@ -2,7 +2,7 @@
 name: picky
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.4.3
+  version: 1.5.0
 platform: ruby
 authors: 
 - Florian Hanke
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 +01:00
+date: 2011-03-03 00:00:00 +01:00
 default_executable: picky
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +24,7 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id001
-description: Fast Ruby small-text search engine with comfortable single field interface.
+description: Fast Ruby semantic text search engine with comfortable single field interface.
 email: florian.hanke+picky@gmail.com
 executables: 
 - picky
@@ -195,6 +195,8 @@ files:
 - spec/lib/internals/index/file/marshal_spec.rb
 - spec/lib/internals/index/file/text_spec.rb
 - spec/lib/internals/index/files_spec.rb
+- spec/lib/internals/index/redis/string_hash_spec.rb
+- spec/lib/internals/index/redis_spec.rb
 - spec/lib/internals/indexed/bundle/memory_spec.rb
 - spec/lib/internals/indexed/categories_spec.rb
 - spec/lib/internals/indexed/category_spec.rb
@@ -310,6 +312,8 @@ test_files:
 - spec/lib/internals/index/file/marshal_spec.rb
 - spec/lib/internals/index/file/text_spec.rb
 - spec/lib/internals/index/files_spec.rb
+- spec/lib/internals/index/redis/string_hash_spec.rb
+- spec/lib/internals/index/redis_spec.rb
 - spec/lib/internals/indexed/bundle/memory_spec.rb
 - spec/lib/internals/indexed/categories_spec.rb
 - spec/lib/internals/indexed/category_spec.rb