gom-couchdb-adapter 0.4.2 → 0.4.3

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

@@ -1,7 +1,8 @@
 
 module GOM::Storage::CouchDB::View
 
-  autoload :Builder, File.join(File.dirname(__FILE__), "view", "builder")
+  autoload :BuilderFromClass, File.join(File.dirname(__FILE__), "view", "builder_from_class")
+  autoload :BuilderFromProperty, File.join(File.dirname(__FILE__), "view", "builder_from_property")
   autoload :Pusher, File.join(File.dirname(__FILE__), "view", "pusher")
 
 end

data/lib/gom/storage/couchdb/view/{builder.rb → builder_from_class.rb}

@@ -1,6 +1,6 @@
 
 # Builds a javascript map-reduce-view out of a class view.
-class GOM::Storage::CouchDB::View::Builder
+class GOM::Storage::CouchDB::View::BuilderFromClass
 
   def initialize(class_view)
     @class_view = class_view

data/lib/gom/storage/couchdb/view/builder_from_property.rb

@@ -0,0 +1,57 @@
+
+# Builds a javascript map-reduce-view out of a property view.
+class GOM::Storage::CouchDB::View::BuilderFromProperty
+
+  def initialize(property_view)
+    @property_view = property_view
+  end
+
+  def map_reduce_view
+    build_conditions
+    build_emits
+    build_emit_string
+
+    GOM::Storage::Configuration::View::MapReduce.new(
+      "function(document) {\n  if (#{@conditions.join(" && ")}) {\n    emit(#{@emit_string}, null);\n  }\n}",
+      nil
+    )
+  end
+
+  private
+
+  def build_conditions
+    @conditions = [ ]
+    @property_view.filter.each do |property_name, condition|
+      @conditions << condition(condition.first, property_name, condition.last)
+    end
+  end
+
+  def build_emits
+    @emits = [ @property_view.properties ].flatten.compact.map do |property|
+      "document['#{property}']"
+    end
+  end
+
+  def build_emit_string
+    @emit_string = case @emits.length
+      when 0
+        "null"
+      when 1
+        @emits.first
+      else
+        "[ " + @emits.join(", ") + " ]"
+    end
+  end
+
+  def condition(kind, property_name, value)
+    case kind
+      when :equals
+        "document['#{property_name}'] == " + (value.is_a?(String) ? "'#{value}'" : value.to_s)
+      when :greater_than
+        "document['#{property_name}'] > " + (value.is_a?(String) ? "'#{value}'" : value.to_s)
+      else
+        raise ArgumentError, "the specified condition kind '#{kind}' is not supported"
+    end
+  end
+
+end

data/lib/gom/storage/couchdb/view/pusher.rb

@@ -32,6 +32,8 @@ class GOM::Storage::CouchDB::View::Pusher
 
   def add_view(name, view)
     case view.class.to_s
+      when "GOM::Storage::Configuration::View::Property"
+        add_view_by_property_view name, view
       when "GOM::Storage::Configuration::View::Class"
         add_view_by_class_view name, view
       when "GOM::Storage::Configuration::View::MapReduce"
@@ -39,8 +41,13 @@ class GOM::Storage::CouchDB::View::Pusher
     end
   end
 
+  def add_view_by_property_view(name, property_view)
+    map_reduce_view = GOM::Storage::CouchDB::View::BuilderFromProperty.new(property_view).map_reduce_view
+    @design.views << ::CouchDB::Design::View.new(@design, name, map_reduce_view.map, map_reduce_view.reduce)
+  end
+
   def add_view_by_class_view(name, class_view)
-    map_reduce_view = GOM::Storage::CouchDB::View::Builder.new(class_view).map_reduce_view
+    map_reduce_view = GOM::Storage::CouchDB::View::BuilderFromClass.new(class_view).map_reduce_view
     @design.views << ::CouchDB::Design::View.new(@design, name, map_reduce_view.map, map_reduce_view.reduce)
   end
 

data/spec/lib/gom/storage/couchdb/view/{builder_spec.rb → builder_from_class_spec.rb}

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "..", "..", "spec_helper"))
 
-describe GOM::Storage::CouchDB::View::Builder do
+describe GOM::Storage::CouchDB::View::BuilderFromClass do
 
   before :each do
     @class_view = mock GOM::Storage::Configuration::View::Class, :class_name => "Object"

data/spec/lib/gom/storage/couchdb/view/builder_from_property_spec.rb

@@ -0,0 +1,24 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "..", "..", "spec_helper"))
+
+describe GOM::Storage::CouchDB::View::BuilderFromProperty do
+
+  before :each do
+    @view = mock GOM::Storage::Configuration::View::Property,
+                 :filter => { :model_class => [ :equals, "GOM::Spec::Object" ], :number => [ :greater_than, 13 ] },
+                 :properties => [ :_id, :number ]
+
+    @builder = described_class.new @view
+  end
+
+  describe "map_reduce_view" do
+
+    it "should return a map reduce view that emits the correct data" do
+      view = @builder.map_reduce_view
+      view.should be_instance_of(GOM::Storage::Configuration::View::MapReduce)
+      view.map.should == "function(document) {\n  if (document['model_class'] == 'GOM::Spec::Object' && document['number'] > 13) {\n    emit([ document['_id'], document['number'] ], null);\n  }\n}"
+      view.reduce.should be_nil
+    end
+
+  end
+
+end

data/spec/lib/gom/storage/couchdb/view/pusher_spec.rb

@@ -5,9 +5,14 @@ describe GOM::Storage::CouchDB::View::Pusher do
   before :each do
     @database = mock CouchDB::Database
 
+    @property_view_configuration = GOM::Storage::Configuration::View::Property.new :filter, :properties
     @class_view_configuration = GOM::Storage::Configuration::View::Class.new "Object"
     @map_reduce_view_configuration = GOM::Storage::Configuration::View::MapReduce.new "function(document) { }", "function(key, values) { }"
-    @view_hash = { "test_class_view" => @class_view_configuration, "test_map_reduce_view" => @map_reduce_view_configuration }
+    @view_hash = {
+      "test_property_view" => @property_view_configuration,
+      "test_class_view" => @class_view_configuration,
+      "test_map_reduce_view" => @map_reduce_view_configuration
+    }
 
     @pusher = described_class.new @database, @view_hash
   end
@@ -18,16 +23,26 @@ describe GOM::Storage::CouchDB::View::Pusher do
       @design = mock CouchDB::Design, :views => mock(CouchDB::Design::ViewsProxy, :<< => nil), :save => true
       CouchDB::Design.stub :new => @design
 
+      @property_view = mock CouchDB::Design::View
       @class_view = mock CouchDB::Design::View
       @map_reduce_view = mock CouchDB::Design::View
       CouchDB::Design::View.stub :new do |design, name, map_function, reduce_function|
-        { "test_class_view" => @class_view, "test_map_reduce_view" => @map_reduce_view }[name]
+        {
+          "test_property_view" => @property_view,
+          "test_class_view" => @class_view,
+          "test_map_reduce_view" => @map_reduce_view
+        }[name]
       end
 
+      @property_map_reduce_view = mock GOM::Storage::Configuration::View::MapReduce,
+        :map => "function(document) { }", :reduce => nil
+      @builder_from_property = mock GOM::Storage::CouchDB::View::BuilderFromProperty, :map_reduce_view => @property_map_reduce_view
+      GOM::Storage::CouchDB::View::BuilderFromProperty.stub :new => @builder_from_property
+
       @class_map_reduce_view = mock GOM::Storage::Configuration::View::MapReduce,
         :map => "function(document) { }", :reduce => nil
-      @builder = mock GOM::Storage::CouchDB::View::Builder, :map_reduce_view => @class_map_reduce_view
-      GOM::Storage::CouchDB::View::Builder.stub :new => @builder
+      @builder_from_class = mock GOM::Storage::CouchDB::View::BuilderFromClass, :map_reduce_view => @class_map_reduce_view
+      GOM::Storage::CouchDB::View::BuilderFromClass.stub :new => @builder_from_class
     end
 
     it "should initialize the design document" do
@@ -35,13 +50,23 @@ describe GOM::Storage::CouchDB::View::Pusher do
       @pusher.perform
     end
 
+    it "should initialize the builder with the property view" do
+      GOM::Storage::CouchDB::View::BuilderFromProperty.should_receive(:new).with(@property_view_configuration).and_return(@builder_from_property)
+      @pusher.perform
+    end
+
+    it "should use the builder to generate a map reduce view out of the property view" do
+      @builder_from_property.should_receive(:map_reduce_view).and_return(@property_map_reduce_view)
+      @pusher.perform
+    end
+
     it "should initialize the builder with the class view" do
-      GOM::Storage::CouchDB::View::Builder.should_receive(:new).with(@class_view_configuration).and_return(@builder)
+      GOM::Storage::CouchDB::View::BuilderFromClass.should_receive(:new).with(@class_view_configuration).and_return(@builder_from_class)
       @pusher.perform
     end
 
     it "should use the builder to generate a map reduce view out of the class view" do
-      @builder.should_receive(:map_reduce_view).and_return(@class_map_reduce_view)
+      @builder_from_class.should_receive(:map_reduce_view).and_return(@class_map_reduce_view)
       @pusher.perform
     end
 

data/spec/spec_helper.rb

@@ -5,45 +5,4 @@ require 'rspec'
 require 'gom/spec'
 
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "gom", "couchdb-adapter"))
-
-GOM::Storage.configure {
-  storage {
-    name :test_storage
-    adapter :couchdb
-    database "test"
-    delete_database_if_exists true
-    create_database_if_missing true
-    view {
-      name :test_object_class_view
-      kind :class
-      model_class GOM::Spec::Object
-    }
-    view {
-      name :test_map_view
-      kind :map_reduce
-      map_function """
-        function(document) {
-          if (document['number'] == 11) {
-            emit(document['_id'], null);
-          }
-        }
-      """
-    }
-    view {
-      name :test_map_reduce_view
-      kind :map_reduce
-      map_function """
-        function(document) {
-          if (document['number']) {
-            emit(document['_id'], document['number']);
-          }
-        }
-      """
-      reduce_function """
-        function(keys, values, rereduce) {
-          return sum(values);
-        }
-      """
-    }
-  }
-}
+require File.join(File.dirname(__FILE__), "storage_configuration")

data/spec/storage_configuration.rb

@@ -0,0 +1,51 @@
+
+GOM::Storage.configure {
+  storage {
+    name :test_storage
+    adapter :couchdb
+    database "test"
+    delete_database_if_exists true
+    create_database_if_missing true
+    view {
+      name :test_property_view
+      kind :property
+      filter {
+        model_class :equals, "GOM::Spec::Object"
+        number :greater_than, 13
+      }
+      properties :_id
+    }
+    view {
+      name :test_object_class_view
+      kind :class
+      model_class GOM::Spec::Object
+    }
+    view {
+      name :test_map_view
+      kind :map_reduce
+      map_function """
+        function(document) {
+          if (document['number'] == 11) {
+            emit(document['_id'], null);
+          }
+        }
+      """
+    }
+    view {
+      name :test_map_reduce_view
+      kind :map_reduce
+      map_function """
+        function(document) {
+          if (document['number']) {
+            emit(document['_id'], document['number']);
+          }
+        }
+      """
+      reduce_function """
+        function(keys, values, rereduce) {
+          return sum(values);
+        }
+      """
+    }
+  }
+}

metadata

@@ -1,140 +1,139 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gom-couchdb-adapter
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.4.3
   prerelease: 
-  version: 0.4.2
 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: gom
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &16512820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.4.1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: couchdb
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *16512820
+- !ruby/object:Gem::Dependency
+  name: couchdb
+  requirement: &16512320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.3
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *16512320
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &16511840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: reek
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *16511840
+- !ruby/object:Gem::Dependency
+  name: reek
+  requirement: &16511340 !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: *id004
-description: CouchDB storage adapter for the General Object Mapper. Currently, version 1.0 of CouchDB is supported.
+  prerelease: false
+  version_requirements: *16511340
+description: CouchDB storage adapter for the General Object Mapper. Currently, version
+  1.0 of CouchDB is supported.
 email: b.phifty@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - README.rdoc
 - LICENSE
 - Rakefile
-- lib/gom/storage/couchdb/adapter.rb
-- lib/gom/storage/couchdb/view/builder.rb
+- lib/gom/storage/couchdb/view/builder_from_class.rb
 - lib/gom/storage/couchdb/view/pusher.rb
-- lib/gom/storage/couchdb/counter.rb
+- lib/gom/storage/couchdb/view/builder_from_property.rb
 - lib/gom/storage/couchdb/view.rb
+- lib/gom/storage/couchdb/collection/fetcher.rb
+- lib/gom/storage/couchdb/counter.rb
+- lib/gom/storage/couchdb/adapter.rb
 - lib/gom/storage/couchdb/saver.rb
-- lib/gom/storage/couchdb/fetcher.rb
+- lib/gom/storage/couchdb/remover.rb
 - lib/gom/storage/couchdb/draft/builder.rb
 - lib/gom/storage/couchdb/draft.rb
-- lib/gom/storage/couchdb/remover.rb
-- lib/gom/storage/couchdb/collection/fetcher.rb
+- lib/gom/storage/couchdb/fetcher.rb
 - lib/gom/storage/couchdb/collection.rb
 - lib/gom/storage/couchdb.rb
-- lib/gom/couchdb-adapter.rb
 - lib/gom/storage.rb
-- spec/lib/gom/storage/couchdb/fetcher_spec.rb
+- lib/gom/couchdb-adapter.rb
+- spec/lib/gom/storage/couchdb/view/builder_from_class_spec.rb
+- spec/lib/gom/storage/couchdb/view/builder_from_property_spec.rb
 - spec/lib/gom/storage/couchdb/view/pusher_spec.rb
-- spec/lib/gom/storage/couchdb/view/builder_spec.rb
-- spec/lib/gom/storage/couchdb/draft/builder_spec.rb
-- spec/lib/gom/storage/couchdb/counter_spec.rb
 - spec/lib/gom/storage/couchdb/collection/fetcher_spec.rb
+- spec/lib/gom/storage/couchdb/adapter_spec.rb
+- spec/lib/gom/storage/couchdb/counter_spec.rb
+- spec/lib/gom/storage/couchdb/draft/builder_spec.rb
+- spec/lib/gom/storage/couchdb/fetcher_spec.rb
 - spec/lib/gom/storage/couchdb/remover_spec.rb
 - spec/lib/gom/storage/couchdb/saver_spec.rb
-- spec/lib/gom/storage/couchdb/adapter_spec.rb
 - spec/spec_helper.rb
-- spec/acceptance/map_spec.rb
-- spec/acceptance/map_reduce_spec.rb
+- spec/storage_configuration.rb
 - spec/acceptance/adapter_spec.rb
+- spec/acceptance/map_reduce_spec.rb
+- spec/acceptance/map_spec.rb
 has_rdoc: true
 homepage: http://github.com/phifty/gom-couchdb-adapter
 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-couchdb-adapter
-rubygems_version: 1.6.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: CouchDB storage adapter for the General Object Mapper.
-test_files: 
-- spec/lib/gom/storage/couchdb/fetcher_spec.rb
+test_files:
+- spec/lib/gom/storage/couchdb/view/builder_from_class_spec.rb
+- spec/lib/gom/storage/couchdb/view/builder_from_property_spec.rb
 - spec/lib/gom/storage/couchdb/view/pusher_spec.rb
-- spec/lib/gom/storage/couchdb/view/builder_spec.rb
-- spec/lib/gom/storage/couchdb/draft/builder_spec.rb
-- spec/lib/gom/storage/couchdb/counter_spec.rb
 - spec/lib/gom/storage/couchdb/collection/fetcher_spec.rb
+- spec/lib/gom/storage/couchdb/adapter_spec.rb
+- spec/lib/gom/storage/couchdb/counter_spec.rb
+- spec/lib/gom/storage/couchdb/draft/builder_spec.rb
+- spec/lib/gom/storage/couchdb/fetcher_spec.rb
 - spec/lib/gom/storage/couchdb/remover_spec.rb
 - spec/lib/gom/storage/couchdb/saver_spec.rb
-- spec/lib/gom/storage/couchdb/adapter_spec.rb
-- spec/acceptance/map_spec.rb
-- spec/acceptance/map_reduce_spec.rb
 - spec/acceptance/adapter_spec.rb
+- spec/acceptance/map_reduce_spec.rb
+- spec/acceptance/map_spec.rb