safer 0.3.1 → 0.4.0

data/lib/safer.rb

@@ -15,5 +15,5 @@
 class Safer
   ##
   # Current release of Safer.
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/test/test_safer_hashprotocol.rb

@@ -8,40 +8,40 @@ class TC_SaferHashProtocol < Test::Unit::TestCase
     @all_hash = { :foo => nil, :bar => nil, :baz => nil }
     @fail_hash = { :blubby => nil }
     @has_key = SHP::HasKey.create(*@all_hash.keys)
+
+    @any = SHP::Any.new(*@has_key)
+    @not_any = SHP::Not.new(@any)
+    @all = SHP::All.new(*@has_key)
+    @not_all = SHP::Not.new(@all)
+    @only = SHP::Only.new(@any)
+    @all_plus = @all_hash.merge(@fail_hash)
   end
   def teardown
   end
 
-  def test_any
-    any = SHP::Any.new(*@has_key)
-    not_any = SHP::Not.new(any)
-    assert(any === @any_hash)
-    assert(! (not_any === @any_hash))
-    assert(any === @all_hash)
-    assert(! (not_any === @all_hash))
-    assert(! (any === @fail_hash))
-    assert(not_any === @fail_hash)
+  def test_anyFromAllKeysShouldMatchAllButFailHash
+    assert(@any === @any_hash)
+    assert(! (@not_any === @any_hash))
+    assert(@any === @all_hash)
+    assert(! (@not_any === @all_hash))
+    assert(! (@any === @fail_hash))
+    assert(@not_any === @fail_hash)
   end
 
-  def test_all
-    all = SHP::All.new(*@has_key)
-    not_all = SHP::Not.new(all)
-
-    assert(! (all === @any_hash))
-    assert(not_all === @any_hash)
-    assert(all === @all_hash)
-    assert(! (not_all === @all_hash))
-    assert(! (all === @fail_hash))
-    assert(not_all === @fail_hash)
+  def test_allFromAllKeysShouldMatchOnlyAllHash
+    assert(! (@all === @any_hash))
+    assert(@not_all === @any_hash)
+    assert(@all === @all_hash)
+    assert(! (@not_all === @all_hash))
+    assert(! (@all === @fail_hash))
+    assert(@not_all === @fail_hash)
   end
 
-  def test_only
-    any = SHP::Any.new(*@has_key)
-    only = SHP::Only.new(any)
-    all_plus = @all_hash.merge(@fail_hash)
-    assert(only === @all_hash)
-    assert(any === @all_hash)
-    assert(! (only === all_plus))
-    assert(any === all_plus)
+  def test_onlyAnyFromAllKeysShouldMatchAll
+    assert(@only === @all_hash)
+  end
+  def test_onlyAnyFromAllKeysShouldFailWithExtraKey
+    assert(! (@only === @all_plus))
+    assert(@any === @all_plus)
   end
 end

data/test/test_safer_ivar.rb

@@ -1,58 +1,42 @@
 require 'safer/ivar'
 require 'test/unit'
 
-module Root
-  class Test
-    class Instance
-      Safer::IVar.instance_variable(self, :instance)
-    end
-    class Reader
-      Safer::IVar.instance_variable(self, :instance)
-      Safer::IVar.export_reader(self, :instance)
-    end
-    class Writer
-      Safer::IVar.instance_variable(self, :instance)
-      Safer::IVar.export_writer(self, :instance)
-    end
-    class Accessor
-      Safer::IVar.instance_variable(self, :instance)
-      Safer::IVar.export_accessor(self, :instance)
+class TC_SaferIVar < Test::Unit::TestCase
+  module Root
+    class Test
+      class Instance
+        Safer::IVar.instance_variable(self, :instance)
+      end
+      class Reader
+        Safer::IVar.instance_variable(self, :instance)
+        Safer::IVar.export_reader(self, :instance)
+      end
+      class Writer
+        Safer::IVar.instance_variable(self, :instance)
+        Safer::IVar.export_writer(self, :instance)
+      end
+      class Accessor
+        Safer::IVar.instance_variable(self, :instance)
+        Safer::IVar.export_accessor(self, :instance)
+      end
     end
   end
-end
 
-class TC_SaferIVar < Test::Unit::TestCase
   def setup
   end
   def teardown
   end
 
   def assert_no_respond_to(object, method, message="")
-    _wrap_assertion do
-      full_message = 
-        build_message(
-          nil,
-          "<?>\ngiven as the method name argument to #assert_no_respond_to " +
-            "must be a Symbol or #respond_to\\?(:to_str).",
-          method
-        )
-
-      assert_block(full_message) do
-        method.kind_of?(Symbol) || method.respond_to?(:to_str)
-      end
-      full_message = 
-        build_message(
-          message, "<?>\nof type <?>\nnot expected to respond_to\\\\?<?>.\n",
-          object, object.class, method
-        )
-      assert_block(full_message) { not object.respond_to?(method) }
-    end
+    assert method.kind_of?(Symbol)
+    msg = "#{object} of type #{object.class} not expected to respond_to? #{method}\n#{message}"
+    assert((not object.respond_to?(method)), msg)
   end
 
   def test_class_symbol_prefix
-    assert_equal("root", Safer::IVar.class_symbol_prefix(Root))
-    assert_equal("root_test", Safer::IVar.class_symbol_prefix(Root::Test))
-    assert_equal("root_test_instance", Safer::IVar.class_symbol_prefix(Root::Test::Instance))
+    assert_equal("tc_saferivar_root", Safer::IVar.class_symbol_prefix(Root))
+    assert_equal("tc_saferivar_root_test", Safer::IVar.class_symbol_prefix(Root::Test))
+    assert_equal("tc_saferivar_root_test_instance", Safer::IVar.class_symbol_prefix(Root::Test::Instance))
     k = Root.class_eval("$k = Class.new(Root::Test::Instance)")
     assert_same(nil, Safer::IVar.class_symbol_prefix(k))
     b = k.class_eval("class Blah ; end ; Blah")
@@ -73,7 +57,7 @@ class TC_SaferIVar < Test::Unit::TestCase
       end
     end
     ti = Root::Test::Instance.new
-    assert_respond_to(ti, :root_test_instance__instance)
+    assert_respond_to(ti, :tc_saferivar_root_test_instance__instance)
     test_accessors.call(ti, false, false)
     tr = Root::Test::Reader.new
     test_accessors.call(tr, true, false)

data/test/test_safer_ivar_run.rb

@@ -0,0 +1,77 @@
+require 'safer/ivar'
+require 'test/unit'
+
+class TC_SaferIVarRun < Test::Unit::TestCase
+  module Root
+    class Test
+      class Instance
+        Safer::IVar.run(self) do |iv|
+          iv.ivar(:instance)
+        end
+      end
+      class Reader
+        Safer::IVar.run(self) do |iv|
+          iv.ivar(:instance)
+          iv.reader(:instance)
+        end
+      end
+      class Writer
+        Safer::IVar.run(self) do |iv|
+          iv.ivar(:instance)
+          iv.writer(:instance)
+        end
+      end
+      class Accessor
+        Safer::IVar.run(self) do |iv|
+          iv.ivar(:instance)
+          iv.accessor(:instance)
+        end
+      end
+    end
+  end
+
+  def setup
+  end
+  def teardown
+  end
+
+  def assert_no_respond_to(object, method, message="")
+    assert method.kind_of?(Symbol)
+    msg = "#{object} of type #{object.class} not expected to respond_to? #{method}\n#{message}"
+    assert((not object.respond_to?(method)), msg)
+  end
+
+  def test_class_symbol_prefix
+    assert_equal("tc_saferivarrun_root", Safer::IVar.class_symbol_prefix(Root))
+    assert_equal("tc_saferivarrun_root_test", Safer::IVar.class_symbol_prefix(Root::Test))
+    assert_equal("tc_saferivarrun_root_test_instance", Safer::IVar.class_symbol_prefix(Root::Test::Instance))
+    k = Root.class_eval("$k = Class.new(Root::Test::Instance)")
+    assert_same(nil, Safer::IVar.class_symbol_prefix(k))
+    b = k.class_eval("class Blah ; end ; Blah")
+    assert_equal("blah", Safer::IVar.class_symbol_prefix(b))
+  end
+
+  def test_instance
+    test_accessors = proc do |obj, expectRead, expectWrite|
+      if expectRead
+        assert_respond_to(obj, :instance)
+      else
+        assert_no_respond_to(obj, :instance)
+      end
+      if expectWrite
+        assert_respond_to(obj, :instance=)
+      else
+        assert_no_respond_to(obj, :instance=)
+      end
+    end
+    ti = Root::Test::Instance.new
+    assert_respond_to(ti, :tc_saferivarrun_root_test_instance__instance)
+    test_accessors.call(ti, false, false)
+    tr = Root::Test::Reader.new
+    test_accessors.call(tr, true, false)
+    tw = Root::Test::Writer.new
+    test_accessors.call(tw, false, true)
+    ta = Root::Test::Accessor.new
+    test_accessors.call(ta, true, true)
+  end
+end

data/test/test_safer_ivarfactory.rb

@@ -0,0 +1,36 @@
+require 'test/unit'
+require 'safer/ivarfactory'
+
+class TC_SaferIVarFactory < Test::Unit::TestCase
+  module Root
+    class Test
+      class Instance
+      end
+      class Reader
+      end
+      class Writer
+      end
+      class Accessor
+      end
+    end
+  end
+
+  def setup
+  end
+  def teardown
+  end
+
+  def test_fullPrefix
+    assert_equal(
+      Safer::IVarFactory::Prefix::Full.class_symbol_prefix(Root::Test),
+      'tc_saferivarfactory_root_test')
+  end
+  def test_lastPrefix
+    assert_equal(
+      Safer::IVarFactory::Prefix::Last.class_symbol_prefix(Root::Test),
+      'test')
+    assert_equal(
+      Safer::IVarFactory::Prefix::Last.class_symbol_prefix(Root),
+      'root')
+  end
+end

data/test/test_safer_protocol.rb

@@ -12,7 +12,9 @@ module ArityModule
   end
   def arity_2_any(one, two, *args)
   end
-  METHODS = %w(empty 1 2 any 2_any).map do |suffix| "arity_#{suffix}".to_sym end
+  METHODS = self.instance_methods.find_all do |meth|
+    /^arity_/ === meth.to_s
+  end
 end
 
 class TestArityClass
@@ -78,7 +80,9 @@ class TC_SaferProtocol < Test::Unit::TestCase
     assert_equal(@both_protocol.class_signature, @class_protocol.class_signature)
     assert_equal(@both_protocol.instance_signature, @instance_protocol.instance_signature)
     assert_equal(@class_protocol.class_signature, @instance_protocol.instance_signature)
-    arity_methods = ArityModule::METHODS.map do |meth| meth.to_s end.sort
+    arity_methods = ArityModule.instance_methods.find_all do |meth|
+      ArityModule::METHODS.include?(meth)
+    end.sort
     assert_equal(@class_protocol.class_signature.table.keys.sort, arity_methods)
   end
 
@@ -109,7 +113,8 @@ class TC_SaferProtocol < Test::Unit::TestCase
     assert_same(methods[:get_object].call(@error_instance), violations.error_object)
     assert_same(@instance_protocol, violations.protocol)
     assert_same(nil, violations.class_violations)
-    assert_equal({ 'arity_empty' => 1 }, violations.instance_violations.table)
+    keysym = ArityModule::METHODS.find do |name| name.to_s == 'arity_empty' end
+    assert_equal({ keysym => 1 }, violations.instance_violations.table)
     begin
       @instance_protocol.send(methods[:conforms], methods[:get_object].call(@error_instance))
       flunk("Expected exception.")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: safer
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 1
-  version: 0.3.1
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Aidan Cully
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-21 00:00:00 -05:00
+date: 2011-10-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,12 +73,11 @@ extensions: []
 extra_rdoc_files: 
 - History.txt
 - Manifest.txt
-- README.txt
 files: 
 - .autotest
 - History.txt
 - Manifest.txt
-- README.txt
+- README.rdoc
 - Rakefile
 - lib/safer.rb
 - lib/safer/ivar.rb
@@ -87,6 +86,8 @@ files:
 - test/test_safer_ivar.rb
 - test/test_safer_protocol.rb
 - test/test_safer_hashprotocol.rb
+- test/test_safer_ivar_run.rb
+- test/test_safer_ivarfactory.rb
 has_rdoc: true
 homepage: http://safer.rubyforge.org
 licenses: []
@@ -94,7 +95,7 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - --main
-- README.txt
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -125,4 +126,6 @@ summary: Safer is an umbrella library, with components designed to make it simpl
 test_files: 
 - test/test_safer_hashprotocol.rb
 - test/test_safer_ivar.rb
+- test/test_safer_ivar_run.rb
+- test/test_safer_ivarfactory.rb
 - test/test_safer_protocol.rb