enf 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3aa05a4afb0adf081ecd35a98ddadf81357da91a
-  data.tar.gz: db6ccc6c863db56f53d83f1ac43a1d51bf73a034
+  metadata.gz: 7ef34aabd94c40d9a77e37ccec899650c1d0aeb8
+  data.tar.gz: cfcaf0c7b4a5aab9f89feaf57ad51f3711f49e5d
 SHA512:
-  metadata.gz: 374795893779728a8ff20c8dd353965191f082846f82c20b940854f2ec1bea05c82920979004ba7f3115e46044b65844d605dba2d5c47b3de8b599d4bed5e706
-  data.tar.gz: 6387e0246377d173da7aa5bc6acffa29edbbae42a048ebb353ae000b93e98f493e80947e7c46f212ad108bb50e78dd5e7d2c2752097abab7210d831596a36e7c
+  metadata.gz: 17431f413061396131d72af1b32c070865c9d8b9c296387a043c8a9dce0175aacfbe6be33c65ba561d8d401543b1ec5010c3b68272bd07c2c1c1ce53aa2d552a
+  data.tar.gz: 508b75410a629e1086b852b7dc097f005c501670839e5e49510137c546951aeeaf35231f70ab01a26d3055cdd071d5ecc3d483ad2ef4639a506cb1dc0217c7e0

data/lib/enf/elephant.rb

@@ -1,30 +1,31 @@
 # encoding: utf-8
 
 require 'enf/input'
+require 'enf/elephant/fetch_service'
 
 module Enf
   # Represent a node of the graph
   class Elephant
+    attr_reader :default_leave_value, :children
+    attr_accessor :leave
     class CannotRegister < RuntimeError; end
     def initialize(default_leave_value = false)
       @default_leave_value = default_leave_value
-      @leave = default_leave_value
+      self.leave = default_leave_value
       @children = Hash.new { |hash, key| hash[key] = Elephant.new }
     end
 
     def register!(element, payload = true)
       fail CannotRegister if frozen? || Input.invalid?(element)
-      return (@leave = payload) if element.empty?
-      @children[element[0]].register!(element[1..-1])
+      return (self.leave = payload) if element.empty?
+      children[element[0]].register!(element[1..-1])
     end
 
     # Null node, used to answer to unknown values
-    class Nope
-      require 'singleton'
-      include Singleton
-
-      def include_impl(_)
-        false
+    class Nope < Elephant
+      def initialize(leave = false)
+        @leave = leave
+        super(leave)
       end
 
       def register!(_)
@@ -33,13 +34,14 @@ module Enf
     end
 
     def include?(element)
-      return @default_leave_value if Input.invalid?(element)
-      include_impl element
+      return default_leave_value if Input.invalid?(element)
+      FetchService.search_in(self, element) { neutral_node }.leave
     end
 
-    def include_impl(element)
-      return @leave if element.empty?
-      @children.fetch(element[0]) { Nope.instance }.include_impl(element[1..-1])
+    protected
+
+    def neutral_node
+      Nope.new default_leave_value
     end
   end
 end

data/lib/enf/elephant/fetch_service.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+module Enf
+  class Elephant
+    # Pattern dectection service class
+    class FetchService
+      SEARCH_KEY_ERROR =  'key not found: %s'
+      def self.search_in(head, searched)
+        elephant = head
+        index = 0
+        while index < searched.size
+          elephant = elephant.children.fetch(searched[index]) do
+            return yield if block_given?
+            fail KeyError, SEARCH_KEY_ERROR % searched[index].inspect
+          end
+          index += 1
+        end
+        elephant
+      end
+    end
+  end
+end

data/lib/enf/suggest.rb

@@ -18,23 +18,23 @@ module Enf
     class Silent
       require 'singleton'
       include Singleton
-      def suggest_impl(_start, _limit, _incompletes, _prefix, results)
+      def complete(_limit, _incompletes, _prefix, results)
         results
       end
     end
 
     def suggest_impl(start, limit, incompletes, prefix = '', results = Set.new)
-      return complete(limit, incompletes, prefix, results) if start.empty?
+      fetch_root(start).complete(limit, incompletes, prefix, results)
+    end
 
-      child = @children.fetch(start[0]) { Silent.instance }
-      child.suggest_impl(start[1..-1], limit, incompletes, prefix, results)
+    def fetch_root(start)
+      Elephant::FetchService.search_in(self, start) { Silent.instance }
     end
 
     def complete(limit, incompletes, prefix, results)
-      return results if limit != :none && limit < 0
       add_current_prefix_if_needed(results, limit, incompletes, prefix)
       limit = next_limit limit
-      return results unless limit == :none || limit >= 0
+      return results if limit != :none && limit < 0
       @children.each do |key, child|
         results = child.complete(limit, incompletes, prefix + key, results)
       end
@@ -64,10 +64,12 @@ module Enf
       raise SuggestParamError, error.message
     end
 
-    INVALID_ERR = 'Invalid input "%s"'
+    INVALID_ERR = 'Invalid input %s'
 
     def once_validated!(start, char_limit, return_incompletes)
-      fail SuggestParamError, INVALID_ERR % start if Input.invalid? start
+      if Input.invalid? start
+        fail SuggestParamError, INVALID_ERR % start.inspect
+      end
       char_limit = validate_char_limit!(char_limit)
       yield start, char_limit, return_incompletes
     end

data/lib/enf/version.rb

@@ -3,7 +3,7 @@
 module Enf
   # This module holds the Enf version information.
   module Version
-    STRING = '0.1.1'
+    STRING = '0.1.2'
 
     module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enf
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Alexandre Ignjatovic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-20 00:00:00.000000000 Z
+date: 2015-07-24 00:00:00.000000000 Z
 dependencies: []
 description: Graph based white/black list implementation. Your elephant won't forget.
 email: alexandre.ignjatovic@gmail.com
@@ -21,6 +21,7 @@ files:
 - enf.gemspec
 - lib/enf.rb
 - lib/enf/elephant.rb
+- lib/enf/elephant/fetch_service.rb
 - lib/enf/input.rb
 - lib/enf/suggest.rb
 - lib/enf/version.rb