modalsupport 0.5.2 → 0.6.0

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.6.0

data/lib/modalsupport/array.rb

@@ -0,0 +1,14 @@
+class Array
+  # backport of Ruby 1.9.2 Array#rotate
+  unless [].respond_to?(:rotate)
+    def rotate(n=1)
+      n = (n % self.size)
+      n>0 ? self[n..-1] + self[0...n] : self
+    end
+  end
+  unless [].respond_to?(:rotate!)
+    def rotate!(n=1)
+      self.replace(self.rotate(n))
+    end
+  end
+end

data/lib/modalsupport/ruby_platform.rb

@@ -29,5 +29,5 @@ def ruby_platform_is?(platform)
 end
 
 def if_ruby_platform_is(platform)
-  yield if platform_is?(platform)
+  yield if platform_is?(platform) 
 end

data/lib/modalsupport.rb

@@ -5,6 +5,7 @@ require 'modalsupport/string'
 require 'modalsupport/regexp'
 require 'modalsupport/enumerable'
 require 'modalsupport/file'
+require 'modalsupport/array'
 
 module ModalSupport
 end

data/modalsupport.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{modalsupport}
-  s.version = "0.5.2"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Javier Goizueta"]
-  s.date = %q{2010-06-10}
+  s.date = %q{2011-02-08}
   s.description = %q{additional support extensions to ActiveSupport and HoboSupport}
   s.email = %q{jgoizueta@gmail.com}
   s.extra_rdoc_files = [
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "lib/modalsupport.rb",
+     "lib/modalsupport/array.rb",
      "lib/modalsupport/enumerable.rb",
      "lib/modalsupport/file.rb",
      "lib/modalsupport/full.rb",
@@ -44,6 +45,7 @@ Gem::Specification.new do |s|
      "test/test_paralell_each.rb",
      "test/test_product.rb",
      "test/test_relative_path.rb",
+     "test/test_rotate.rb",
      "test/test_slice.rb",
      "test/test_state_equivalent.rb",
      "test/test_unindent.rb"
@@ -51,7 +53,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/jgoizueta/modalsupport}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{simple extensions to core classes}
   s.test_files = [
     "test/helper.rb",
@@ -63,16 +65,18 @@ Gem::Specification.new do |s|
      "test/test_paralell_each.rb",
      "test/test_product.rb",
      "test/test_relative_path.rb",
+     "test/test_rotate.rb",
      "test/test_slice.rb",
      "test/test_state_equivalent.rb",
-     "test/test_unindent.rb"
+     "test/test_unindent.rb",
+     "test/tstr.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<shoulda>, [">= 0"])
     else
       s.add_dependency(%q<shoulda>, [">= 0"])

data/test/test_rotate.rb

@@ -0,0 +1,72 @@
+require 'helper'
+
+class TestRotate < Test::Unit::TestCase
+
+  context "Arrays" do
+
+    should "have a proper rotate method" do
+      assert_equal [2,3,4,5,6,7,1], [1,2,3,4,5,6,7].rotate
+      assert_equal [2,3,4,5,6,7,1], [1,2,3,4,5,6,7].rotate(1)
+      assert_equal [3,4,5,6,7,1,2], [1,2,3,4,5,6,7].rotate(2)
+      assert_equal [4,5,6,7,1,2,3], [1,2,3,4,5,6,7].rotate(3)
+      assert_equal [5,6,7,1,2,3,4], [1,2,3,4,5,6,7].rotate(4)
+      assert_equal [6,7,1,2,3,4,5], [1,2,3,4,5,6,7].rotate(5)
+      assert_equal [7,1,2,3,4,5,6], [1,2,3,4,5,6,7].rotate(6)
+      assert_equal [1,2,3,4,5,6,7], [1,2,3,4,5,6,7].rotate(7)
+      assert_equal [1,2,3,4,5,6,7], [1,2,3,4,5,6,7].rotate(0)
+      assert_equal [2,3,4,5,6,7,1], [1,2,3,4,5,6,7].rotate(8)
+      assert_equal [7,1,2,3,4,5,6], [1,2,3,4,5,6,7].rotate(-1)
+      assert_equal [6,7,1,2,3,4,5], [1,2,3,4,5,6,7].rotate(-2)
+      assert_equal [5,6,7,1,2,3,4], [1,2,3,4,5,6,7].rotate(-3)
+      assert_equal [4,5,6,7,1,2,3], [1,2,3,4,5,6,7].rotate(-4)
+      assert_equal [3,4,5,6,7,1,2], [1,2,3,4,5,6,7].rotate(-5)
+      assert_equal [2,3,4,5,6,7,1], [1,2,3,4,5,6,7].rotate(-6)
+      assert_equal [1,2,3,4,5,6,7], [1,2,3,4,5,6,7].rotate(-7)
+      assert_equal [7,1,2,3,4,5,6], [1,2,3,4,5,6,7].rotate(-8)
+      assert_equal [3,4,5,6,7,1,2], [1,2,3,4,5,6,7].rotate(23)
+      assert_equal [6,7,1,2,3,4,5], [1,2,3,4,5,6,7].rotate(-23)
+    end
+
+    should "not be muted by rotate" do
+      a = [1,2,3,4,5,6,7]
+      a.rotate(3)
+      assert_equal [1,2,3,4,5,6,7], a
+      a.rotate(-3)
+      assert_equal [1,2,3,4,5,6,7], a
+    end
+    
+    should "have a proper rotate! method" do
+      assert_equal [2,3,4,5,6,7,1], [1,2,3,4,5,6,7].rotate!
+      assert_equal [2,3,4,5,6,7,1], [1,2,3,4,5,6,7].rotate!(1)
+      assert_equal [3,4,5,6,7,1,2], [1,2,3,4,5,6,7].rotate!(2)
+      assert_equal [4,5,6,7,1,2,3], [1,2,3,4,5,6,7].rotate!(3)
+      assert_equal [5,6,7,1,2,3,4], [1,2,3,4,5,6,7].rotate!(4)
+      assert_equal [6,7,1,2,3,4,5], [1,2,3,4,5,6,7].rotate!(5)
+      assert_equal [7,1,2,3,4,5,6], [1,2,3,4,5,6,7].rotate!(6)
+      assert_equal [1,2,3,4,5,6,7], [1,2,3,4,5,6,7].rotate!(7)
+      assert_equal [1,2,3,4,5,6,7], [1,2,3,4,5,6,7].rotate!(0)
+      assert_equal [2,3,4,5,6,7,1], [1,2,3,4,5,6,7].rotate!(8)
+      assert_equal [7,1,2,3,4,5,6], [1,2,3,4,5,6,7].rotate!(-1)
+      assert_equal [6,7,1,2,3,4,5], [1,2,3,4,5,6,7].rotate!(-2)
+      assert_equal [5,6,7,1,2,3,4], [1,2,3,4,5,6,7].rotate!(-3)
+      assert_equal [4,5,6,7,1,2,3], [1,2,3,4,5,6,7].rotate!(-4)
+      assert_equal [3,4,5,6,7,1,2], [1,2,3,4,5,6,7].rotate!(-5)
+      assert_equal [2,3,4,5,6,7,1], [1,2,3,4,5,6,7].rotate!(-6)
+      assert_equal [1,2,3,4,5,6,7], [1,2,3,4,5,6,7].rotate!(-7)
+      assert_equal [7,1,2,3,4,5,6], [1,2,3,4,5,6,7].rotate!(-8)
+      assert_equal [3,4,5,6,7,1,2], [1,2,3,4,5,6,7].rotate!(23)
+      assert_equal [6,7,1,2,3,4,5], [1,2,3,4,5,6,7].rotate!(-23)
+    end
+
+    should "be muted by rotate" do
+      a = [1,2,3,4,5,6,7]
+      a.rotate!(3)
+      assert_equal [4,5,6,7,1,2,3], a
+      a = [1,2,3,4,5,6,7]
+      a.rotate!(-3)
+      assert_equal [5,6,7,1,2,3,4], a
+    end
+
+  end
+
+end

data/test/tstr.rb

@@ -0,0 +1,109 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '.', 'lib'))
+
+require 'benchmark'
+
+class Array
+
+  # rot1: splicing
+  def rot1(n=1)
+    self[n..-1] + self[0...n]
+  end
+  def rot1!(n=1)
+    self.replace(self.rot1(n))
+  end
+
+  # rot2: <</shift, no válido para n<0
+  def rot2(n=1)
+    a = dup
+    n.times do a << a.shift end
+    a
+  end
+  def rot2!(n=1)
+    n.times do self << self.shift end
+    self
+  end
+  
+  # rot3: in-place juggling
+  def rot3!(n=1)    
+    m = self.size
+    i0 = 0
+    v0 = self[i=i0]
+    loop do
+      j = (i+n)%m # next index
+      if j==i0
+        self[i] = v0
+        break
+      else
+        self[i] = self[j]
+      end
+      i = j
+    end
+    self
+  end
+  def rot3(n=1)
+    self.dup.rot3!(n)
+  end
+  
+end
+
+if false
+puts [1,2,3,4,5,6,7].rot3(0).inspect
+puts [1,2,3,4,5,6,7].rot3(1).inspect
+puts [1,2,3,4,5,6,7].rot3(3).inspect
+puts [1,2,3,4,5,6,7].rot3(5).inspect
+puts [1,2,3,4,5,6,7].rot3(6).inspect
+
+a=(1..7).to_a
+a.rot3!(3)
+puts a.inspect
+
+exit
+end
+
+N=100
+M=1000
+M2=15
+
+a1 = Array.new(M){rand}
+a2 = Array.new(M){Array.new(rand(M2)){rand}}
+b1 = b2 = nil
+
+Benchmark.bm(15) do |bm|
+  b1 = a1.dup
+  b2 = a2.dup
+  bm.report("rot1") {    
+    N.times{ (1...b1.size).each{|n| b1.rot1(n)}  }
+    N.times{ (1...b2.size).each{|n| b2.rot1(n)}  }
+  }
+  b1 = a1.dup
+  b2 = a2.dup
+  bm.report("rot1!") {    
+    N.times{ (1...b1.size).each{|n| b1.rot1!(n)}  }
+    N.times{ (1...b2.size).each{|n| b2.rot1!(n)}  }
+  }
+  b1 = a1.dup
+  b2 = a2.dup
+  bm.report("rot2") {    
+    N.times{ (1...b1.size).each{|n| b1.rot2(n)}  }
+    N.times{ (1...b2.size).each{|n| b2.rot2(n)}  }
+  }
+  b1 = a1.dup
+  b2 = a2.dup
+  bm.report("rot2!") {    
+    N.times{ (1...b1.size).each{|n| b1.rot2!(n)}  }
+    N.times{ (1...b2.size).each{|n| b2.rot2!(n)}  }
+  }
+  b1 = a1.dup
+  b2 = a2.dup
+  bm.report("rot3") {    
+    N.times{ (1...b1.size).each{|n| b1.rot3(n)}  }
+    N.times{ (1...b2.size).each{|n| b2.rot3(n)}  }
+  }
+  b1 = a1.dup
+  b2 = a2.dup
+  bm.report("rot3!") {    
+    N.times{ (1...b1.size).each{|n| b1.rot3!(n)}  }
+    N.times{ (1...b2.size).each{|n| b2.rot3!(n)}  }
+  }
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: modalsupport
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 2
-  version: 0.5.2
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Javier Goizueta
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-10 00:00:00 +02:00
+date: 2011-02-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,6 +49,7 @@ files:
 - Rakefile
 - VERSION
 - lib/modalsupport.rb
+- lib/modalsupport/array.rb
 - lib/modalsupport/enumerable.rb
 - lib/modalsupport/file.rb
 - lib/modalsupport/full.rb
@@ -69,9 +70,11 @@ files:
 - test/test_paralell_each.rb
 - test/test_product.rb
 - test/test_relative_path.rb
+- test/test_rotate.rb
 - test/test_slice.rb
 - test/test_state_equivalent.rb
 - test/test_unindent.rb
+- test/tstr.rb
 has_rdoc: true
 homepage: http://github.com/jgoizueta/modalsupport
 licenses: []
@@ -102,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: simple extensions to core classes
@@ -116,6 +119,8 @@ test_files:
 - test/test_paralell_each.rb
 - test/test_product.rb
 - test/test_relative_path.rb
+- test/test_rotate.rb
 - test/test_slice.rb
 - test/test_state_equivalent.rb
 - test/test_unindent.rb
+- test/tstr.rb