gom 0.2.0 → 0.3.0

data/lib/gom/storage/fetcher.rb

@@ -1,44 +1,36 @@
 
-module GOM
+# Fetches an object from the storage.
+class GOM::Storage::Fetcher
 
-  module Storage
+  attr_accessor :id
 
-    # Fetches an object from the storage.
-    class Fetcher
-
-      attr_accessor :id
-
-      def initialize(id)
-        @id = id
-      end
-
-      def object
-        fetch_draft
-        return unless has_draft?
-        build_object
-        @object
-      end
-
-      private
+  def initialize(id)
+    @id = id
+  end
 
-      def fetch_draft
-        @draft = @id ? adapter.fetch(@id.object_id) : nil
-      end
+  def object
+    fetch_draft
+    return unless has_draft?
+    build_object
+    @object
+  end
 
-      def has_draft?
-        !!@draft
-      end
+  private
 
-      def build_object
-        @object = GOM::Object::CachedBuilder.new(@draft, @id).object
-      end
+  def fetch_draft
+    @draft = @id ? adapter.fetch(@id.object_id) : nil
+  end
 
-      def adapter
-        @adapter ||= GOM::Storage::Configuration[@id.storage_name].adapter
-      end
+  def has_draft?
+    !!@draft
+  end
 
-    end
+  def build_object
+    @object = GOM::Object::CachedBuilder.new(@draft, @id).object
+  end
 
+  def adapter
+    @adapter ||= GOM::Storage::Configuration[@id.storage_name].adapter
   end
 
 end

data/lib/gom/storage/remover.rb

@@ -1,47 +1,39 @@
 
-module GOM
+# Removes an object from the storage.
+class GOM::Storage::Remover
 
-  module Storage
+  attr_reader :object
+  attr_reader :id
 
-    # Removes an object from the storage.
-    class Remover
-
-      attr_reader :object
-      attr_reader :id
-
-      def initialize(object_or_id)
-        @object, @id = object_or_id.is_a?(GOM::Object::Id) ?
-          [ nil, object_or_id ] :
-          [ object_or_id, nil ]
-      end
-
-      def perform
-        check_mapping
-        remove_object
-        remove_mapping
-      end
-
-      private
+  def initialize(object_or_id)
+    @object, @id = object_or_id.is_a?(GOM::Object::Id) ?
+      [ nil, object_or_id ] :
+      [ object_or_id, nil ]
+  end
 
-      def check_mapping
-        @id ||= GOM::Object::Mapping.id_by_object @object
-        raise ArgumentError, "No id existing for the given object!" unless @id
-      end
+  def perform
+    check_mapping
+    remove_object
+    remove_mapping
+  end
 
-      def remove_object
-        adapter.remove @id.object_id
-      end
+  private
 
-      def remove_mapping
-        GOM::Object::Mapping.remove_by_object @object
-      end
+  def check_mapping
+    @id ||= GOM::Object::Mapping.id_by_object @object
+    raise ArgumentError, "No id existing for the given object!" unless @id
+  end
 
-      def adapter
-        @adapter ||= GOM::Storage::Configuration[@id.storage_name].adapter
-      end
+  def remove_object
+    adapter.remove @id.object_id
+  end
 
-    end
+  def remove_mapping
+    GOM::Object::Mapping.remove_by_object @object
+  end
 
+  def adapter
+    @adapter ||= GOM::Storage::Configuration[@id.storage_name].adapter
   end
 
 end

data/lib/gom/storage/saver.rb

@@ -1,57 +1,49 @@
 
-module GOM
+# Stores an object to the storage.
+class GOM::Storage::Saver
 
-  module Storage
+  attr_reader :object
+  attr_reader :storage_name
 
-    # Stores an object to the storage.
-    class Saver
-
-      attr_reader :object
-      attr_reader :storage_name
-
-      def initialize(object, storage_name = nil)
-        @object, @storage_name = object, storage_name
-      end
-
-      def perform
-        fetch_id
-        update_storage_name
-        inspect_object
-        store_draft
-        store_id
-      end
-
-      private
+  def initialize(object, storage_name = nil)
+    @object, @storage_name = object, storage_name
+  end
 
-      def fetch_id
-        @id = GOM::Object::Mapping.id_by_object @object
-      end
+  def perform
+    fetch_id
+    update_storage_name
+    inspect_object
+    store_draft
+    store_id
+  end
 
-      def update_storage_name
-        @storage_name ||= @id.storage_name if @id
-        @storage_name ||= GOM::Storage::Configuration.default.name
-      end
+  private
 
-      def inspect_object
-        @draft = GOM::Object::Inspector.new(@object).draft
-        @draft.id = @id.object_id if @id
-      end
+  def fetch_id
+    @id = GOM::Object::Mapping.id_by_object @object
+  end
 
-      def store_draft
-        object_id = adapter.store @draft
-        @id = GOM::Object::Id.new @storage_name.to_s, object_id
-      end
+  def update_storage_name
+    @storage_name ||= @id.storage_name if @id
+    @storage_name ||= GOM::Storage::Configuration.default.name
+  end
 
-      def store_id
-        GOM::Object::Mapping.put @object, @id
-      end
+  def inspect_object
+    @draft = GOM::Object::Inspector.new(@object).draft
+    @draft.id = @id.object_id if @id
+  end
 
-      def adapter
-        GOM::Storage::Configuration[@storage_name].adapter
-      end
+  def store_draft
+    object_id = adapter.store @draft
+    @id = GOM::Object::Id.new @storage_name.to_s, object_id
+  end
 
-    end
+  def store_id
+    GOM::Object::Mapping.put @object, @id
+  end
 
+  def adapter
+    GOM::Storage::Configuration[@storage_name].adapter
   end
 
 end

data/spec/acceptance/adapter_spec.rb

@@ -1,10 +1,22 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "spec_helper"))
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib", "gom"))
 
 GOM::Storage::Configuration.read File.join(File.dirname(__FILE__), "..", "storage.configuration")
 
-describe "fake adapter" do
+describe "adapter" do
 
-  it_should_behave_like "an adapter connected to a stateful storage"
+  before :each do
+    GOM::Storage.teardown
+  end
 
-end
+  describe "setup" do
+
+    it "should raise a #{GOM::Storage::AdapterNotFoundError} if no adapter of that name is registered" do
+      GOM::Storage::Configuration[:test_storage].hash[:adapter] = "invalid"
+      lambda do
+        GOM::Storage.setup
+      end.should raise_error(GOM::Storage::AdapterNotFoundError)
+    end
+
+  end
+
+end

data/spec/acceptance/fake_adapter_spec.rb

@@ -0,0 +1,11 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "spec_helper"))
+
+GOM::Storage::Configuration.read File.join(File.dirname(__FILE__), "..", "storage.configuration")
+
+describe "fake adapter" do
+
+  it_should_behave_like "an adapter that needs setup"
+
+  it_should_behave_like "an adapter connected to a stateful storage"
+
+end

data/spec/acceptance/object_spec.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "spec_helper"))
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib", "gom"))
 
 GOM::Storage::Configuration.read File.join(File.dirname(__FILE__), "..", "storage.configuration")
 
@@ -10,6 +9,10 @@ describe "object" do
     @object = Object.new
   end
 
+  after :each do
+    GOM::Storage.teardown
+  end
+
   describe "getting it's id" do
 
     before :each do

data/spec/fake_adapter.rb

@@ -37,15 +37,22 @@ class FakeAdapter < GOM::Storage::Adapter
     @store = { }
   end
 
+  def teardown
+    @store = nil
+  end
+
   def fetch(id)
+    raise GOM::Storage::Adapter::NoSetupError unless @store
     @store[id]
   end
 
   def store(draft)
+    raise GOM::Storage::Adapter::NoSetupError unless @store
     # store relations
     draft.relations.each do |key, related_object_proxy|
-      GOM::Storage.store related_object_proxy.object, configuration.name
-      id = GOM::Object::Mapping.id_by_object related_object_proxy.object
+      related_object = related_object_proxy.object
+      GOM::Storage.store related_object, configuration.name
+      id = GOM::Object::Mapping.id_by_object related_object
       draft.relations[key] = GOM::Object::Proxy.new id
     end
 
@@ -59,13 +66,15 @@ class FakeAdapter < GOM::Storage::Adapter
   end
 
   def remove(id)
+    raise GOM::Storage::Adapter::NoSetupError unless @store
     @store.delete id
   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, "Object")
+        GOM::Object::Collection.new ClassCollectionFetcher.new(@store, configuration.name, "GOM::Spec::Object")
       when :test_map_view
         GOM::Object::Collection.new MapReduceCollectionFetcher.new(@store, configuration.name, :number, 11)
     end

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

@@ -3,9 +3,9 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "sp
 describe GOM::Object::Builder do
 
   before :each do
-    @related_object_proxy = Object.new
+    @related_object_proxy = mock GOM::Object::Proxy
 
-    @draft = GOM::Object::Draft.new nil, "Object", { :test => "test value" }, { :related_object => @related_object_proxy }
+    @draft = GOM::Object::Draft.new nil, GOM::Spec::Object.to_s, { :number => 21 }, { :related_object => @related_object_proxy }
     @builder = described_class.new @draft
   end
 
@@ -13,7 +13,7 @@ describe GOM::Object::Builder do
 
     it "should initialize an object of the right class" do
       object = @builder.object
-      object.class.should == Object
+      object.class.should == GOM::Spec::Object
     end
 
     it "should not initialize an object if one is given" do
@@ -24,12 +24,12 @@ describe GOM::Object::Builder do
 
     it "should set the properties" do
       object = @builder.object
-      object.instance_variable_get(:@test).should == "test value"
+      object.number.should == 21
     end
 
     it "should set the relations" do
       object = @builder.object
-      object.instance_variable_get(:@related_object).should == @related_object_proxy
+      object.related_object.should == @related_object_proxy
     end
 
     it "should work without a properties hash" do

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

@@ -3,24 +3,20 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "sp
 describe GOM::Object::Inspector do
 
   before :each do
-    @related_object_proxy = GOM::Object.reference Object.new
+    @related_object_proxy = GOM::Object.reference GOM::Spec::Object.new
 
-    @object = Object.new
-    @object.instance_variable_set :@test, "test value"
-    @object.instance_variable_set :@related_object, @related_object_proxy
+    @object = GOM::Spec::Object.new
+    @object.number = 12
+    @object.related_object = @related_object_proxy
 
     @inspector = GOM::Object::Inspector.new @object
   end
 
   describe "draft" do
 
-    before :each do
-      @draft = GOM::Object::Draft.new nil, "Object", { :test => "test value" }, { :related_object => @related_object_proxy }
-    end
-
     it "should return the correct draft" do
       draft = @inspector.draft
-      draft.should == @draft
+      draft.should == GOM::Object::Draft.new(nil, GOM::Spec::Object.to_s, { :number => 12 }, { :related_object => @related_object_proxy })
     end
 
   end

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

@@ -60,6 +60,23 @@ describe GOM::Object::Mapping do
 
     end
 
+    describe "size" do
+
+      it "should return the number of mapping entries" do
+        @mapping.size.should == 1
+      end
+
+    end
+
+    describe "clear!" do
+
+      it "should remove all mappings" do
+        @mapping.clear!
+        @mapping.size.should == 0
+      end
+
+    end
+
   end
 
   describe "class method" do
@@ -88,67 +105,20 @@ describe GOM::Object::Mapping do
 
     end
 
-    describe "put" do
-
-      before :each do
-        GOM::Object::Mapping.stub!(:singleton).and_return(@mapping)
-      end
-
-      it "should call put on the mapping instance" do
-        @mapping.should_receive(:put).with(@object, @id)
-        GOM::Object::Mapping.put @object, @id
-      end
-
-    end
-
-    describe "object_by_id" do
-
-      before :each do
-        GOM::Object::Mapping.stub!(:singleton).and_return(@mapping)
-      end
-
-      it "should call object_by_id on the mapping instance" do
-        @mapping.should_receive(:object_by_id).with(@id).and_return(@object)
-        GOM::Object::Mapping.object_by_id(@id).should == @object
-      end
-
-    end
-
-    describe "id_by_object" do
-
-      before :each do
-        GOM::Object::Mapping.stub!(:singleton).and_return(@mapping)
-      end
-
-      it "should call id_by_object on the mapping instance" do
-        @mapping.should_receive(:id_by_object).with(@object).and_return(@id)
-        GOM::Object::Mapping.id_by_object(@object).should == @id
-      end
+    [ :put, :object_by_id, :id_by_object, :remove_by_id, :remove_by_object, :size ].each do |method_name|
 
-    end
+      describe "put" do
 
-    describe "remove_by_id" do
+        before :each do
+          GOM::Object::Mapping.stub(:singleton).and_return(@mapping)
+        end
 
-      before :each do
-        GOM::Object::Mapping.stub!(:singleton).and_return(@mapping)
-      end
-
-      it "should call remove_by_id on the mapping instance" do
-        @mapping.should_receive(:remove_by_id).with(@id)
-        GOM::Object::Mapping.remove_by_id(@id)
-      end
-
-    end
-
-    describe "remove_by_object" do
-
-      before :each do
-        GOM::Object::Mapping.stub!(:singleton).and_return(@mapping)
-      end
+        it "should call #{method_name} on the mapping instance" do
+          @mapping.should_receive(method_name).with(:argument).and_return(:result)
+          result = GOM::Object::Mapping.send method_name, :argument
+          result.should == :result
+        end
 
-      it "should call remove_by_object on the mapping instance" do
-        @mapping.should_receive(:remove_by_object).with(@object)
-        GOM::Object::Mapping.remove_by_object(@object)
       end
 
     end