fetchable 0.1.1 → 1.0.0

data/lib/fetchable.rb

@@ -1,33 +1,20 @@
 module Fetchable
-  def fetch(key, not_found_value = no_default_given, &block)
-    if not_found_value != no_default_given && block
+  NO_DEFAULT_GIVEN = Object.new
+
+  def fetch(key, not_found_value = NO_DEFAULT_GIVEN)
+    if not_found_value != NO_DEFAULT_GIVEN && block_given?
       raise ArgumentError.new("Cannot provide both a default arg and block to #fetch")
     end
 
     result = public_send(:[], key)
 
     if result.nil?
-      default_value(key, not_found_value, &block)
-    else
-      result
-    end
-  end
+      return yield(key) if block_given?
+      return not_found_value unless not_found_value == NO_DEFAULT_GIVEN
 
-  private
-
-  def no_default_given
-    @default ||= Object.new
-  end
-
-  def default_value(key, not_found_value, &block)
-    if not_found_value == no_default_given
-      if block
-        block.call(key)
-      else
-        raise KeyError.new("key not found #{key}")
-      end
+      raise KeyError.new("key not found #{key}")
     else
-      not_found_value
+      result
     end
   end
 end

data/lib/fetchable/version.rb

@@ -1,5 +1,5 @@
 require "fetchable"
 
 module Fetchable
-  VERSION = "0.1.1"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fetchable
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler