rubysl-e2mmap 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 346bf1dcdde5b69543447281363a996392422990
-  data.tar.gz: ddbbb3a0c8e4b5ff355522bc78c17ac828ec770b
+  metadata.gz: f11f517f32e3d09ee6075f8713b7a2d326b8b198
+  data.tar.gz: 1b427c240add26f684738e68e8ad0700748cc53d
 SHA512:
-  metadata.gz: 020b324df8806e79016476f329ba2683a777e062555dbf9a3fcf080de9b5debb997a11f5090bd9eb36051e71f47b17ebc91cfdf92cb9aa8dd5d8ee6ff2a28d9c
-  data.tar.gz: cba3d12fcb4368c30dd660465637f6e5a73bceb4ae235ede17352f25bb9fa917727c96eee13a4d650ea48e659efaa73a84dc4e7edb984499b5326026fbf9a541
+  metadata.gz: 23a06501ed6e6669f8cc48712b6c906274f7697d11e0d5bad4e2d9bde5033519539c813cc6fc9f2d82b4d34878ec1d252ceaf925fc1f44f120abc75d393f9206
+  data.tar.gz: 94599fda67e4dd5352df93513116b4bdf8b6a00e569fa6a2d8bc1ca6547dcf181ed4474f058e0fc0ceeb2615a29f84cdb2d22aae76d271f23303c42ab4c3b024

data/lib/rubysl/e2mmap/e2mmap.rb

@@ -1,9 +1,8 @@
 #
 #   e2mmap.rb - for ruby 1.1
-#   	$Release Version: 2.0$
-#   	$Revision: 1.10 $
-#   	$Date: 1999/02/17 12:33:17 $
-#   	by Keiju ISHITSUKA
+#       $Release Version: 2.0$
+#       $Revision: 1.10 $
+#       by Keiju ISHITSUKA
 #
 # --
 #   Usage:
@@ -48,8 +47,6 @@
 #   Foo.Fail ExistingExceptionClass, arg...
 #
 #
-fail "Use Ruby 1.1" if VERSION < "1.1"
-
 module Exception2MessageMapper
   @RCS_ID='-$Id: e2mmap.rb,v 1.10 1999/02/17 12:33:17 keiju Exp keiju $-'
 
@@ -57,13 +54,7 @@ module Exception2MessageMapper
 
   def E2MM.extend_object(cl)
     super
-    cl.bind(self) unless cl == E2MM
-  end
-
-  # backward compatibility
-  def E2MM.extend_to(b)
-    c = eval("self", b)
-    c.extend(self)
+    cl.bind(self) unless cl < E2MM
   end
 
   def bind(cl)
@@ -80,44 +71,31 @@ module Exception2MessageMapper
   end
 
   # Fail(err, *rest)
-  #	err:	exception
-  #	rest:	message arguments
+  #     err:    exception
+  #     rest:   message arguments
   #
-  def Raise(err=nil, *rest)
+  def Raise(err = nil, *rest)
     E2MM.Raise(self, err, *rest)
   end
   alias Fail Raise
-
-  # backward compatibility
-  alias fail! fail
-  def fail(err=nil, *rest)
-    begin 
-      E2MM.Fail(self, err, *rest)
-    rescue E2MM::ErrNotRegisteredException
-      super
-    end
-  end
-  class << self
-    public :fail
-  end
-
+  alias fail Raise
 
   # def_e2message(c, m)
-  #	    c:  exception
-  #	    m:  message_form
-  #	define exception c with message m.
+  #         c:  exception
+  #         m:  message_form
+  #     define exception c with message m.
   #
   def def_e2message(c, m)
     E2MM.def_e2message(self, c, m)
   end
 
   # def_exception(n, m, s)
-  #	    n:  exception_name
-  #	    m:  message_form
-  #	    s:	superclass(default: StandardError)
-  #	define exception named ``c'' with message m.
+  #         n:  exception_name
+  #         m:  message_form
+  #         s:  superclass(default: StandardError)
+  #     define exception named ``c'' with message m.
   #
-  def def_exception(n, m, s=StandardError)
+  def def_exception(n, m, s = StandardError)
     E2MM.def_exception(self, n, m, s)
   end
 
@@ -127,44 +105,48 @@ module Exception2MessageMapper
   # {[class, exp] => message, ...}
   @MessageMap = {}
 
-  # E2MM.def_exception(k, e, m)
-  #	    k:  class to define exception under.
-  #	    e:  exception
-  #	    m:  message_form
-  #	define exception c with message m.
+  # E2MM.def_e2message(k, e, m)
+  #         k:  class to define exception under.
+  #         e:  exception
+  #         m:  message_form
+  #     define exception c with message m.
   #
   def E2MM.def_e2message(k, c, m)
-    E2MM.instance_eval { @MessageMap[[k, c]] = m }
+    E2MM.instance_eval{@MessageMap[[k, c]] = m}
     c
   end
 
   # E2MM.def_exception(k, n, m, s)
-  #	    k:  class to define exception under.
-  #	    n:  exception_name
-  #	    m:  message_form
-  #	    s:	superclass(default: StandardError)
-  #	define exception named ``c'' with message m.
+  #         k:  class to define exception under.
+  #         n:  exception_name
+  #         m:  message_form
+  #         s:  superclass(default: StandardError)
+  #     define exception named ``c'' with message m.
   #
-  def E2MM.def_exception(k, n, m, s=StandardError)
+  def E2MM.def_exception(k, n, m, s = StandardError)
+    n = n.id2name if n.kind_of?(Fixnum)
     e = Class.new(s)
-    E2MM.instance_eval { @MessageMap[[k, e]] = m }
+    E2MM.instance_eval{@MessageMap[[k, e]] = m}
     k.const_set(n, e)
   end
 
   # Fail(klass, err, *rest)
-  #	klass:  class to define exception under.
-  #	err:	exception
-  #	rest:	message arguments
+  #     klass:  class to define exception under.
+  #     err:    exception
+  #     rest:   message arguments
   #
-  def E2MM.Raise(klass=E2MM, err=nil, *rest)
+  def E2MM.Raise(klass = E2MM, err = nil, *rest)
     if form = e2mm_message(klass, err)
-      raise err, sprintf(form, *rest)
+      b = $@.nil? ? caller(1) : $@
+      #p $@
+      #p __FILE__
+      b.shift if b[0] =~ /^#{Regexp.quote(__FILE__)}:/
+      raise err, sprintf(form, *rest), b
     else
       E2MM.Fail E2MM, ErrNotRegisteredException, err.inspect
     end
   end
-
-  class <<E2MM
+  class << E2MM
     alias Fail Raise
   end
 
@@ -178,13 +160,12 @@ module Exception2MessageMapper
     end
     nil
   end
-
-  class <<self
+  class << self
     alias message e2mm_message
   end
 
-  E2MM.def_exception(E2MM, 
-                     :ErrNotRegisteredException, 
+  E2MM.def_exception(E2MM,
+                     :ErrNotRegisteredException,
                      "not registerd exception(%s)")
 end
 

data/lib/rubysl/e2mmap/version.rb

@@ -1,5 +1,5 @@
 module RubySL
   module Exception2MessageMapper
-    VERSION = "1.0.0"
+    VERSION = "2.0.0"
   end
 end

data/rubysl-e2mmap.gemspec

@@ -19,5 +19,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "mspec", "~> 1.5"
-  spec.add_development_dependency "rubysl-prettyprint", "~> 1.0"
+  spec.add_development_dependency "rubysl-prettyprint", "~> 2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysl-e2mmap
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-16 00:00:00.000000000 Z
+date: 2013-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 description: Ruby standard library e2mmap.
 email:
 - brixen@gmail.com
@@ -74,7 +74,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -104,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: Ruby standard library e2mmap.

data/.travis.yml

@@ -1,8 +0,0 @@
-language: ruby
-before_install:
-  - gem update --system
-  - gem --version
-  - gem install rubysl-bundler
-script: bundle exec mspec spec
-rvm:
-  - rbx-nightly-18mode