adapter 0.6.1 → 0.6.2

data/.gitignore

@@ -1,3 +1,4 @@
 .bundle
 log
 pkg
+Gemfile.lock

data/Guardfile

@@ -4,9 +4,9 @@ rspec_options = {
 }
 
 guard 'rspec', rspec_options do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
-  watch('spec/helper.rb')  { "spec" }
+  watch(%r{^spec/.+_spec\.rb$}) { "spec" }
+  watch(%r{^lib/(.+)\.rb$}) { "spec" }
+  watch('spec/helper.rb') { "spec" }
   watch(%r{lib/adapter/spec/(.+)\.rb}) { "spec" }
 end
 

data/README.md

@@ -12,8 +12,8 @@ Adapter.define(:memory) do
     decode(client[key_for(key)])
   end
 
-  def write(key, value)
-    client[key_for(key)] = encode(value)
+  def write(key, attributes)
+    client[key_for(key)] = encode(attributes)
   end
 
   def delete(key)

data/examples/overriding_serialization.rb

@@ -19,12 +19,12 @@ require 'adapter/memory'
 # Marshal.load/dump. Also, important to note that this does not affect
 # the memory adapter which still uses Marshal.
 Adapter.define(:memory_json, Adapter::Memory) do
-  def encode(value)
-    ActiveSupport::JSON.encode(value)
+  def encode(attributes)
+    ActiveSupport::JSON.encode(attributes)
   end
 
-  def decode(value)
-    ActiveSupport::JSON.decode(value)
+  def decode(attributes)
+    ActiveSupport::JSON.decode(attributes)
   end
 end
 

data/lib/adapter.rb

@@ -3,15 +3,15 @@ require 'adapter/defaults'
 require 'adapter/exceptions'
 
 module Adapter
+  extend self
   extend Asserts
-  include Defaults
 
   # Stores the definitions for each adapter by name
-  def self.definitions
+  def definitions
     @definitions ||= {}
   end
 
-  def self.define(name, mod=nil, &block)
+  def define(name, mod=nil, &block)
     definition_module = Module.new
     definition_module.send(:include, Defaults)
     definition_module.send(:include, mod) unless mod.nil?
@@ -22,17 +22,17 @@ module Adapter
   end
 
   # Memoizes adapter instances based on their definitions
-  def self.adapters
+  def adapters
     @adapters ||= {}
   end
 
-  def self.[](name)
+  def [](name)
     assert_valid_adapter(name)
     adapters[name.to_sym] ||= get_adapter_instance(name)
   end
 
   private
-    def self.get_adapter_instance(name)
+    def get_adapter_instance(name)
       Class.new do
         attr_reader :client, :options
 

data/lib/adapter/defaults.rb

@@ -1,9 +1,12 @@
 module Adapter
   module Defaults
-    def fetch(key, value=nil, &block)
+    def fetch(key, default_attributes=nil)
       read(key) || begin
-        value = block_given? ? yield(key) : value
-        read(key) || value
+        if block_given?
+          yield(key)
+        else
+          default_attributes
+        end
       end
     end
 
@@ -21,12 +24,12 @@ module Adapter
       key
     end
 
-    def encode(value)
-      value
+    def encode(attributes)
+      attributes
     end
 
-    def decode(value)
-      value
+    def decode(attributes)
+      attributes
     end
   end
 end

data/lib/adapter/memory.rb

@@ -6,8 +6,8 @@ module Adapter
       decode(client[key_for(key)])
     end
 
-    def write(key, value)
-      client[key_for(key)] = encode(value)
+    def write(key, attributes)
+      client[key_for(key)] = encode(attributes)
     end
 
     def delete(key)

data/lib/adapter/spec/an_adapter.rb

@@ -25,9 +25,12 @@ shared_examples_for "an adapter" do
       adapter.read(key).should be_nil
     end
 
-    it "returns value if key available" do
+    it "returns attributes if key available" do
       adapter.write(key, attributes)
-      adapter.read(key).should eq(attributes)
+      result = adapter.read(key)
+      attributes.each do |column, value|
+        result[column].should eq(value)
+      end
     end
   end
 
@@ -36,9 +39,12 @@ shared_examples_for "an adapter" do
       adapter.get(key).should be_nil
     end
 
-    it "returns value if key available" do
+    it "returns attributes if key available" do
       adapter.write(key, attributes)
-      adapter.get(key).should eq(attributes)
+      result = adapter.get(key)
+      attributes.each do |column, value|
+        result[column].should eq(value)
+      end
     end
   end
 
@@ -47,9 +53,12 @@ shared_examples_for "an adapter" do
       adapter[key].should be_nil
     end
 
-    it "returns value if key available" do
+    it "returns attributes if key available" do
       adapter.write(key, attributes)
-      adapter[key].should eq(attributes)
+      result = adapter[key]
+      attributes.each do |column, value|
+        result[column].should eq(value)
+      end
     end
   end
 
@@ -59,21 +68,32 @@ shared_examples_for "an adapter" do
       adapter.write(key2, attributes2)
     end
 
-    it "returns Hash of keys and values" do
-      adapter.read_multiple(key, key2).should eq({
-        key  => attributes,
-        key2 => attributes2,
-      })
+    it "returns Hash of keys and attributes" do
+      result = adapter.read_multiple(key, key2)
+
+      attributes.each do |column, value|
+        result[key][column].should eq(value)
+      end
+
+      attributes2.each do |column, value|
+        result[key2][column].should eq(value)
+      end
     end
 
     context "with mix of keys that are and are not available" do
-      it "returns Hash of keys and values where unavailable keys are nil" do
-        adapter.read_multiple(key, key2, 'foo', 'bar').should eq({
-          key => attributes,
-          key2 => attributes2,
-          'foo' => nil,
-          'bar' => nil,
-        })
+      it "returns Hash of keys and attributes where unavailable keys are nil" do
+        result = adapter.read_multiple(key, key2, 'foo', 'bar')
+
+        attributes.each do |column, value|
+          result[key][column].should eq(value)
+        end
+
+        attributes2.each do |column, value|
+          result[key2][column].should eq(value)
+        end
+
+        result['foo'].should be_nil
+        result['bar'].should be_nil
       end
     end
   end
@@ -84,21 +104,32 @@ shared_examples_for "an adapter" do
       adapter.write(key2, attributes2)
     end
 
-    it "returns Hash of keys and values" do
-      adapter.get_multiple(key, key2).should eq({
-        key  => attributes,
-        key2 => attributes2,
-      })
+    it "returns Hash of keys and attributes" do
+      result = adapter.get_multiple(key, key2)
+
+      attributes.each do |column, value|
+        result[key][column].should eq(value)
+      end
+
+      attributes2.each do |column, value|
+        result[key2][column].should eq(value)
+      end
     end
 
     context "with mix of keys that are and are not available" do
-      it "returns Hash of keys and values where unavailable keys are nil" do
-        adapter.get_multiple(key, key2, 'foo', 'bar').should eq({
-          key => attributes,
-          key2 => attributes2,
-          'foo' => nil,
-          'bar' => nil,
-        })
+      it "returns Hash of keys and attributes where unavailable keys are nil" do
+        result = adapter.get_multiple(key, key2, 'foo', 'bar')
+
+        attributes.each do |column, value|
+          result[key][column].should eq(value)
+        end
+
+        attributes2.each do |column, value|
+          result[key2][column].should eq(value)
+        end
+
+        result['foo'].should be_nil
+        result['bar'].should be_nil
       end
     end
   end
@@ -115,9 +146,9 @@ shared_examples_for "an adapter" do
   end
 
   describe "#fetch" do
-    context "with key not stored" do
-      context "with default value" do
-        it "returns default value" do
+    context "with key not available" do
+      context "with default attributes" do
+        it "returns default" do
           adapter.fetch(key, {}).should eq({})
         end
       end
@@ -129,11 +160,14 @@ shared_examples_for "an adapter" do
       end
     end
 
-    context "with key that is stored" do
-      context "with default value" do
-        it "returns key value instead of default" do
+    context "with key that is available" do
+      context "with default attributes" do
+        it "returns result of read instead of default" do
           adapter.write(key, attributes2)
-          adapter.fetch(key, attributes).should eq(attributes2)
+          result = adapter.fetch(key, attributes)
+          attributes2.each do |column, value|
+            result[column].should eq(value)
+          end
         end
       end
 
@@ -149,53 +183,61 @@ shared_examples_for "an adapter" do
   end
 
   describe "#write" do
-    it "sets key to value" do
+    it "sets key to attributes" do
       adapter.write(key, attributes)
-      adapter.read(key).should eq(attributes)
+      result = adapter.read(key)
+      attributes.each do |column, value|
+        result[column].should eq(value)
+      end
     end
   end
 
   describe "#set" do
-    it "sets key to value" do
+    it "sets key to attributes" do
       adapter.set(key, attributes)
-      adapter.read(key).should eq(attributes)
+      result = adapter.read(key)
+      attributes.each do |column, value|
+        result[column].should eq(value)
+      end
     end
   end
 
   describe "#[]=" do
-    it "sets key to value" do
+    it "sets key to attributes" do
       adapter[key] = attributes
-      adapter.read(key).should eq(attributes)
+      result = adapter.read(key)
+      attributes.each do |column, value|
+        result[column].should eq(value)
+      end
     end
   end
 
   describe "#delete" do
     context "when key available" do
-      before do
+      it "removes key" do
         adapter.write(key, attributes)
+        adapter.key?(key).should be_true
         adapter.delete(key)
-      end
-
-      it "removes key" do
         adapter.key?(key).should be_false
       end
     end
 
     context "when key not available" do
       it "does not complain" do
+        adapter.key?(key).should be_false
         adapter.delete(key)
+        adapter.key?(key).should be_false
       end
     end
   end
 
   describe "#clear" do
-    before do
-      adapter[key] = attributes
-      adapter[key2] = attributes2
+    it "removes all available keys" do
+      adapter.write(key, attributes)
+      adapter.write(key2, attributes2)
+      adapter.key?(key).should be_true
+      adapter.key?(key2).should be_true
       adapter.clear
-    end
-
-    it "removes all stored keys" do
       adapter.key?(key).should be_false
       adapter.key?(key2).should be_false
     end

data/lib/adapter/version.rb

@@ -1,3 +1,3 @@
 module Adapter
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

data/spec/helper.rb

@@ -9,6 +9,6 @@ require 'support/module_helpers'
 
 Bundler.require(:default, :test)
 
-Rspec.configure do |c|
-  c.include(ModuleHelpers)
+RSpec.configure do |config|
+  config.include(ModuleHelpers)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adapter
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-07 00:00:00.000000000 Z
+date: 2012-11-08 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -26,7 +26,6 @@ files:
 - .travis.yml
 - Changelog.md
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - LICENSE
 - README.md
@@ -61,7 +60,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1252811508821145516
+      hash: -3288681116228721407
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -70,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1252811508821145516
+      hash: -3288681116228721407
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/Gemfile.lock

@@ -1,39 +0,0 @@
-PATH
-  remote: .
-  specs:
-    adapter (0.6.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    diff-lcs (1.1.3)
-    ffi (1.0.11)
-    guard (1.0.0)
-      ffi (>= 0.5.0)
-      thor (~> 0.14.6)
-    guard-bundler (0.1.3)
-      bundler (>= 1.0.0)
-      guard (>= 0.2.2)
-    guard-rspec (0.6.0)
-      guard (>= 0.10.0)
-    rake (0.9.2)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    thor (0.14.6)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  adapter!
-  guard
-  guard-bundler
-  guard-rspec
-  rake
-  rspec