gom 0.2.0 → 0.3.0

data/lib/gom/object/inspector.rb

@@ -1,69 +1,61 @@
 
-module GOM
+# Inspect an object and returns it's class and it's properties
+class GOM::Object::Inspector
 
-  module Object
+  attr_accessor :object
 
-    # Inspect an object and returns it's class and it's properties
-    class Inspector
-
-      attr_accessor :object
-
-      def initialize(object)
-        @object = object
-      end
-
-      def draft
-        initialize_draft
-        set_class
-        set_properties
-        set_relations
-        @draft
-      end
-
-      private
-
-      def initialize_draft
-        @draft = Draft.new
-      end
+  def initialize(object)
+    @object = object
+  end
 
-      def set_class
-        @draft.class_name = @object.class.to_s
-      end
+  def draft
+    initialize_draft
+    set_class
+    set_properties
+    set_relations
+    @draft
+  end
 
-      def set_properties
-        properties = { }
-        read_instance_variables do |key, value|
-          properties[key] = value if self.class.property_value?(value)
-        end
-        @draft.properties = properties
-      end
+  private
 
-      def set_relations
-        relations = { }
-        read_instance_variables do |key, value|
-          relations[key] = value if self.class.relation_value?(value)
-        end
-        @draft.relations = relations
-      end
+  def initialize_draft
+    @draft = GOM::Object::Draft.new
+  end
 
-      def read_instance_variables
-        @object.instance_variables.each do |name|
-          key = name.to_s.sub(/^@/, "").to_sym
-          value = @object.instance_variable_get name
-          yield key, value
-        end
-      end
+  def set_class
+    @draft.class_name = @object.class.to_s
+  end
 
-      def self.property_value?(value)
-        !relation_value?(value)
-      end
+  def set_properties
+    properties = { }
+    read_instance_variables do |key, value|
+      properties[key] = value if self.class.property_value?(value)
+    end
+    @draft.properties = properties
+  end
 
-      def self.relation_value?(value)
-        value.is_a?(GOM::Object::Proxy)
-      end
+  def set_relations
+    relations = { }
+    read_instance_variables do |key, value|
+      relations[key] = value if self.class.relation_value?(value)
+    end
+    @draft.relations = relations
+  end
 
+  def read_instance_variables
+    @object.instance_variables.each do |name|
+      key = name.to_s.sub(/^@/, "").to_sym
+      value = @object.instance_variable_get name
+      yield key, value
     end
+  end
+
+  def self.property_value?(value)
+    !relation_value?(value)
+  end
 
+  def self.relation_value?(value)
+    value.is_a?(GOM::Object::Proxy)
   end
 
 end

data/lib/gom/object/mapping.rb

@@ -1,61 +1,45 @@
 
-module GOM
+# Provides a mapping between objects and ids
+class GOM::Object::Mapping
 
-  module Object
-
-    # Provides a mapping between objects and ids
-    class Mapping
-
-      def initialize
-        @map = { }
-      end
-
-      def put(object, id)
-        @map[object] = id
-      end
-
-      def object_by_id(id)
-        @map.respond_to?(:key) ? @map.key(id) : @map.index(id)
-      end
-
-      def id_by_object(object)
-        @map[object]
-      end
-
-      def remove_by_id(id)
-        @map.delete object_by_id(id)
-      end
+  def initialize
+    @map = { }
+  end
 
-      def remove_by_object(object)
-        @map.delete object
-      end
+  def put(object, id)
+    @map[object] = id
+  end
 
-      def self.singleton
-        @mapping ||= self.new
-      end
+  def object_by_id(id)
+    @map.respond_to?(:key) ? @map.key(id) : @map.index(id)
+  end
 
-      def self.put(object, id)
-        self.singleton.put object, id
-      end
+  def id_by_object(object)
+    @map[object]
+  end
 
-      def self.object_by_id(id)
-        self.singleton.object_by_id id
-      end
+  def remove_by_id(id)
+    @map.delete object_by_id(id)
+  end
 
-      def self.id_by_object(object)
-        self.singleton.id_by_object object
-      end
+  def remove_by_object(object)
+    @map.delete object
+  end
 
-      def self.remove_by_id(id)
-        self.singleton.remove_by_id id
-      end
+  def size
+    @map.size
+  end
 
-      def self.remove_by_object(object)
-        self.singleton.remove_by_object object
-      end
+  def clear!
+    @map.clear
+  end
 
-    end
+  def self.singleton
+    @mapping ||= self.new
+  end
 
+  def self.method_missing(method_name, *arguments, &block)
+    self.singleton.send method_name, *arguments, &block
   end
 
 end

data/lib/gom/object/proxy.rb

@@ -1,44 +1,36 @@
 
-module GOM
+# The proxy that fetches an object if it's needed and simply passes method calls to it.
+class GOM::Object::Proxy
 
-  module Object
-
-    # The proxy that fetches an object if it's needed and simply passes method calls to it.
-    class Proxy
-
-      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 object
-        fetch_object unless @object
-        @object
-      end
-
-      def id
-        fetch_id unless @id
-        @id
-      end
+  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 method_missing(method_name, *arguments, &block)
-        fetch_object unless @object
-        @object.send method_name, *arguments, &block
-      end
+  def object
+    fetch_object unless @object
+    @object
+  end
 
-      private
+  def id
+    fetch_id unless @id
+    @id
+  end
 
-      def fetch_object
-        @object = GOM::Storage::Fetcher.new(@id).object
-      end
+  def method_missing(method_name, *arguments, &block)
+    fetch_object unless @object
+    @object.send method_name, *arguments, &block
+  end
 
-      def fetch_id
-        @id = GOM::Object::Mapping.id_by_object @object
-      end
+  private
 
-    end
+  def fetch_object
+    @object = GOM::Storage::Fetcher.new(@id).object
+  end
 
+  def fetch_id
+    @id = GOM::Object::Mapping.id_by_object @object
   end
 
 end

data/lib/gom/spec.rb

@@ -1,4 +1,15 @@
 require 'rspec'
 
+require File.join(File.dirname(__FILE__), "spec", "acceptance", "adapter_that_needs_setup")
 require File.join(File.dirname(__FILE__), "spec", "acceptance", "adapter_with_stateful_storage")
 require File.join(File.dirname(__FILE__), "spec", "acceptance", "read_only_adapter_with_stateless_storage")
+
+module GOM
+
+  module Spec
+
+    autoload :Object, File.join(File.dirname(__FILE__), "spec", "object")
+
+  end
+
+end

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

@@ -0,0 +1,58 @@
+
+shared_examples_for "an adapter that needs setup" do
+
+  before :each do
+    GOM::Storage.teardown
+  end
+
+  describe "fetching an object" do
+
+    it "should raise a #{GOM::Storage::Adapter::NoSetupError}" do
+      lambda do
+        GOM::Storage.fetch "test_storage:object_1"
+      end.should raise_error(GOM::Storage::Adapter::NoSetupError)
+    end
+
+  end
+
+  describe "storing an object" do
+
+    it "should raise a #{GOM::Storage::Adapter::NoSetupError}" do
+      lambda do
+        GOM::Storage.store :object
+      end.should raise_error(GOM::Storage::Adapter::NoSetupError)
+    end
+
+  end
+
+  describe "removing an object" do
+
+    it "should raise a #{GOM::Storage::Adapter::NoSetupError}" do
+      lambda do
+        GOM::Storage.remove "test_storage:object_1"
+      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
+      lambda do
+        GOM::Storage.collection :test_storage, :test_object_class_view
+      end.should raise_error(GOM::Storage::Adapter::NoSetupError)
+    end
+
+  end
+
+  describe "fetching a map collection" do
+
+    it "should raise a #{GOM::Storage::Adapter::NoSetupError}" do
+      lambda do
+        GOM::Storage.collection :test_storage, :test_map_view
+      end.should raise_error(GOM::Storage::Adapter::NoSetupError)
+    end
+
+  end
+
+end

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

@@ -5,20 +5,24 @@ shared_examples_for "an adapter connected to a stateful storage" do
     GOM::Storage.setup
   end
 
+  after :all do
+    GOM::Storage.teardown
+  end
+
   before :each do
-    @related_object = Object.new
-    @related_object.instance_variable_set :@number, 16
+    @related_object = GOM::Spec::Object.new
+    @related_object.number = 16
 
-    @object = Object.new
-    @object.instance_variable_set :@number, 11
-    @object.instance_variable_set :@related_object, GOM::Object.reference(@related_object)
+    @object = GOM::Spec::Object.new
+    @object.number = 11
+    @object.related_object = GOM::Object.reference @related_object
   end
 
   describe "fetching an object" do
 
     before :each do
       GOM::Storage.store @object, :test_storage
-      @id = GOM::Object.id(@object)
+      @id = GOM::Object.id @object
 
       @object = GOM::Storage.fetch @id
     end
@@ -29,11 +33,11 @@ shared_examples_for "an adapter connected to a stateful storage" do
     end
 
     it "should return an object of the correct class" do
-      @object.class.should == Object
+      @object.class.should == GOM::Spec::Object
     end
 
     it "should set the object's instance variables" do
-      @object.instance_variable_get(:@number).should == 11
+      @object.number.should == 11
     end
 
     it "should assign an object id" do
@@ -41,9 +45,9 @@ shared_examples_for "an adapter connected to a stateful storage" do
     end
 
     it "should also fetch the related object" do
-      related_object_proxy = @object.instance_variable_get :@related_object
+      related_object_proxy = @object.related_object
       related_object_proxy.should be_instance_of(GOM::Object::Proxy)
-      related_object_proxy.object.instance_variable_get(:@number).should == 16
+      related_object_proxy.object.number.should == 16
     end
 
   end
@@ -74,7 +78,7 @@ shared_examples_for "an adapter connected to a stateful storage" do
     it "should store the related object" do
       GOM::Storage.store @object, :test_storage
       related_object = GOM::Storage.fetch GOM::Object.id(@related_object)
-      related_object.instance_variable_get(:@number).should == 16
+      related_object.number.should == 16
     end
 
   end
@@ -115,8 +119,7 @@ shared_examples_for "an adapter connected to a stateful storage" do
   describe "fetching a class collection" do
 
     before :each do
-      @another_object = mock Object, :class => mock(Class, :to_s => "Test")
-      @another_object.instance_variable_set :@number, 17
+      @another_object = Object.new
 
       GOM::Storage.store @object, :test_storage
       GOM::Storage.store @another_object, :test_storage
@@ -138,13 +141,7 @@ shared_examples_for "an adapter connected to a stateful storage" do
       collection.size.should > 0
       collection.each do |object_proxy|
         object_proxy.should be_instance_of(GOM::Object::Proxy)
-        [
-          @object.instance_variable_get(:@number),
-          @related_object.instance_variable_get(:@number)
-        ].should include(object_proxy.object.instance_variable_get(:@number))
-        [
-          @another_object.instance_variable_get(:@number)
-        ].should_not include(object_proxy.object.instance_variable_get(:@number))
+        object_proxy.object.should be_instance_of(GOM::Spec::Object)
       end
     end
 
@@ -171,7 +168,8 @@ shared_examples_for "an adapter connected to a stateful storage" do
       collection.size.should > 0
       collection.each do |object_proxy|
         object_proxy.should be_instance_of(GOM::Object::Proxy)
-        object_proxy.object.instance_variable_get(:@number).should == @object.instance_variable_get(:@number)
+        object_proxy.object.should be_instance_of(GOM::Spec::Object)
+        object_proxy.object.number.should == @object.number
       end
     end