dm-mongo-adapter 0.2.0.pre3 → 0.6.0

data/Gemfile

@@ -0,0 +1,27 @@
+source 'http://rubygems.org'
+
+group :runtime do
+  MONGO_VERSION = '~> 1.2.4'
+
+  # MongoDB driver
+  gem 'mongo', MONGO_VERSION
+
+  # DataMapper libs
+  DM_VERSION = '~> 1.1.0'
+
+  gem 'dm-core',       DM_VERSION
+  gem 'dm-aggregates', DM_VERSION
+  gem 'dm-migrations', DM_VERSION
+end
+
+group :development do
+  gem 'rake'
+  gem 'rcov'
+  gem 'rspec',   '~> 1.3'
+  gem 'jeweler', '~> 1.5.1'
+  gem 'yard',    '~> 0.5'
+end
+
+group :quality do
+  gem 'yardstick', '~> 0.1'
+end

data/README.rdoc

@@ -1,5 +1,16 @@
 = DataMapper MongoDB Adapter
 
+== Status
+
+The adapter is going through a major re-work as DataMapper will soon support EmbeddedValue (see: http://wiki.github.com/datamapper/dm-core/roadmap)
+and the adapter will significantly benefit from that fact as there won't be a need to hack around DM's private API like
+it used to be. Apart from embedded docs support there's plenty of work that needs to be done around MongoDB's modifier
+operators (http://www.mongodb.org/display/DOCS/Updating). With these things done we can start thinking about releasing 1.0.
+
+Contributors are most welcome! In case of any questions you can find me on #datamapper IRC channel.
+
+solnic
+
 Useful links:
 
 * http://github.com/solnic/dm-mongo-adapter
@@ -10,13 +21,13 @@ Useful links:
 
 Ruby gems
 
-* dm-core ~> 0.10.2
-* dm-aggregates ~> 0.10.2
-* mongo ~> 0.18.3
+* dm-core ~> 1.1.0
+* dm-aggregates ~> 1.1.0
+* mongo ~> 1.2.4
 
 == Install
 
-  gem install dm-mongo-adapter --pre
+  gem install dm-mongo-adapter
 
 == Synopsis
 
@@ -25,35 +36,13 @@ Ruby gems
     :database => 'my_mongo_db',
   )
 
-  # Define embedded resources
-  class Address
-    include DataMapper::Mongo::EmbeddedResource
-
-    property :street, String
-    property :city, String
-    property :state, String
-    property :postal_code, String
-  end
-
-  class Score
-    include DataMapper::Mongo::EmbeddedResource
-
-    property :grade, Float
-    property :course_id, DBRef
-
-    belongs_to :course
-  end
-
-  # Define top-level resources
+  # Define resources
   class Student
     include DataMapper::Mongo::Resource
 
     property :id, ObjectID
     property :name, String
     property :age, Integer
-
-    embeds 1, :address, :model => Address
-    embeds n, :scores
   end
 
   class Course
@@ -67,17 +56,9 @@ Ruby gems
   biology = Course.create(:name => "Biology")
   english = Course.create(:name => "English")
 
-  # Nested attributes
-  student = Student.create(:name => "John", :age => "26",
-    :address => { :street => "123 Main St.", :city => "New York", :state => "NY", :postal_code => "10014" },
-    :scores  => [ { :grade => 4.0, :course_id => biology.id }, { :grade => 3.0, :course_id => english.id } ])
-
   # Queries
   Student.all(:age.gte => 20, :name => /oh/, :limit => 20, :order => [:age.asc])
 
-  # Reaching into embedded objects
-  Student.all(:"address.state" => "NY")
-
   # Array and Hash as a property
   class Zoo
     include DataMapper::Mongo::Resource

data/Rakefile

@@ -7,22 +7,12 @@ CLOBBER.include ['pkg', '*.gem', 'doc', 'coverage', 'measurements']
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
-    gem.name        = 'dm-mongo-adapter'
-    gem.summary     = 'MongoDB DataMapper Adapter'
-    gem.email       = "piotr.solnica@gmail.com"
-    gem.homepage    = "http://github.com/solnic/dm-mongo-adapter"
-    gem.authors     = ['Piotr Solnica']
-
-    gem.has_rdoc    = false
-
-    # Dependencies
-    gem.add_dependency 'dm-core', '~> 0.10.2'
-    gem.add_dependency 'dm-aggregates', '~> 0.10.2'
-    gem.add_dependency 'mongo',   '~> 0.18.3'
-    gem.add_dependency 'mongo_ext',   '~> 0.18.3'
-    gem.add_development_dependency 'rspec',     '>= 1.3.0'
-    gem.add_development_dependency 'yard',      '>= 0.5'
-    gem.add_development_dependency 'yardstick', '>= 0.1'
+    gem.name      = 'dm-mongo-adapter'
+    gem.summary   = 'MongoDB DataMapper Adapter'
+    gem.email     = "piotr.solnica@gmail.com"
+    gem.homepage  = "http://github.com/solnic/dm-mongo-adapter"
+    gem.authors   = ['Piotr Solnica']
+    gem.has_rdoc  = false
 
     # Exclude files
     gem.files.exclude "bin/console"

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
-:minor: 2
+:minor: 6
 :patch: 0
-:build: pre3
+:build: 

data/dm-mongo-adapter.gemspec

@@ -1,152 +1,131 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{dm-mongo-adapter}
-  s.version = "0.2.0.pre3"
+  s.version = "0.6.0"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Piotr Solnica"]
-  s.date = %q{2010-02-22}
+  s.date = %q{2011-03-19}
   s.default_executable = %q{console}
   s.email = %q{piotr.solnica@gmail.com}
   s.executables = ["console"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc",
-     "TODO"
+    "README.rdoc",
+    "TODO"
   ]
   s.files = [
-    ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "TODO",
-     "VERSION.yml",
-     "dm-mongo-adapter.gemspec",
-     "lib/mongo_adapter.rb",
-     "lib/mongo_adapter/adapter.rb",
-     "lib/mongo_adapter/aggregates.rb",
-     "lib/mongo_adapter/conditions.rb",
-     "lib/mongo_adapter/embedded_model.rb",
-     "lib/mongo_adapter/embedded_resource.rb",
-     "lib/mongo_adapter/embedments/one_to_many.rb",
-     "lib/mongo_adapter/embedments/one_to_one.rb",
-     "lib/mongo_adapter/embedments/relationship.rb",
-     "lib/mongo_adapter/migrations.rb",
-     "lib/mongo_adapter/model.rb",
-     "lib/mongo_adapter/model/embedment.rb",
-     "lib/mongo_adapter/modifier.rb",
-     "lib/mongo_adapter/query.rb",
-     "lib/mongo_adapter/query/java_script.rb",
-     "lib/mongo_adapter/resource.rb",
-     "lib/mongo_adapter/types/date.rb",
-     "lib/mongo_adapter/types/date_time.rb",
-     "lib/mongo_adapter/types/db_ref.rb",
-     "lib/mongo_adapter/types/discriminator.rb",
-     "lib/mongo_adapter/types/object_id.rb",
-     "lib/mongo_adapter/types/objects.rb",
-     "script/performance.rb",
-     "spec/legacy/README",
-     "spec/legacy/adapter_shared_spec.rb",
-     "spec/legacy/adapter_spec.rb",
-     "spec/legacy/associations_spec.rb",
-     "spec/legacy/embedded_resource_spec.rb",
-     "spec/legacy/embedments_spec.rb",
-     "spec/legacy/modifier_spec.rb",
-     "spec/legacy/property_spec.rb",
-     "spec/legacy/spec_helper.rb",
-     "spec/legacy/sti_spec.rb",
-     "spec/lib/cleanup_models.rb",
-     "spec/lib/raw_connections.rb",
-     "spec/public/embedded_collection_spec.rb",
-     "spec/public/embedded_resource_spec.rb",
-     "spec/public/model/embedment_spec.rb",
-     "spec/public/model_spec.rb",
-     "spec/public/resource_spec.rb",
-     "spec/public/shared/model_embedments_spec.rb",
-     "spec/public/shared/object_id_shared_spec.rb",
-     "spec/public/types/df_ref_spec.rb",
-     "spec/public/types/discriminator_spec.rb",
-     "spec/public/types/embedded_array_spec.rb",
-     "spec/public/types/embedded_hash_spec.rb",
-     "spec/public/types/object_id_spec.rb",
-     "spec/rcov.opts",
-     "spec/semipublic/embedded_model_spec.rb",
-     "spec/semipublic/model/embedment_spec.rb",
-     "spec/semipublic/resource_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "tasks/spec.rake",
-     "tasks/yard.rake",
-     "tasks/yardstick.rake"
+    "Gemfile",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "TODO",
+    "VERSION.yml",
+    "dm-mongo-adapter.gemspec",
+    "lib/mongo_adapter.rb",
+    "lib/mongo_adapter/adapter.rb",
+    "lib/mongo_adapter/aggregates.rb",
+    "lib/mongo_adapter/conditions.rb",
+    "lib/mongo_adapter/migrations.rb",
+    "lib/mongo_adapter/model.rb",
+    "lib/mongo_adapter/modifier.rb",
+    "lib/mongo_adapter/property/array.rb",
+    "lib/mongo_adapter/property/db_ref.rb",
+    "lib/mongo_adapter/property/hash.rb",
+    "lib/mongo_adapter/property/object_id.rb",
+    "lib/mongo_adapter/query.rb",
+    "lib/mongo_adapter/query/java_script.rb",
+    "lib/mongo_adapter/rails/storage.rb",
+    "lib/mongo_adapter/resource.rb",
+    "lib/mongo_adapter/support/class.rb",
+    "lib/mongo_adapter/support/date.rb",
+    "lib/mongo_adapter/support/date_time.rb",
+    "lib/mongo_adapter/support/object.rb",
+    "script/performance.rb",
+    "spec/legacy/README",
+    "spec/legacy/adapter_shared_spec.rb",
+    "spec/legacy/adapter_spec.rb",
+    "spec/legacy/associations_spec.rb",
+    "spec/legacy/property_spec.rb",
+    "spec/legacy/spec_helper.rb",
+    "spec/legacy/sti_spec.rb",
+    "spec/lib/cleanup_models.rb",
+    "spec/lib/raw_connections.rb",
+    "spec/public/aggregates_spec.rb",
+    "spec/public/model_spec.rb",
+    "spec/public/modifier_spec.rb",
+    "spec/public/properties/db_ref_spec.rb",
+    "spec/public/properties/object_id_spec.rb",
+    "spec/public/resource_spec.rb",
+    "spec/public/shared/object_id_shared_spec.rb",
+    "spec/rcov.opts",
+    "spec/spec.opts",
+    "spec/spec_helper.rb",
+    "tasks/spec.rake",
+    "tasks/yard.rake",
+    "tasks/yardstick.rake"
   ]
   s.homepage = %q{http://github.com/solnic/dm-mongo-adapter}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{MongoDB DataMapper Adapter}
   s.test_files = [
-    "spec/semipublic/model/embedment_spec.rb",
-     "spec/semipublic/resource_spec.rb",
-     "spec/semipublic/embedded_model_spec.rb",
-     "spec/public/types/discriminator_spec.rb",
-     "spec/public/types/df_ref_spec.rb",
-     "spec/public/types/embedded_hash_spec.rb",
-     "spec/public/types/object_id_spec.rb",
-     "spec/public/types/embedded_array_spec.rb",
-     "spec/public/model/embedment_spec.rb",
-     "spec/public/resource_spec.rb",
-     "spec/public/shared/object_id_shared_spec.rb",
-     "spec/public/shared/model_embedments_spec.rb",
-     "spec/public/embedded_resource_spec.rb",
-     "spec/public/embedded_collection_spec.rb",
-     "spec/public/model_spec.rb",
-     "spec/legacy/property_spec.rb",
-     "spec/legacy/associations_spec.rb",
-     "spec/legacy/modifier_spec.rb",
-     "spec/legacy/adapter_shared_spec.rb",
-     "spec/legacy/embedded_resource_spec.rb",
-     "spec/legacy/sti_spec.rb",
-     "spec/legacy/embedments_spec.rb",
-     "spec/legacy/adapter_spec.rb",
-     "spec/legacy/spec_helper.rb",
-     "spec/spec_helper.rb",
-     "spec/lib/cleanup_models.rb",
-     "spec/lib/raw_connections.rb"
+    "spec/legacy/adapter_shared_spec.rb",
+    "spec/legacy/adapter_spec.rb",
+    "spec/legacy/associations_spec.rb",
+    "spec/legacy/property_spec.rb",
+    "spec/legacy/spec_helper.rb",
+    "spec/legacy/sti_spec.rb",
+    "spec/lib/cleanup_models.rb",
+    "spec/lib/raw_connections.rb",
+    "spec/public/aggregates_spec.rb",
+    "spec/public/model_spec.rb",
+    "spec/public/modifier_spec.rb",
+    "spec/public/properties/db_ref_spec.rb",
+    "spec/public/properties/object_id_spec.rb",
+    "spec/public/resource_spec.rb",
+    "spec/public/shared/object_id_shared_spec.rb",
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dm-core>, ["~> 0.10.2"])
-      s.add_runtime_dependency(%q<dm-aggregates>, ["~> 0.10.2"])
-      s.add_runtime_dependency(%q<mongo>, ["~> 0.18.3"])
-      s.add_runtime_dependency(%q<mongo_ext>, ["~> 0.18.3"])
-      s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
-      s.add_development_dependency(%q<yard>, [">= 0.5"])
-      s.add_development_dependency(%q<yardstick>, [">= 0.1"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<mongo>, ["~> 1.2.4"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.1.0"])
+      s.add_runtime_dependency(%q<dm-aggregates>, ["~> 1.1.0"])
+      s.add_runtime_dependency(%q<dm-migrations>, ["~> 1.1.0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
+      s.add_development_dependency(%q<yard>, ["~> 0.5"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 0.10.2"])
-      s.add_dependency(%q<dm-aggregates>, ["~> 0.10.2"])
-      s.add_dependency(%q<mongo>, ["~> 0.18.3"])
-      s.add_dependency(%q<mongo_ext>, ["~> 0.18.3"])
-      s.add_dependency(%q<rspec>, [">= 1.3.0"])
-      s.add_dependency(%q<yard>, [">= 0.5"])
-      s.add_dependency(%q<yardstick>, [">= 0.1"])
+      s.add_dependency(%q<mongo>, ["~> 1.2.4"])
+      s.add_dependency(%q<dm-core>, ["~> 1.1.0"])
+      s.add_dependency(%q<dm-aggregates>, ["~> 1.1.0"])
+      s.add_dependency(%q<dm-migrations>, ["~> 1.1.0"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
+      s.add_dependency(%q<yard>, ["~> 0.5"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 0.10.2"])
-    s.add_dependency(%q<dm-aggregates>, ["~> 0.10.2"])
-    s.add_dependency(%q<mongo>, ["~> 0.18.3"])
-    s.add_dependency(%q<mongo_ext>, ["~> 0.18.3"])
-    s.add_dependency(%q<rspec>, [">= 1.3.0"])
-    s.add_dependency(%q<yard>, [">= 0.5"])
-    s.add_dependency(%q<yardstick>, [">= 0.1"])
+    s.add_dependency(%q<mongo>, ["~> 1.2.4"])
+    s.add_dependency(%q<dm-core>, ["~> 1.1.0"])
+    s.add_dependency(%q<dm-aggregates>, ["~> 1.1.0"])
+    s.add_dependency(%q<dm-migrations>, ["~> 1.1.0"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 1.3"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
+    s.add_dependency(%q<yard>, ["~> 0.5"])
   end
 end
 

data/lib/mongo_adapter.rb

@@ -1,71 +1,28 @@
-if defined?(gem)
-  gem 'dm-core', '~> 0.10.2'
-  gem 'mongo', '~> 0.18'
-end
-
 require 'dm-core'
 require 'dm-aggregates'
 require 'mongo'
 
-dir = Pathname(__FILE__).dirname.expand_path / 'mongo_adapter'
-
-require dir / 'query'
-require dir / 'query' / 'java_script'
-require dir / 'conditions'
-require dir / 'types' / 'discriminator'
-require dir / 'types' / 'date_time'
-require dir / 'types' / 'date'
-require dir / 'types' / 'object_id'
-require dir / 'types' / 'db_ref'
-require dir / 'types' / 'objects'
-
-require dir / 'model' / 'embedment'
-require dir / 'model'
-
-require dir / 'resource'
-require dir / 'migrations'
-
-require dir / 'embedments' / 'relationship'
-require dir / 'embedments' / 'one_to_one'
-require dir / 'embedments' / 'one_to_many'
-
-require dir / 'embedded_model'
-require dir / 'embedded_resource'
-require dir / 'modifier'
-
-require dir / 'aggregates'
-require dir / 'adapter'
-
-module DataMapper
-  module Mongo
-    module QueryExtensions
-      def self.included(base)
-        # FIXME: figure out a cleaner approach than AMC
-        base.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          alias assert_valid_conditions_without_embedment assert_valid_conditions
-          alias assert_valid_conditions assert_valid_conditions_with_embedment
-        RUBY
-      end
+dir = Pathname(__FILE__).dirname.expand_path + 'mongo_adapter'
 
-      def assert_valid_conditions_with_embedment(conditions)
-        if conditions.is_a?(Hash) && model.respond_to?(:embedments) && !model.embedments.blank?
-          conditions.each_key do |key|
-            key_s = key.to_s
+require dir + 'query'
+require dir + 'query' + 'java_script'
+require dir + 'conditions'
 
-            name  = if key_s.include?('.')
-              key_s.split('.')[0].to_sym
-            else
-              key
-            end
+require dir + 'property' + 'object_id'
+require dir + 'property' + 'db_ref'
+require dir + 'property' + 'array'
+require dir + 'property' + 'hash'
 
-            conditions.delete(key) if model.embedments.key?(name)
-          end
-        end
+require dir + 'support' + 'class'
+require dir + 'support' + 'date'
+require dir + 'support' + 'date_time'
+require dir + 'support' + 'object'
 
-        assert_valid_conditions_without_embedment(conditions)
-      end
-    end
-  end
-end
+require dir + 'migrations'
+require dir + 'model'
+require dir + 'resource'
+require dir + 'migrations'
+require dir + 'modifier'
 
-DataMapper::Query.send(:include, DataMapper::Mongo::QueryExtensions)
+require dir + 'aggregates'
+require dir + 'adapter'