try 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59d052acdfe93469250ccd32f028f0909d22ebc3
-  data.tar.gz: 8af0c816b218d044e8f50fff90195b1c77e0189d
+  metadata.gz: bf2862d6d70b79ba5c2e897a48f8997afe3b73f7
+  data.tar.gz: f5539752a77ad04ae555b4f3133528705b47e292
 SHA512:
-  metadata.gz: b87930d9e447137c7f0b324f063369ba6e2b5d06b499e31dac4a1550945e5edbc2617b8c920b1f6890adbc3530ca54e4df7c5b025efdfaba19cef6847351b605
-  data.tar.gz: a6058c19afd7279d899d7274fff0574da95c301488fd0b629a66d246058ca84f84c718f750f399a4534b56e930e22eeb52524363c7572ce111b6b2d48b18dc03
+  metadata.gz: 66afc8ba7c914c47f91fab87e28fb11667d78f2ff5354254878ea95f34982c1be7c1e3160ad71df1537b3639cdfff16654c30887fd445110956c3de950529cbb
+  data.tar.gz: 5b7e26f86b575fe5e4d5a3038fcb969b498eb0dcd5d76a473921ad2bd637fb525604bc72acd5d35f91cddc601827412e0bdcd34d74164a0cb2e4ca23dd93d1a3

data/lib/try.rb

@@ -9,13 +9,17 @@ by MOO Code through the following  language constructs:
 
 In Ruby these become:
 
-  Try.try { unsafe_expression }
+  Try.try { unsafe_expression }  # OR: unsafe_expression rescue $!
   Try.trap(Exception=>fallback) { unsafe_expression }  # OR: unsafe_expression rescue fallback
   Try.trap(FooError, BarError) { unsafe_expression}
   Try.trap(FooError=>fallback, BarError=>fallback) { unsafe_expression }
 
 =end
 module Try
+  # In #trap this can be used to map an class of exception to the
+  # raised exception itself.
+  ORIG = Object.new
+
   #
   # Evaluates the given block and returns its value.
   # If an exception is raised, that exception is returned instead.
@@ -35,7 +39,8 @@ module Try
   # Additionally, specific exception types can default to a fallback
   # value if passed as (({Type => value})) pairs.  If the +value+ is
   # a Proc, it is called and the exception object is passed as a
-  # parameter.
+  # parameter.  If the +value+ is Try::ERROR, the exception object
+  # itself is returned.
   #
   # Any un-trapped exception is raised normally.
   #
@@ -51,7 +56,7 @@ module Try
       return ex if klass.instance_of?(Module) ? ex.kind_of?(klass) : ex.is_a?(klass)
     end
     hash.each_pair do |klass,value|
-      return value.is_a?(Proc) ? value.call(ex) : value if klass.instance_of?(Module) ? ex.kind_of?(klass) : ex.is_a?(klass)
+      return value.is_a?(Proc) ? value.call(ex) : (value.equal?(ORIG) ? ex : value) if klass.instance_of?(Module) ? ex.kind_of?(klass) : ex.is_a?(klass)
     end
     raise
   end
@@ -79,26 +84,18 @@ module Try
 end
 
 =begin
-Copyright (c) 2013, Matthew Kerwin
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met: 
+Copyright (c) 2013, Matthew Kerwin <matthew@kerwin.net.au>
 
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer. 
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution. 
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 =end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: try
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Matthew Kerwin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-21 00:00:00.000000000 Z
+date: 2013-06-03 00:00:00.000000000 Z
 dependencies: []
 description: Lazy mechanisms to capture exceptions on-the-fly.
 email: matthew@kerwin.net.au
@@ -19,7 +19,7 @@ files:
 - lib/try.rb
 homepage: http://rubygems.org/gems/try
 licenses:
-- Simplified BSD License
+- ISC License
 metadata: {}
 post_install_message: 
 rdoc_options:
@@ -44,7 +44,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: 'Try: do, or do not'