stash 0.1.1 → 1.0.0

data/Rakefile

@@ -12,7 +12,7 @@ begin
     gem.authors = ["Tony Arcieri"]
     gem.add_dependency "redis", "~> 2.1.0"
     gem.add_dependency "redis-namespace", "~> 0.10.0"
-    gem.add_development_dependency "rspec", "~> 2.1.0"
+    gem.add_development_dependency "rspec", ">= 2.2.0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -25,7 +25,7 @@ RSpec::Core::RakeTask.new(:rspec) do |rspec|
   rspec.rspec_opts = %w[-fs -c -b]
 end
 
-RSpec::Core::RakeTask.new(:rspec) do |rspec|
+RSpec::Core::RakeTask.new(:rcov) do |rspec|
   rspec.rspec_opts = %w[-fs -c -b]
   rspec.rcov = true
 end

data/VERSION

@@ -1 +1 @@
-0.1.1
+1.0.0

data/lib/stash.rb

@@ -7,16 +7,7 @@ class Stash
   
   def initialize(config)
     raise ArgumentError, "no adapter specified" unless config[:adapter]
-    adapter_name  = config[:adapter].to_s.split('_').map { |s| s.capitalize }.join
-    adapter_name += "Adapter"  
-    
-    begin
-      adapter_class = Stash.const_get adapter_name
-    rescue NameError
-      raise ArgumentError, "unknown adapter: #{config[:adapter]}"
-    end
-    
-    @adapter = adapter_class.new config
+    @adapter = Stash.adapter_class(config[:adapter]).new config
   end 
   
   # Store an object in the Stash

data/lib/stash/class_methods.rb

@@ -41,6 +41,18 @@ class Stash
       default.delete(key)
       true
     end
+    
+    # Obtain the class for a given adapter name
+    def adapter_class(name)
+      adapter_name = name.to_s.split('_').map { |s| s.capitalize }.join
+      adapter_name << "Adapter"
+      
+      begin
+        Stash.const_get adapter_name
+      rescue NameError
+        raise ArgumentError, "unknown adapter: #{name}"
+      end
+    end
   end
   
   extend ClassMethods

data/lib/stash/redis_adapter.rb

@@ -4,30 +4,32 @@ require 'redis-namespace'
 class Stash
   # Adapter for the Redis data structures server. 
   # See http://code.google.com/p/redis/
-  class RedisAdapter
-    attr_reader :capabilities
-    
+  class RedisAdapter    
     def initialize(config)
-      # Symbolize keys in config
-      config = config.inject({}) { |h, (k, v)| h[k.to_sym] = v; h }
+      # Convert config keys to symbols
+      config = symbolize_config(config)
       
       raise ArgumentError, "missing 'host' key" unless config[:host]
       config[:port] ||= 6379 # Default Redis port
       
-      redis = Redis.new config
-      redis = Redis::Namespace.new config[:namespace], :redis => redis if config[:namespace]
-      
-      @capabilities = [:string, :list, :hash]
-      
-      # Redis 2.0RC+ supports blocking pop
-      @capabilities << :bpop if redis.info['redis_version'] >= "1.3.0"
+      @config = config
+    end
+
+    # Obtain a connection to Redis
+    def connection
+      redis = Redis.new @config
+      redis = Redis::Namespace.new @config[:namespace], :redis => redis if @config[:namespace]
       
-      @redis = redis
+      begin
+        yield redis
+      ensure
+        redis.quit
+      end
     end
     
     # Set a given key within Redis
     def []=(key, value)
-      @redis.set key.to_s, value.to_s
+      connection { |redis| redis.set key.to_s, value.to_s }
     end
     
     # Retrieve a given key from Redis
@@ -42,91 +44,109 @@ class Stash
     
     # Retrieve the type for a given key
     def type(key)
-      @redis.type key.to_s
+      connection { |redis| redis.type key.to_s }
     end
     
     # Retrieve a key as a string
     def get(key)
-      @redis.get key.to_s
+      connection { |redis| redis.get key.to_s }
     end
     
     # Delete a key
     def delete(key)
-      @redis.del key.to_s
+      connection { |redis| redis.del key.to_s }
     end
     
     # Push an element onto a list
     def list_push(name, value, side)
-      case side
-      when :right
-        @redis.rpush name.to_s, value.to_s
-      when :left
-        @redis.lpush name.to_s, value.to_s
-      else raise ArgumentError, "left or right plztks"
+      connection do |redis|
+        case side
+        when :right
+          redis.rpush name.to_s, value.to_s
+        when :left
+          redis.lpush name.to_s, value.to_s
+        else raise ArgumentError, "left or right plztks"
+        end
       end
     end
         
     # Pop from a list
     def list_pop(name, side)
-      case side
-      when :right
-        @redis.rpop name.to_s
-      when :left
-        @redis.lpop name.to_s
-      else raise ArgumentError, "left or right plztks"
+      connection do |redis|
+        case side
+        when :right
+          redis.rpop name.to_s
+        when :left
+          redis.lpop name.to_s
+        else raise ArgumentError, "left or right plztks"
+        end
       end
     end
     
     # Blocking pop from a list
     def list_blocking_pop(name, side, timeout = nil)
-      timeout ||= 0
-      res = case side
-      when :left
-        @redis.blpop name, timeout
-      when :right
-        @redis.brpop name, timeout
-      else raise ArgumentError, "left or right plztks"
-      end
+      connection do |redis|
+        timeout ||= 0
+        res = case side
+        when :left
+          redis.blpop name, timeout
+        when :right
+          redis.brpop name, timeout
+        else raise ArgumentError, "left or right plztks"
+        end
       
-      return res[1] if res
-      raise Stash::TimeoutError, "request timed out"
+        return res[1] if res
+        raise Stash::TimeoutError, "request timed out"
+      end
     end
     
     # Retrieve the length of a list
     def list_length(name)
-      @redis.llen name.to_s
+      connection { |redis| redis.llen name.to_s }
     end
     
     # Retrieve the given range from a list
     def list_range(name, from, to)
-      @redis.lrange name.to_s, from, to
+      connection { |redis| redis.lrange name.to_s, from, to }
     end
     
     # Retrieve a value from a hash
     def hash_get(name, key)
-      res = @redis.hget name.to_s, key.to_s
+      res = connection { |redis| redis.hget name.to_s, key.to_s }
       return if res == ""
       res
     end
     
     # Store a value in a hash
     def hash_set(name, key, value)
-      @redis.hset name.to_s, key.to_s, value.to_s
+      connection { |redis| redis.hset name.to_s, key.to_s, value.to_s }
     end
     
     # Retrieve the contents of a hash as a Ruby hash
     def hash_value(name)
-      @redis.hgetall name.to_s
+      connection { |redis| redis.hgetall name.to_s }
     end
     
     # Delete an entry from a hash
     def hash_delete(name, key)
-      @redis.hdel name.to_s, key.to_s
+      connection { |redis| redis.hdel name.to_s, key.to_s }
     end
     
     # Return the length of a hash
     def hash_length(name)
-      @redis.hlen name.to_s
+      connection { |redis| redis.hlen name.to_s }
+    end
+    
+    #######
+    private
+    #######
+    
+    def symbolize_config(config)
+      new_config = {}
+      config.each do |k, v|
+        new_config[k.to_sym] = v
+      end
+      new_config
     end
   end
 end

data/stash.gemspec

@@ -0,0 +1,68 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{stash}
+  s.version = "1.0.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Tony Arcieri"]
+  s.date = %q{2010-12-07}
+  s.description = %q{Stash maps the facilities provided by data structures servers onto classes which mimic Ruby's built-in types}
+  s.email = %q{tony@medioh.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README.markdown"
+  ]
+  s.files = [
+    ".document",
+    "LICENSE",
+    "README.markdown",
+    "Rakefile",
+    "VERSION",
+    "lib/stash.rb",
+    "lib/stash/class_methods.rb",
+    "lib/stash/hash.rb",
+    "lib/stash/list.rb",
+    "lib/stash/redis_adapter.rb",
+    "lib/stash/string.rb",
+    "spec/hash_spec.rb",
+    "spec/list_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb",
+    "spec/string_spec.rb",
+    "stash.gemspec"
+  ]
+  s.homepage = %q{http://github.com/tarcieri/stash}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Abstract interface to data structures servers}
+  s.test_files = [
+    "spec/hash_spec.rb",
+    "spec/list_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/string_spec.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<redis>, ["~> 2.1.0"])
+      s.add_runtime_dependency(%q<redis-namespace>, ["~> 0.10.0"])
+      s.add_development_dependency(%q<rspec>, [">= 2.2.0"])
+    else
+      s.add_dependency(%q<redis>, ["~> 2.1.0"])
+      s.add_dependency(%q<redis-namespace>, ["~> 0.10.0"])
+      s.add_dependency(%q<rspec>, [">= 2.2.0"])
+    end
+  else
+    s.add_dependency(%q<redis>, ["~> 2.1.0"])
+    s.add_dependency(%q<redis-namespace>, ["~> 0.10.0"])
+    s.add_dependency(%q<rspec>, [">= 2.2.0"])
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stash
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
-  - 0
-  - 1
   - 1
-  version: 0.1.1
+  - 0
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Tony Arcieri
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-30 00:00:00 -07:00
+date: 2010-12-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,14 +56,14 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 7
         segments: 
         - 2
-        - 1
+        - 2
         - 0
-        version: 2.1.0
+        version: 2.2.0
   type: :development
   version_requirements: *id003
 description: Stash maps the facilities provided by data structures servers onto classes which mimic Ruby's built-in types
@@ -92,6 +92,7 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/string_spec.rb
+- stash.gemspec
 has_rdoc: true
 homepage: http://github.com/tarcieri/stash
 licenses: []