aclatraz 0.1.1 → 0.1.2

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+== Version 0.1.2
+
+* Added possibility to passing connection objects in Aclatraz#init
+* Tested Aclatraz#init with Redis hash options given
+* Minor bugfixes
+
 == Version 0.1.1
 
 * Riak store [Thanks seven1m]

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/aclatraz.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{aclatraz}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kriss 'nu7hatch' Kowalik"]
-  s.date = %q{2010-09-17}
+  s.date = %q{2010-09-19}
   s.description = %q{      Extremaly fast and flexible access control mechanism inspired by *nix ACLs, 
       powered by fast key value stores like Redis or TokyoCabinet.
 }

data/lib/aclatraz/store/redis.rb

@@ -1,5 +1,6 @@
 begin
   require 'redis'
+  require 'redis/distributed'
 rescue LoadError
   raise "You must install the redis gem to use the Redis store"
 end
@@ -21,7 +22,11 @@ module Aclatraz
       MEMBER_ROLES = "member.%s.roles"
       
       def initialize(*args) # :nodoc:
-        @backend = ::Redis.new(*args)
+        case args.first when ::Redis, ::Redis::Distributed
+          @backend = args.first 
+        else
+          @backend = ::Redis.new(*args)
+        end
       end
 
       def set(role, member, object=nil)

data/lib/aclatraz/store/riak.rb

@@ -18,7 +18,11 @@ module Aclatraz
       include Aclatraz::Helpers
 
       def initialize(bucket_name, *args) # :nodoc:
-        @backend = ::Riak::Client.new(*args).bucket(bucket_name)
+        case args.first when ::Riak::Client
+          @backend = args.first.bucket(bucket_name)
+        else
+          @backend = ::Riak::Client.new(*args).bucket(bucket_name)
+        end
       end
 
       def set(role, member, object=nil)

data/spec/aclatraz/stores_spec.rb

@@ -55,19 +55,34 @@ describe "Aclatraz" do
   let(:owner) { StubOwner.new }
   let(:target) { StubTarget.new }
   
-  describe "Redis store" do 
-    before(:all) { @redis = Thread.new { `redis-server` } }
-    after(:all) { @redis.exit! }
+  describe "for Redis store" do 
     subject { Aclatraz.init(:redis, "redis://localhost:6379/0") }
     
     class_eval &STORE_SPECS
+    
+    it "should respect persistent connection given on initalize" do 
+      Aclatraz.instance_variable_set("@store", nil)
+      Aclatraz.init(:redis, Redis.new("redis://localhost:6379/0"))
+      Aclatraz.store.instance_variable_get('@backend').should be_kind_of(Redis)
+      Aclatraz.store.instance_variable_get('@backend').ping.should be_true
+    end
+    
+    it "shouls respect redis hash options given in init" do 
+      Aclatraz.instance_variable_set("@store", nil)
+      Aclatraz.init(:redis, :url => "redis://localhost:6379/0")
+      Aclatraz.store.instance_variable_get('@backend').ping.should be_true
+    end 
   end
 
-  describe "Riak store" do 
-    before(:all) { @riak = Thread.new { `riak start` } }
-    after(:all) { @riak.exit! }
+  describe "for Riak store" do 
     subject { Aclatraz.init(:riak, "roles") }
     
     class_eval &STORE_SPECS
+    
+    it "should respect persistent connection given on initalize" do 
+      Aclatraz.instance_variable_set("@store", nil)
+      Aclatraz.init(:riak, "roles", ::Riak::Client.new)
+      Aclatraz.store.instance_variable_get('@backend').should be_kind_of(Riak::Bucket)
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: aclatraz
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Kriss 'nu7hatch' Kowalik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-17 00:00:00 +02:00
+date: 2010-09-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency