melisa 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 108e4a649293c67d566fec46997d324648ead6fb
-  data.tar.gz: 199fdaf673933b9b369f8a0886e52efdb43e7791
+  metadata.gz: 32a6c2d8935c0153a541ebd24149c48285bfeb3e
+  data.tar.gz: 9ca141c1b3236bb9a58a548aca80cff24a7512c9
 SHA512:
-  metadata.gz: df5a3f3fcecdc2f2b95064bfa5b68c0a51e5d5caa01eac352d81ae9f0f1a12f2fd7773dc8922765693b3cc22ecd719bc64c646e40610c7056e280a831df9eaa7
-  data.tar.gz: 181e0348caefccb4f0247903dc51ec7b2a8091d295a8f5e1399906c0ca2926018b49c8086b859259ed5b6865ff919e064c2f43fbaa06a5ff676c943577983194
+  metadata.gz: 4adbb03528aaeb653e2d7d8221d02ba57729adbb0802102106556207bf738f409cf8cf4639efc93d110b8ed244411f009d05e3a8fce177edfe4d0f2da1f4f071
+  data.tar.gz: bd4f6f669ee41b4f3e0539f435617a30788b69e9dc7b53f636527d70af8417decaf2eadfb43b6e18278c84ed900ca9320e56adef15d8b5f71ce74dd8dd404c39

data/lib/melisa/bytes_trie.rb

@@ -11,9 +11,9 @@ module Melisa
       add_many(hash, [])
     end
 
-    def add_many(hash, weights)
+    def add_many(hash, weight=nil)
       for key, value in hash
-        push(raw_key(key, value))
+        push(raw_key(key, value), weight)
       end
     end
 
@@ -22,8 +22,7 @@ module Melisa
     end
 
     def get(key)
-      build unless @built
-      agent = Marisa::Agent.new
+      build_if_necessary
       agent.set_query(key + @sep)
       if @trie.predictive_search(agent)
         agent_key_value(agent)
@@ -38,8 +37,7 @@ module Melisa
 
     # Search for many results with a given prefix
     def get_all(key)
-      build unless @built
-      agent = Marisa::Agent.new
+      build_if_necessary
       agent.set_query(key)
       [].tap do |results|
         while @trie.predictive_search(agent)

data/lib/melisa/trie.rb

@@ -26,9 +26,19 @@ module Melisa
       add_many(keys, weights)
     end
 
+    def agent
+      @agent ||= Marisa::Agent.new
+    end
+
     def build
-      @trie.build(@keyset, config_flags(@options)) unless @built
-      @built = true
+      @trie.build(@keyset, config_flags(@options))
+    end
+
+    def build_if_necessary
+      unless @built
+        build
+        @built = true
+      end
     end
 
     # Note: weight is not the same thing as a value! use a BytesTrie
@@ -45,33 +55,47 @@ module Melisa
       end
     end
 
+    def get_id(key)
+      build_if_necessary
+      agent.set_query(key)
+      trie.lookup(agent)
+      agent.key_id if agent.key_str
+    end
+
+    def get_key(id)
+      build_if_necessary
+      agent.set_query(id)
+      trie.reverse_lookup(agent)
+      agent.key_str
+    end
+
     def search(prefix)
-      build unless @built
+      build_if_necessary
       Search.new(self, prefix)
     end
 
     def each(&block)
-      build unless @built
+      build_if_necessary
       search('').each(&block)
     end
 
     def size
-      build unless @built
+      build_if_necessary
       @trie.num_keys()
     end
 
     def keys
-      build unless @built
+      build_if_necessary
       search('').keys
     end
 
     def has_keys?
-      build unless @built
+      build_if_necessary
       search('').has_keys?
     end
 
     def include?(key)
-      build unless @built
+      build_if_necessary
       search('').include?(key)
     end
 
@@ -80,7 +104,7 @@ module Melisa
     end
 
     def save(path)
-      build unless @built
+      build_if_necessary
       self.tap { @trie.save(path) }
     end
 
@@ -89,7 +113,7 @@ module Melisa
 
     def push(key, weight=nil)
       if weight
-        @keyset.push_back(key, weight)
+        @keyset.push_back(key) #, weight) # For now, ignore weight due to marisa C++ binding issue
       else
         @keyset.push_back(key)
       end

data/lib/melisa/version.rb

@@ -1,3 +1,3 @@
 module Melisa
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/spec/trie_spec.rb

@@ -27,4 +27,19 @@ describe Melisa::Trie do
 
     expect(trie2.keys).to match_array ['one', 'two', 'onetwo']
   end
+
+  it "gets a key's integer ID" do
+    expect(trie.get_id('NOT_KEY1')).to be_nil
+    expect(trie.get_id('NOT_KEY2')).to be_nil
+    expect(trie.get_id('one')).to eq 0
+    expect(trie.get_id('two')).to eq 1
+    expect(trie.get_id('onetwo')).to eq 2
+  end
+
+  it "gets a key given an ID" do
+    expect(trie.get_key(0)).to eq 'one'
+    expect(trie.get_key(1)).to eq 'two'
+    expect(trie.get_key(2)).to eq 'onetwo'
+    expect{ trie.get_key(3) }.to raise_error
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: melisa
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Duane Johnson