memcache 1.0.0 → 1.0.1

data/VERSION.yml

@@ -1,4 +1,5 @@
 --- 
-:patch: 0
-:major: 1
+:build: 
 :minor: 0
+:patch: 1
+:major: 1

data/lib/memcache.rb

@@ -91,7 +91,7 @@ class Memcache
   end
 
   def set(key, value, opts = {})
-    raise 'opts must be hash' unless opts.kind_of?(Hash)
+    opts = compatible_opts(opts)
 
     expiry = opts[:expiry] || default_expiry
     flags  = opts[:flags]  || 0
@@ -106,7 +106,7 @@ class Memcache
   end
 
   def add(key, value, opts = {})
-    raise 'opts must be hash' unless opts.kind_of?(Hash)
+    opts = compatible_opts(opts)
 
     expiry = opts[:expiry] || default_expiry
     flags  = opts[:flags]  || 0
@@ -116,7 +116,7 @@ class Memcache
   end
 
   def replace(key, value, opts = {})
-    raise 'opts must be hash' unless opts.kind_of?(Hash)
+    opts = compatible_opts(opts)
 
     expiry = opts[:expiry] || default_expiry
     flags  = opts[:flags]  || 0
@@ -281,8 +281,35 @@ class Memcache
     set(key, value)
   end
 
+  def self.init(yaml_file = nil)
+    yaml_file = File.join(Rails.root, 'config', 'memcached.yml')
+
+    if File.exists?(yaml_file)
+      yaml = YAML.load_file(yaml_file)
+      defaults = (yaml.delete('defaults') || {}).symbolize_keys
+      config   = (yaml[Rails.env] || {}).symbolize_keys
+
+      if not config.empty? and not config[:disabled]
+        if config[:servers]
+          opts = defaults.merge(config.symbolize_keys)
+          Object.const_set('CACHE', Memcache.new(opts))
+        else
+          config.each do |connection, opts|
+            opts = defaults.merge(opts.symbolize_keys)
+            Memcache.pool[connection] = Memcache.new(opts)
+          end
+        end
+      end
+    end
+  end
+
 protected
 
+  def compatible_opts(opts)
+    # Support passing expiry instead of opts. This may be deprecated in the future.
+    opts.kind_of?(Hash) ? opts : {:expiry => opts}
+  end
+
   def multi_get(keys, opts = {})
     return {} if keys.empty?
     

data/memcache.gemspec

@@ -5,14 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{memcache}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Balthrop"]
   s.date = %q{2009-11-20}
   s.description = %q{Ruby client for memcached supporting advanced protocol features and pluggable architecture.}
   s.email = %q{code@justinbalthrop.com}
-  s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: memcache
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Justin Balthrop
@@ -17,8 +17,8 @@ description: Ruby client for memcached supporting advanced protocol features and
 email: code@justinbalthrop.com
 executables: []
 
-extensions: 
-- ext/extconf.rb
+extensions: []
+
 extra_rdoc_files: 
 - LICENSE
 - README.rdoc

data/ext/extconf.rb

@@ -1,3 +0,0 @@
-require 'mkmf'
-have_library('memcached')
-create_makefile('native_server')