dm-mongo-adapter 0.2.0.pre1 → 0.2.0.pre2

data/Rakefile

@@ -23,6 +23,9 @@ begin
     gem.add_development_dependency 'rspec',     '>= 1.3.0'
     gem.add_development_dependency 'yard',      '>= 0.5'
     gem.add_development_dependency 'yardstick', '>= 0.1'
+
+    # Exclude files
+    gem.files.exclude "bin/console"
   end
   Jeweler::GemcutterTasks.new
   FileList['tasks/**/*.rake'].each { |task| import task }

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 0
 :minor: 2
 :patch: 0
-:build: pre1
+:build: pre2

data/dm-mongo-adapter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-mongo-adapter}
-  s.version = "0.2.0.pre1"
+  s.version = "0.2.0.pre2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Piotr Solnica"]
-  s.date = %q{2010-01-31}
+  s.date = %q{2010-02-22}
   s.default_executable = %q{console}
   s.email = %q{piotr.solnica@gmail.com}
   s.executables = ["console"]
@@ -25,7 +25,6 @@ Gem::Specification.new do |s|
      "Rakefile",
      "TODO",
      "VERSION.yml",
-     "bin/console",
      "dm-mongo-adapter.gemspec",
      "lib/mongo_adapter.rb",
      "lib/mongo_adapter/adapter.rb",
@@ -84,38 +83,37 @@ Gem::Specification.new do |s|
      "tasks/yard.rake",
      "tasks/yardstick.rake"
   ]
-  s.has_rdoc = false
   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.5}
+  s.rubygems_version = %q{1.3.6}
   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/spec_helper.rb",
-     "spec/legacy/sti_spec.rb",
-     "spec/legacy/property_spec.rb",
-     "spec/legacy/modifier_spec.rb",
-     "spec/legacy/adapter_spec.rb",
-     "spec/legacy/spec_helper.rb",
-     "spec/legacy/embedments_spec.rb",
-     "spec/legacy/adapter_shared_spec.rb",
-     "spec/legacy/associations_spec.rb",
-     "spec/legacy/embedded_resource_spec.rb",
-     "spec/public/embedded_collection_spec.rb",
-     "spec/public/model_spec.rb",
-     "spec/public/model/embedment_spec.rb",
-     "spec/public/shared/model_embedments_spec.rb",
-     "spec/public/shared/object_id_shared_spec.rb",
-     "spec/public/resource_spec.rb",
      "spec/public/types/discriminator_spec.rb",
-     "spec/public/types/embedded_hash_spec.rb",
-     "spec/public/types/embedded_array_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"
   ]

data/lib/mongo_adapter/adapter.rb

@@ -154,7 +154,8 @@ module DataMapper
         model.properties.each do |property|
           name = property.name
           if model.public_method_defined?(name)
-            value = record.__send__(name)
+            value = property.get(record)
+            
             attributes[property.field] = property.custom? ?
               property.type.dump(value, property) : value
           end
@@ -166,7 +167,7 @@ module DataMapper
               value = record.__send__(name)
 
               if embedment.kind_of?(Embedments::OneToMany::Relationship)
-                attributes[name] = value.map{ |resource| attributes_as_fields(resource) }
+                attributes[embedment.storage_name] = value.map{ |resource| attributes_as_fields(resource) }
               else
                 attributes[name] = attributes_as_fields(value)
               end
@@ -186,7 +187,7 @@ module DataMapper
             when DataMapper::Property
               attributes[key.field] = key.custom? ? key.type.dump(value, key) : value
             when Embedments::Relationship
-              attributes[key.name] = attributes_as_fields(value)
+              attributes[key.storage_name] = attributes_as_fields(value)
             end
         end
 

data/lib/mongo_adapter/embedments/one_to_many.rb

@@ -59,6 +59,11 @@ module DataMapper
             get!(source).replace(targets)
           end
 
+          # @api public
+          def storage_name
+            @storage_name ||= target_model.storage_name
+          end
+
           private
 
           # Creates a new collection instance for the source resources.

data/lib/mongo_adapter/embedments/one_to_one.rb

@@ -46,6 +46,10 @@ module DataMapper
             set!(source, target)
           end
 
+          # @api public
+          def storage_name
+            @storage_name ||= target_model.storage_name.singular
+          end
         end # Relationship
       end # OneToOne
     end # Embedments

data/lib/mongo_adapter/query.rb

@@ -149,7 +149,7 @@ module DataMapper
       def comparison_statement_for_embedment(comparison, affirmative = true)
         embedment = @query.model.embedments.values.detect { |e| e.target_model == comparison.subject.model }
 
-        field = "#{embedment.name}.#{comparison.subject.field}"
+        field = "#{embedment.storage_name}.#{comparison.subject.field}"
 
        update_statements(comparison, field, affirmative)
       end

data/lib/mongo_adapter/types/date.rb

@@ -8,10 +8,6 @@ module DataMapper
           self.typecast(value, property)
         end
 
-        def self.dump(value, property)
-          self.typecast(value, property)
-        end
-
         def self.typecast(value, property)
           case value
           when ::Date

data/spec/public/resource_spec.rb

@@ -9,8 +9,7 @@ describe DataMapper::Mongo::Resource do
       property :state, String
     end
 
-    class ::Location
-      include DataMapper::Mongo::EmbeddedResource
+    class ::Location < ::Address
       property :country,   String
       property :continent, String
     end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-mongo-adapter
 version: !ruby/object:Gem::Version 
-  version: 0.2.0.pre1
+  prerelease: true
+  segments: 
+  - 0
+  - 2
+  - 0
+  - pre2
+  version: 0.2.0.pre2
 platform: ruby
 authors: 
 - Piotr Solnica
@@ -9,79 +15,105 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-31 00:00:00 +01:00
+date: 2010-02-22 00:00:00 +01:00
 default_executable: console
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: dm-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 10
+        - 2
         version: 0.10.2
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: dm-aggregates
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 10
+        - 2
         version: 0.10.2
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: mongo
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 18
+        - 3
         version: 0.18.3
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: mongo_ext
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 18
+        - 3
         version: 0.18.3
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 0
         version: 1.3.0
-    version: 
+  type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: yard
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
         version: "0.5"
-    version: 
+  type: :development
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: yardstick
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
         version: "0.1"
-    version: 
+  type: :development
+  version_requirements: *id007
 description: 
 email: piotr.solnica@gmail.com
 executables: 
@@ -99,7 +131,6 @@ files:
 - Rakefile
 - TODO
 - VERSION.yml
-- bin/console
 - dm-mongo-adapter.gemspec
 - lib/mongo_adapter.rb
 - lib/mongo_adapter/adapter.rb
@@ -157,7 +188,7 @@ files:
 - tasks/spec.rake
 - tasks/yard.rake
 - tasks/yardstick.rake
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/solnic/dm-mongo-adapter
 licenses: []
 
@@ -170,18 +201,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: MongoDB DataMapper Adapter
@@ -189,27 +224,27 @@ test_files:
 - spec/semipublic/model/embedment_spec.rb
 - spec/semipublic/resource_spec.rb
 - spec/semipublic/embedded_model_spec.rb
-- spec/spec_helper.rb
-- spec/legacy/sti_spec.rb
-- spec/legacy/property_spec.rb
-- spec/legacy/modifier_spec.rb
-- spec/legacy/adapter_spec.rb
-- spec/legacy/spec_helper.rb
-- spec/legacy/embedments_spec.rb
-- spec/legacy/adapter_shared_spec.rb
-- spec/legacy/associations_spec.rb
-- spec/legacy/embedded_resource_spec.rb
-- spec/public/embedded_collection_spec.rb
-- spec/public/model_spec.rb
-- spec/public/model/embedment_spec.rb
-- spec/public/shared/model_embedments_spec.rb
-- spec/public/shared/object_id_shared_spec.rb
-- spec/public/resource_spec.rb
 - spec/public/types/discriminator_spec.rb
-- spec/public/types/embedded_hash_spec.rb
-- spec/public/types/embedded_array_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