time_frame 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d91f181ec54007dec205fb4f579cfea5239ab3a5
-  data.tar.gz: 4f99fccea8014b5d159a1cbd7bc535a0825459fe
+  metadata.gz: 00c76a3400b8cad304f5c52c6b8d619f69dfd222
+  data.tar.gz: 0f77d91410ec48f03bf77a4522b53d6cad56caee
 SHA512:
-  metadata.gz: db5553cf7505f6c75df2bb6d8b8f0024fdede6032333f70e69cef34052b3fdab50b81d0642dc974383f957437bb93d62c3f8ef993f31a5d91e3de26f15417c66
-  data.tar.gz: aa430375956dc1cce91092b52f40fa8fffba961d1d232af9aba962ca1c540657e1a971b39ffec09de838010afbc66185b6e005b8f3c0d93609b2d69d4b59ffc3
+  metadata.gz: 452f866f8489f4c3611265981fe38c516e6f54f6d377476d7e34f927dc72121d74d824f0ebcebc09cbc51437c82d57a5793a902b61389295c603dee7c349ffd6
+  data.tar.gz: ea33d048127eea7b77e5470b0057ac0739cfe0e5a2955b9f16e9e0ddb515ba698eecf184b7d3d27b65d2d106b1149d5621e0f4755522457fae4fd7a026ee5520

data/lib/time_frame/collection.rb

@@ -6,70 +6,75 @@ class TimeFrame
   # given time_frames or covering time elements
   class Collection
     include Enumerable
-    attr_reader :tree_nodes, :root
+
     def initialize(item_list = [], sorted = false, &block)
-      @block = block ? block : ->(item) { item }
+      block ||= ->(item) { item }
       @tree_nodes = item_list.map do |item|
-        TreeNode.new(item: item, &@block)
+        TreeNode.new(item: item, &block)
       end
-
-      sort_list(@tree_nodes) unless sorted
-      build_tree(0, @tree_nodes.size - 1)
-      @root = @tree_nodes[(@tree_nodes.size - 1) / 2]
+      build_tree(sorted) if @tree_nodes.any?
     end
 
     def each(&block)
-      tree_nodes.map { |node| node.item }.each(&block)
+      @tree_nodes.each do |node|
+        block.call(node.item)
+      end
     end
 
     def all_covering(time)
-      result = []
-      add_covering(time, @root, result)
-      result.sort_by { |item | [@block.call(item).min, @block.call(item).max] }
+      [].tap do |result|
+        add_covering(time, @root, result) if any?
+      end
     end
 
     def all_intersecting(time_frame)
-      result = []
-      add_intersecting(time_frame, @root, result)
-      result.sort_by { |item | [@block.call(item).min, @block.call(item).max] }
+      [].tap do |result|
+        add_intersecting(time_frame, @root, result) if any?
+      end
     end
 
     private
 
-    def sort_list(item_list)
-      item_list.sort_by! do |item|
+    def sort_nodes
+      @tree_nodes.sort_by! do |item|
         [item.time_frame.min, item.time_frame.max]
       end
     end
 
-    def build_tree(lower, upper, ancestor = nil, side = nil)
+    def build_tree(sorted)
+      sort_nodes unless sorted
+      build_sub_tree(0, @tree_nodes.size - 1)
+      @root = @tree_nodes[(@tree_nodes.size - 1) / 2]
+    end
+
+    def build_sub_tree(lower, upper, ancestor = nil, side = nil)
       mid = (lower + upper) / 2
       node = @tree_nodes[mid]
 
       node.update_ancestor_relation(ancestor, side) if ancestor && side
 
-      build_tree(lower, mid - 1, node, :left) unless lower == mid
-      build_tree(mid + 1, upper, node, :right) unless upper == mid
+      build_sub_tree(lower, mid - 1, node, :left) unless lower == mid
+      build_sub_tree(mid + 1, upper, node, :right) unless upper == mid
 
       node.update_child_frame(node.child_time_frame) if lower == upper
     end
 
     def add_covering(time, node, result)
+      search_left = node.continue_left_side_search_for_time?(time)
+      search_right = node.continue_right_side_search_for_time?(time)
+
+      add_covering(time, node.left_child, result) if search_left
       result << node.item if node.time_frame.cover?(time)
-      if node.continue_left_side_search_for_time?(time)
-        add_covering(time, node.left_child, result)
-      end
-      return unless node.continue_right_side_search_for_time?(time)
-      add_covering(time, node.right_child, result)
+      add_covering(time, node.right_child, result) if search_right
     end
 
     def add_intersecting(time_frame, node, result)
-      result << node.item unless (node.time_frame & time_frame).empty?
-      if node.continue_left_side_search_for_time_frame?(time_frame)
-        add_intersecting(time_frame, node.left_child, result)
-      end
-      return unless node.continue_right_side_search_for_time_frame?(time_frame)
-      add_intersecting(time_frame, node.right_child, result)
+      search_left = node.continue_left_side_search_for_time_frame?(time_frame)
+      search_right = node.continue_right_side_search_for_time_frame?(time_frame)
+
+      add_intersecting(time_frame, node.left_child, result) if search_left
+      result << node.item if node.time_frame.overlaps? time_frame
+      add_intersecting(time_frame, node.right_child, result) if search_right
     end
   end
 end

data/lib/time_frame/version.rb

@@ -1,5 +1,5 @@
 # Encoding: utf-8
 # gem version
 class TimeFrame
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

data/spec/collection_spec.rb

@@ -16,6 +16,11 @@ describe TimeFrame::Collection do
 
   describe '#all_covering' do
     context 'when a pure time_frame tree is given' do
+      it 'returns an empty array if the collection is empty' do
+        collection = TimeFrame::Collection.new([])
+        expect(collection.all_covering(time)).to eq []
+      end
+
       it 'returns all covering time_frames' do
         time_frames = 20.times.map { |i| time_frame.shift_by((5 * i).days) }
         tree = TimeFrame::Collection.new(time_frames)
@@ -49,6 +54,11 @@ describe TimeFrame::Collection do
     end
 
     context 'when objects containing time_frames are given' do
+      it 'returns an empty array if the collection is empty' do
+        collection = TimeFrame::Collection.new([]) { |item| item.time_frame }
+        expect(collection.all_covering(time)).to eq []
+      end
+
       it 'returns all covering time_frames' do
         objects = 20.times.map do |i|
           OpenStruct.new(time_frame: time_frame.shift_by((5 * i).days))
@@ -90,6 +100,10 @@ describe TimeFrame::Collection do
 
   describe '#all_intersecting' do
     context 'when a pure time_frame tree is given' do
+      it 'returns an empty array if the collection is empty' do
+        collection = TimeFrame::Collection.new([])
+        expect(collection.all_intersecting(time)).to eq []
+      end
       it 'returns all intersecting time_frames' do
         time_frames = 20.times.map { |i| time_frame.shift_by((5 * i).days) }
         tree = TimeFrame::Collection.new(time_frames)
@@ -138,6 +152,10 @@ describe TimeFrame::Collection do
     end
 
     context 'when objects containing time_frames are given' do
+      it 'returns an empty array if the collection is empty' do
+        collection = TimeFrame::Collection.new([]) { |item| item.time_frame }
+        expect(collection.all_intersecting(time)).to eq []
+      end
       it 'returns all intersecting time_frames' do
         objects = 20.times.map do |i|
           OpenStruct.new(time_frame: time_frame.shift_by((5 * i).days))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: time_frame
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Patrick Derichs
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake