gom 0.1.0 → 0.2.0

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

@@ -6,14 +6,12 @@ describe GOM::Storage::Remover do
     @id = GOM::Object::Id.new "test_storage", "object_1"
     @object = Object.new
 
-    @adapter = Object.new
-    @adapter.stub!(:remove)
-    @configuration = Object.new
-    @configuration.stub!(:adapter).and_return(@adapter)
-    GOM::Storage::Configuration.stub!(:[]).and_return(@configuration)
+    @adapter = mock GOM::Storage::Adapter, :remove => nil
+    @configuration = mock GOM::Storage::Configuration, :adapter => @adapter
+    GOM::Storage::Configuration.stub(:[]).and_return(@configuration)
 
-    GOM::Object::Mapping.stub!(:id_by_object).with(@object).and_return(@id)
-    GOM::Object::Mapping.stub!(:remove_by_object)
+    GOM::Object::Mapping.stub(:id_by_object).with(@object).and_return(@id)
+    GOM::Object::Mapping.stub(:remove_by_object)
 
     @remover = GOM::Storage::Remover.new @object
   end
@@ -30,8 +28,8 @@ describe GOM::Storage::Remover do
       @remover.perform
     end
 
-    it "should raise an ArugmentError if no mapping for the given object exists" do
-      GOM::Object::Mapping.stub!(:id_by_object).with(@object).and_return(nil)
+    it "should raise an #{ArgumentError} if no mapping for the given object exists" do
+      GOM::Object::Mapping.stub(:id_by_object).with(@object).and_return(nil)
       lambda do
         @remover.perform
       end.should raise_error(ArgumentError)

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

@@ -7,29 +7,18 @@ describe GOM::Storage::Saver do
     @object = Object.new
     @object.instance_variable_set :@test, "test value"
     @object.freeze
-    @object_hash = {
-      :class => "Object",
-      :id => "object_1",
-      :properties => {
-        :test => "test value"
-      }
-    }
-
-    GOM::Object::Mapping.stub!(:id_by_object).with(@object).and_return(@id)
-    GOM::Object::Mapping.stub!(:put)
-
-    @adapter = Object.new
-    @adapter.stub!(:store).and_return("object_1")
-    @configuration = Object.new
-    @configuration.stub!(:name).and_return("default_test_storage")
-    @configuration.stub!(:adapter).and_return(@adapter)
-    GOM::Storage::Configuration.stub!(:[]).and_return(@configuration)
-    GOM::Storage::Configuration.stub!(:default).and_return(@configuration)
-
-    @inspector = Object.new
-    @inspector.stub!(:perform)
-    @inspector.stub!(:object_hash).and_return(@object_hash)
-    GOM::Object::Inspector.stub!(:new).and_return(@inspector)
+    @draft = GOM::Object::Draft.new "object_1", "Object", { :test => "test value" }
+
+    GOM::Object::Mapping.stub(:id_by_object).with(@object).and_return(@id)
+    GOM::Object::Mapping.stub(:put)
+
+    @adapter = mock GOM::Storage::Adapter, :store => "object_1"
+    @configuration = mock GOM::Storage::Configuration, :name => "default_test_storage", :adapter => @adapter
+    GOM::Storage::Configuration.stub(:[]).and_return(@configuration)
+    GOM::Storage::Configuration.stub(:default).and_return(@configuration)
+
+    @inspector = mock GOM::Object::Inspector, :draft => @draft
+    GOM::Object::Inspector.stub(:new).and_return(@inspector)
 
     @saver = GOM::Storage::Saver.new @object
   end
@@ -48,7 +37,7 @@ describe GOM::Storage::Saver do
     end
 
     it "should select the default storage if no storage name can be detected" do
-      GOM::Object::Mapping.stub!(:id_by_object).with(@object).and_return(nil)
+      GOM::Object::Mapping.stub(:id_by_object).with(@object).and_return(nil)
       @saver.perform
       @saver.storage_name.should == "default_test_storage"
     end
@@ -59,20 +48,15 @@ describe GOM::Storage::Saver do
     end
 
     it "should store the object with the adapter instance" do
-      @adapter.should_receive(:store).with(@object_hash).and_return("object_1")
+      @adapter.should_receive(:store).with(@draft).and_return("object_1")
       @saver.perform
     end
 
     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)
-      @object_hash.delete :id
-
-      @adapter.should_receive(:store).with(@object_hash).and_return("object_1")
-      @saver.perform
-    end
+      GOM::Object::Mapping.stub(:id_by_object).with(@object).and_return(nil)
+      @draft.id = nil
 
-    it "should inspect the object" do
-      @inspector.should_receive(:perform)
+      @adapter.should_receive(:store).with(@draft).and_return("object_1")
       @saver.perform
     end
 

data/spec/lib/gom/storage_spec.rb

@@ -57,9 +57,8 @@ describe GOM::Storage do
 
     before :each do
       @storage_name = "another_test_storage"
-      @saver = Object.new
-      @saver.stub!(:perform)
-      described_class::Saver.stub!(:new).and_return(@saver)
+      @saver = mock described_class::Saver, :perform => nil
+      described_class::Saver.stub(:new).and_return(@saver)
     end
 
     it "should initialize the saver correctly" do
@@ -77,12 +76,11 @@ describe GOM::Storage do
   describe "remove" do
 
     before :each do
-      @id = Object.new
-      GOM::Object::Id.stub!(:new).and_return(@id)
+      @id = mock GOM::Object::Id
+      GOM::Object::Id.stub(:new).and_return(@id)
 
-      @remover = Object.new
-      @remover.stub!(:perform)
-      described_class::Remover.stub!(:new).and_return(@remover)
+      @remover = mock described_class::Remover, :perform => nil
+      described_class::Remover.stub(:new).and_return(@remover)
     end
 
     it "should initialize the remover correctly" do
@@ -98,7 +96,33 @@ describe GOM::Storage do
     it "should convert a given string into an id" do
       GOM::Object::Id.should_receive(:new).with("test_storage:object_1").and_return(@id)
       described_class::Remover.should_receive(:new).with(@id).and_return(@remover)
-      described_class::remove "test_storage:object_1"
+      described_class.remove "test_storage:object_1"
+    end
+
+  end
+
+  describe "collection" do
+
+    before :each do
+      @collection = mock GOM::Object::Collection
+      @adapter = mock GOM::Storage::Adapter, :collection => @collection
+      @configuration = mock GOM::Storage::Configuration, :adapter => @adapter
+      GOM::Storage::Configuration.stub(:[]).with(:test_storage).and_return(@configuration)
+    end
+
+    it "should select the right configuration" do
+      GOM::Storage::Configuration.should_receive(:[]).with(:test_storage).and_return(@configuration)
+      described_class.collection :test_storage, :argument_one, :argument_two
+    end
+
+    it "should pass all arguments to the adapters collection method" do
+      @adapter.should_receive(:collection).with(:argument_one, :argument_two)
+      described_class.collection :test_storage, :argument_one, :argument_two
+    end
+
+    it "should return the adapter's collection" do
+      collection = described_class.collection :test_storage
+      collection.should == @collection
     end
 
   end

data/spec/storage.configuration

@@ -2,3 +2,13 @@
 test_storage:
   adapter: fake_adapter
   test: test value
+  views:
+    test_object_class_view:
+      type: class
+      class: "Object"
+    test_map_view:
+      type: map_reduce
+      map:
+        function(document) { }
+      reduce:
+        function(key, values) { }

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - "Philipp Br\xC3\xBCll"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-08 00:00:00 +01:00
+date: 2010-12-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,6 +61,9 @@ files:
 - 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
@@ -68,20 +71,28 @@ files:
 - lib/gom/spec/acceptance/read_only_adapter_with_stateless_storage.rb
 - lib/gom/spec.rb
 - lib/gom/object/mapping.rb
-- lib/gom/object/injector.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/storage/fetcher_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/object/injector_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
@@ -127,11 +138,16 @@ test_files:
 - 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/object/injector_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

data/lib/gom/object/injector.rb

@@ -1,45 +0,0 @@
-
-module GOM
-
-  module Object
-
-    # Injects the given properties into the given object.s
-    class Injector
-
-      attr_reader :object
-
-      def initialize(object, object_hash)
-        @object, @object_hash = object, object_hash
-      end
-
-      def perform
-        clear_instance_variables
-        write_properties
-        write_relations
-      end
-
-      private
-
-      def clear_instance_variables
-        @object.instance_variables.each do |name|
-          @object.send :remove_instance_variable, name
-        end
-      end
-
-      def write_properties
-        (@object_hash[:properties] || { }).each do |name, value|
-          @object.instance_variable_set :"@#{name}", value
-        end
-      end
-
-      def write_relations
-        (@object_hash[:relations] || { }).each do |name, value|
-          @object.instance_variable_set :"@#{name}", value
-        end
-      end
-
-    end
-
-  end
-
-end

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

@@ -1,51 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "spec_helper"))
-
-describe GOM::Object::Injector do
-
-  before :each do
-    @related_object_proxy = Object.new
-
-    @object = Object.new
-    @object.instance_variable_set :@old, "old value"
-    @object_hash = {
-      :class => "Object",
-      :properties => { :test => "test value" },
-      :relations => { :related_object => @related_object_proxy }
-    }
-    @injector = GOM::Object::Injector.new @object, @object_hash
-  end
-
-  describe "perform" do
-
-    it "should clear all instance variables" do
-      @injector.perform
-      @injector.object.instance_variables.should_not include(:@old)
-    end
-
-    it "should set the properties" do
-      @injector.perform
-      @injector.object.instance_variable_get(:@test).should == "test value"
-    end
-
-    it "should set the relations" do
-      @injector.perform
-      @injector.object.instance_variable_get(:@related_object).should == @related_object_proxy
-    end
-
-    it "should work without a properties hash" do
-      @object_hash.delete :properties
-      lambda do
-        @injector.perform
-      end.should_not raise_error
-    end
-
-    it "should work without a relations hash" do
-      @object_hash.delete :relations
-      lambda do
-        @injector.perform
-      end.should_not raise_error
-    end
-
-  end
-
-end