gom 0.3.0 → 0.3.1

data/lib/gom/object.rb

@@ -15,8 +15,13 @@ module GOM::Object
     id ? id.to_s : nil
   end
 
+  def self.storage_name(object)
+    id = Mapping.id_by_object object
+    id ? id.storage_name : nil
+  end
+
   def self.reference(object)
-    Proxy.new object
+    object.is_a?(GOM::Object::Proxy) ? object : Proxy.new(object)
   end
 
 end

data/lib/gom/object/cached_builder.rb

@@ -4,13 +4,14 @@
 class GOM::Object::CachedBuilder
 
   attr_accessor :draft
-  attr_accessor :id
+  attr_accessor :storage_name
 
-  def initialize(draft, id = nil)
-    @draft, @id = draft, id
+  def initialize(draft, storage_name)
+    @draft, @storage_name = draft, storage_name
   end
 
   def object
+    initialize_id
     check_mapping
     build_object
     set_mapping
@@ -19,6 +20,10 @@ class GOM::Object::CachedBuilder
 
   private
 
+  def initialize_id
+    @id = GOM::Object::Id.new @storage_name, @draft.object_id
+  end
+
   def check_mapping
     @object = GOM::Object::Mapping.object_by_id @id
   end

data/lib/gom/object/collection.rb

@@ -2,8 +2,8 @@
 # A class for a collection of objects.
 class GOM::Object::Collection
 
-  def initialize(fetcher)
-    @fetcher = fetcher
+  def initialize(fetcher, storage_name)
+    @fetcher, @storage_name = fetcher, storage_name
   end
 
   def total_count
@@ -15,15 +15,15 @@ class GOM::Object::Collection
   end
 
   def method_missing(method_name, *arguments, &block)
-    load unless (@object_proxies || @rows)
-    (@object_proxies || @rows).send method_name, *arguments, &block
+    load unless (@objects || @object_proxies || @rows)
+    (@objects || @object_proxies || @rows).send method_name, *arguments, &block
   end
 
   private
 
   def load
     if fetcher_has_drafts?
-      load_object_proxies_from_drafts
+      load_objects_from_drafts
     elsif fetcher_has_ids?
       load_object_proxies_from_ids
     elsif fetcher_has_rows?
@@ -37,9 +37,9 @@ class GOM::Object::Collection
     @fetcher.respond_to?(:drafts) && @fetcher.drafts
   end
 
-  def load_object_proxies_from_drafts
-    @object_proxies = @fetcher.drafts.map do |draft|
-      GOM::Object::Proxy.new GOM::Object::CachedBuilder.new(draft).object
+  def load_objects_from_drafts
+    @objects = @fetcher.drafts.map do |draft|
+      GOM::Object::CachedBuilder.new(draft, @storage_name).object
     end
   end
 

data/lib/gom/object/draft.rb

@@ -2,13 +2,13 @@
 # A draft for an object
 class GOM::Object::Draft
 
-  attr_accessor :id
+  attr_accessor :object_id
   attr_accessor :class_name
   attr_writer :properties
   attr_writer :relations
 
-  def initialize(id = nil, class_name = nil, properties = { }, relations = { })
-    @id, @class_name, @properties, @relations = id, class_name, properties, relations
+  def initialize(object_id = nil, class_name = nil, properties = { }, relations = { })
+    @object_id, @class_name, @properties, @relations = object_id, class_name, properties, relations
   end
 
   def properties
@@ -20,7 +20,7 @@ class GOM::Object::Draft
   end
 
   def ==(other)
-    id == other.id && class_name == other.class_name && properties == other.properties && relations == other.relations
+    object_id == other.object_id && class_name == other.class_name && properties == other.properties && relations == other.relations
   end
 
 end

data/lib/gom/object/mapping.rb

@@ -7,6 +7,7 @@ class GOM::Object::Mapping
   end
 
   def put(object, id)
+    return if object.nil? || id.nil?
     @map[object] = id
   end
 
@@ -34,6 +35,12 @@ class GOM::Object::Mapping
     @map.clear
   end
 
+  def inspect
+    output = ""
+    @map.each{ |object, id| output += object.inspect + " => " + id.to_s + "\n" }
+    output
+  end
+
   def self.singleton
     @mapping ||= self.new
   end

data/lib/gom/object/proxy.rb

@@ -15,7 +15,12 @@ class GOM::Object::Proxy
 
   def id
     fetch_id unless @id
-    @id
+    @id && @id.to_s
+  end
+
+  def storage_name
+    fetch_id unless @id
+    @id && @id.storage_name
   end
 
   def method_missing(method_name, *arguments, &block)

data/lib/gom/spec/acceptance/adapter_that_needs_setup.rb

@@ -35,6 +35,16 @@ shared_examples_for "an adapter that needs setup" do
 
   end
 
+  describe "counting the objects" do
+
+    it "should raise a #{GOM::Storage::Adapter::NoSetupError}" do
+      lambda do
+        GOM::Storage.count :test_storage
+      end.should raise_error(GOM::Storage::Adapter::NoSetupError)
+    end
+
+  end
+
   describe "fetching a class collection" do
 
     it "should raise a #{GOM::Storage::Adapter::NoSetupError}" do
@@ -55,4 +65,4 @@ shared_examples_for "an adapter that needs setup" do
 
   end
 
-end
+end

data/lib/gom/spec/acceptance/adapter_with_stateful_storage.rb

@@ -50,6 +50,11 @@ shared_examples_for "an adapter connected to a stateful storage" do
       related_object_proxy.object.number.should == 16
     end
 
+    it "should return exactly the same object if the id is fetched again" do
+      object = GOM::Storage.fetch @id
+      object.should === @object
+    end
+
   end
 
   describe "storing an object" do
@@ -65,6 +70,13 @@ shared_examples_for "an adapter connected to a stateful storage" do
       object.should == @object
     end
 
+    it "should change the object count by 2" do
+      counter = Proc.new { GOM::Storage.count :test_storage }
+      lambda do
+        GOM::Storage.store @object, :test_storage
+      end.should change(counter, :call).by(2)
+    end
+
     it "should use default storage if nothing specified" do
       GOM::Storage.store @object
       GOM::Object.id(@object).should =~ /^test_storage:/
@@ -81,6 +93,14 @@ shared_examples_for "an adapter connected to a stateful storage" do
       related_object.number.should == 16
     end
 
+    it "should not change the object count if performing an update" do
+      GOM::Storage.store @object, :test_storage
+      counter = Proc.new { GOM::Storage.count :test_storage }
+      lambda do
+        GOM::Storage.store @object, :test_storage
+      end.should_not change(counter, :call)
+    end
+
   end
 
   describe "removing an object" do
@@ -109,6 +129,13 @@ shared_examples_for "an adapter connected to a stateful storage" do
       GOM::Object.id(@object).should be_nil
     end
 
+    it "should change the object count by -1" do
+      counter = Proc.new { GOM::Storage.count :test_storage }
+      lambda do
+        GOM::Storage.remove @object
+      end.should change(counter, :call).by(-1)
+    end
+
     it "should not remove the related object" do
       GOM::Storage.remove @object
       GOM::Object.id(@related_object).should_not be_nil
@@ -138,11 +165,7 @@ shared_examples_for "an adapter connected to a stateful storage" do
 
     it "should provide a collection of all objects of the class from a class view" do
       collection = GOM::Storage.collection :test_storage, :test_object_class_view
-      collection.size.should > 0
-      collection.each do |object_proxy|
-        object_proxy.should be_instance_of(GOM::Object::Proxy)
-        object_proxy.object.should be_instance_of(GOM::Spec::Object)
-      end
+      collection.map(&:class).uniq.should == [ GOM::Spec::Object ]
     end
 
   end
@@ -165,12 +188,7 @@ shared_examples_for "an adapter connected to a stateful storage" do
 
     it "should provide a collection of the objects emitted by the map reduce view" do
       collection = GOM::Storage.collection :test_storage, :test_map_view
-      collection.size.should > 0
-      collection.each do |object_proxy|
-        object_proxy.should be_instance_of(GOM::Object::Proxy)
-        object_proxy.object.should be_instance_of(GOM::Spec::Object)
-        object_proxy.object.number.should == @object.number
-      end
+      collection.map(&:number).uniq.should == [ 11 ]
     end
 
   end

data/lib/gom/spec/acceptance/read_only_adapter_with_stateless_storage.rb

@@ -7,7 +7,7 @@ shared_examples_for "a read-only adapter connected to a stateless storage" do
 
   after :all do
     GOM::Storage.teardown
-  end  
+  end
 
   describe "fetching an object" do
 
@@ -18,6 +18,12 @@ shared_examples_for "a read-only adapter connected to a stateless storage" do
       GOM::Object.id(object).should == "test_storage:object_1"
     end
 
+    it "should return the exactly the same object if fetched again" do
+      object_one = GOM::Storage.fetch "test_storage:object_1"
+      object_two = GOM::Storage.fetch "test_storage:object_1"
+      object_one.should === object_two
+    end
+
     it "should return proxy objects that fetches the related objects" do
       object = GOM::Storage.fetch "test_storage:object_1"
       related_object = object.related_object
@@ -51,6 +57,15 @@ shared_examples_for "a read-only adapter connected to a stateless storage" do
 
   end
 
+  describe "counting the objects" do
+
+    it "should return a number" do
+      count = GOM::Storage.count :test_storage
+      count.should be_instance_of(Fixnum)
+    end
+
+  end
+
   describe "fetching a class collection" do
 
     it "should return a collection" do
@@ -61,8 +76,8 @@ shared_examples_for "a read-only adapter connected to a stateless storage" do
     it "should return a collection that contains all object of class Object" do
       collection = GOM::Storage.collection :test_storage, :test_object_class_view
       collection.size > 0
-      collection.each do |object_proxy|
-        [ 5, 7 ].should include(object_proxy.object.number)
+      collection.each do |object|
+        [ 5, 7 ].should include(object.number)
       end
     end
 

data/lib/gom/storage.rb

@@ -3,6 +3,7 @@ module GOM::Storage
 
   autoload :Adapter, File.join(File.dirname(__FILE__), "storage", "adapter")
   autoload :Configuration, File.join(File.dirname(__FILE__), "storage", "configuration")
+  autoload :Counter, File.join(File.dirname(__FILE__), "storage", "counter")
   autoload :Fetcher, File.join(File.dirname(__FILE__), "storage", "fetcher")
   autoload :Remover, File.join(File.dirname(__FILE__), "storage", "remover")
   autoload :Saver, File.join(File.dirname(__FILE__), "storage", "saver")
@@ -36,6 +37,10 @@ module GOM::Storage
     Remover.new(object_or_id).perform
   end
 
+  def self.count(storage_name)
+    Counter.new(storage_name).perform
+  end
+
   def self.collection(storage_name, *arguments)
     Configuration[storage_name].adapter.collection *arguments
   end

data/lib/gom/storage/adapter.rb

@@ -14,7 +14,7 @@ class GOM::Storage::Adapter
     @configuration = configuration
   end
 
-  [ :setup, :teardown, :fetch, :store, :remove, :collection ].each do |key|
+  [ :setup, :teardown, :fetch, :store, :remove, :count, :collection ].each do |key|
 
     define_method key do |*arguments|
       not_implemented key

data/lib/gom/storage/counter.rb

@@ -0,0 +1,19 @@
+
+# Counts the number of objects in the given storage.
+class GOM::Storage::Counter
+
+  def initialize(storage_name)
+    @storage_name = storage_name
+  end
+
+  def perform
+    adapter.count
+  end
+
+  private
+
+  def adapter
+    @adapter ||= GOM::Storage::Configuration[@storage_name].adapter
+  end
+
+end

data/lib/gom/storage/fetcher.rb

@@ -1,5 +1,5 @@
 
-# Fetches an object from the storage.
+# Fetches a draft from the storage adapter and uses the cached builder to build an object from it.
 class GOM::Storage::Fetcher
 
   attr_accessor :id
@@ -10,7 +10,7 @@ class GOM::Storage::Fetcher
 
   def object
     fetch_draft
-    return unless has_draft?
+    return nil unless has_draft?
     build_object
     @object
   end
@@ -26,7 +26,7 @@ class GOM::Storage::Fetcher
   end
 
   def build_object
-    @object = GOM::Object::CachedBuilder.new(@draft, @id).object
+    @object = GOM::Object::CachedBuilder.new(@draft, @id.storage_name).object
   end
 
   def adapter

data/lib/gom/storage/saver.rb

@@ -30,7 +30,7 @@ class GOM::Storage::Saver
 
   def inspect_object
     @draft = GOM::Object::Inspector.new(@object).draft
-    @draft.id = @id.object_id if @id
+    @draft.object_id = @id.object_id if @id
   end
 
   def store_draft

data/spec/fake_adapter.rb

@@ -57,12 +57,12 @@ class FakeAdapter < GOM::Storage::Adapter
     end
 
     # may generate an id
-    object_id = draft.id || next_id
+    draft.object_id ||= next_id
 
     # store the draft
-    @store[object_id] = draft
+    @store[draft.object_id] = draft
 
-    object_id
+    draft.object_id
   end
 
   def remove(id)
@@ -70,13 +70,18 @@ class FakeAdapter < GOM::Storage::Adapter
     @store.delete id
   end
 
+  def count
+    raise GOM::Storage::Adapter::NoSetupError unless @store
+    @store.size
+  end
+
   def collection(view_name)
     raise GOM::Storage::Adapter::NoSetupError unless @store
     case view_name.to_sym
       when :test_object_class_view
-        GOM::Object::Collection.new ClassCollectionFetcher.new(@store, configuration.name, "GOM::Spec::Object")
+        GOM::Object::Collection.new ClassCollectionFetcher.new(@store, configuration.name, "GOM::Spec::Object"), configuration.name
       when :test_map_view
-        GOM::Object::Collection.new MapReduceCollectionFetcher.new(@store, configuration.name, :number, 11)
+        GOM::Object::Collection.new MapReduceCollectionFetcher.new(@store, configuration.name, :number, 11), configuration.name
     end
   end
 

data/spec/lib/gom/object/cached_builder_spec.rb

@@ -3,8 +3,11 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "sp
 describe GOM::Object::CachedBuilder do
 
   before :each do
-    @draft = mock GOM::Object::Draft
+    @object_id = "object_1"
+    @draft = GOM::Object::Draft.new @object_id
+
     @id = mock GOM::Object::Id
+    GOM::Object::Id.stub(:new).and_return(@id)
 
     @object = mock Object
     GOM::Object::Mapping.stub(:object_by_id).and_return(@object)
@@ -13,11 +16,16 @@ describe GOM::Object::CachedBuilder do
     @builder = mock GOM::Object::Builder, :object => @object
     GOM::Object::Builder.stub(:new).and_return(@builder)
 
-    @cached_builder = described_class.new @draft, @id
+    @cached_builder = described_class.new @draft, "test_storage"
   end
 
   describe "object" do
 
+    it "should initialize the right id" do
+      GOM::Object::Id.should_receive(:new).with("test_storage", "object_1").and_return(@id)
+      @cached_builder.object
+    end
+
     it "should check the mapping for the object" do
       GOM::Object::Mapping.should_receive(:object_by_id).with(@id).and_return(@object)
       @cached_builder.object

data/spec/lib/gom/object/collection_spec.rb

@@ -13,7 +13,7 @@ describe GOM::Object::Collection do
     @builder = mock GOM::Object::CachedBuilder, :object => @object
     GOM::Object::CachedBuilder.stub(:new).and_return(@builder)
 
-    @collection = described_class.new @fetcher
+    @collection = described_class.new @fetcher, "test_storage"
   end
 
   describe "total_count" do
@@ -44,18 +44,13 @@ describe GOM::Object::Collection do
         end
 
         it "should initialize the cached object builder with each draft" do
-          GOM::Object::CachedBuilder.should_receive(:new).with(@draft).and_return(@builder)
+          GOM::Object::CachedBuilder.should_receive(:new).with(@draft, "test_storage").and_return(@builder)
           @collection.first
         end
 
-        it "should initialize an object proxy with the object" do
-          GOM::Object::Proxy.should_receive(:new).with(@object).and_return(@proxy)
-          @collection.first
-        end
-
-        it "should return a object proxy for the first object" do
-          object_proxy = @collection.first
-          object_proxy.should == @proxy
+        it "should return the first object" do
+          object = @collection.first
+          object.should == @object
         end
 
       end
@@ -147,8 +142,8 @@ describe GOM::Object::Collection do
       end
 
       it "should return a object proxy for the first object" do
-        object_proxy = @collection.first
-        object_proxy.should == @proxy
+        object = @collection.first
+        object.should == @object
       end
 
     end

data/spec/lib/gom/object/draft_spec.rb

@@ -8,8 +8,8 @@ describe GOM::Object::Draft do
 
   describe "initialize" do
 
-    it "should set the id" do
-      @draft.id.should == "object_1"
+    it "should set the object id" do
+      @draft.object_id.should == "object_1"
     end
 
     it "should set the class name" do

data/spec/lib/gom/object/mapping_spec.rb

@@ -15,12 +15,24 @@ describe GOM::Object::Mapping do
       @mapping.object_by_id(@id).should == @object
     end
 
+    it "should not store anything if object is nil" do
+      lambda do
+        @mapping.put nil, @id
+      end.should_not change(@mapping, :size)
+    end
+
+    it "should not store anything if id is nil" do
+      lambda do
+        @mapping.put @object, nil
+      end.should_not change(@mapping, :size)
+    end
+
   end
 
   describe "with a mapping" do
 
     before :each do
-      @same_id = GOM::Object::Id.new "test_storage", "object_1"
+      @same_id = GOM::Object::Id.new @id.storage_name, @id.object_id
       @mapping.put @object, @id
     end
 
@@ -28,6 +40,9 @@ describe GOM::Object::Mapping do
 
       it "should return the object to the given id" do
         @mapping.object_by_id(@id).should == @object
+      end
+
+      it "should return the object for a different id with the same attributes" do
         @mapping.object_by_id(@same_id).should == @object
       end
 
@@ -77,6 +92,15 @@ describe GOM::Object::Mapping do
 
     end
 
+    describe "inspect" do
+
+      it "should return a string with all the mappings" do
+        output = @mapping.inspect
+        output.should =~ /#<Object:.*> => test_storage:object_1\n/
+      end
+
+    end
+
   end
 
   describe "class method" do

data/spec/lib/gom/object/proxy_spec.rb

@@ -2,11 +2,14 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "sp
 
 describe GOM::Object::Proxy do
 
+  before :each do
+    @id = GOM::Object::Id.new "test_storage", "object_1"
+    @object = mock Object, :test_method => nil
+  end
+
   describe "initialized with an object" do
 
     before :each do
-      @object = mock Object, :test_method => nil
-
       @proxy = GOM::Object::Proxy.new @object
     end
 
@@ -26,7 +29,6 @@ describe GOM::Object::Proxy do
     describe "id" do
 
       before :each do
-        @id = mock GOM::Object::Id
         GOM::Object::Mapping.stub(:id_by_object).and_return(@id)
       end
 
@@ -36,12 +38,38 @@ describe GOM::Object::Proxy do
       end
 
       it "should return the fetched id" do
-        @proxy.id.should == @id
+        id = @proxy.id
+        id.should == "test_storage:object_1"
       end
 
       it "should return nil if no mapping exists" do
         GOM::Object::Mapping.stub(:id_by_object).and_return(nil)
-        @proxy.id.should be_nil
+        id = @proxy.id
+        id.should be_nil
+      end
+
+    end
+
+    describe "storage_name" do
+
+      before :each do
+        GOM::Object::Mapping.stub(:id_by_object).and_return(@id)
+      end
+
+      it "should fetch the id from the mapping" do
+        GOM::Object::Mapping.should_receive(:id_by_object).with(@object).and_return(@id)
+        @proxy.storage_name
+      end
+
+      it "should return the fetched storage name" do
+        storage_name = @proxy.storage_name
+        storage_name.should == "test_storage"
+      end
+
+      it "should return nil if no mapping exists" do
+        GOM::Object::Mapping.stub(:id_by_object).and_return(nil)
+        storage_name = @proxy.storage_name
+        storage_name.should be_nil
       end
 
     end
@@ -51,10 +79,6 @@ describe GOM::Object::Proxy do
   describe "initialized with an id" do
 
     before :each do
-      @id = GOM::Object::Id.new "test_storage", "object_1"
-
-      @object = mock Object, :test_method => nil
-
       @fetcher = mock GOM::Storage::Fetcher, :object => @object
       GOM::Storage::Fetcher.stub(:new).and_return(@fetcher)
 
@@ -81,7 +105,17 @@ describe GOM::Object::Proxy do
     describe "id" do
 
       it "should return the id" do
-        @proxy.id.should == @id
+        id = @proxy.id
+        id.should == "test_storage:object_1"
+      end
+
+    end
+
+    describe "storage_name" do
+
+      it "should return the storage name" do
+        storage_name = @proxy.storage_name
+        storage_name.should == "test_storage"
       end
 
     end

data/spec/lib/gom/object_spec.rb

@@ -8,25 +8,54 @@ describe GOM::Object do
       @id_string = "test_storage:object_1"
       @id = GOM::Object::Id.new @id_string
       @object = Object.new
-      GOM::Object::Mapping.stub!(:id_by_object).and_return(@id)
+      GOM::Object::Mapping.stub(:id_by_object).and_return(@id)
     end
 
     it "should call id_by_object of object mapping" do
       GOM::Object::Mapping.should_receive(:id_by_object).with(@object).and_return(@id)
+      GOM::Object.id @object
+    end
+
+    it "should return the id string" do
       GOM::Object.id(@object).should == @id_string
     end
 
     it "should return nil if the call of id_by_object returned nil" do
-      GOM::Object::Mapping.stub!(:id_by_object).and_return(nil)
+      GOM::Object::Mapping.stub(:id_by_object).and_return(nil)
       GOM::Object.id(@object).should be_nil
     end
 
   end
 
+  describe "storage_name" do
+
+    before :each do
+      @id = GOM::Object::Id.new "test_storage:object_1"
+      @object = Object.new
+      GOM::Object::Mapping.stub(:id_by_object).and_return(@id)
+    end
+
+    it "should call id_by_object of object mapping" do
+      GOM::Object::Mapping.should_receive(:id_by_object).with(@object).and_return(@id)
+      GOM::Object.storage_name @object
+    end
+
+    it "should return the storage name" do
+      GOM::Object.storage_name(@object).should == "test_storage"
+    end
+
+    it "should return nil if the call of id_by_object returned nil" do
+      GOM::Object::Mapping.stub(:id_by_object).and_return(nil)
+      GOM::Object.storage_name(@object).should be_nil
+    end
+
+  end
+
   describe "reference" do
 
     before :each do
       @object = Object.new
+      @proxy = GOM::Object::Proxy.new @object
     end
 
     it "should return a proxy for the given object" do
@@ -35,6 +64,11 @@ describe GOM::Object do
       proxy.object.should == @object
     end
 
+    it "should return the proxy if a proxy is given" do
+      proxy = GOM::Object::reference @proxy
+      proxy.should == @proxy
+    end
+
   end
 
 end

data/spec/lib/gom/storage/adapter_spec.rb

@@ -30,7 +30,7 @@ describe GOM::Storage::Adapter do
 
   end
 
-  [ :setup, :teardown, :fetch, :store, :remove, :collection ].each do |method_name|
+  [ :setup, :teardown, :fetch, :store, :remove, :count, :collection ].each do |method_name|
 
     describe "#{method_name}" do
 

data/spec/lib/gom/storage/counter_spec.rb

@@ -0,0 +1,32 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "spec_helper"))
+
+describe GOM::Storage::Counter do
+
+  before :each do
+    @adapter = mock GOM::Storage::Adapter, :count => 1
+    @configuration = mock GOM::Storage::Configuration, :adapter => @adapter
+    GOM::Storage::Configuration.stub(:[]).and_return(@configuration)
+
+    @counter = described_class.new "test_storage"
+  end
+
+  describe "perform" do
+
+    it "should route the call to the correct storage" do
+      GOM::Storage::Configuration.should_receive(:[]).with("test_storage").and_return(@configuration)
+      @counter.perform
+    end
+
+    it "should fetch the count from the adapter instance" do
+      @adapter.should_receive(:count).and_return(1)
+      @counter.perform
+    end
+
+    it "should return the count" do
+      count = @counter.perform
+      count.should == 1
+    end
+
+  end
+
+end

data/spec/lib/gom/storage/fetcher_spec.rb

@@ -4,8 +4,10 @@ describe GOM::Storage::Fetcher do
 
   before :each do
     @id = GOM::Object::Id.new "test_storage", "object_1"
+
     @object = Object.new
     @object.instance_variable_set :@test, "test value"
+
     @draft = GOM::Object::Draft.new nil, "Object", { :test => "test value" }
 
     @adapter = mock GOM::Storage::Adapter, :fetch => @draft
@@ -28,7 +30,7 @@ describe GOM::Storage::Fetcher do
     end
 
     it "should route the call to the correct storage" do
-      GOM::Storage::Configuration.should_receive(:[]).with("test_storage")
+      GOM::Storage::Configuration.should_receive(:[]).with("test_storage").and_return(@configuration)
       @fetcher.object
     end
 
@@ -38,7 +40,7 @@ describe GOM::Storage::Fetcher do
     end
 
     it "should initialize the cached object builder" do
-      GOM::Object::CachedBuilder.should_receive(:new).with(@draft, @id).and_return(@builder)
+      GOM::Object::CachedBuilder.should_receive(:new).with(@draft, "test_storage").and_return(@builder)
       @fetcher.object
     end
 

data/spec/lib/gom/storage/saver_spec.rb

@@ -4,9 +4,11 @@ describe GOM::Storage::Saver do
 
   before :each do
     @id = GOM::Object::Id.new "test_storage", "object_1"
+
     @object = Object.new
     @object.instance_variable_set :@test, "test value"
     @object.freeze
+
     @draft = GOM::Object::Draft.new "object_1", "Object", { :test => "test value" }
 
     GOM::Object::Mapping.stub(:id_by_object).with(@object).and_return(@id)
@@ -54,7 +56,7 @@ describe GOM::Storage::Saver do
 
     it "should store the object without an id if no mapping exists" do
       GOM::Object::Mapping.stub(:id_by_object).with(@object).and_return(nil)
-      @draft.id = nil
+      @draft.object_id = nil
 
       @adapter.should_receive(:store).with(@draft).and_return("object_1")
       @saver.perform

data/spec/lib/gom/storage_spec.rb

@@ -120,6 +120,25 @@ describe GOM::Storage do
 
   end
 
+  describe "count" do
+
+    before :each do
+      @counter = mock described_class::Counter, :perform => 1
+      described_class::Counter.stub(:new).and_return(@counter)
+    end
+
+    it "should initialize the counter" do
+      described_class::Counter.should_receive(:new).with("test_storage").and_return(@counter)
+      described_class.count "test_storage"
+    end
+
+    it "should return the count" do
+      count = described_class.count "test_storage"
+      count.should == 1
+    end
+
+  end
+
   describe "collection" do
 
     before :each do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - "Philipp Br\xC3\xBCll"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-17 00:00:00 +01:00
+date: 2011-03-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,52 +56,54 @@ files:
 - README.rdoc
 - LICENSE
 - Rakefile
-- lib/gom/storage.rb
-- lib/gom/object/id.rb
-- lib/gom/object/inspector.rb
-- lib/gom/object/collection.rb
-- lib/gom/object/cached_builder.rb
-- lib/gom/object/draft.rb
-- lib/gom/object/builder.rb
-- lib/gom/object/proxy.rb
-- lib/gom/object/mapping.rb
+- lib/gom.rb
+- lib/gom/storage/adapter.rb
+- lib/gom/storage/counter.rb
+- lib/gom/storage/saver.rb
+- lib/gom/storage/fetcher.rb
+- lib/gom/storage/remover.rb
+- lib/gom/storage/configuration/view/class.rb
+- lib/gom/storage/configuration/view/map_reduce.rb
+- lib/gom/storage/configuration/view.rb
+- lib/gom/storage/configuration.rb
 - lib/gom/object.rb
+- lib/gom/storage.rb
+- lib/gom/spec/object.rb
 - lib/gom/spec/acceptance/adapter_with_stateful_storage.rb
 - lib/gom/spec/acceptance/read_only_adapter_with_stateless_storage.rb
 - lib/gom/spec/acceptance/adapter_that_needs_setup.rb
-- lib/gom/spec/object.rb
-- lib/gom/storage/fetcher.rb
-- lib/gom/storage/saver.rb
-- lib/gom/storage/remover.rb
-- lib/gom/storage/configuration.rb
-- lib/gom/storage/configuration/view.rb
-- lib/gom/storage/configuration/view/map_reduce.rb
-- lib/gom/storage/configuration/view/class.rb
-- lib/gom/storage/adapter.rb
 - lib/gom/spec.rb
-- lib/gom.rb
-- spec/storage.configuration
-- spec/lib/gom/storage_spec.rb
+- lib/gom/object/mapping.rb
+- lib/gom/object/builder.rb
+- lib/gom/object/inspector.rb
+- lib/gom/object/id.rb
+- lib/gom/object/cached_builder.rb
+- lib/gom/object/draft.rb
+- lib/gom/object/proxy.rb
+- lib/gom/object/collection.rb
 - spec/lib/gom/object_spec.rb
-- spec/lib/gom/object/builder_spec.rb
-- spec/lib/gom/object/proxy_spec.rb
-- spec/lib/gom/object/cached_builder_spec.rb
-- spec/lib/gom/object/collection_spec.rb
-- spec/lib/gom/object/mapping_spec.rb
-- spec/lib/gom/object/id_spec.rb
-- spec/lib/gom/object/draft_spec.rb
-- spec/lib/gom/object/inspector_spec.rb
+- spec/lib/gom/storage/fetcher_spec.rb
+- spec/lib/gom/storage/counter_spec.rb
 - spec/lib/gom/storage/configuration_spec.rb
+- spec/lib/gom/storage/remover_spec.rb
+- spec/lib/gom/storage/saver_spec.rb
 - spec/lib/gom/storage/configuration/view/class_spec.rb
 - spec/lib/gom/storage/configuration/view/map_reduce_spec.rb
 - spec/lib/gom/storage/adapter_spec.rb
-- spec/lib/gom/storage/fetcher_spec.rb
-- spec/lib/gom/storage/saver_spec.rb
-- spec/lib/gom/storage/remover_spec.rb
-- spec/acceptance/fake_adapter_spec.rb
+- spec/lib/gom/object/mapping_spec.rb
+- spec/lib/gom/object/draft_spec.rb
+- spec/lib/gom/object/proxy_spec.rb
+- spec/lib/gom/object/inspector_spec.rb
+- spec/lib/gom/object/builder_spec.rb
+- spec/lib/gom/object/collection_spec.rb
+- spec/lib/gom/object/cached_builder_spec.rb
+- spec/lib/gom/object/id_spec.rb
+- spec/lib/gom/storage_spec.rb
+- spec/storage.configuration
+- spec/spec_helper.rb
 - spec/acceptance/object_spec.rb
+- spec/acceptance/fake_adapter_spec.rb
 - spec/acceptance/adapter_spec.rb
-- spec/spec_helper.rb
 - spec/fake_adapter.rb
 has_rdoc: true
 homepage: http://github.com/phifty/gom
@@ -136,23 +138,24 @@ signing_key:
 specification_version: 3
 summary: General Object Mapper - maps any ruby object to different kinds of storage engines and vice versa.
 test_files: 
-- spec/lib/gom/storage_spec.rb
 - spec/lib/gom/object_spec.rb
-- spec/lib/gom/object/builder_spec.rb
-- spec/lib/gom/object/proxy_spec.rb
-- spec/lib/gom/object/cached_builder_spec.rb
-- spec/lib/gom/object/collection_spec.rb
-- spec/lib/gom/object/mapping_spec.rb
-- spec/lib/gom/object/id_spec.rb
-- spec/lib/gom/object/draft_spec.rb
-- spec/lib/gom/object/inspector_spec.rb
+- spec/lib/gom/storage/fetcher_spec.rb
+- spec/lib/gom/storage/counter_spec.rb
 - spec/lib/gom/storage/configuration_spec.rb
+- spec/lib/gom/storage/remover_spec.rb
+- spec/lib/gom/storage/saver_spec.rb
 - spec/lib/gom/storage/configuration/view/class_spec.rb
 - spec/lib/gom/storage/configuration/view/map_reduce_spec.rb
 - spec/lib/gom/storage/adapter_spec.rb
-- spec/lib/gom/storage/fetcher_spec.rb
-- spec/lib/gom/storage/saver_spec.rb
-- spec/lib/gom/storage/remover_spec.rb
-- spec/acceptance/fake_adapter_spec.rb
+- spec/lib/gom/object/mapping_spec.rb
+- spec/lib/gom/object/draft_spec.rb
+- spec/lib/gom/object/proxy_spec.rb
+- spec/lib/gom/object/inspector_spec.rb
+- spec/lib/gom/object/builder_spec.rb
+- spec/lib/gom/object/collection_spec.rb
+- spec/lib/gom/object/cached_builder_spec.rb
+- spec/lib/gom/object/id_spec.rb
+- spec/lib/gom/storage_spec.rb
 - spec/acceptance/object_spec.rb
+- spec/acceptance/fake_adapter_spec.rb
 - spec/acceptance/adapter_spec.rb