modalsupport 0.8.2 → 0.8.3

data/VERSION

@@ -1 +1 @@
-0.8.2
+0.8.3

data/lib/modalsupport/mixins/bracket_constructor.rb

@@ -1,4 +1,26 @@
-# Mixin that adds a [] operator constructor to a class
+# Mixin that adds a [] operator constructor to a class, which
+# is a not-so-ugly alternative to the +new+ method.
+#
+#   class A
+#     include BracketConstructor
+#     def initialize(a)
+#       puts "A.new(#{a.inspect})"
+#     end 
+#   end
+#
+#   A[100] # => A.new(100)
+#
+# In Rails, this kind of constructor has an advantage over a function such as:
+#
+#   def A(*args)
+#     A.new(*args)
+#   end
+#
+# With the A[] notation we've referenced the class name via the constant A, 
+# which in Rails brings in the declaration for A automatically, whereas the
+# method A() won't be found unless the file which declares it is explicitely
+# required.
+#
 module ModalSupport::BracketConstructor
   
   def self.included(base)

data/lib/modalsupport/string.rb

@@ -59,5 +59,20 @@ class String
     lines.join("\n")
   end
   
+  # Remove wrapping characters and external whitespace
+  def unwrap(wrapping)
+    if wrapping.length==1
+      open = close = wrapping
+    else
+      open = wrapping[0,wrapping.length/2]
+      close = wrapping[-wrapping.length/2..-1]
+    end
+    if self.match(/\A\s*#{Regexp.escape(open)}(.*)#{Regexp.escape(close)}\s*\Z/m)
+      $1
+    else
+      self
+    end
+  end
+  
 end
 

data/modalsupport.gemspec

@@ -1,86 +1,65 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{modalsupport}
-  s.version = "0.8.2"
+  s.version = "0.8.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Javier Goizueta"]
-  s.date = %q{2011-02-21}
+  s.authors = [%q{Javier Goizueta}]
+  s.date = %q{2011-11-29}
   s.description = %q{additional support extensions to ActiveSupport and HoboSupport}
   s.email = %q{jgoizueta@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/modalsupport.rb",
-     "lib/modalsupport/array.rb",
-     "lib/modalsupport/enumerable.rb",
-     "lib/modalsupport/file.rb",
-     "lib/modalsupport/full.rb",
-     "lib/modalsupport/mixins/bracket_constructor.rb",
-     "lib/modalsupport/mixins/state_equivalent.rb",
-     "lib/modalsupport/recursive_map.rb",
-     "lib/modalsupport/regexp.rb",
-     "lib/modalsupport/ruby_engine.rb",
-     "lib/modalsupport/ruby_platform.rb",
-     "lib/modalsupport/ruby_version.rb",
-     "lib/modalsupport/string.rb",
-     "modalsupport.gemspec",
-     "test/helper.rb",
-     "test/test_array_index.rb",
-     "test/test_array_to_h.rb",
-     "test/test_bracket_constructor.rb",
-     "test/test_cross_each.rb",
-     "test/test_grep.rb",
-     "test/test_gsub.rb",
-     "test/test_match.rb",
-     "test/test_paralell_each.rb",
-     "test/test_product.rb",
-     "test/test_recursive_map.rb",
-     "test/test_relative_path.rb",
-     "test/test_rotate.rb",
-     "test/test_slice.rb",
-     "test/test_state_equivalent.rb",
-     "test/test_unindent.rb"
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/modalsupport.rb",
+    "lib/modalsupport/array.rb",
+    "lib/modalsupport/enumerable.rb",
+    "lib/modalsupport/file.rb",
+    "lib/modalsupport/full.rb",
+    "lib/modalsupport/mixins/bracket_constructor.rb",
+    "lib/modalsupport/mixins/state_equivalent.rb",
+    "lib/modalsupport/recursive_map.rb",
+    "lib/modalsupport/regexp.rb",
+    "lib/modalsupport/ruby_engine.rb",
+    "lib/modalsupport/ruby_platform.rb",
+    "lib/modalsupport/ruby_version.rb",
+    "lib/modalsupport/string.rb",
+    "modalsupport.gemspec",
+    "test/helper.rb",
+    "test/test_array_index.rb",
+    "test/test_array_to_h.rb",
+    "test/test_bracket_constructor.rb",
+    "test/test_cross_each.rb",
+    "test/test_grep.rb",
+    "test/test_gsub.rb",
+    "test/test_match.rb",
+    "test/test_paralell_each.rb",
+    "test/test_product.rb",
+    "test/test_recursive_map.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_unwrap.rb"
   ]
   s.homepage = %q{http://github.com/jgoizueta/modalsupport}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
   s.summary = %q{simple extensions to core classes}
-  s.test_files = [
-    "test/helper.rb",
-     "test/test_array_index.rb",
-     "test/test_array_to_h.rb",
-     "test/test_bracket_constructor.rb",
-     "test/test_cross_each.rb",
-     "test/test_grep.rb",
-     "test/test_gsub.rb",
-     "test/test_match.rb",
-     "test/test_paralell_each.rb",
-     "test/test_product.rb",
-     "test/test_recursive_map.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"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/test/test_array_to_h.rb

@@ -6,6 +6,7 @@ class TestArrayIndex < Test::Unit::TestCase
 
     should "have an to_h method converting key-value pairs to a hash" do
       assert_respond_to [], :to_h
+      assert_equal({}, [].to_h)
       assert_equal({:a=>11, :b=>22}, [[:a,11], [:b,22]].to_h)
       assert_equal({:a=>11, :b=>[22,33]}, [[:a,11], [:b,22,33]].to_h)
       assert_equal({1=>nil, 2=>nil, 3=>nil}, [1,2,3].to_h)

data/test/test_recursive_map.rb

@@ -64,7 +64,7 @@ class TestRecursiveMap < Test::Unit::TestCase
         ModalSupport.recursive_map(:a=>11, :b=>22, :d=>[1,2,3], &@array_to_string)        
       )
       assert_same_elements(
-        [[:a, 11], [:b, 22], [:c, [[:x, 100], [:y, 200]]], [:d, [1, 2, 3]]],
+        [[:a, 11], [:b, 22], [:c, {:x=>100,:y=>200}.to_a], [:d, [1, 2, 3]]],
         ModalSupport.recursive_map(:a=>11, :b=>22, :c=>{:x=>100,:y=>200}, :d=>[1,2,3], &@hash_to_array)
       )
       assert_equal(

data/test/test_unwrap.rb

@@ -0,0 +1,50 @@
+require 'helper'
+
+class TestUnwrap < Test::Unit::TestCase
+
+  should "unwrap brackets" do
+    assert_equal "1234", "[1234]".unwrap("[]")
+    assert_equal "[1234]", "[[1234]]".unwrap("[]")
+    assert_equal "1234", "{1234}".unwrap("{}")
+    assert_equal "{1234}", "{{1234}}".unwrap("{}")
+    assert_equal "1234", "(1234)".unwrap("()")
+    assert_equal "(1234)", "((1234))".unwrap("()")
+  end
+  
+  should "unwrap quotes" do
+    assert_equal "1234", '"1234"'.unwrap('""')
+    assert_equal "1234", '"1234"'.unwrap('"')
+    assert_equal "1234", "'1234'".unwrap("''")
+    assert_equal "1234", "'1234'".unwrap("'")
+    assert_equal '"1234"', '""1234""'.unwrap('""')
+    assert_equal '"1234"', '""1234""'.unwrap('"')
+    assert_equal "'1234'", "''1234''".unwrap("''")
+    assert_equal "'1234'", "''1234''".unwrap("'")
+  end
+
+  should "unwrap and remove external whitespace" do
+    assert_equal "1234", " [1234]".unwrap("[]")
+    assert_equal "1234", " [1234]   ".unwrap("[]")
+    assert_equal "[1234]", "  [[1234]] ".unwrap("[]")
+  end
+  
+  should "preserve internal whitespace" do
+    assert_equal "12  34", "[12  34]".unwrap("[]")
+    assert_equal "12  3\n4", "[12  3\n4]".unwrap("[]")
+    assert_equal "  12  3\n4", "[  12  3\n4]".unwrap("[]")
+    assert_equal "  12  3\n4 ", "[  12  3\n4 ]".unwrap("[]")
+    assert_equal "  12  3\n4 ", " [  12  3\n4 ] ".unwrap("[]")
+    assert_equal "  12  3\n4 ", " [  12  3\n4 ]  ".unwrap("[]")
+  end
+
+  should "preserve non-wrapped strings" do
+    assert_equal "1234", "1234".unwrap("[]")
+    assert_equal "1234", "1234".unwrap('""')
+    assert_equal "1234", "1234".unwrap('"')
+    assert_equal "  1234  ", "  1234  ".unwrap("[]")
+    assert_equal "  1234  ", "  1234  ".unwrap('""')
+    assert_equal "  1234  ", "  1234  ".unwrap('"')
+  end
+
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: modalsupport
 version: !ruby/object:Gem::Version 
-  hash: 59
-  prerelease: false
+  hash: 57
+  prerelease: 
   segments: 
   - 0
   - 8
-  - 2
-  version: 0.8.2
+  - 3
+  version: 0.8.3
 platform: ruby
 authors: 
 - Javier Goizueta
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-21 00:00:00 +01:00
-default_executable: 
+date: 2011-11-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
@@ -43,7 +42,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -78,14 +76,13 @@ files:
 - test/test_slice.rb
 - test/test_state_equivalent.rb
 - test/test_unindent.rb
-- test/tstr.rb
-has_rdoc: true
+- test/test_unwrap.rb
 homepage: http://github.com/jgoizueta/modalsupport
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -109,25 +106,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: simple extensions to core classes
-test_files: 
-- test/helper.rb
-- test/test_array_index.rb
-- test/test_array_to_h.rb
-- test/test_bracket_constructor.rb
-- test/test_cross_each.rb
-- test/test_grep.rb
-- test/test_gsub.rb
-- test/test_match.rb
-- test/test_paralell_each.rb
-- test/test_product.rb
-- test/test_recursive_map.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
+test_files: []
+

data/.gitignore

@@ -1,24 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## Rubinius
-*.rbc
-
-## PROJECT::SPECIFIC

data/test/tstr.rb

@@ -1,109 +0,0 @@
-$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