picky 3.6.4 → 3.6.6

data/lib/picky/categories.rb

@@ -49,7 +49,7 @@ module Picky
     end
 
     def to_s
-      categories.join(', ')
+      "#{self.class}(#{categories.join(', ')})"
     end
 
   end

data/lib/picky/query/combination.rb

@@ -21,18 +21,6 @@ module Picky
         @category = category
       end
 
-      # Returns the token's text.
-      #
-      def text
-        @text ||= token.text
-      end
-
-      # Returns the category's bundle.
-      #
-      def bundle
-        @bundle ||= category.bundle_for(token)
-      end
-
       # Returns the category's name.
       #
       def category_name
@@ -44,7 +32,7 @@ module Picky
       # Note: Caching is most of the time useful.
       #
       def weight
-        @weight ||= bundle.weight(text)
+        @weight ||= category.weight(token)
       end
 
       # Returns an array of ids for the given text.
@@ -52,19 +40,21 @@ module Picky
       # Note: Caching is most of the time useful.
       #
       def ids
-        @ids ||= bundle.ids(text)
+        @ids ||= category.ids(token)
       end
 
       # The identifier for this combination.
       #
       def identifier
-        "#{bundle.identifier}:#{token.identifier}"
+        "#{category.bundle_for(token).identifier}:#{token.identifier}"
       end
 
       # Note: Required for uniq!
       #
+      # TODO Ok with category or is the bundle needed?
+      #
       def hash
-        [token.to_s, bundle].hash
+        [token.to_s, category].hash
       end
 
       # Combines the category names with the original names.
@@ -81,7 +71,7 @@ module Picky
       #  "exact title:Peter*:peter"
       #
       def to_s
-        "#{bundle.identifier} #{to_result.join(':')}"
+        "#{category.bundle_for(token).identifier} #{to_result.join(':')}"
       end
 
     end

data/lib/picky/wrappers/category/exact_first.rb

@@ -11,21 +11,24 @@ module Picky
       #
       class ExactFirst
 
-        delegate :similar,
+        delegate :add,
+                 :qualifiers,
+                 :exact,
+                 :partial,
+                 :replace,
+
                  :identifier,
                  :name,
-                 :to => :@exact
-        delegate :index,
+
+                 :index,
                  :category,
-                 :weight,
-                 :generate_partial_from,
-                 :generate_caches_from_memory,
-                 :generate_derived,
                  :dump,
                  :load,
-                 :to => :@partial
+
+                 :to => :@category
 
         def initialize category
+          @category = category
           @exact   = category.exact
           @partial = category.partial
         end
@@ -39,15 +42,36 @@ module Picky
           end
         end
         def self.wrap_each_of categories
-          categories.categories.collect! { |category| new(category) }
+          actual_categories = categories.categories
+          categories.clear_categories
+
+          actual_categories.each do |category|
+            categories << new(category)
+          end
         end
 
-        def ids text
-          @exact.ids(text) + @partial.ids(text)
+        def ids token
+          text = token.text
+          if token.partial?
+            @exact.ids(text) | @partial.ids(text)
+          else
+            @exact.ids text
+          end
+        end
+
+        def weight token
+          text = token.text
+          if token.partial?
+            [@exact.weight(text), @partial.weight(text)].compact.max
+          else
+            @exact.weight text
+          end
         end
 
-        def weight text
-          [@exact.weight(text) || 0, @partial.weight(text) || 0].max
+        # TODO Refactor! (Subclass Picky::Category?)
+        #
+        def combination_for token
+          weight(token) && Query::Combination.new(token, self)
         end
 
       end

data/spec/lib/indexed/wrappers/exact_first_spec.rb

@@ -43,21 +43,30 @@ describe Picky::Wrappers::Category::ExactFirst do
       @exact.stub!   :ids => [1,4,5,6]
       @partial.stub! :ids => [2,3,7]
 
-      @wrapper.ids(:anything).should == [1,4,5,6,2,3,7]
+      @wrapper.ids(stub(:token, :text => :anything, :partial? => true)).should == [1,4,5,6,2,3,7]
+    end
+    it "uses only the exact ids" do
+      @exact.stub!   :ids => [1,4,5,6]
+      @partial.stub! :ids => [2,3,7]
+
+      @wrapper.ids(stub(:token, :text => :anything, :partial? => false)).should == [1,4,5,6]
     end
   end
 
   describe 'weight' do
     context "exact with weight" do
       before(:each) do
-        @exact.stub! :weight => 1.23
+        @exact.stub! :weight => 0.12
       end
       context "partial with weight" do
         before(:each) do
-          @partial.stub! :weight => 0.12
+          @partial.stub! :weight => 1.23
         end
         it "uses the higher weight" do
-          @wrapper.weight(:anything).should == 1.23
+          @wrapper.weight(stub(:token, :text => :anything, :partial? => true)).should == 1.23
+        end
+        it "uses the exact weight" do
+          @wrapper.weight(stub(:token, :text => :anything, :partial? => false)).should == 0.12
         end
       end
       context "partial without weight" do
@@ -65,7 +74,10 @@ describe Picky::Wrappers::Category::ExactFirst do
           @partial.stub! :weight => nil
         end
         it "uses the exact weight" do
-          @wrapper.weight(:anything).should == 1.23
+          @wrapper.weight(stub(:token, :text => :anything, :partial? => true)).should == 0.12
+        end
+        it "uses the exact weight" do
+          @wrapper.weight(stub(:token, :text => :anything, :partial? => false)).should == 0.12
         end
       end
     end
@@ -78,15 +90,21 @@ describe Picky::Wrappers::Category::ExactFirst do
           @partial.stub! :weight => 0.12
         end
         it "uses the partial weight" do
-          @wrapper.weight(:anything).should == 0.12
+          @wrapper.weight(stub(:token, :text => :anything, :partial? => true)).should == 0.12
+        end
+        it "uses the exact weight" do
+          @wrapper.weight(stub(:token, :text => :anything, :partial? => false)).should == nil
         end
       end
       context "partial without weight" do
         before(:each) do
           @partial.stub! :weight => nil
         end
-        it "is zero" do
-          @wrapper.weight(:anything).should == 0
+        it "is nil" do
+          @wrapper.weight(stub(:token, :text => :anything, :partial? => true)).should == nil
+        end
+        it "is nil" do
+          @wrapper.weight(stub(:token, :text => :anything, :partial? => false)).should == nil
         end
       end
     end

data/spec/lib/query/combination_spec.rb

@@ -7,7 +7,10 @@ describe Picky::Query::Combination do
   before(:each) do
     @bundle      = stub :bundle, :identifier => :bundle_name
     @token       = Picky::Query::Token.processed('some_text~', 'Some Original~')
-    @category    = stub :category, :bundle_for => @bundle, :name => :some_category_name
+    @category    = stub :category,
+                        :bundle_for => @bundle,
+                        :name => :some_category_name,
+                        :identifier => 'some_category_identifier'
 
     @combination = described_class.new @token, @category
   end
@@ -22,7 +25,7 @@ describe Picky::Query::Combination do
 
   describe 'hash' do
     it 'should hash the token and the bundle' do
-      @combination.hash.should == [@token.to_s, @bundle].hash
+      @combination.hash.should == [@token.to_s, @category].hash
     end
   end
 
@@ -52,15 +55,15 @@ describe Picky::Query::Combination do
 
   describe 'ids' do
     it 'should call ids with the text on bundle' do
-      @bundle.should_receive(:ids).once.with 'some_text'
+      @category.should_receive(:ids).once.with @token
 
       @combination.ids
     end
     it 'should not call it twice, but cache' do
-      @bundle.stub! :ids => :some_ids
+      @category.stub! :ids => :some_ids
       @combination.ids
 
-      @bundle.should_receive(:ids).never
+      @category.should_receive(:ids).never
 
       @combination.ids.should == :some_ids
     end
@@ -68,15 +71,15 @@ describe Picky::Query::Combination do
 
   describe 'weight' do
     it 'should call weight with the text on bundle' do
-      @bundle.should_receive(:weight).once.with 'some_text'
+      @category.should_receive(:weight).once.with @token
 
       @combination.weight
     end
     it 'should not call it twice, but cache' do
-      @bundle.stub! :weight => :some_weight
+      @category.stub! :weight => :some_weight
       @combination.weight
 
-      @bundle.should_receive(:weight).never
+      @category.should_receive(:weight).never
 
       @combination.weight.should == :some_weight
     end

data/spec/specific/exact_first_spec.rb

@@ -0,0 +1,31 @@
+# encoding: utf-8
+#
+require 'spec_helper'
+
+describe "Weights" do
+
+  # This tests the weights option.
+  #
+  it 'can handle dynamic weights' do
+    index = Picky::Index.new :exact_first do
+      source { [] }
+      category :text, partial: Picky::Partial::Substring.new(from: 1)
+    end
+
+    require 'ostruct'
+    exact   = OpenStruct.new id: 1, text: "disco"
+    partial = OpenStruct.new id: 2, text: "discofox"
+    index.add exact
+    index.add partial
+
+    normal = Picky::Search.new index
+    normal.search("disco").ids.should == [2, 1] # 2 was added later.
+
+    index = Picky::Wrappers::Category::ExactFirst.wrap index
+
+    exact_first = Picky::Search.new index
+    exact_first.search("disco").ids.should == [1, 2] # Exact first.
+    exact_first.search("disc").ids.should  == [2, 1] # Not exact, so not first.
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 3.6.4
+  version: 3.6.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-23 00:00:00.000000000 Z
+date: 2011-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70330594739240 !ruby/object:Gem::Requirement
+  requirement: &70228260909520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70330594739240
+  version_requirements: *70228260909520
 - !ruby/object:Gem::Dependency
   name: picky-client
-  requirement: &70330594738740 !ruby/object:Gem::Requirement
+  requirement: &70228260909020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.6.4
+        version: 3.6.6
   type: :development
   prerelease: false
-  version_requirements: *70330594738740
+  version_requirements: *70228260909020
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70330594738320 !ruby/object:Gem::Requirement
+  requirement: &70228260908600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70330594738320
+  version_requirements: *70228260908600
 - !ruby/object:Gem::Dependency
   name: rack_fast_escape
-  requirement: &70330594737860 !ruby/object:Gem::Requirement
+  requirement: &70228260908140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70330594737860
+  version_requirements: *70228260908140
 - !ruby/object:Gem::Dependency
   name: text
-  requirement: &70330594737440 !ruby/object:Gem::Requirement
+  requirement: &70228260907720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70330594737440
+  version_requirements: *70228260907720
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70330594737020 !ruby/object:Gem::Requirement
+  requirement: &70228260907300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70330594737020
+  version_requirements: *70228260907300
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70330594752900 !ruby/object:Gem::Requirement
+  requirement: &70228260906800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70330594752900
+  version_requirements: *70228260906800
 - !ruby/object:Gem::Dependency
   name: unicorn
-  requirement: &70330594752480 !ruby/object:Gem::Requirement
+  requirement: &70228260906380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70330594752480
+  version_requirements: *70228260906380
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70330594752020 !ruby/object:Gem::Requirement
+  requirement: &70228260905920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70330594752020
+  version_requirements: *70228260905920
 description: Fast Ruby semantic text search engine with comfortable single field interface.
 email: florian.hanke+picky@gmail.com
 executables:
@@ -353,6 +353,7 @@ files:
 - spec/lib/tasks/try_spec.rb
 - spec/lib/tokenizer_spec.rb
 - spec/specific/dynamic_weights_spec.rb
+- spec/specific/exact_first_spec.rb
 - spec/specific/realtime_spec.rb
 - spec/specific/regression_spec.rb
 - spec/specific/speed_spec.rb
@@ -482,6 +483,7 @@ test_files:
 - spec/lib/tasks/try_spec.rb
 - spec/lib/tokenizer_spec.rb
 - spec/specific/dynamic_weights_spec.rb
+- spec/specific/exact_first_spec.rb
 - spec/specific/realtime_spec.rb
 - spec/specific/regression_spec.rb
 - spec/specific/speed_spec.rb