trie-storage 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8a3fd73429cb8c7b95251a46ae2f4b7c15930d8
-  data.tar.gz: 25bd794fb5d8ca4191708c1962f3942e8e326431
+  metadata.gz: 12b94af64a8344e58c57f7c80225ce0f632f59ac
+  data.tar.gz: b3898b0c4e2b3bbf202c37835a764dd93caf3b35
 SHA512:
-  metadata.gz: 53bf0d8059d6862aef12fd878be5271edc18af53da416377807ac2c2e2cdaed71d62f6cf594091ecbd8f60883f655fc82a5e28cf5ba29f8fdcffc2e6f9fec070
-  data.tar.gz: b7724ffeede6923581b5a756c1effb168214fdbe45c8d45ce6830ec4b117f5929ae19ee1f929193e2161a7aa4430d5dabc45fd0127b83ae77a253a4e595926a6
+  metadata.gz: 13d6f214e24e454622b0be428f0fe1f87d83d00622704a2a60f693641e732e6b4ee56bb25a25f66135d4bddeb1f68974d013050b878d8f77aab2800f4c54312f
+  data.tar.gz: 22c629c77ca1d719ecf164f07b1b5d4da04b09d239a8ab43764878d1230b249863ab1776c500aaf7ceeac3f3ddad30c9a1362a1e5a49bd7935892f2426a8cc59

data/lib/trie-storage.rb

@@ -1,4 +1,5 @@
 require 'zip'
+module Storage
 #Class trie - storage
 class Storage
   attr_accessor :trie
@@ -8,18 +9,13 @@ class Storage
 
   #add str to storage
   def add(str)
-    if !str.match(/^[[:alpha:][,]]+$/)
-      raise ArgumentError
-    end
-    words = str.split(",").reject { |c| c.empty? }
-    words.each do |word|
-      @trie.add_word(word)
-    end
+    raise ArgumentError if !str.match(/^[[:alpha:][,]]+$/)
+    words = str.split(',').reject { |c| c.empty? }.each {|word| @trie.add_word(word)}
   end
 
   #print all trie words
-  def print
-    puts @trie.get_subtrie_words([],"")
+  def to_s
+    @trie.get_subtrie_words([], '').join(",")
   end
 
   #check contains str in storage
@@ -29,31 +25,27 @@ class Storage
 
   #find all words starting from str
   def find(str)
-    if str.length<3
-      raise ArgumentError
-    end
+    raise ArgumentError if str.length<3
     st = str.dup
     @trie.find([],str,st)
   end
 
   #load words in storage from file
   def load_from_file(filename)
-    lines=IO.readlines(filename)
+    lines = IO.readlines(filename)
     lines.map {|line| add(line.strip)}
   end
 
   #save words from storage to file
   def save_to_file(filename)
-    File.open(filename, "w+") do |f|
-      f.puts(@trie.get_subtrie_words([],"").join(","))
-    end
+    File.open(filename, 'w+') {|f| f.puts(self)}
   end
 
   #load words in storage from zip
   def load_from_zip(filename)
     Zip::File.foreach(filename) do |entry|
       istream = entry.get_input_stream
-      istream.read.split("\n").each do |line|
+      istream.read.split('\n').each do |line|
         add(line)
       end
     end
@@ -63,7 +55,7 @@ class Storage
   def save_to_zip(filename)
     Zip::File.open(filename, Zip::File::CREATE) {
         |zipfile|
-      zipfile.get_output_stream("storage.txt") { |f| f.puts  @trie.get_subtrie_words([],"").join(",") }
+      zipfile.get_output_stream('storage.txt') { |f| f.puts  @trie.get_subtrie_words([], '').join(',') }
     }
   end
 
@@ -72,7 +64,16 @@ end
 #Class Node of trie
 class Node
   # subtrie and property of ending word on this node
-  attr_accessor :subtrie,:final
+  attr_accessor :subtrie
+
+  def final!
+    @final = true
+  end
+
+  def final?
+    @final
+  end
+
   def initialize
     @final = false
     @subtrie = {}
@@ -80,50 +81,43 @@ class Node
 
   #check contains str starting from current node
   def contains?(str)
-    let=str[0]
+    let = str[0]
     if str.empty?
-      @final
+      final?
     elsif @subtrie[let]
       @subtrie[let].contains?(str[1..-1])
-    else
-      return false
+    else false
     end
   end
 
   #add word in trie
   def add_word(word)
-    let=word[0]
+    let = word[0]
     if !word.empty?
       if !@subtrie[let]
-        @subtrie[let]=Node.new
+        @subtrie[let] = Node.new
       end
       @subtrie[let].add_word(word[1..-1])
     else
-      @final=true
+      final!
     end
   end
 
   #get all words starting from current node
   def get_subtrie_words(res,str)
     @subtrie.each do |k,node|
-      if node.final
-         res.push(str+k)
-      end
-      if !node.subtrie.empty?
-        node.get_subtrie_words(res,str+k)
-      end
+      res.push(str+k) if node.final?
+      node.get_subtrie_words(res,str+k) if !node.subtrie.empty?
     end
     res
   end
 
   #find all words starting from current node and str
   def find(res,str,st)
-    let=str[0]
+    let = str[0]
     if @subtrie[let]
-      if str.length==1
-        if @subtrie[let].final
-          res.push(st)
-        end
+      if str.length == 1
+        res.push(st) if @subtrie[let].final?
         @subtrie[let].get_subtrie_words(res,st)
       else
         @subtrie[let].find(res,str[1..-1],st)
@@ -133,3 +127,4 @@ class Node
     end
   end
 end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trie-storage
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Danila Potapov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-27 00:00:00.000000000 Z
+date: 2016-10-31 00:00:00.000000000 Z
 dependencies: []
 description: A simple trie storage gem
 email: potapovd36@gmail.com