ohm 0.0.24 → 0.0.25

data/lib/ohm.rb

@@ -180,6 +180,10 @@ module Ohm
       def size
         db.llen(key)
       end
+
+      def inspect
+        "#<List: #{raw.inspect}>"
+      end
     end
 
     # Represents a Redis set.
@@ -243,6 +247,7 @@ module Ohm
       #     end
       #   end
       def filter(hash, &block)
+        raise ArgumentError, "filter expects a block" unless block_given?
         apply(:sinterstore, keys(hash).push(key), &block)
       end
 
@@ -255,6 +260,7 @@ module Ohm
       #     events = search_results.all
       #   end
       def search(hash, &block)
+        raise ArgumentError, "search expects a block" unless block_given?
         apply(:sunionstore, keys(hash), &block)
       end
 
@@ -265,11 +271,15 @@ module Ohm
       # Apply a redis operation on a collection of sets. Note that
       # the resulting set is removed inmediatly after use.
       def apply(operation, source, &block)
-        target = source.join(operation.to_s)
+        target = source.uniq.join("+")
         db.send(operation, target, *source)
         set = self.class.new(db, target, model)
         block.call(set)
-        set.delete!
+        set.delete! if source.size > 1
+      end
+
+      def inspect
+        "#<Set: #{raw.inspect}>"
       end
 
     private
@@ -397,6 +407,10 @@ module Ohm
       new(:id => id) if exists?(id)
     end
 
+    def self.to_proc
+      Proc.new { |id| self[id] }
+    end
+
     def self.all
       @all ||= Attributes::Set.new(db, key(:all), self)
     end
@@ -557,6 +571,20 @@ module Ohm
       self
     end
 
+    def inspect
+      everything = (attributes + collections + counters).map do |att|
+        value = begin
+                  send(att)
+                rescue ModelIsNew
+                  nil
+                end
+
+        [att, value.inspect]
+      end
+
+      "#<#{self.class}:#{id || "?"} #{everything.map {|e| e.join("=") }.join(" ")}>"
+    end
+
   protected
 
     def key(*args)

data/test/model_test.rb

@@ -112,6 +112,10 @@ class TestRedis < Test::Unit::TestCase
       assert_equal 1, User[1].id
       assert_equal "albert@example.com", User[1].email
     end
+
+    should "allow to map ids to models" do
+      assert_equal [User[1]], [1].map(&User)
+    end
   end
 
   context "Updating a user" do
@@ -526,4 +530,27 @@ class TestRedis < Test::Unit::TestCase
       assert_not_equal @user, OpenStruct.new(:key => @user.send(:key))
     end
   end
+
+  context "Debugging" do
+    class ::Bar < Ohm::Model
+      attribute :name
+      counter :visits
+      set :friends
+      list :comments
+    end
+
+    should "provide a meaningful inspect" do
+      bar = Bar.new
+
+      assert_equal "#<Bar:? name=nil friends=nil comments=nil visits=0>", bar.inspect
+
+      bar.update(:name => "Albert")
+      bar.friends << 1
+      bar.friends << 2
+      bar.comments << "A"
+      bar.incr(:visits)
+
+      assert_equal %Q{#<Bar:#{bar.id} name="Albert" friends=#<Set: ["1", "2"]> comments=#<List: ["A"]> visits=1>}, Bar[bar.id].inspect
+    end
+  end
 end

data/test/search_test.rb

@@ -0,0 +1,42 @@
+require File.join(File.dirname(__FILE__), "test_helper")
+
+class SearchTest < Test::Unit::TestCase
+  setup do
+    Ohm.flush
+  end
+
+  class Lane < Ohm::Model
+    attribute :lane_type
+
+    index :lane_type
+
+    def to_s
+      lane_type.capitalize
+    end
+
+    def validate
+      assert_unique :lane_type
+    end
+
+    def error_messages
+      errors.present do |e|
+        e.on [:lane_type, :not_unique], "The lane type #{lane_type} is already in use"
+      end
+    end
+  end
+
+  context "A model with an indexed attribute" do
+    setup do
+      @results = []
+      @subresults = []
+      Lane.search(:lane_type => "email") { |sr| @results << sr.size }
+      Lane.create(:lane_type => "email")
+      Lane.search(:lane_type => "email") { |sr| @results << sr.size }
+      Lane.search(:lane_type => "email") { |sr| @results << sr.size }
+    end
+
+    should "be able to find by the given attribute" do
+      assert_equal [0, 1, 1], @results
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ohm
 version: !ruby/object:Gem::Version 
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors: 
 - Michel Martens
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-25 00:00:00 -03:00
+date: 2009-10-07 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
@@ -40,6 +40,7 @@ files:
 - test/model_test.rb
 - test/mutex_test.rb
 - test/redis_test.rb
+- test/search_test.rb
 - test/test_helper.rb
 - test/validations_test.rb
 - test/test.conf