diviner 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4a7ccb4a2983496e7e16134161d598586071d10
-  data.tar.gz: c154e3b39bf3b6314503fef01ab47da3bddb3dc9
+  metadata.gz: 6b394c94e959d168855fbdd58a40e2785acff6e5
+  data.tar.gz: c188f6c5c2d71aa2e33cfda62f04953b9437290c
 SHA512:
-  metadata.gz: f56c6cf85a44dc21215430dbd244a88aa4b6bca73b11cb653d0797c6cb4f717ad9190df3446f3078bc67d9d6cd85e1754d770f8ea4d2fdeb6713c9019db0f656
-  data.tar.gz: 803e067181fd6bf181f327eb948191f7b1378dd39839a248085b32a713a4681383e0dde53cef6326a3447cba47ad12fd0d0f929fa3ca25c798d42e4b003fed78
+  metadata.gz: 8386e140b2cc549e5ba8c443d233abfb44a0ee90dfd2058f178fef00eef8341aaa1c3b811673ffb4d697b72e0cc9e2c3bee4b372ee26e7e521e9866c2f70045a
+  data.tar.gz: f3a1c90770ca1c9dff3b11616306d37a71adb1d573d1cb7fa66ee0f3dcc1b2082aea78988d7031cd5104c054a4c442dfba926fb72e124f6e1bccc97a3973c20b

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/diviner.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: diviner 0.1.2 ruby lib
+# stub: diviner 0.1.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "diviner"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Ferhat Ziba"]
-  s.date = "2016-06-13"
+  s.date = "2016-06-14"
   s.description = "It matches from a list of categories the right category to a Product."
   s.email = "fero.ziba@gmail.com"
   s.extra_rdoc_files = [

data/lib/deviner/match.rb

@@ -62,6 +62,10 @@ module Deviner
         end
       end
 
+      result = result.reject{ |x| x[:value] != highest_value}
+      puts "ACHTUNG"
+      puts result
+
       return selected_category
 
     end
@@ -81,24 +85,30 @@ module Deviner
       query = prepare_query(query)
       return  cache[query] if cache[query] != nil
       search = Picky::Search.new @index
-      result = search.search(query)
+      subqueries = query.split(" ")
+      total = 0
+      for subquery in subqueries
+        result = search.search(query)
+        total+=result.total
+      end
       if options[:has_parent]
         parent = category.send(options[:parent_method])
       else
         parent = nil
       end
-      cache[query] = result.total + score(parent)
+      cache[query] = total + score(parent)
     end
 
     def prepare_query query
-      query.gsub(",", " OR ").
-            gsub("&", " OR ").
+      query.gsub(",", " ").
+            gsub("&", " ").
             gsub("ü", "ue").
             gsub("ö", "oe").
             gsub("ä", "ae").
             gsub("Ü", "Ue").
             gsub("Ö", "Oe").
-            gsub("Ä", "Ae")
+            gsub("Ä", "Ae").
+            gsub("  ", " ")
     end
 
   end

data/test/helper.rb

@@ -67,15 +67,14 @@ taxonomies.each_line do |line|
     stack.pop
   end
 
+  stack = [] if names.length == 1
+
   parent = stack.last
   category = TestCategory.new(names.last,parent)
   stack.push(category)
   @categories << category
 end
 
-
-puts @categories
-
 class MyTestCategory
 
   def self.categories=(categories)

data/test/test_diviner.rb

@@ -21,4 +21,18 @@ class TestDiviner < Test::Unit::TestCase
     matcher.model(model, keys)
     assert_equal "Massageöle", matcher.match(MyTestCategory.categories).name
   end
+
+  should "find more complex testcase" do
+    Product = Struct.new :id, :name, :description, :categories
+    keys = [:name, :description, :categories]
+    weights = {categories: 3, name: 2, description: 1}
+    model = Product.new(1,  "HiPP Gemüserisotto mit zarter Bio-Pute, 250 g",
+                            "HiPP Gemüserisotto mit zarter Bio-Pute enthält schonend dampfgegarte Zutaten mit kindgerechter Würzung und Omega-3 Fettsäuren aus Bio-Rapsöl. Die Mahlzeit ist geeignet für eine sichere und ausgewogene Ernährung Ihres Babys ab dem12. Monat.      mit Stückchenfürs Kauenlernen  salzreduziert  glutenfrei  ohne Zusatz von Aromen, Konservierungsstoffen, Farbstoffen, Verdickungsmitteln",
+                         "Baby & Kind Babynahrung Kindernahrung Beikost")
+    matcher = Deviner::Match.new(weights)
+    matcher.model(model, keys)
+    assert_equal "Babynahrung", matcher.match(MyTestCategory.categories).name
+  end
+
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diviner
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Ferhat Ziba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-13 00:00:00.000000000 Z
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-stemmer