picky 4.0.6 → 4.0.7

data/lib/picky/bundle_realtime.rb

@@ -82,10 +82,13 @@ module Picky
     # Partializes the text and then adds each.
     #
     def add_partialized id, text, where = :unshift
-      self.partial_strategy.each_partial text do |partial_text|
+      partialized text do |partial_text|
         add id, partial_text, where
       end
     end
+    def partialized text, &block
+      self.partial_strategy.each_partial text, &block
+    end
 
     # Builds the realtime mapping.
     #

data/lib/picky/categories_realtime.rb

@@ -5,6 +5,7 @@ module Picky
     each_delegate :remove,
                   :add,
                   :replace,
+                  :replace_from,
                   :clear_realtime,
                   :build_realtime_mapping,
                   :to => :categories

data/lib/picky/category_realtime.rb

@@ -15,8 +15,7 @@ module Picky
     # given object.
     #
     def add object, where = :unshift
-      tokens, _ = tokenizer.tokenize object.send(from)
-      add_tokenized object.id, tokens, where
+      add_text object.id, object.send(from), where
     end
 
     # Removes the object's id, and then
@@ -26,6 +25,22 @@ module Picky
       remove object.id
       add object, where
     end
+    
+    # Replaces just part of the indexed data.
+    #
+    # Note: Takes a hash as opposed to the add/replace method.
+    #
+    def replace_from hash
+      # TODO Decide on a format.
+      #
+      return unless text = hash[from] || hash[from.to_s]
+      
+      id = hash[:id] || hash['id']
+      id = id.send key_format
+      
+      remove id
+      add_text id, text
+    end
 
     # Add at the end.
     #
@@ -42,7 +57,9 @@ module Picky
     # For the given id, adds the list of
     # strings to the index for the given id.
     #
-    def add_tokenized id, tokens, where = :unshift
+    def add_text id, text, where = :unshift
+      # text = text.to_sym if @symbols # TODO Symbols.
+      tokens, _ = tokenizer.tokenize text
       tokens.each { |text| add_tokenized_token id.send(key_format), text, where, false }
     end
 

data/lib/picky/index_realtime.rb

@@ -7,6 +7,7 @@ module Picky
     delegate :remove,  # aka "delete".
              :add,     # aka "insert".
              :replace, # aka "insert or update". Thus, not called update.
+             :replace_from, # TODO Naming ok?
              :clear_realtime,
              :build_realtime_mapping,
              :to => :categories

data/lib/picky/query/token.rb

@@ -149,27 +149,28 @@ module Picky
       @@split_qualifiers     = ','
       def qualify
         @qualifiers, @text = (@text || EMPTY_STRING).split(@@split_qualifier_text, 2)
-        @qualifiers, @text = if @text.blank?
-          [nil, (@qualifiers || EMPTY_STRING)]
+        if @text.blank?
+          @text = @qualifiers || EMPTY_STRING
+          @qualifiers = nil
         else
-          [@qualifiers.split(@@split_qualifiers), @text]
+          @qualifiers = @qualifiers.split @@split_qualifiers
         end
-        # if @text.blank?
-        #   @qualifiers = nil
-        #   @text = @qualifiers || EMPTY_STRING
-        # else
-        #   @qualifiers = @qualifiers.split @@split_qualifiers
-        # end
       end
-
-      # Internally, qualifiers are nil if there are none.
-      # This returns an empty array in this case for a nicer API.
+      
+      # Returns the qualifiers as an array.
+      #
+      # Example:
+      #   token.qualifiers # => ['title', 'author']
+      #   token.qualifiers # => []
+      #
+      # Note: Internally, qualifiers are nil if there are none.
       #
       def qualifiers
         @qualifiers || []
       end
 
-      #
+      # Returns the token in the form
+      #   ['original:Text', 'processedtext']
       #
       def to_result
         [@original, @text]
@@ -177,6 +178,8 @@ module Picky
 
       # Internal identifier.
       #
+      # Note: Used in many backends.
+      #
       def identifier
         "#{similar?? :similarity : :inverted}:#{@text}"
       end

data/lib/picky/sinatra/index_actions.rb

@@ -0,0 +1,24 @@
+module Picky
+  module Sinatra
+      
+    module IndexActions
+      
+      def self.extended base
+        base.post '/' do
+          index_name = params[:index]
+          index = Picky::Indexes[index_name.to_sym]
+          data = params[:data]
+          index.replace_from data if data
+        end
+        base.delete '/' do
+          index_name = params[:index]
+          index = Picky::Indexes[index_name.to_sym]
+          id = params[:data][:id]
+          index.remove id if id
+        end
+      end
+      
+    end
+    
+  end
+end

data/lib/picky/sinatra.rb

@@ -31,4 +31,7 @@ end
 #
 if private_methods.include? :get
   extend Picky::Sinatra
+  # Enable index actions.
+  #
+  require_relative 'sinatra/index_actions'
 end

data/spec/lib/query/token_spec.rb

@@ -139,7 +139,9 @@ describe Picky::Query::Token do
   describe 'qualify' do
     def self.it_should_qualify text, expected_result
       it "should extract the qualifier #{expected_result} from #{text}" do
-        described_class.new(text).qualify.should == expected_result
+        token = described_class.new text
+        token.qualify
+        [token.instance_variable_get(:@qualifiers), token.text].should == expected_result
       end
     end
     it_should_qualify 'spec:qualifier',    [['spec'],      'qualifier']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 4.0.6
+  version: 4.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-02 00:00:00.000000000 Z
+date: 2012-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70313201158420 !ruby/object:Gem::Requirement
+  requirement: &70160585740240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70313201158420
+  version_requirements: *70160585740240
 - !ruby/object:Gem::Dependency
   name: picky-client
-  requirement: &70313201157320 !ruby/object:Gem::Requirement
+  requirement: &70160585738100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.6
+        version: 4.0.7
   type: :development
   prerelease: false
-  version_requirements: *70313201157320
+  version_requirements: *70160585738100
 - !ruby/object:Gem::Dependency
   name: text
-  requirement: &70313201154620 !ruby/object:Gem::Requirement
+  requirement: &70160585737280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70313201154620
+  version_requirements: *70160585737280
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70313201153540 !ruby/object:Gem::Requirement
+  requirement: &70160585735700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70313201153540
+  version_requirements: *70160585735700
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70313201152460 !ruby/object:Gem::Requirement
+  requirement: &70160585734980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70313201152460
+  version_requirements: *70160585734980
 - !ruby/object:Gem::Dependency
   name: procrastinate
-  requirement: &70313201151140 !ruby/object:Gem::Requirement
+  requirement: &70160585749640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70313201151140
+  version_requirements: *70160585749640
 - !ruby/object:Gem::Dependency
   name: rack_fast_escape
-  requirement: &70313201150480 !ruby/object:Gem::Requirement
+  requirement: &70160585748580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70313201150480
+  version_requirements: *70160585748580
 description: Fast Ruby semantic text search engine with comfortable single field interface.
 email: florian.hanke+picky@gmail.com
 executables:
@@ -214,6 +214,7 @@ files:
 - lib/picky/results.rb
 - lib/picky/scheduler.rb
 - lib/picky/search.rb
+- lib/picky/sinatra/index_actions.rb
 - lib/picky/sinatra.rb
 - lib/picky/statistics.rb
 - lib/picky/tasks.rb