picky 2.1.2 → 2.2.0

data/spec/lib/sources/couch_spec.rb

@@ -34,8 +34,8 @@ describe Sources::Couch do
 
         describe "harvest" do
           it "yields the right data" do
-            field = stub :b, :from => :b
-            @source.harvest :anything, field do |id, token|
+            category = stub :b, :from => :b
+            @source.harvest category do |id, token|
               id.should    eql('550e8400-e29b-41d4-a716-446655440000') 
               token.should eql('b data')
             end.should have(1).item
@@ -60,8 +60,8 @@ describe Sources::Couch do
 
         describe "harvest" do
           it "yields the right data" do
-            field = stub :b, :from => :b
-            @source.harvest :anything, field do |id, token|
+            category = stub :b, :from => :b
+            @source.harvest category do |id, token|
               id.should    eql('123') 
               token.should eql('b data')
             end.should have(1).item
@@ -94,8 +94,8 @@ describe Sources::Couch do
 
       describe "harvest" do
         it "yields the right data" do
-          field = stub :b, :from => :b
-          @source.harvest :anything, field do |id, token|
+          category = stub :b, :from => :b
+          @source.harvest category do |id, token|
             id.should    eql('7f') 
             token.should eql('b data')
           end.should have(1).item

data/spec/lib/sources/csv_spec.rb

@@ -50,8 +50,8 @@ describe Sources::CSV do
       end
       describe "harvest" do
         it "should yield the right data" do
-          field = stub :b, :from => :b
-          @source.harvest :anything, field do |id, token|
+          category = stub :b, :from => :b
+          @source.harvest category do |id, token|
             [id, token].should == [' 7', 'b data']
           end
         end
@@ -70,8 +70,8 @@ describe Sources::CSV do
       end
       describe "harvest" do
         it "should yield the right data" do
-          field = stub :b, :from => :b
-          @source.harvest :anything, field do |id, token|
+          category = stub :b, :from => :b
+          @source.harvest category do |id, token|
             [id, token].should == [' 7', 'b data']
           end
         end

data/spec/lib/sources/db_spec.rb

@@ -24,8 +24,8 @@ describe Sources::DB do
   
   describe "get_data" do
     before(:each) do
-      @type     = stub :type,     :name => :some_type
-      @category = stub :category, :from => :some_category
+      @index    = stub :index, :name => :some_index_name
+      @category = stub :category, :from => :some_category, :index => @index
     end
     context 'mysql' do
       before(:each) do
@@ -36,20 +36,20 @@ describe Sources::DB do
 
           @connection.should_receive(:execute).
                       once.
-                      with('SELECT id, some_category FROM picky_some_type_index st WHERE st.__picky_id > some_offset LIMIT 25000').
+                      with('SELECT id, some_category FROM picky_some_index_name_index st WHERE st.__picky_id > some_offset LIMIT 25000').
                       and_return []
 
-          @source.get_data @type, @category, :some_offset
+          @source.get_data @category, :some_offset
         end
       end
       context 'with data' do
         it 'yields to the caller' do
           @connection.should_receive(:execute).
                       any_number_of_times.
-                      with('SELECT id, some_category FROM picky_some_type_index st WHERE st.__picky_id > some_offset LIMIT 25000').
+                      with('SELECT id, some_category FROM picky_some_index_name_index st WHERE st.__picky_id > some_offset LIMIT 25000').
                       and_return [[1, 'text']]
 
-          @source.get_data @type, @category, :some_offset do |id, text|
+          @source.get_data @category, :some_offset do |id, text|
             id.should == 1
             text.should == 'text'
           end
@@ -100,8 +100,8 @@ describe Sources::DB do
   
   describe 'harvest' do
     before(:each) do
-      @type     = stub :type,     :name => :some_type
-      @category = stub :category, :name => :some_category
+      @index    = stub :index,    :name => :some_index
+      @category = stub :category, :name => :some_category, :index => @index
 
       @source.should_receive(:get_data).any_number_of_times.and_return [[:some_id, 'some_text']].cycle
       @source.stub! :count => 17
@@ -109,7 +109,7 @@ describe Sources::DB do
     it 'calls connect_backend' do
       @source.should_receive(:connect_backend).once.with()
       
-      @source.harvest @type, @category do |id, text|
+      @source.harvest @category do |id, text|
         p [id, text]
       end
     end
@@ -118,19 +118,18 @@ describe Sources::DB do
   describe "harvest_statement_with_offset" do
     before(:each) do
       @category = stub :category, :from => :some_category
-      @type     = stub :type,     :name => :some_type
     end
     it "should get a harvest statement and the chunksize to put the statement together" do
-      @source.should_receive(:harvest_statement).once.with(@type, @category).and_return 'some_example_statement'
-      @source.harvest_statement_with_offset(@type, @category, :some_offset)
+      @source.should_receive(:harvest_statement).once.with(@category).and_return 'some_example_statement'
+      @source.harvest_statement_with_offset(@category, :some_offset)
     end
     it "should add an AND if it already contains a WHERE statement" do
       @source.should_receive(:harvest_statement).and_return 'WHERE'
-      @source.harvest_statement_with_offset(@type, @category, :some_offset).should == "WHERE AND st.__picky_id > some_offset LIMIT 25000"
+      @source.harvest_statement_with_offset(@category, :some_offset).should == "WHERE AND st.__picky_id > some_offset LIMIT 25000"
     end
     it "should add a WHERE if it doesn't already contain one" do
       @source.should_receive(:harvest_statement).and_return 'some_statement'
-      @source.harvest_statement_with_offset(@type, @category, :some_offset).should == "some_statement WHERE st.__picky_id > some_offset LIMIT 25000"
+      @source.harvest_statement_with_offset(@category, :some_offset).should == "some_statement WHERE st.__picky_id > some_offset LIMIT 25000"
     end
   end
   

data/spec/lib/sources/delicious_spec.rb

@@ -51,19 +51,19 @@ describe Sources::Delicious do
       end
       it "should yield the right data" do
         category = stub :b, :from => :tags
-        @source.harvest :anything, category do |id, token|
+        @source.harvest category do |id, token|
           [id, token].should == [1, "barefoot running shoe"]
         end
       end
       it "should yield the right data" do
         category = stub :b, :from => :title
-        @source.harvest :anything, category do |id, token|
+        @source.harvest category do |id, token|
           [id, token].should == [1, "VIBRAM - FiveFingers"]
         end
       end
       it "should yield the right data" do
         category = stub :b, :from => :url
-        @source.harvest :anything, category do |id, token|
+        @source.harvest category do |id, token|
           [id, token].should == [1, "http://www.vibramfivefingers.it/"]
         end
       end

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

@@ -3,36 +3,35 @@ require 'spec_helper'
 describe Sources::Wrappers::Base do
   
   before(:each) do
-    @backend  = stub :backend
-    @category = stub :category, :source => @backend
+    @source   = stub :source
   end
   
   context "with backend" do
     it "doesn't fail" do
-      lambda { Sources::Wrappers::Base.new(@category) }.should_not raise_error
+      lambda { described_class.new(@source) }.should_not raise_error
     end
     before(:each) do
-      @wrapper  = Sources::Wrappers::Base.new @category
+      @wrapper = described_class.new @source
     end
     it "delegates harvest" do
-      @backend.should_receive(:harvest).once.with :some_type, :some_field
+      @source.should_receive(:harvest).once.with :some_category
       
-      @wrapper.harvest :some_type, :some_field
+      @wrapper.harvest :some_category
     end
     it "delegates take_snapshot" do
-      @backend.should_receive(:take_snapshot).once.with :some_type
+      @source.should_receive(:take_snapshot).once.with :some_index
       
-      @wrapper.take_snapshot :some_type
+      @wrapper.take_snapshot :some_index
     end
     it "delegates connect_backend" do
-      @backend.should_receive(:connect_backend).once.with # nothing
+      @source.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)
+      lambda { described_class.new }.should raise_error(ArgumentError)
     end
   end
   

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

@@ -4,8 +4,8 @@ describe Sources::Wrappers::Location do
   
   context "with backend" do
     before(:each) do
-      @backend  = stub :backend
-      @category = stub :category, :source => @backend
+      @source   = stub :source
+      @category = stub :category
     end
     context "without grid option" do
       it "fails" do
@@ -14,47 +14,35 @@ describe Sources::Wrappers::Location do
     end
     context "with grid option" do
       before(:each) do
-        @wrapper = described_class.new @category, grid:10
+        @wrapper = described_class.new @source, 10
       end
       it "uses a default of 1 on the precision" do
-        @wrapper.precision.should == 1
+        @wrapper.calculation.precision.should == 1
       end
       it "delegates harvest" do
         @category.stub! :exact => {}
         
-        @backend.should_receive(:harvest).once.with :some_type, @category
+        @source.should_receive(:harvest).once.with @category
         
-        @wrapper.harvest :some_type, @category
+        @wrapper.harvest @category
       end
       it "delegates take_snapshot" do
-        @backend.should_receive(:take_snapshot).once.with :some_type
+        @source.should_receive(:take_snapshot).once.with()
         
-        @wrapper.take_snapshot :some_type
+        @wrapper.take_snapshot
       end
       it "delegates connect_backend" do
-        @backend.should_receive(:connect_backend).once.with # nothing
+        @source.should_receive(:connect_backend).once.with()
         
         @wrapper.connect_backend
       end
     end
     context "with grid and precision option" do
       before(:each) do
-        @wrapper = described_class.new @category, grid:4, precision:2
+        @wrapper = described_class.new @category, 4, 2
       end
       it "uses the given precision" do
-        @wrapper.precision.should == 2
-      end
-      
-      describe "locations_for" do
-        it "returns the right array" do
-          @wrapper.locations_for(15).should == [13, 14, 15, 16, 17]
-        end
-        it "returns the right array" do
-          @wrapper.locations_for(2).should == [0, 1, 2, 3, 4]
-        end
-        it "returns the right array" do
-          @wrapper.locations_for(16).should == [14, 15, 16, 17, 18]
-        end
+        @wrapper.calculation.precision.should == 2
       end
     end
   end

metadata

@@ -2,7 +2,7 @@
 name: picky
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors: 
 - Florian Hanke
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-11 00:00:00 +10:00
+date: 2011-04-14 00:00:00 +10:00
 default_executable: picky
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,15 +33,14 @@ extensions:
 extra_rdoc_files: []
 
 files: 
+- aux/picky/cli.rb
 - lib/bundling.rb
 - lib/constants.rb
 - lib/deployment.rb
 - lib/picky/aliases.rb
 - lib/picky/analyzer.rb
 - lib/picky/application.rb
-- lib/picky/auxiliary/terminal.rb
 - lib/picky/character_substituters/west_european.rb
-- lib/picky/cli.rb
 - lib/picky/cores.rb
 - lib/picky/generators/aliases.rb
 - lib/picky/index/base.rb
@@ -56,7 +55,6 @@ files:
 - lib/picky/internals/adapters/rack/query.rb
 - lib/picky/internals/adapters/rack.rb
 - lib/picky/internals/calculations/location.rb
-- lib/picky/internals/configuration/index.rb
 - lib/picky/internals/ext/maybe_compile.rb
 - lib/picky/internals/ext/ruby19/extconf.rb
 - lib/picky/internals/extensions/array.rb
@@ -104,17 +102,19 @@ files:
 - lib/picky/internals/indexed/wrappers/bundle/calculation.rb
 - lib/picky/internals/indexed/wrappers/bundle/location.rb
 - lib/picky/internals/indexed/wrappers/bundle/wrapper.rb
+- lib/picky/internals/indexed/wrappers/category/location.rb
 - lib/picky/internals/indexed/wrappers/exact_first.rb
-- lib/picky/internals/indexers/no_source_specified_error.rb
+- lib/picky/internals/indexers/base.rb
+- lib/picky/internals/indexers/parallel.rb
 - lib/picky/internals/indexers/serial.rb
 - lib/picky/internals/indexers/solr.rb
 - lib/picky/internals/indexing/bundle/base.rb
 - lib/picky/internals/indexing/bundle/memory.rb
 - lib/picky/internals/indexing/bundle/redis.rb
 - lib/picky/internals/indexing/bundle/super_base.rb
-- lib/picky/internals/indexing/categories.rb
 - lib/picky/internals/indexing/category.rb
 - lib/picky/internals/indexing/index.rb
+- lib/picky/internals/indexing/wrappers/category/location.rb
 - lib/picky/internals/performant.rb
 - lib/picky/internals/query/allocation.rb
 - lib/picky/internals/query/allocations.rb
@@ -127,13 +127,16 @@ files:
 - lib/picky/internals/query/token.rb
 - lib/picky/internals/query/tokens.rb
 - lib/picky/internals/query/weights.rb
+- lib/picky/internals/shared/category.rb
 - lib/picky/internals/solr/schema_generator.rb
 - lib/picky/internals/tokenizers/base.rb
 - lib/picky/internals/tokenizers/index.rb
+- lib/picky/internals/tokenizers/location.rb
 - lib/picky/internals/tokenizers/query.rb
 - lib/picky/internals.rb
 - lib/picky/loader.rb
 - lib/picky/loggers/search.rb
+- lib/picky/no_source_specified_exception.rb
 - lib/picky/query/solr.rb
 - lib/picky/query.rb
 - lib/picky/rack/harakiri.rb
@@ -164,14 +167,13 @@ files:
 - lib/tasks/todo.rake
 - lib/tasks/try.rake
 - lib/picky/internals/ext/ruby19/performant.c
+- spec/aux/picky/cli_spec.rb
 - spec/ext/performant_spec.rb
 - spec/lib/aliases_spec.rb
 - spec/lib/analyzer_spec.rb
 - spec/lib/application_spec.rb
-- spec/lib/auxiliary/terminal_spec.rb
 - spec/lib/bundling_spec.rb
 - spec/lib/character_substituters/west_european_spec.rb
-- spec/lib/cli_spec.rb
 - spec/lib/generators/aliases_spec.rb
 - spec/lib/index/base_spec.rb
 - spec/lib/index/redis_spec.rb
@@ -182,7 +184,6 @@ files:
 - spec/lib/internals/adapters/rack/live_parameters_spec.rb
 - spec/lib/internals/adapters/rack/query_spec.rb
 - spec/lib/internals/calculations/location_spec.rb
-- spec/lib/internals/configuration/index_spec.rb
 - spec/lib/internals/cores_spec.rb
 - spec/lib/internals/extensions/array_spec.rb
 - spec/lib/internals/extensions/hash_spec.rb
@@ -221,12 +222,12 @@ files:
 - spec/lib/internals/indexed/wrappers/bundle/calculation_spec.rb
 - spec/lib/internals/indexed/wrappers/bundle/wrapper_spec.rb
 - spec/lib/internals/indexed/wrappers/exact_first_spec.rb
+- spec/lib/internals/indexers/parallel_spec.rb
 - spec/lib/internals/indexers/serial_spec.rb
 - spec/lib/internals/indexing/bundle/memory_partial_generation_speed_spec.rb
 - spec/lib/internals/indexing/bundle/memory_spec.rb
 - spec/lib/internals/indexing/bundle/redis_spec.rb
 - spec/lib/internals/indexing/bundle/super_base_spec.rb
-- spec/lib/internals/indexing/categories_spec.rb
 - spec/lib/internals/indexing/category_spec.rb
 - spec/lib/internals/indexing/index_spec.rb
 - spec/lib/internals/indexing/indexes_spec.rb
@@ -290,14 +291,13 @@ signing_key:
 specification_version: 3
 summary: "Picky: Semantic Search Engine. Clever Interface. Good Tools."
 test_files: 
+- spec/aux/picky/cli_spec.rb
 - spec/ext/performant_spec.rb
 - spec/lib/aliases_spec.rb
 - spec/lib/analyzer_spec.rb
 - spec/lib/application_spec.rb
-- spec/lib/auxiliary/terminal_spec.rb
 - spec/lib/bundling_spec.rb
 - spec/lib/character_substituters/west_european_spec.rb
-- spec/lib/cli_spec.rb
 - spec/lib/generators/aliases_spec.rb
 - spec/lib/index/base_spec.rb
 - spec/lib/index/redis_spec.rb
@@ -308,7 +308,6 @@ test_files:
 - spec/lib/internals/adapters/rack/live_parameters_spec.rb
 - spec/lib/internals/adapters/rack/query_spec.rb
 - spec/lib/internals/calculations/location_spec.rb
-- spec/lib/internals/configuration/index_spec.rb
 - spec/lib/internals/cores_spec.rb
 - spec/lib/internals/extensions/array_spec.rb
 - spec/lib/internals/extensions/hash_spec.rb
@@ -347,12 +346,12 @@ test_files:
 - spec/lib/internals/indexed/wrappers/bundle/calculation_spec.rb
 - spec/lib/internals/indexed/wrappers/bundle/wrapper_spec.rb
 - spec/lib/internals/indexed/wrappers/exact_first_spec.rb
+- spec/lib/internals/indexers/parallel_spec.rb
 - spec/lib/internals/indexers/serial_spec.rb
 - spec/lib/internals/indexing/bundle/memory_partial_generation_speed_spec.rb
 - spec/lib/internals/indexing/bundle/memory_spec.rb
 - spec/lib/internals/indexing/bundle/redis_spec.rb
 - spec/lib/internals/indexing/bundle/super_base_spec.rb
-- spec/lib/internals/indexing/categories_spec.rb
 - spec/lib/internals/indexing/category_spec.rb
 - spec/lib/internals/indexing/index_spec.rb
 - spec/lib/internals/indexing/indexes_spec.rb

data/lib/picky/auxiliary/terminal.rb

@@ -1,219 +0,0 @@
-class Terminal
-
-  attr_reader :client
-
-  def initialize given_uri, id_amount = nil
-    check_highline_gem
-    check_picky_client_gem
-
-    require 'uri'
-    uri = URI.parse given_uri
-
-    # If the user gave a whole url without http, add that and reparse.
-    #
-    unless uri.path
-      uri = URI.parse "http://#{given_uri}"
-    end
-
-    # If the user gave a path without / in front, add one.
-    #
-    unless uri.path =~ /^\//
-      uri.path = "/#{uri.path}"
-    end
-
-    @searches  = 0
-    @durations = 0
-    @current_text  = ''
-    @cursor_offset = 0
-    @last_ids      = ''
-    @id_amount     = id_amount && Integer(id_amount) || 20
-    @client = Picky::Client.new :host => (uri.host || 'localhost'), :port => (uri.port || 8080), :path => uri.path
-
-    install_trap
-  end
-  def check_highline_gem # :nodoc:
-    require "highline/system_extensions"
-    extend HighLine::SystemExtensions
-  rescue LoadError
-    warn_gem_missing 'highline', 'the terminal interface'
-    exit 1
-  end
-  def check_picky_client_gem # :nodoc:
-    require 'picky-client'
-  rescue LoadError
-    warn_gem_missing 'picky-client', 'the terminal interface'
-    exit 1
-  end
-
-  # Install the Ctrl-C handler.
-  #
-  def install_trap
-    Signal.trap('INT') do
-      print "\e[100D"
-      flush
-      puts "\n"
-      puts "You performed #{@searches} searches, totalling #{"%.3f" % @durations} seconds."
-      print "\e[100D"
-      flush
-      exit
-    end
-  end
-
-  # Flush to STDOUT.
-  #
-  def flush
-    STDOUT.flush
-  end
-
-  # Position cursor amount to the left.
-  #
-  def left amount = 1
-    print "\e[#{amount}D"
-    flush
-  end
-
-  # Position cursor amount to the right.
-  #
-  def right amount = 1
-    print "\e[#{amount}C"
-    flush
-  end
-
-  # Move cursor to position.
-  #
-  def move_to position
-    relative = position - @cursor_offset
-    if relative > 0
-      right relative
-    else
-      left relative
-    end
-    @cursor_offset = position
-    flush
-  end
-
-  # Delete one character.
-  #
-  def backspace
-    chop_text
-    print "\e[1D \e[1D"
-    flush
-  end
-
-  # Write the text to the input area.
-  #
-  def write text
-    @cursor_offset += text.size
-    print text
-    flush
-  end
-
-  # Chop off one character.
-  #
-  def chop_text
-    @current_text.chop!
-  end
-
-  # Add the given text to the current text.
-  #
-  def add_text text
-    @current_text << text
-  end
-
-  # Type the given text into the input area.
-  #
-  def type_search character
-    add_text character
-    write character
-  end
-
-  # Write the amount of result ids.
-  #
-  def write_results results
-    move_to 0
-    write "%9d" % (results && results.total || 0)
-    move_to 10 + @current_text.size
-  end
-
-  # Move to the id area.
-  #
-  def move_to_ids
-    move_to 12 + @current_text.size
-  end
-
-  # Write the result ids.
-  #
-  def write_ids results
-    move_to_ids
-    write "=> #{results.total ? results.ids(@id_amount) : []}"
-  rescue StandardError => e
-    p e.message
-    p e.backtrace
-  end
-
-  # Clear the result ids.
-  #
-  def clear_ids
-    move_to_ids
-    write @ids_clearing_string ||= " "*200
-  end
-
-  # Log a search.
-  #
-  def log results
-    @searches += 1
-    @durations += (results[:duration] || 0)
-  end
-
-  # Perform a search.
-  #
-  def search full = false
-    client.search @current_text, :ids => (full ? @id_amount : 0)
-  end
-
-  # Perform a search and write the results.
-  #
-  # Handles 404s and connection problems.
-  #
-  def search_and_write full = false
-    results = search full
-    results.extend Picky::Convenience
-
-    log results
-
-    full ? write_ids(results) : clear_ids
-
-    write_results results
-  rescue Errno::ECONNREFUSED => e
-    write "Please start a Picky server listening to #{@client.path}."
-  rescue Yajl::ParseError => e
-    write "Got a 404. Maybe the path #{@client.path} isn't a correct one?"
-  end
-
-  # Run the terminal.
-  #
-  # Note: Uses a simple loop to handle input.
-  #
-  def run
-    puts "Type and see the result count update. Press enter for the first #{@id_amount} result ids."
-    puts "Break with Ctrl-C."
-
-    search_and_write
-
-    loop do
-      input = get_character
-
-      case input
-      when 127
-        backspace
-        search_and_write
-      when 13
-        search_and_write true
-      else # All other.
-        type_search input.chr
-        search_and_write
-      end
-    end
-  end
-
-end