adapter 0.5.1 → 0.5.2

data/README.rdoc

@@ -52,8 +52,4 @@ Adapters can be defined using a block, a module, or a module and a block. This a
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so we don't break it in a future version unintentionally.
 * Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine, but bump version in a commit by itself so we can ignore when we pull)
-* Send us a pull request. Bonus points for topic branches.
-
-== Copyright
-
-Copyright (c) 2010 New Toy. See LICENSE for details.
+* Send us a pull request. Bonus points for topic branches.

data/lib/adapter/defaults.rb

@@ -2,9 +2,8 @@ module Adapter
   module Defaults
     def fetch(key, value=nil, &block)
       read(key) || begin
-        value = yield(key) if value.nil? && block_given?
-        write(key, value)
-        value
+        value = block_given? ? yield(key) : value
+        read(key) || value
       end
     end
 

data/lib/adapter/version.rb

@@ -1,3 +1,3 @@
 module Adapter
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

data/spec/adapter_spec.rb

@@ -195,12 +195,12 @@ describe Adapter do
     end
 
     describe "#fetch" do
-      it "returns value if found" do
+      it "returns value if key found" do
         adapter.write('foo', 'bar')
         adapter.fetch('foo', 'baz').should == 'bar'
       end
 
-      it "returns value if not found" do
+      it "returns default value if not key found" do
         adapter.fetch('foo', 'baz').should == 'baz'
       end
 
@@ -213,11 +213,20 @@ describe Adapter do
           end.should == 'bar'
         end
 
-        it "returns result of block if key not found and writes result to key" do
+        it "returns default if key not found" do
+          adapter.fetch('foo', 'default').should == 'default'
+        end
+
+        it "returns result of block if key not found" do
           adapter.fetch('foo') do
             'baz'
           end.should == 'baz'
-          adapter.fetch('foo').should == 'baz'
+        end
+
+        it "returns key if result of block writes key" do
+          adapter.fetch('foo', 'default') do
+            adapter.write('foo', 'write in block')
+          end.should == 'write in block'
         end
 
         it "yields key to block" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: adapter
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - John Nunemaker
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-25 00:00:00 -05:00
+date: 2011-01-26 00:00:00 -05:00
 default_executable: 
 dependencies: []