modalsupport 0.2.0 → 0.3.0

data/.gitignore

@@ -18,4 +18,7 @@ coverage
 rdoc
 pkg
 
+## Rubinius
+*.rbc
+
 ## PROJECT::SPECIFIC

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gem.email = "jgoizueta@gmail.com"
     gem.homepage = "http://github.com/jgoizueta/modalsupport"
     gem.authors = ["Javier Goizueta"]
-    gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
+    gem.add_development_dependency "shoulda"
     gem.add_dependency "hobosupport"
     gem.add_dependency "activesupport"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/modalsupport.rb

@@ -1,6 +1,12 @@
-require 'activesupport'
+require 'active_support'
 require 'hobosupport'
 require 'modalsupport/string'
 require 'modalsupport/regexp'
 require 'modalsupport/enumerable'
 require 'modalsupport/file'
+
+module ModalSupport
+end
+
+require 'modalsupport/mixins/state_equivalent'
+require 'modalsupport/mixins/bracket_constructor'

data/lib/modalsupport/enumerable.rb

@@ -3,7 +3,7 @@ module Enumerable
   def grep_each(pattern)
     grep(pattern){|str| yield(Regexp.last_match)}
   end
-  
+
   if RUBY_VERSION < "1.8.7"
     require 'enumerator'
     alias enumerator_each_slice each_slice
@@ -16,16 +16,31 @@ module Enumerable
       end
     end
   end
-  
+
   def each_pair(&blk)
     each_slice(2, &blk)
   end
-  
+
   # Convert to pairs [[e1,e2], [e3,e4], ...]
   # Note that for a Hash, this is equivalent to hash.to_a.to_pairs which may not be what's intended; hash.to_a is
   # an array of key-value pairs; to_pairs is an array of pairs of key-value pairs.
   def to_pairs
     each_pair.to_a
   end
- 
+
+  # cartesian product
+  #  note that for Ruby >= 1.8.7 a.each_product_pair(b).to_a == a.to_a.product(b.to_a)
+  def each_product_pair(other)
+    if block_given?
+      self.each do |this|
+        other.each do |that|
+          yield [this, that]
+        end
+      end
+    else
+      enum_for(:each_product_pair, other)
+    end
+  end
+
+
 end

data/lib/modalsupport/mixins/bracket_constructor.rb

@@ -0,0 +1,19 @@
+# Mixin that adds a [] operator constructor to a class
+module ModalSupport::BracketConstructor
+  
+  def self.included(base)
+    base.extend ClassMethods
+  end
+  
+  module ClassMethods
+    def [](*args)
+      if args.size==1
+        arg = args.first
+        return nil if arg.nil?
+        return arg if arg.kind_of?(self)
+      end
+      self.new(*args)
+    end
+  end
+  
+end

data/lib/modalsupport/mixins/state_equivalent.rb

@@ -0,0 +1,36 @@
+module ModalSupport::StateEquivalent
+  
+  def ==(obj)
+    test_equal(obj)
+  end
+  
+  def eql?(obj)
+    test_equal(obj)
+  end
+  
+  def ===(obj)
+    test_equal(obj)
+  end
+  
+  def hash
+    h = 0
+    self.instance_variables.each do |var|
+      v = self.instance_variable_get(var)
+      h ^= v.hash unless v.nil?
+    end
+    h
+  end
+  
+  private
+  
+  def test_equal(other)
+    return false unless self.class == other.class
+    (self.instance_variables + other.instance_variables).uniq.each do |var|
+      v1 = self.instance_variable_get(var)
+      v2 = other.instance_variable_get(var)
+      return false unless v1 == v2
+    end
+    true
+  end
+  
+end

data/modalsupport.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{modalsupport}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Javier Goizueta"]
-  s.date = %q{2010-02-05}
+  s.date = %q{2010-06-09}
   s.description = %q{additional support extensions to ActiveSupport and HoboSupport}
   s.email = %q{jgoizueta@gmail.com}
   s.extra_rdoc_files = [
@@ -26,29 +26,37 @@ Gem::Specification.new do |s|
      "lib/modalsupport.rb",
      "lib/modalsupport/enumerable.rb",
      "lib/modalsupport/file.rb",
+     "lib/modalsupport/mixins/bracket_constructor.rb",
+     "lib/modalsupport/mixins/state_equivalent.rb",
      "lib/modalsupport/regexp.rb",
      "lib/modalsupport/string.rb",
      "modalsupport.gemspec",
      "test/helper.rb",
+     "test/test_bracket_constructor.rb",
      "test/test_grep.rb",
      "test/test_gsub.rb",
      "test/test_match.rb",
+     "test/test_product.rb",
      "test/test_relative_path.rb",
      "test/test_slice.rb",
+     "test/test_state_equivalent.rb",
      "test/test_unindent.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.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{simple extensions to core classes}
   s.test_files = [
     "test/helper.rb",
+     "test/test_bracket_constructor.rb",
      "test/test_grep.rb",
      "test/test_gsub.rb",
      "test/test_match.rb",
+     "test/test_product.rb",
      "test/test_relative_path.rb",
      "test/test_slice.rb",
+     "test/test_state_equivalent.rb",
      "test/test_unindent.rb"
   ]
 
@@ -56,17 +64,17 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_runtime_dependency(%q<hobosupport>, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
     else
-      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<hobosupport>, [">= 0"])
       s.add_dependency(%q<activesupport>, [">= 0"])
     end
   else
-    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<hobosupport>, [">= 0"])
     s.add_dependency(%q<activesupport>, [">= 0"])
   end

data/test/test_bracket_constructor.rb

@@ -0,0 +1,31 @@
+require 'helper'
+
+class TestBracketConstructor < Test::Unit::TestCase
+
+  context "Mixing-in BracketConstructor" do
+    
+    class TestClass
+      def initialize(v)
+        @value = v
+      end
+      attr_reader :value
+      include ModalSupport::BracketConstructor
+    end
+
+    should "preserve nils" do
+      assert_nil TestClass[nil]
+    end
+    
+    should "preserve objects of the class" do
+      x = TestClass.new(10)
+      # assert_equal x.value, TestClass[x].value
+      assert_equal x.object_id, TestClass[x].object_id
+    end
+    
+    should "create new object" do
+      assert_equal 11, TestClass[11].value
+    end
+    
+  end
+
+end

data/test/test_product.rb

@@ -0,0 +1,58 @@
+require 'helper'
+
+class TestProduct < Test::Unit::TestCase
+
+  context "Enumerable objects" do
+
+    result = [[1, 1], [1, 2], [1, 3],
+              [2, 1], [2, 2], [2, 3],
+              [3, 1], [3, 2], [3, 3],
+              [4, 1], [4, 2], [4, 3],
+              [5, 1], [5, 2], [5, 3]]
+
+    should "have cartesian product iterator" do
+      p = []
+      (1..5).each_product_pair(1..3) do |pair|
+        p << pair
+      end
+      assert_equal result, p
+
+      p = []
+      (1..5).to_a.each_product_pair((1..3).to_a) do |pair|
+        p << pair
+      end
+      assert_equal result, p
+
+      p = []
+      (1..5).each_product_pair(1..3) do |x,y|
+        p << [x,y]
+      end
+      assert_equal result, p
+
+    end
+
+    should "have exernal cartesian product iterator" do
+      it = (1..5).each_product_pair(1..3)
+      p = []
+      it.each do |pair|
+        p << pair
+      end
+      assert_equal result, p
+
+      it = (1..5).to_a.each_product_pair((1..3).to_a)
+      p = []
+      it.each do |pair|
+        p << pair
+      end
+      assert_equal result, p
+      
+      assert_equal result, (1..5).each_product_pair(1..3).to_a
+      assert_equal result, (1..5).to_a.each_product_pair(1..3).to_a
+      assert_equal result, (1..5).each_product_pair((1..3).to_a).to_a
+      assert_equal result, (1..5).to_a.each_product_pair((1..3).to_a).to_a
+
+    end
+
+  end
+
+end

data/test/test_state_equivalent.rb

@@ -0,0 +1,35 @@
+require 'helper'
+
+class TestStateEquivalent < Test::Unit::TestCase
+
+  context "Mixing-in StateEquivalent" do
+    
+    class TestClass
+      def initialize(v, w)
+        @value1 = v
+        @value2 = w
+      end
+      attr_reader :value1, :value2
+      include ModalSupport::StateEquivalent
+    end
+
+    should "provide equality" do
+      assert_equal TestClass.new(11,22), TestClass.new(11,22)
+      assert_equal TestClass.new(11,nil), TestClass.new(11,nil)
+      assert_not_equal TestClass.new(11,22), TestClass.new(11,23)
+      assert_not_equal TestClass.new(11,22), 11
+      assert TestClass.new(11,22).eql?(TestClass.new(11,22))
+      assert TestClass.new(11,nil).eql?(TestClass.new(11,nil))
+      assert !TestClass.new(11,22).eql?(TestClass.new(11,23))
+      assert !TestClass.new(11,22).eql?(11)
+    end
+    
+    should "provide hash consistent with equality" do
+      assert_equal TestClass.new(11,22).hash, TestClass.new(11,22).hash
+      assert_equal TestClass.new(11,nil).hash, TestClass.new(11,nil).hash
+      assert_not_equal TestClass.new(11,22).hash, TestClass.new(11,23).hash
+    end
+    
+  end
+
+end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: modalsupport
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  hash: 19
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Javier Goizueta
@@ -9,39 +15,51 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-05 00:00:00 +01:00
+date: 2010-06-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: shoulda
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: hobosupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 description: additional support extensions to ActiveSupport and HoboSupport
 email: jgoizueta@gmail.com
 executables: []
@@ -61,15 +79,20 @@ files:
 - lib/modalsupport.rb
 - lib/modalsupport/enumerable.rb
 - lib/modalsupport/file.rb
+- lib/modalsupport/mixins/bracket_constructor.rb
+- lib/modalsupport/mixins/state_equivalent.rb
 - lib/modalsupport/regexp.rb
 - lib/modalsupport/string.rb
 - modalsupport.gemspec
 - test/helper.rb
+- test/test_bracket_constructor.rb
 - test/test_grep.rb
 - test/test_gsub.rb
 - test/test_match.rb
+- test/test_product.rb
 - test/test_relative_path.rb
 - test/test_slice.rb
+- test/test_state_equivalent.rb
 - test/test_unindent.rb
 has_rdoc: true
 homepage: http://github.com/jgoizueta/modalsupport
@@ -81,29 +104,38 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: simple extensions to core classes
 test_files: 
 - test/helper.rb
+- test/test_bracket_constructor.rb
 - test/test_grep.rb
 - test/test_gsub.rb
 - test/test_match.rb
+- test/test_product.rb
 - test/test_relative_path.rb
 - test/test_slice.rb
+- test/test_state_equivalent.rb
 - test/test_unindent.rb