dm-mongo-adapter 0.2.0.pre3 → 0.6.0

data/spec/public/shared/object_id_shared_spec.rb

@@ -1,56 +1,33 @@
-share_examples_for 'An ObjectID Type' do
-
-  describe '.load' do
+share_examples_for 'An ObjectId Type' do
+  describe '#typecast' do
     it 'should return nil when given nil' do
-      @type_class.load(nil, nil).should be_nil
+      @property.typecast(nil).should be_nil
     end
 
-    it 'should return the argument when given a string' do
-      loaded = @type_class.load('avalue', nil)
-      loaded.should == 'avalue'
+    it 'should return BSON::ObjectId when given a valid string' do
+      value = '4d7b57618f9f1f12bd000002'
+      loaded = @property.typecast(value)
+      loaded.should == ::BSON::ObjectId.from_string(value)
     end
 
-    it 'should return a string when given a Mongo::ObjectID' do
-      mongo_id = ::Mongo::ObjectID.new
-      loaded = @type_class.load(mongo_id, nil)
-      loaded.should be_kind_of(String)
-      loaded.should == mongo_id.to_s
+    it 'should raise BSON::InvalidObjectId when give an invalid string' do
+      lambda {
+        @property.typecast('#invalid#')
+      }.should raise_error(::BSON::InvalidObjectId)
     end
 
-    it 'should raise an error when given anything else' do
-      [ 0, 1, Object.new, true, false, [], {} ].each do |value|
-        lambda {
-          @type_class.load(value, nil)
-        }.should raise_error(ArgumentError)
-      end
-    end
-  end
-
-  describe '.dump' do
-    it 'should return nil when given nil' do
-      @type_class.dump(nil, nil).should be_nil
-    end
-
-    it 'should return a Mongo::ObjectID when given a string' do
-      mongo_id = ::Mongo::ObjectID.new
-      dumped = @type_class.dump(mongo_id.to_s, nil)
-      dumped.should be_kind_of(::Mongo::ObjectID)
-      dumped.to_s.should == mongo_id.to_s
-    end
-
-    it 'should return the argument when given a Mongo::ObjectID' do
-      mongo_id = ::Mongo::ObjectID.new
-      dumped = @type_class.dump(mongo_id, nil)
-      dumped.should == mongo_id
+    it 'should return the argument when given a BSON::ObjectId' do
+      mongo_id = ::BSON::ObjectId.new
+      loaded = @property.typecast(mongo_id)
+      loaded.should be(mongo_id)
     end
 
     it 'should raise an error when given anything else' do
       [ 0, 1, Object.new, true, false, [], {} ].each do |value|
         lambda {
-          @type_class.dump(value, nil)
+          @property.typecast(value)
         }.should raise_error(ArgumentError)
       end
     end
   end
-
 end

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 require 'pathname'
-require 'rubygems'
 require 'spec'
 
 MONGO_SPEC_ROOT = Pathname(__FILE__).dirname.expand_path
@@ -31,9 +30,6 @@ Spec::Runner.configure do |config|
 
   config.before(:all) do
     models  = DataMapper::Model.descendants.to_a
-    models += DataMapper::Mongo::EmbeddedModel.descendants.to_a
-    models.delete(DataMapper::Mongo::EmbeddedResource)
-
     cleanup_models(*models)
   end
 

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: dm-mongo-adapter
 version: !ruby/object:Gem::Version 
-  prerelease: true
-  segments: 
-  - 0
-  - 2
-  - 0
-  - pre3
-  version: 0.2.0.pre3
+  prerelease: 
+  version: 0.6.0
 platform: ruby
 authors: 
 - Piotr Solnica
@@ -15,105 +10,108 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-22 00:00:00 +01:00
+date: 2011-03-19 00:00:00 +01:00
 default_executable: console
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: dm-core
-  prerelease: false
+  name: mongo
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 10
-        - 2
-        version: 0.10.2
+        version: 1.2.4
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: dm-aggregates
-  prerelease: false
+  name: dm-core
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 10
-        - 2
-        version: 0.10.2
+        version: 1.1.0
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: mongo
-  prerelease: false
+  name: dm-aggregates
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 18
-        - 3
-        version: 0.18.3
+        version: 1.1.0
   type: :runtime
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: mongo_ext
-  prerelease: false
+  name: dm-migrations
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 18
-        - 3
-        version: 0.18.3
+        version: 1.1.0
   type: :runtime
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
+  name: rake
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 0
-        version: 1.3.0
+        version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: yard
-  prerelease: false
+  name: rcov
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 5
-        version: "0.5"
+        version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: yardstick
-  prerelease: false
+  name: rspec
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        version: "0.1"
+        version: "1.3"
   type: :development
+  prerelease: false
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.5.1
+  type: :development
+  prerelease: false
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: yard
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "0.5"
+  type: :development
+  prerelease: false
+  version_requirements: *id009
 description: 
 email: piotr.solnica@gmail.com
 executables: 
@@ -125,7 +123,7 @@ extra_rdoc_files:
 - README.rdoc
 - TODO
 files: 
-- .gitignore
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -136,115 +134,87 @@ files:
 - 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/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/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
+- 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/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/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/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
+- bin/console
 has_rdoc: true
 homepage: http://github.com/solnic/dm-mongo-adapter
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: MongoDB DataMapper Adapter
 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/associations_spec.rb
+- spec/legacy/property_spec.rb
 - spec/legacy/spec_helper.rb
-- spec/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

data/.gitignore

@@ -1,9 +0,0 @@
-*.sw?
-.DS_Store
-.yardoc
-coverage
-doc
-measurements
-pkg
-rdoc
-script/dumps

data/lib/mongo_adapter/embedded_model.rb

@@ -1,187 +0,0 @@
-module DataMapper
-  module Mongo
-    module EmbeddedModel
-      extend Chainable
-      include DataMapper::Model
-
-      # Creates a new Model class with default_storage_name +storage_name+
-      #
-      # If a block is passed, it will be eval'd in the context of the new Model
-      #
-      # @param [Proc] block
-      #   a block that will be eval'd in the context of the new Model class
-      #
-      # @return [Model]
-      #   the newly created Model class
-      #
-      # @api semipublic
-      def self.new(&block)
-        model = Class.new
-
-        model.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-        include DataMapper::Mongo::EmbeddedResource
-
-        def self.name
-          to_s
-        end
-        RUBY
-
-        model.instance_eval(&block) if block
-        model
-      end
-
-      # Methods copied from DataMapper::Model
-
-      # Return all models that extend the Model module
-      #
-      #   class Foo
-      #     include DataMapper::Resource
-      #   end
-      #
-      #   DataMapper::Model.descendants.first   #=> Foo
-      #
-      # @return [DescendantSet]
-      #   Set containing the descendant models
-      #
-      # @api semipublic
-      def self.descendants
-        @descendants ||= DescendantSet.new
-      end
-
-      # Return all models that inherit from a Model
-      #
-      #   class Foo
-      #     include DataMapper::Resource
-      #   end
-      #
-      #   class Bar < Foo
-      #   end
-      #
-      #   Foo.descendants.first   #=> Bar
-      #
-      # @return [Set]
-      #   Set containing the descendant classes
-      #
-      # @api semipublic
-      attr_reader :descendants
-
-      # Appends a module for inclusion into the model class after Resource.
-      #
-      # This is a useful way to extend Resource while still retaining a
-      # self.included method.
-      #
-      # @param [Module] inclusions
-      #   the module that is to be appended to the module after Resource
-      #
-      # @return [Boolean]
-      #   true if the inclusions have been successfully appended to the list
-      #
-      # @api semipublic
-      def self.append_inclusions(*inclusions)
-        extra_inclusions.concat inclusions
-
-        # Add the inclusion to existing descendants
-        descendants.each do |model|
-          inclusions.each { |inclusion| model.send :include, inclusion }
-        end
-
-        true
-      end
-
-      # The current registered extra inclusions
-      #
-      # @return [Set]
-      #
-      # @api private
-      def self.extra_inclusions
-        @extra_inclusions ||= []
-      end
-
-      # Extends the model with this module after Resource has been included.
-      #
-      # This is a useful way to extend Model while still retaining a self.extended method.
-      #
-      # @param [Module] extensions
-      #   List of modules that will extend the model after it is extended by Model
-      #
-      # @return [Boolean]
-      #   whether or not the inclusions have been successfully appended to the list
-      #
-      # @api semipublic
-      def self.append_extensions(*extensions)
-        extra_extensions.concat extensions
-
-        # Add the extension to existing descendants
-        descendants.each do |model|
-          extensions.each { |extension| model.extend(extension) }
-        end
-
-        true
-      end
-
-      # The current registered extra extensions
-      #
-      # @return [Set]
-      #
-      # @api private
-      def self.extra_extensions
-        @extra_extensions ||= []
-      end
-
-      # @api private
-      def self.extended(model)
-        descendants = self.descendants
-
-        descendants << model
-
-        model.instance_variable_set(:@valid,         false)
-        model.instance_variable_set(:@base_model,    model)
-        model.instance_variable_set(:@storage_names, {})
-        model.instance_variable_set(:@default_order, {})
-        model.instance_variable_set(:@descendants,   descendants.class.new(model, descendants))
-
-        extra_extensions.each { |mod| model.extend(mod)         }
-        extra_inclusions.each { |mod| model.send(:include, mod) }
-      end
-
-      # @api private
-      chainable do
-        def inherited(model)
-          descendants = self.descendants
-
-          descendants << model
-
-          model.instance_variable_set(:@valid,         false)
-          model.instance_variable_set(:@base_model,    base_model)
-          model.instance_variable_set(:@storage_names, @storage_names.dup)
-          model.instance_variable_set(:@default_order, @default_order.dup)
-          model.instance_variable_set(:@descendants,   descendants.class.new(model, descendants))
-
-          # TODO: move this into dm-validations
-          if respond_to?(:validators)
-            validators.contexts.each do |context, validators|
-              model.validators.context(context).concat(validators)
-            end
-          end
-        end
-      end
-
-      # end of DataMapper::Model methods
-
-      append_extensions DataMapper::Model::Hook
-      append_extensions DataMapper::Model::Property
-      append_extensions DataMapper::Model::Relationship
-
-      # @overrides DataMapper::Model#assert_valid
-      def assert_valid
-        return if @valid
-        @valid = true
-
-        if properties.empty?
-          raise IncompleteModelError, "#{self.name} must have at least one property to be valid"
-        end
-      end
-
-    end # EmbeddedModel
-  end # Mongo
-end # DataMapper