gom-filesystem-adapter 0.1.0 → 0.2.0

data/README.rdoc

@@ -42,6 +42,10 @@ A fetch of that book would look like:
 The fetched object would have the instance variable <tt>@pages</tt> set to <tt>1253</tt> and <tt>@author</tt> would
 point to an object of the class <tt>Author</tt> with the id <tt>author_1</tt>.
 
+== Views
+
+This adapter currently supports class views. For documentation see http://github.com/phifty/gom.
+
 == Development
 
 Development has been done test-driven and the code follows at most the Clean Code paradigms. Code smells has been

data/lib/gom/storage/filesystem.rb

@@ -6,6 +6,7 @@ module GOM
     module Filesystem
 
       autoload :Adapter, File.join(File.dirname(__FILE__), "filesystem", "adapter")
+      autoload :Collection, File.join(File.dirname(__FILE__), "filesystem", "collection")
       autoload :Loader, File.join(File.dirname(__FILE__), "filesystem", "loader")
 
     end

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

@@ -8,33 +8,36 @@ module GOM
       # The filesystem storage adapter
       class Adapter < GOM::Storage::Adapter
 
-        def initialize(configuration)
-          super configuration
-        end
-
         def setup
-          load_data
+          load_drafts
         end
 
         def fetch(id)
-          @data[id]
+          @drafts[id]
+        end
+
+        def store(*arguments)
+          read_only_error
         end
 
-        def store(object, storage_name = nil)
-          read_only_error "store"
+        def remove(*arguments)
+          read_only_error
         end
 
-        def remove(object)
-          read_only_error "remove"
+        def collection(view_name, options = { })
+          view = configuration.views[view_name.to_sym]
+          raise ViewNotFoundError, "there are no view with the name #{view_name}" unless view
+          fetcher = Collection::Fetcher.new @drafts, view
+          GOM::Object::Collection.new fetcher
         end
 
         private
 
-        def load_data
-          @data = GOM::Storage::Filesystem::Loader.new(configuration[:directory]).data
+        def load_drafts
+          @drafts = GOM::Storage::Filesystem::Loader.new(configuration[:directory]).drafts
         end
 
-        def read_only_error(method_name)
+        def read_only_error
           raise GOM::Storage::ReadOnlyError, "The adapter doesn't provide write methods"
         end
 

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

@@ -0,0 +1,18 @@
+
+module GOM
+
+  module Storage
+
+    module Filesystem
+
+      module Collection
+
+        autoload :Fetcher, File.join(File.dirname(__FILE__), "collection", "fetcher")
+
+      end
+
+    end
+
+  end
+
+end

data/lib/gom/storage/filesystem/collection/fetcher.rb

@@ -0,0 +1,32 @@
+
+module GOM
+
+  module Storage
+
+    module Filesystem
+
+      module Collection
+
+        # A class collection fetcher for the filesystem adapter.
+        class Fetcher
+
+          attr_accessor :drafts
+          attr_accessor :view
+
+          def initialize(drafts, view)
+            @drafts, @view = drafts, view
+          end
+
+          def drafts
+            @drafts.values.select{ |draft| draft.class_name == @view.class_name }
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

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

@@ -13,18 +13,17 @@ module GOM
 
         def initialize(directory)
           @directory = directory
-          @data = { }
         end
 
-        def data
+        def drafts
+          @drafts = { }
           load_yml_files
-          @data
+          @drafts
         end
 
         private
 
         def load_yml_files
-          @data = { }
           Dir[File.join(@directory, "*.yml")].each do |filename|
             load_yml_file filename
           end
@@ -37,43 +36,45 @@ module GOM
 
         def load_file_hash(classname, file_hash)
           file_hash.each do |id, hash|
-            @data[id] = Builder.new(classname, hash).object_hash
+            @drafts[id] = Builder.new(classname, hash).draft
           end
         end
 
-        # Builds an object hash out of the file hashes.
+        # Builds a draft out of the file hashes.
         class Builder
 
-          attr_reader :object_hash
+          def initialize(class_name, hash)
+            @class_name, @hash = class_name, hash
+          end
 
-          def initialize(classname, hash)
-            @classname, @hash = classname, hash
-            @object_hash = { }
-            copy_classname
-            copy_properties
-            copy_relations
+          def draft
+            @draft = GOM::Object::Draft.new
+            set_class_name
+            set_properties
+            set_relations
+            @draft
           end
 
           private
 
-          def copy_classname
-            @object_hash[:class] = @classname
+          def set_class_name
+            @draft.class_name = @class_name
           end
 
-          def copy_properties
+          def set_properties
             properties = { }
             (@hash["properties"] || { }).each do |key, value|
               properties[key] = value
             end
-            @object_hash[:properties] = properties unless properties.empty?
+            @draft.properties = properties unless properties.empty?
           end
 
-          def copy_relations
+          def set_relations
             relations = { }
             (@hash["relations"] || { }).each do |key, value|
               relations[key] = GOM::Object::Proxy.new GOM::Object::Id.new(value)
             end
-            @object_hash[:relations] = relations unless relations.empty?
+            @draft.relations = relations unless relations.empty?
           end
 
         end

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

@@ -3,18 +3,10 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "sp
 describe GOM::Storage::Filesystem::Adapter do
 
   before :each do
-    @data = {
-      "object_1" => {
-        :class => "Object",
-        :properties => { :test => "test value" }
-      },
-      "object_2" => {
-        :class => "Object",
-        :properties => { :test => "another test value" }
-      }
-    }
-
-    @loader = mock GOM::Storage::Filesystem::Loader, :data => @data
+    @draft = mock GOM::Object::Draft
+    @drafts = mock Hash, :[] => @draft
+
+    @loader = mock GOM::Storage::Filesystem::Loader, :drafts => @drafts
     GOM::Storage::Filesystem::Loader.stub(:new).and_return(@loader)
 
     @configuration = mock GOM::Storage::Configuration
@@ -34,7 +26,7 @@ describe GOM::Storage::Filesystem::Adapter do
     end
 
     it "should load the data" do
-      @loader.should_receive(:data).and_return(@data)
+      @loader.should_receive(:drafts).and_return(@drafts)
       @adapter.setup
     end
 
@@ -47,7 +39,7 @@ describe GOM::Storage::Filesystem::Adapter do
     end
 
     it "should return the object hash" do
-      @adapter.fetch("object_1").should == @data["object_1"]
+      @adapter.fetch("object_1").should == @draft
     end
 
   end
@@ -72,4 +64,49 @@ describe GOM::Storage::Filesystem::Adapter do
 
   end
 
+  describe "collection" do
+
+    before :each do
+      @adapter.setup
+
+      @view = mock GOM::Storage::Configuration::View::Class
+      @views = mock Hash, :[] => @view
+      @configuration.stub(:views).and_return(@views)
+
+      @fetcher = mock GOM::Storage::Filesystem::Collection::Fetcher
+      GOM::Storage::Filesystem::Collection::Fetcher.stub(:new).and_return(@fetcher)
+
+      @collection = mock GOM::Object::Collection
+      GOM::Object::Collection.stub(:new).and_return(@collection)
+    end
+
+    it "should select the right view" do
+      @views.should_receive(:[]).with(:test_object_class_view).and_return(@view)
+      @adapter.collection "test_object_class_view"
+    end
+
+    it "should raise a #{described_class::ViewNotFoundError} if view name if invalid" do
+      @views.stub(:[]).and_return(nil)
+      lambda do
+        @adapter.collection :test_object_class_view
+      end.should raise_error(described_class::ViewNotFoundError)
+    end
+
+    it "should initialize the collection fetcher" do
+      GOM::Storage::Filesystem::Collection::Fetcher.should_receive(:new).with(@drafts, @view).and_return(@fetcher)
+      @adapter.collection :test_object_class_view
+    end
+
+    it "should initialize the collection" do
+      GOM::Object::Collection.should_receive(:new).and_return(@collection)
+      @adapter.collection :test_object_class_view
+    end
+
+    it "should return the collection" do
+      collection = @adapter.collection :test_object_class_view
+      collection.should == @collection
+    end
+
+  end
+
 end

data/spec/gom/storage/filesystem/collection/fetcher_spec.rb

@@ -0,0 +1,24 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "..", "spec_helper"))
+
+describe GOM::Storage::Filesystem::Collection::Fetcher do
+
+  before :each do
+    @draft_one = mock GOM::Object::Draft, :class_name => "Object"
+    @draft_two = mock GOM::Object::Draft, :class_name => "Test"
+    @drafts = mock Hash, :values => [ @draft_one, @draft_two ]
+    @view = mock GOM::Storage::Configuration::View::Class, :class_name => "Object"
+
+    @fetcher = described_class.new @drafts, @view
+  end
+
+  describe "drafts" do
+
+    it "should return an array with a selection of drafts" do
+      drafts = @fetcher.drafts
+      drafts.should include(@draft_one)
+      drafts.should_not include(@draft_two)
+    end
+
+  end
+
+end

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

@@ -15,7 +15,7 @@ describe GOM::Storage::Filesystem::Loader do
 
   end
 
-  describe "data" do
+  describe "drafts" do
 
     before :each do
       @filename = "directory/Object.yml"
@@ -45,31 +45,28 @@ describe GOM::Storage::Filesystem::Loader do
 
     it "should searches all .yml file in the directory" do
       Dir.should_receive(:[]).with("directory/*.yml").and_return(@filenames)
-      @loader.data
+      @loader.drafts
     end
 
     it "should load the files" do
       YAML.should_receive(:load_file).with(@filename).and_return(@file_hash)
-      @loader.data
+      @loader.drafts
     end
 
     it "should create object proxies for relations" do
       GOM::Object::Proxy.should_receive(:new).with(GOM::Object::Id.new("test_storage:object_2")).and_return(@proxy)
-      @loader.data
+      @loader.drafts
     end
 
-    it "should convert the file hash into object hashes" do
-      @loader.data.should == {
-        "object_1" => {
-          :class => "Object",
-          :properties => { "test" => "test value" },
-          :relations => { "related_object" => @proxy }
-        },
-        "object_2" => {
-          :class => "Object",
-          :properties => { "test" => "another test value" }
-        }
-      }
+    it "should convert the file hash into drafts" do
+      draft_one = @loader.drafts["object_1"]
+      draft_one.class_name.should == "Object"
+      draft_one.properties.should == { "test" => "test value" }
+      draft_one.relations.should == { "related_object" => @proxy }
+
+      draft_two = @loader.drafts["object_2"]
+      draft_two.class_name.should == "Object"
+      draft_two.properties.should == { "test" => "another test value" }
     end
 
   end

data/spec/storage.configuration

@@ -1,5 +1,8 @@
 
 test_storage:
-  adapter:           filesystem
-  directory:         /home/phifty/projects/gom-filesystem-adapter/spec/acceptance/data
-  relation_detector: _id$
+  adapter:   filesystem
+  directory: /home/phifty/projects/gom-filesystem-adapter/spec/acceptance/data
+  views:
+    test_object_class_view:
+      type: class
+      class: Object

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 
@@ -27,9 +27,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
+        - 2
         - 0
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -73,9 +73,12 @@ files:
 - Rakefile
 - 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
 - lib/gom/storage.rb
 - lib/filesystem.rb
+- spec/gom/storage/filesystem/collection/fetcher_spec.rb
 - spec/gom/storage/filesystem/adapter_spec.rb
 - spec/gom/storage/filesystem/loader_spec.rb
 - spec/storage.configuration
@@ -115,6 +118,7 @@ signing_key:
 specification_version: 3
 summary: Filesystem storage adapter for the General Object Mapper.
 test_files: 
+- 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