Merge branch 'master' into new-views

yrashk · May 22, 2008 · 08934af · 08934af
2 parents 6a6f9d1 + 5c90fb1
commit 08934af
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/lib/strokedb/util/lazy_mapping_array.rb b/lib/strokedb/util/lazy_mapping_array.rb
@@ -135,6 +135,10 @@ def include?(v)
     def to_a
        Array.new(map{|v| v})
     end
+
+    def ==(arr)
+      to_a == arr
+    end
 
     def class
       Array

diff --git a/spec/lib/strokedb/document/document_spec.rb b/spec/lib/strokedb/document/document_spec.rb
@@ -224,7 +224,7 @@
     @document.metas_slot = [Meta]
     @document = @document.save!.reload
     @document.meta_slot.should == Meta.document(@document.store)
-    @document.metas_slot.to_a.should == [Meta.document(@document.store)]
+    @document.metas_slot.should == [Meta.document(@document.store)]
   end
 
   it "should not save itself once declared immutable" do

diff --git a/spec/lib/strokedb/util/lazy_mapping_array_spec.rb b/spec/lib/strokedb/util/lazy_mapping_array_spec.rb
@@ -18,7 +18,7 @@
   end
 end
 
-describe "LazyMappingArray instance with block specified" do
+describe "LazyMappingArray instance with map/unmap specified" do
   before(:each) do
     @original = [1,2,3,[1],[2]]
     @mapper = proc {|arg| arg.to_s }
@@ -167,5 +167,8 @@
     @array.should_not include("10")
   end
 
+  it "should be == to similar non-lazy array" do
+    @array.should == @original.map{|v| @mapper.call(v)}
+  end
+
 end
-