segment_tree 0.0.2 → 0.0.3

data/lib/segment_tree/version.rb

@@ -1,3 +1,3 @@
 class SegmentTree
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/segment_tree.rb

@@ -1,23 +1,45 @@
-require "forwardable"
-
+# == Synopsys
+# Segment tree is a tree data structure for storing intervals, or segments.
+# It allows querying which of the stored segments contain a given point.
+# It is, in principle, a static structure; that is, its content cannot be modified once the structure is built.
+#
+# == Example
+#   data = [
+#     [IPAddr.new('87.224.241.0/24').to_range, {:city => "YEKT"}],
+#     [IPAddr.new('195.58.18.0/24').to_range, {:city => "MSK"}]
+#     # and so on
+#   ]
+#   ip_tree = SegmentTree.new(data)
+#
+#   client_ip = IPAddr.new("87.224.241.66")
+#   ip_tree.find_first(client_ip).value # => {:city=>"YEKT"}
 class SegmentTree
   # An abstract tree node
   class Node #:nodoc:all:
-    extend Forwardable
-    def_delegators :@range, :include?, :begin, :end
+    attr_reader :begin, :end
+
+    def initialize(*)
+      @begin, @end = @range.begin, @range.end
+    end
+    protected :initialize
+
+    def include?(x)
+      @range.include?(x)
+    end
   end
 
   # An elementary intervals or nodes container
   class Container < Node #:nodoc:all:
     extend Forwardable
 
-    attr_reader :left, :right
+    #attr_reader :left, :right
 
     # Node constructor, accepts both +Node+ and +Segment+
     def initialize(left, right)
       @left, @right = left, right
-
       @range = left.begin..(right || left).end
+
+      super
     end
 
     # Find all intervals containing point +x+ within node's children. Returns array
@@ -48,6 +70,7 @@ class SegmentTree
       raise ArgumentError, 'Range expected, %s given' % range.class.name unless range.is_a?(Range)
 
       @range, @value = range, value
+      super
     end
 
     def find(x)
@@ -55,7 +78,7 @@ class SegmentTree
     end
 
     def find_first(x)
-      include?(x) ? self : nil
+      @range.include?(x) ? self : nil
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: segment_tree
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-02 00:00:00.000000000 Z
+date: 2012-08-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &82956300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.0'
+  version_requirements: *82956300
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &82956050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,12 +32,7 @@ dependencies:
         version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.11'
+  version_requirements: *82956050
 description: Tree data structure for storing segments. It allows querying which of
   the stored segments contain a given point.
 email: amikhailov83@gmail.com
@@ -76,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Tree data structure for storing segments. It allows querying which of the