gom 0.4.1 → 0.4.2

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 gem 'rspec'
 gem 'reek'
 require 'rspec'
-require 'rake/rdoctask'
+require 'rdoc/task'
 require 'rspec/core/rake_task'
 require 'reek/rake/task'
 

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

@@ -143,6 +143,30 @@ shared_examples_for "an adapter connected to a stateful storage" do
 
   end
 
+  describe "fetching a property collection" do
+
+    before :each do
+      GOM::Storage.store @object, :test_storage
+    end
+
+    after :each do
+      GOM::Storage.remove @related_object
+      GOM::Storage.remove @object
+    end
+
+    it "should provide a collection of the property view" do
+      collection = GOM::Storage.collection :test_storage, :test_property_view
+      collection.should be_instance_of(GOM::Object::Collection)
+    end
+
+    it "should provide a collection that filters the objects by the given conditions" do
+      collection = GOM::Storage.collection :test_storage, :test_property_view
+      collection.map(&:number) == [ 16 ]
+      collection.map(&:class).uniq.should == [ GOM::Spec::Object ]
+    end
+
+  end
+
   describe "fetching a class collection" do
 
     before :each do

data/lib/gom/storage/configuration.rb

@@ -97,6 +97,10 @@ class GOM::Storage::Configuration
     View::MapReduce.new *hash.values_at(:map_function, :reduce_function)
   end
 
+  def self.property_view(hash)
+    View::Property.new *hash.values_at(:filter, :properties)
+  end
+
   def self.setup_all
     @configurations.values.each do |configuration|
       configuration.setup

data/lib/gom/storage/configuration/view.rb

@@ -3,5 +3,6 @@ module GOM::Storage::Configuration::View
 
   autoload :Class, File.join(File.dirname(__FILE__), "view", "class")
   autoload :MapReduce, File.join(File.dirname(__FILE__), "view", "map_reduce")
+  autoload :Property, File.join(File.dirname(__FILE__), "view", "property")
 
 end

data/lib/gom/storage/configuration/view/property.rb

@@ -0,0 +1,12 @@
+
+# Contains all parameters to describe a property view.
+class GOM::Storage::Configuration::View::Property
+
+  attr_accessor :filter
+  attr_accessor :properties
+
+  def initialize(filter, properties)
+    @filter, @properties = filter, properties
+  end
+
+end

data/spec/acceptance/adapter_spec.rb

@@ -9,10 +9,11 @@ describe "adapter" do
   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"
+      GOM::Storage::Configuration[:test_storage].hash[:adapter] = :invalid
       lambda do
         GOM::Storage.setup
       end.should raise_error(GOM::Storage::AdapterNotFoundError)
+      GOM::Storage::Configuration[:test_storage].hash[:adapter] = :fake_adapter
     end
 
   end

data/spec/fake_adapter.rb

@@ -1,6 +1,36 @@
 
 class FakeAdapter < GOM::Storage::Adapter
 
+  class PropertyCollectionFetcher
+
+    def initialize(store, storage_name, filter, properties)
+      @store, @storage_name, @filter, @properties = store, storage_name, filter, properties
+    end
+
+    def drafts
+      drafts = [ ]
+      @store.each do |object_id, draft|
+        match = true
+        (@filter || { }).each do |property_name, condition|
+          condition_kind, condition_value = *condition
+          match &&= case condition_kind
+            when :equals
+              property_name == :model_class ?
+                draft.class_name == condition_value :
+                draft.properties[property_name] == condition_value
+            when :greater_than
+              draft.properties[property_name] > condition_value
+            else
+              raise ArgumentError, "condition kind #{condition_kind} is not implemented"
+          end
+        end
+        drafts << draft if match
+      end
+      drafts
+    end
+
+  end
+
   class ClassCollectionFetcher
 
     def initialize(store, storage_name, class_name)
@@ -77,7 +107,10 @@ class FakeAdapter < GOM::Storage::Adapter
 
   def collection(view_name)
     raise GOM::Storage::Adapter::NoSetupError unless @store
+    view = configuration.views[view_name]
     case view_name.to_sym
+      when :test_property_view
+        GOM::Object::Collection.new PropertyCollectionFetcher.new(@store, configuration.name, view.filter, view.properties), configuration.name
       when :test_object_class_view
         GOM::Object::Collection.new ClassCollectionFetcher.new(@store, configuration.name, "GOM::Spec::Object"), configuration.name
       when :test_map_view

data/spec/lib/gom/storage/configuration/view/class_spec.rb

@@ -3,13 +3,13 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "..
 describe GOM::Storage::Configuration::View::Class do
 
   before :each do
-    @class = described_class.new "Object"
+    @view = described_class.new "Object"
   end
 
   describe "initialize" do
 
     it "should set the view's class name" do
-      @class.class_name.should == "Object"
+      @view.class_name.should == "Object"
     end
 
   end

data/spec/lib/gom/storage/configuration/view/map_reduce_spec.rb

@@ -3,17 +3,17 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "..
 describe GOM::Storage::Configuration::View::MapReduce do
 
   before :each do
-    @map_reduce = described_class.new "map function", "reduce function"
+    @view = described_class.new "map function", "reduce function"
   end
 
   describe "initialize" do
 
     it "should set the view's map function" do
-      @map_reduce.map.should == "map function"
+      @view.map.should == "map function"
     end
 
     it "should set the view's reduce function" do
-      @map_reduce.reduce.should == "reduce function"
+      @view.reduce.should == "reduce function"
     end
 
   end

data/spec/lib/gom/storage/configuration/view/property_spec.rb

@@ -0,0 +1,23 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "..", "..", "spec_helper"))
+
+describe GOM::Storage::Configuration::View::Property do
+
+  before :each do
+    @view = described_class.new "filter", "properties"
+  end
+
+  describe "initialize" do
+
+    it "should set the filter" do
+      filter = @view.filter
+      filter.should == "filter"
+    end
+
+    it "should set the properties" do
+      properties = @view.properties
+      properties.should == "properties"
+    end
+
+  end
+
+end

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

@@ -11,6 +11,14 @@ describe GOM::Storage::Configuration do
       storage {
         name :test_storage
         adapter :test
+        view {
+          name :test_property_view
+          kind :property
+          filter {
+            model_class :equals, "Object"
+          }
+          properties :model_class, :number
+        }
         view {
           name :test_object_class_view
           kind :class
@@ -99,6 +107,13 @@ describe GOM::Storage::Configuration do
 
   describe "#self.views" do
 
+    it "should return a hash including property views" do
+      view = @configuration.views[:test_property_view]
+      view.should be_instance_of(described_class::View::Property)
+      view.filter.should == { :model_class => [ :equals, "Object" ] }
+      view.properties.should == [ :model_class, :number ]
+    end
+
     it "should return a hash including class views" do
       view = @configuration.views[:test_object_class_view]
       view.should be_instance_of(described_class::View::Class)

data/spec/spec_helper.rb

@@ -5,21 +5,4 @@ require 'rspec'
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "gom"))
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "gom", "spec"))
 require File.join(File.dirname(__FILE__), "fake_adapter")
-
-GOM::Storage.configure {
-  storage {
-    name :test_storage
-    adapter :fake_adapter
-    view {
-      name :test_object_class_view
-      kind :class
-      model_class Object
-    }
-    view {
-      name :test_map_view
-      kind :map_reduce
-      map_function "function(document) { }"
-      reduce_function "function(key, values) { }"
-    }
-  }
-}
+require File.join(File.dirname(__FILE__), "storage_configuration")

data/spec/storage_configuration.rb

@@ -0,0 +1,28 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "gom"))
+
+GOM::Storage.configure {
+  storage {
+    name :test_storage
+    adapter :fake_adapter
+    view {
+      name :test_property_view
+      kind :property
+      filter {
+        model_class :equals, "GOM::Spec::Object"
+        number :greater_than, 13
+      }
+      properties :number
+    }
+    view {
+      name :test_object_class_view
+      kind :class
+      model_class Object
+    }
+    view {
+      name :test_map_view
+      kind :map_reduce
+      map_function "function(document) { }"
+      reduce_function "function(key, values) { }"
+    }
+  }
+}

metadata

@@ -1,159 +1,157 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gom
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.4.2
   prerelease: 
-  version: 0.4.1
 platform: ruby
-authors: 
-- "Philipp Br\xC3\xBCll"
+authors:
+- Philipp Brüll
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-30 00:00:00 +02:00
+date: 2011-08-15 00:00:00.000000000 +02:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: configure
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &19789800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *19789800
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &19789280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: reek
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *19789280
+- !ruby/object:Gem::Dependency
+  name: reek
+  requirement: &19788800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "1.2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *19788800
 description: Core package of the General Object Mapper.
 email: b.phifty@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - README.rdoc
 - LICENSE
 - Rakefile
-- lib/gom.rb
-- lib/gom/storage/adapter.rb
+- lib/gom/object/mapping.rb
+- lib/gom/object/id.rb
+- lib/gom/object/inspector.rb
+- lib/gom/object/draft.rb
+- lib/gom/object/proxy.rb
+- lib/gom/object/builder.rb
+- lib/gom/object/collection.rb
+- lib/gom/object/cached_builder.rb
 - lib/gom/storage/counter.rb
-- lib/gom/storage/saver.rb
-- lib/gom/storage/fetcher.rb
-- lib/gom/storage/remover.rb
+- lib/gom/storage/configuration/view/property.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/adapter.rb
+- lib/gom/storage/saver.rb
+- lib/gom/storage/remover.rb
 - lib/gom/storage/configuration.rb
+- lib/gom/storage/fetcher.rb
 - lib/gom/object.rb
 - lib/gom/storage.rb
+- lib/gom/spec.rb
 - lib/gom/spec/object.rb
 - lib/gom/spec/acceptance/adapter_with_stateful_storage.rb
 - lib/gom/spec/acceptance/read_only_adapter_with_stateless_storage.rb
 - lib/gom/spec/acceptance/adapter_that_needs_setup.rb
-- lib/gom/spec.rb
-- lib/gom/object/mapping.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/counter_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/mapping_spec.rb
-- spec/lib/gom/object/draft_spec.rb
-- spec/lib/gom/object/proxy_spec.rb
+- lib/gom.rb
+- spec/fake_adapter.rb
+- spec/lib/gom/object/cached_builder_spec.rb
 - spec/lib/gom/object/inspector_spec.rb
+- spec/lib/gom/object/proxy_spec.rb
+- spec/lib/gom/object/draft_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/object/mapping_spec.rb
+- spec/lib/gom/storage/adapter_spec.rb
+- spec/lib/gom/storage/counter_spec.rb
+- spec/lib/gom/storage/configuration/view/property_spec.rb
+- spec/lib/gom/storage/configuration/view/map_reduce_spec.rb
+- spec/lib/gom/storage/configuration/view/class_spec.rb
+- spec/lib/gom/storage/fetcher_spec.rb
+- spec/lib/gom/storage/remover_spec.rb
+- spec/lib/gom/storage/saver_spec.rb
+- spec/lib/gom/storage/configuration_spec.rb
 - spec/lib/gom/storage_spec.rb
-- spec/storage.configuration
+- spec/lib/gom/object_spec.rb
 - spec/spec_helper.rb
-- spec/acceptance/object_spec.rb
-- spec/acceptance/fake_adapter_spec.rb
+- spec/storage_configuration.rb
 - spec/acceptance/adapter_spec.rb
-- spec/fake_adapter.rb
+- spec/acceptance/fake_adapter_spec.rb
+- spec/acceptance/object_spec.rb
 has_rdoc: true
 homepage: http://github.com/phifty/gom
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: gom
-rubygems_version: 1.6.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: General Object Mapper - maps any ruby object to different kinds of storage engines and vice versa.
-test_files: 
-- spec/lib/gom/object_spec.rb
-- spec/lib/gom/storage/fetcher_spec.rb
-- spec/lib/gom/storage/counter_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/mapping_spec.rb
-- spec/lib/gom/object/draft_spec.rb
-- spec/lib/gom/object/proxy_spec.rb
+summary: General Object Mapper - maps any ruby object to different kinds of storage
+  engines and vice versa.
+test_files:
+- spec/lib/gom/object/cached_builder_spec.rb
 - spec/lib/gom/object/inspector_spec.rb
+- spec/lib/gom/object/proxy_spec.rb
+- spec/lib/gom/object/draft_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/object/mapping_spec.rb
+- spec/lib/gom/storage/adapter_spec.rb
+- spec/lib/gom/storage/counter_spec.rb
+- spec/lib/gom/storage/configuration/view/property_spec.rb
+- spec/lib/gom/storage/configuration/view/map_reduce_spec.rb
+- spec/lib/gom/storage/configuration/view/class_spec.rb
+- spec/lib/gom/storage/fetcher_spec.rb
+- spec/lib/gom/storage/remover_spec.rb
+- spec/lib/gom/storage/saver_spec.rb
+- spec/lib/gom/storage/configuration_spec.rb
 - spec/lib/gom/storage_spec.rb
-- spec/acceptance/object_spec.rb
-- spec/acceptance/fake_adapter_spec.rb
+- spec/lib/gom/object_spec.rb
 - spec/acceptance/adapter_spec.rb
+- spec/acceptance/fake_adapter_spec.rb
+- spec/acceptance/object_spec.rb

data/spec/storage.configuration

@@ -1,14 +0,0 @@
-
-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) { }