ohm 0.0.13 → 0.0.14

data/lib/ohm.rb

@@ -6,7 +6,11 @@ module Ohm
 
   # Provides access to the Redis database. This is shared accross all models and instances.
   def redis
-    @redis
+    Thread.current[:redis]
+  end
+
+  def redis=(connection)
+    Thread.current[:redis] = connection
   end
 
   # Connect to a redis database.
@@ -19,12 +23,12 @@ module Ohm
   # @example Connect to a database in port 6380.
   #   Ohm.connect(:port => 6380)
   def connect(*options)
-    @redis = Ohm::Redis.new(*options)
+    self.redis = Ohm::Redis.new(*options)
   end
 
   # Clear the database.
   def flush
-    @redis.flushdb
+    redis.flushdb
   end
 
   # Join the parameters with ":" to create a key.
@@ -32,7 +36,7 @@ module Ohm
     args.join(":")
   end
 
-  module_function :key, :connect, :flush, :redis
+  module_function :key, :connect, :flush, :redis, :redis=
 
   module Attributes
     class Collection
@@ -490,7 +494,7 @@ module Ohm
 
     def read_locals(attrs)
       attrs.map do |att|
-        read_local(att)
+        send(att)
       end
     end
 

data/test/indices_test.rb

@@ -5,6 +5,11 @@ class IndicesTest < Test::Unit::TestCase
     attribute :email
 
     index :email
+    index :email_provider
+
+    def email_provider
+      email.split("@").last
+    end
   end
 
   context "A model with an indexed attribute" do
@@ -43,4 +48,19 @@ class IndicesTest < Test::Unit::TestCase
       assert_equal [@user3], User.find(:email, "baz qux")
     end
   end
+
+  context "Indexing arbitrary attributes" do
+    setup do
+      Ohm.flush
+
+      @user1 = User.create(:email => "foo@gmail.com")
+      @user2 = User.create(:email => "bar@gmail.com")
+      @user3 = User.create(:email => "bazqux@yahoo.com")
+    end
+
+    should "allow indexing by an arbitrary attribute" do
+      assert_equal [@user1, @user2], User.find(:email_provider, "gmail.com").to_a.sort_by { |u| u.id }
+      assert_equal [@user3], User.find(:email_provider, "yahoo.com")
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ohm
 version: !ruby/object:Gem::Version 
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors: 
 - Michel Martens