positionrange 0.6.7 → 0.7.0

data/README

@@ -68,7 +68,7 @@ Clustering overlaps maintains attributes.
 
 == Installation
 
-You can install Position Range with the following command:
+You can install PositionRange with the following command:
 
   % [sudo] gem install positionrange
 
@@ -82,9 +82,9 @@ And then from its distribution directory installed with:
 
 == Support
 
-The Position Range homepage is http://positionrange.rubyforge.org.
+The PositionRange homepage is http://positionrange.rubyforge.org.
 
-For the latest news on Position Range:
+For the latest news on PositionRange:
 
 * http://foundation.logilogi.org/tags/PositionRange
 
@@ -99,11 +99,11 @@ This documentation can be browsed online at:
 
 == Copyrights
 
-Position Range and these docs are Copyright (c) 2006-2009 The LogiLogi
-Foundation. Position Range is licensed under the {GNU Lesser General 
+PositionRange and these docs are Copyright (c) 2006-2009 The LogiLogi
+Foundation. PositionRange is licensed under the {GNU Lesser General 
 Public License}[http://www.gnu.org/licenses/lgpl-3.0-standalone.html].
 These docs are available under the {Creative Commons Attribution-Share
 Alike License}[http://creativecommons.org/licenses/by-sa/3.0/].
 
-You can use Position Range in an application that is not Free Software
-but Position Range itself remains Free Software.
+You can use PositionRange in an application that is not Free Software
+but PositionRange itself remains Free Software.

data/Rakefile

@@ -67,7 +67,7 @@ Rake::GemPackageTask.new(spec) do |p|
   p.need_zip = true
 end
 
-desc "Publish the docs, gem, and release files"
+desc "Build and publish the docs, gem, and release files"
 task :deploy => [:release, :pdoc] do 
   puts 'Published gem'
 end

data/lib/position_range/error.rb

@@ -1,15 +1,13 @@
 #--#
-# Copyright: (c) 2006-2008 The LogiLogi Foundation <foundation@logilogi.org>
+# Copyright: (c) 2006-2009 The LogiLogi Foundation <foundation@logilogi.org>
 #
 # License:
-#   This file is part of the PositionRange Library. PositionRange is Free
-#   Software. You can run/distribute/modify PositionRange under the terms of
-#   the GNU Affero General Public License version 3. The Affero GPL states
-#   that running a modified version or a derivative work also requires you to
-#   make the sourcecode of that work available to everyone that can interact
-#   with it. We chose the Affero GPL to ensure that PositionRange remains open
-#   and libre (LICENSE.txt contains the full text of the legally binding
-#   license).
+#   This file is part of the PositionRange Library. PositionRange is Free 
+#   Software. You can run/distribute/modify PositionRange under the terms 
+#   of the GNU Lesser General Public License version 3. This license
+#   states that you can use PositionRange in applications that are not Free 
+#   Software but PositionRange itself remains Free Software. (LICENSE contains 
+#   the full text of the legally binding license).
 #++#
 #
 # This Error is raised if positions are out of range.

data/lib/position_range/list.rb

@@ -270,7 +270,7 @@ class PositionRange::List < Array
     self.dup.invert!(maximum_size)
   end
 
-  # Makes sure that there are no non-overlapping borders between
+  # Makes sure that there are no overlapping borders between
   # PositionRanges.
   #
   # The guaranteed situation after calling this method:
@@ -401,6 +401,9 @@ class PositionRange::List < Array
           'of different range_sizes: ' + ranges_to_insert.to_s + ', ' +
           ranges_at_which_to_insert.to_s
     end
+    ranges_to_insert.align_chunks!(ranges_at_which_to_insert)
+    ranges_at_which_to_insert.align_chunks!(ranges_to_insert)
+
     ranges_to_act = ranges_at_which_to_insert.each {|p_r| p_r.action = :ins}.concat(
         ranges_to_skip).sort!
 
@@ -433,6 +436,37 @@ class PositionRange::List < Array
     return self
   end
 
+  # Ensures that the other list and this list don't have any
+  # overlapping chunks, considering their size.
+  #
+  # So PositionRange::List.from_s('10,20:50,70').align_chunks!(
+  #     PositionRange::List.from_s('20,30:200,210,550,560'))
+  #
+  # will result in:
+  # PositionRange::List.from_s('10,20:50,60:60,70')
+  #
+  def align_chunks!(other_ranges)
+    i = -1
+    self_p = 0
+    other_p = 0
+    other_ranges.each {|p_r|
+      i += 1
+      if !self[i]
+        return self
+      end
+      other_p += p_r.size
+      self_p += self[i].size
+      if self_p > other_p
+        copy = self[i]
+        cut = self[i].begin + p_r.size
+        self[i] = copy.new_dup(copy.begin, cut)
+        self.insert(i + 1, copy.new_dup(cut, copy.end))
+        self_p = other_p
+      end
+    }
+    return self
+  end
+
   # Inserting at ranges returning a new list.
   #
   # See insert_at_ranges!

data/lib/position_range/version.rb

@@ -1,8 +1,8 @@
 module PositionRange
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 6
-    TINY  = 7
+    MINOR = 7
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/position_range.rb

@@ -1,15 +1,13 @@
 #--#
-# Copyright: (c) 2006-2008 The LogiLogi Foundation <foundation@logilogi.org>
+# Copyright: (c) 2006-2009 The LogiLogi Foundation <foundation@logilogi.org>
 #
 # License:
-#   This file is part of the PositionRange Library. PositionRange is Free
-#   Software. You can run/distribute/modify PositionRange under the terms of
-#   the GNU Affero General Public License version 3. The Affero GPL states
-#   that running a modified version or a derivative work also requires you to
-#   make the sourcecode of that work available to everyone that can interact
-#   with it. We chose the Affero GPL to ensure that PositionRange remains open
-#   and libre (LICENSE.txt contains the full text of the legally binding
-#   license).
+#   This file is part of the PositionRange Library. PositionRange is Free 
+#   Software. You can run/distribute/modify PositionRange under the terms 
+#   of the GNU Lesser General Public License version 3. This license
+#   states that you can use PositionRange in applications that are not Free 
+#   Software but PositionRange itself remains Free Software. (LICENSE contains 
+#   the full text of the legally binding license).
 #++#
 #
 # PositionRanges allow one to model ranges of text.

data/test/position_range_list_test.rb

@@ -378,10 +378,10 @@ class PositionRangeListTest < Test::Unit::TestCase
 
   def test_insert_at_ranges
     # Without skipping
-    assert_equal PositionRange::List.from_s('0,10:50,59:15,20'),
+    assert_equal PositionRange::List.from_s('0,10:50,60:15,20'),
         PositionRange::List.from_s('0,10:15,20').insert_at_ranges!(
-            PositionRange::List.from_s('50,59'),
-            PositionRange::List.from_s('11,20'))
+            PositionRange::List.from_s('50,60'),
+            PositionRange::List.from_s('10,20'))
 
     # With skipping
     assert_equal PositionRange::List.from_s('39,49:100,102:6,7:16,20'),
@@ -414,6 +414,12 @@ class PositionRangeListTest < Test::Unit::TestCase
             PositionRange::List.from_s('20,30:40,50'),
             PositionRange::List.from_s('800,810:850,860'))
 
+    # error-case
+    assert_equal PositionRange::List.from_s('0,10:50,59:15,20:59,68'),
+        PositionRange::List.from_s('0,10:15,20').insert_at_ranges!(
+            PositionRange::List.from_s('50,68'),
+            PositionRange::List.from_s('11,20:25,34'))
+
     # dup-alternatives
     p = PositionRange::List.from_s('0,10:15,20')
     to_p = PositionRange::List.from_s('0,10:50,59:15,20')
@@ -429,6 +435,23 @@ class PositionRangeListTest < Test::Unit::TestCase
     assert_equal p, to_p
   end
 
+  def test_align_chunks
+    # standard case
+    assert_equal PositionRange::List.from_s('10,20:50,60:60,70'),
+        PositionRange::List.from_s('10,20:50,70').align_chunks!(
+            PositionRange::List.from_s('20,30:200,210:550,560'))
+
+    # self longer
+    assert_equal PositionRange::List.from_s('10,20:50,60:60,70:70,80'),
+        PositionRange::List.from_s('10,20:50,80').align_chunks!(
+            PositionRange::List.from_s('20,30:200,210:550,560'))
+
+    # other longer
+    assert_equal PositionRange::List.from_s('10,20:50,60:60,70'),
+        PositionRange::List.from_s('10,20:50,70').align_chunks!(
+            PositionRange::List.from_s('20,30:200,210:550,590'))
+  end
+
   ### Highlevel methods
 
   def test_translate_to_view

data/test/position_range_test.rb

@@ -1,15 +1,13 @@
 #--#
-# Copyright: (c) 2006-2008 The LogiLogi Foundation <foundation@logilogi.org>
+# Copyright: (c) 2006-2009 The LogiLogi Foundation <foundation@logilogi.org>
 #
 # License:
-#   This file is part of the PositionRange Library. PositionRange is free
-#   software. You can run/distribute/modify PositionRange under the terms of
-#   the GNU Affero General Public License version 3. The Affero GPL states
-#   that running a modified version or a derivative work also requires you to
-#   make the sourcecode of that work available to everyone that can interact
-#   with it. We chose the Affero GPL to ensure that PositionRange remains open
-#   and libre (LICENSE.txt contains the full text of the legally binding
-#   license).
+#   This file is part of the PositionRange Library. PositionRange is Free 
+#   Software. You can run/distribute/modify PositionRange under the terms 
+#   of the GNU Lesser General Public License version 3. This license
+#   states that you can use PositionRange in applications that are not Free 
+#   Software but PositionRange itself remains Free Software. (LICENSE contains 
+#   the full text of the legally binding license).
 #++#
 
 require File.dirname(__FILE__) + '/test_helper.rb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: positionrange
 version: !ruby/object:Gem::Version 
-  version: 0.6.7
+  version: 0.7.0
 platform: ruby
 authors: 
 - Wybo Wiersma
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-06 00:00:00 +02:00
+date: 2010-02-02 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -27,14 +27,14 @@ files:
 - README
 - CHANGELOG
 - LICENSE
-- lib/position_range.rb
-- lib/position_range/version.rb
 - lib/position_range/error.rb
 - lib/position_range/list.rb
+- lib/position_range/version.rb
+- lib/position_range.rb
 - lib/positionrange.rb
+- test/test_helper.rb
 - test/position_range_list_test.rb
 - test/position_range_test.rb
-- test/test_helper.rb
 has_rdoc: true
 homepage: http://positionrange.rubyforge.org
 licenses: []
@@ -59,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: positionrange
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Ranges with attributes that can be juggled.