gom-filesystem-adapter 0.3.0 → 0.3.1

data/lib/gom/storage/filesystem/adapter.rb

@@ -27,12 +27,17 @@ class GOM::Storage::Filesystem::Adapter < GOM::Storage::Adapter
     read_only_error
   end
 
+  def count
+    check_setup
+    @drafts.size
+  end
+
   def collection(view_name, options = { })
     check_setup
+    configuration = self.configuration
     view = configuration.views[view_name.to_sym]
     raise ViewNotFoundError, "there are no view with the name #{view_name}" unless view
-    fetcher = GOM::Storage::Filesystem::Collection::Fetcher.new @drafts, view
-    GOM::Object::Collection.new fetcher
+    GOM::Object::Collection.new GOM::Storage::Filesystem::Collection::Fetcher.new(@drafts, view), configuration.name
   end
 
   private

data/lib/gom/storage/filesystem/loader.rb

@@ -28,20 +28,20 @@ class GOM::Storage::Filesystem::Loader
   end
 
   def load_file_hash(file_hash)
-    file_hash.each do |id, hash|
-      @drafts[id] = Builder.new(hash).draft
+    file_hash.each do |object_id, hash|
+      @drafts[object_id] = Builder.new(object_id, hash).draft
     end
   end
 
   # Builds a draft out of the file hashes.
   class Builder
 
-    def initialize(hash)
-      @hash = hash
+    def initialize(object_id, hash)
+      @object_id, @hash = object_id, hash
     end
 
     def draft
-      @draft = GOM::Object::Draft.new
+      initialize_draft
       set_class_name
       set_properties
       set_relations
@@ -50,6 +50,10 @@ class GOM::Storage::Filesystem::Loader
 
     private
 
+    def initialize_draft
+      @draft = GOM::Object::Draft.new @object_id
+    end
+
     def set_class_name
       @draft.class_name = @hash["class"] || "Object"
     end

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

@@ -4,12 +4,12 @@ describe GOM::Storage::Filesystem::Adapter do
 
   before :each do
     @draft = mock GOM::Object::Draft
-    @drafts = mock Hash, :[] => @draft
+    @drafts = mock Hash, :[] => @draft, :size => 1
 
     @loader = mock GOM::Storage::Filesystem::Loader, :drafts => @drafts
     GOM::Storage::Filesystem::Loader.stub(:new).and_return(@loader)
 
-    @configuration = mock GOM::Storage::Configuration
+    @configuration = mock GOM::Storage::Configuration, :name => "test_storage"
     @configuration.stub(:[]).with(:files).and_return("test_files")
     @adapter = described_class.new @configuration
   end
@@ -107,6 +107,25 @@ describe GOM::Storage::Filesystem::Adapter do
 
   end
 
+  describe "count" do
+
+    before :each do
+      @adapter.setup
+    end
+
+    it "should return the object hash" do
+      @adapter.count.should == 1
+    end
+
+    it "should raise a #{GOM::Storage::Adapter::NoSetupError} if no drafts has been loaded" do
+      @adapter.teardown
+      lambda do
+        @adapter.count
+      end.should raise_error(GOM::Storage::Adapter::NoSetupError)
+    end
+
+  end
+
   describe "collection" do
 
     before :each do

data/spec/gom/storage/filesystem/loader_spec.rb

@@ -61,11 +61,13 @@ describe GOM::Storage::Filesystem::Loader do
 
     it "should convert the file hash into drafts" do
       draft_one = @loader.drafts["object_1"]
+      draft_one.object_id.should == "object_1"
       draft_one.class_name.should == "Test::Model"
       draft_one.properties.should == { "test" => "test value" }
       draft_one.relations.should == { "related_object" => @proxy }
 
       draft_two = @loader.drafts["object_2"]
+      draft_two.object_id.should == "object_2"
       draft_two.class_name.should == "Object"
       draft_two.properties.should == { "test" => "another test value" }
     end

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 
@@ -28,7 +28,8 @@ dependencies:
         segments: 
         - 0
         - 3
-        version: "0.3"
+        - 1
+        version: 0.3.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -70,20 +71,20 @@ files:
 - README.rdoc
 - LICENSE
 - Rakefile
-- lib/gom/storage.rb
-- lib/gom/filesystem-adapter.rb
-- lib/gom/storage/filesystem/collection/fetcher.rb
-- lib/gom/storage/filesystem/collection.rb
 - lib/gom/storage/filesystem/adapter.rb
 - lib/gom/storage/filesystem/loader.rb
+- lib/gom/storage/filesystem/collection/fetcher.rb
+- lib/gom/storage/filesystem/collection.rb
 - lib/gom/storage/filesystem.rb
-- spec/storage.configuration
-- spec/gom/storage/filesystem/loader_spec.rb
+- lib/gom/filesystem-adapter.rb
+- lib/gom/storage.rb
 - spec/gom/storage/filesystem/collection/fetcher_spec.rb
 - spec/gom/storage/filesystem/adapter_spec.rb
-- spec/acceptance/adapter_spec.rb
-- spec/acceptance/data/objects.yml
+- spec/gom/storage/filesystem/loader_spec.rb
+- spec/storage.configuration
 - spec/spec_helper.rb
+- spec/acceptance/data/objects.yml
+- spec/acceptance/adapter_spec.rb
 has_rdoc: true
 homepage: http://github.com/phifty/gom-filesystem-adapter
 licenses: []
@@ -117,7 +118,7 @@ signing_key:
 specification_version: 3
 summary: Filesystem storage adapter for the General Object Mapper.
 test_files: 
-- spec/gom/storage/filesystem/loader_spec.rb
 - spec/gom/storage/filesystem/collection/fetcher_spec.rb
 - spec/gom/storage/filesystem/adapter_spec.rb
+- spec/gom/storage/filesystem/loader_spec.rb
 - spec/acceptance/adapter_spec.rb